Bump betterproto2 from 0.9.1 to 0.10.0

Bumps [betterproto2](https://github.com/betterproto/python-betterproto2) from 0.9.1 to 0.10.0.
- [Release notes](https://github.com/betterproto/python-betterproto2/releases)
- [Changelog](https://github.com/betterproto/python-betterproto2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/betterproto/python-betterproto2/compare/lib-v0.9.1...lib-v0.10.0)

---
updated-dependencies:
- dependency-name: betterproto2
  dependency-version: 0.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

README.md

@@ -60,11 +60,6 @@ For alternative installation options and known issues, please refer to the [docu
 
 MVT provides two commands `mvt-ios` and `mvt-android`. [Check out the documentation to learn how to use them!](https://docs.mvt.re/)
 
-Module-running `check-*` commands can load custom Python modules with
-`--load-module PATH` or from a folder set in `MVT_CUSTOM_MODULES`. See the
-[development documentation](https://docs.mvt.re/en/latest/development/) for
-details.
-
 
 ## License
 

docs/development.md

@@ -39,82 +39,6 @@ Selecting a single module also runs its transitive dependencies. If a dependency
 is unavailable or the dependency graph contains a cycle, the command logs a
 warning and does not run any modules.
 
-## Custom modules
-
-Module-running `check-*` commands can load custom modules from Python files that
-are not installed as part of MVT. Load one file with:
-
-```bash
-mvt-ios check-backup --load-module ./example_module.py --output ./out ./backup
-```
-
-You can also load a folder. MVT loads non-hidden top-level `*.py` files in
-sorted order and skips `__init__.py`:
-
-```bash
-mvt-ios check-fs --load-module ./custom_modules ./filesystem-dump
-```
-
-Set `MVT_CUSTOM_MODULES` to load a folder for every module-running command. This
-folder is loaded before any `--load-module` path:
-
-```bash
-MVT_CUSTOM_MODULES=./custom_modules mvt-android check-bugreport ./bugreport.zip
-```
-
-Custom modules are normal `MVTModule` subclasses:
-
-```python
-from mvt.common.module import MVTModule
-
-
-class ExampleCustomModule(MVTModule):
-    supported_commands = (("ios", "check-backup"), ("ios", "check-fs"))
-    slug = "example_custom_module"
-
-    def run(self):
-        self.results = [{"message": "custom module ran"}]
-
-    def check_indicators(self):
-        pass
-
-    def serialize(self, result):
-        return None
-```
-
-Use `supported_commands` to restrict a module to specific platform/command
-pairs. Missing or empty `supported_commands` means the module is available to
-all commands, which keeps older modules compatible. Supported pairs are:
-
-```python
-("ios", "check-backup")
-("ios", "check-fs")
-("ios", "check-iocs")
-("android", "check-backup")
-("android", "check-bugreport")
-("android", "check-androidqf")
-("android", "check-intrusion-logs")
-("android", "check-iocs")
-```
-
-Custom modules can depend on existing MVT module classes. Dependencies are
-resolved with the same ordering logic as built-in modules, and custom modules
-are appended after built-ins before ordering:
-
-```python
-from mvt.common.module import MVTModule
-from mvt.ios.modules.backup.manifest import Manifest
-
-
-class DependentCustomModule(MVTModule):
-    supported_commands = (("ios", "check-backup"),)
-    dependencies = (Manifest,)
-
-    def run(self):
-        manifest_results = self.get_dependency_results(Manifest)
-        self.results = [{"manifest_entries": len(manifest_results)}]
-```
-
 ## Profiling
 
 Some MVT modules extract and process significant amounts of data during the analysis process or while checking results against known indicators. Care must be

pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "cryptography==47.0.0",
     "PyYAML>=6.0.2",
     "pyahocorasick==2.3.1",
-    "betterproto2==0.9.1",
+    "betterproto2==0.10.0",
     "pydantic==2.13.3",
     "pydantic-settings==2.14.0",
     "NSKeyedUnArchiver==1.5.2",

src/mvt/android/cli.py

@@ -22,7 +22,6 @@ from mvt.common.help import (
     HELP_MSG_HASHES,
     HELP_MSG_IOC,
     HELP_MSG_LIST_MODULES,
-    HELP_MSG_LOAD_MODULE,
     HELP_MSG_MODULE,
     HELP_MSG_NONINTERACTIVE,
     HELP_MSG_OUTPUT,
@@ -31,7 +30,6 @@ from mvt.common.help import (
     HELP_MSG_VERSION,
 )
 from mvt.common.logo import logo
-from mvt.common.module_loader import CustomModuleLoadError, load_custom_modules
 from mvt.common.updates import IndicatorsUpdates
 from mvt.common.utils import init_logging, set_verbose_logging
 
@@ -61,13 +59,6 @@ def _get_disable_flags(ctx):
     )
 
 
-def _load_custom_modules(load_module):
-    try:
-        return load_custom_modules(load_module)
-    except CustomModuleLoadError as exc:
-        raise click.ClickException(str(exc)) from exc
-
-
 # ==============================================================================
 # Main
 # ==============================================================================
@@ -128,28 +119,11 @@ def check_adb(ctx):
 @click.option("--output", "-o", type=click.Path(exists=False), help=HELP_MSG_OUTPUT)
 @click.option("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
 @click.option("--module", "-m", help=HELP_MSG_MODULE)
-@click.option(
-    "--load-module",
-    type=click.Path(exists=True),
-    multiple=True,
-    default=[],
-    help=HELP_MSG_LOAD_MODULE,
-)
 @click.option("--verbose", "-v", is_flag=True, help=HELP_MSG_VERBOSE)
 @click.argument("BUGREPORT_PATH", type=click.Path(exists=True))
 @click.pass_context
-def check_bugreport(
-    ctx,
-    iocs,
-    output,
-    list_modules,
-    module,
-    load_module,
-    verbose,
-    bugreport_path,
-):
+def check_bugreport(ctx, iocs, output, list_modules, module, verbose, bugreport_path):
     set_verbose_logging(verbose)
-    custom_modules = _load_custom_modules(load_module)
     # Always generate hashes as bug reports are small.
     cmd = CmdAndroidCheckBugreport(
         target_path=bugreport_path,
@@ -159,7 +133,6 @@ def check_bugreport(
         hashes=True,
         disable_version_check=_get_disable_flags(ctx)[0],
         disable_indicator_check=_get_disable_flags(ctx)[1],
-        custom_modules=custom_modules,
     )
 
     if list_modules:
@@ -191,13 +164,6 @@ def check_bugreport(
 )
 @click.option("--output", "-o", type=click.Path(exists=False), help=HELP_MSG_OUTPUT)
 @click.option("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
-@click.option(
-    "--load-module",
-    type=click.Path(exists=True),
-    multiple=True,
-    default=[],
-    help=HELP_MSG_LOAD_MODULE,
-)
 @click.option("--non-interactive", "-n", is_flag=True, help=HELP_MSG_NONINTERACTIVE)
 @click.option("--backup-password", "-p", help=HELP_MSG_ANDROID_BACKUP_PASSWORD)
 @click.option("--verbose", "-v", is_flag=True, help=HELP_MSG_VERBOSE)
@@ -208,14 +174,12 @@ def check_backup(
     iocs,
     output,
     list_modules,
-    load_module,
     non_interactive,
     backup_password,
     verbose,
     backup_path,
 ):
     set_verbose_logging(verbose)
-    custom_modules = _load_custom_modules(load_module)
 
     # Always generate hashes as backups are generally small.
     cmd = CmdAndroidCheckBackup(
@@ -229,7 +193,6 @@ def check_backup(
         },
         disable_version_check=_get_disable_flags(ctx)[0],
         disable_indicator_check=_get_disable_flags(ctx)[1],
-        custom_modules=custom_modules,
     )
 
     if list_modules:
@@ -260,13 +223,6 @@ def check_backup(
 @click.option("--output", "-o", type=click.Path(exists=False), help=HELP_MSG_OUTPUT)
 @click.option("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
 @click.option("--module", "-m", help=HELP_MSG_MODULE)
-@click.option(
-    "--load-module",
-    type=click.Path(exists=True),
-    multiple=True,
-    default=[],
-    help=HELP_MSG_LOAD_MODULE,
-)
 @click.option("--hashes", "-H", is_flag=True, help=HELP_MSG_HASHES)
 @click.option("--non-interactive", "-n", is_flag=True, help=HELP_MSG_NONINTERACTIVE)
 @click.option("--backup-password", "-p", help=HELP_MSG_ANDROID_BACKUP_PASSWORD)
@@ -279,7 +235,6 @@ def check_androidqf(
     output,
     list_modules,
     module,
-    load_module,
     hashes,
     non_interactive,
     backup_password,
@@ -287,7 +242,6 @@ def check_androidqf(
     androidqf_path,
 ):
     set_verbose_logging(verbose)
-    custom_modules = _load_custom_modules(load_module)
 
     cmd = CmdAndroidCheckAndroidQF(
         target_path=androidqf_path,
@@ -301,7 +255,6 @@ def check_androidqf(
         },
         disable_version_check=_get_disable_flags(ctx)[0],
         disable_indicator_check=_get_disable_flags(ctx)[1],
-        custom_modules=custom_modules,
     )
 
     if list_modules:
@@ -335,13 +288,6 @@ def check_androidqf(
 @click.option("--output", "-o", type=click.Path(exists=False), help=HELP_MSG_OUTPUT)
 @click.option("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
 @click.option("--module", "-m", help=HELP_MSG_MODULE)
-@click.option(
-    "--load-module",
-    type=click.Path(exists=True),
-    multiple=True,
-    default=[],
-    help=HELP_MSG_LOAD_MODULE,
-)
 @click.option(
     "--timezone",
     "-t",
@@ -361,13 +307,11 @@ def check_intrusion_logs(
     output,
     list_modules,
     module,
-    load_module,
     timezone,
     verbose,
     logs_path,
 ):
     set_verbose_logging(verbose)
-    custom_modules = _load_custom_modules(load_module)
 
     module_options = {}
     if timezone:
@@ -381,7 +325,6 @@ def check_intrusion_logs(
         module_options=module_options if module_options else None,
         disable_version_check=_get_disable_flags(ctx)[0],
         disable_indicator_check=_get_disable_flags(ctx)[1],
-        custom_modules=custom_modules,
     )
 
     if list_modules:
@@ -409,25 +352,15 @@ def check_intrusion_logs(
 )
 @click.option("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
 @click.option("--module", "-m", help=HELP_MSG_MODULE)
-@click.option(
-    "--load-module",
-    type=click.Path(exists=True),
-    multiple=True,
-    default=[],
-    help=HELP_MSG_LOAD_MODULE,
-)
 @click.argument("FOLDER", type=click.Path(exists=True))
 @click.pass_context
-def check_iocs(ctx, iocs, list_modules, module, load_module, folder):
-    custom_modules = _load_custom_modules(load_module)
+def check_iocs(ctx, iocs, list_modules, module, folder):
     cmd = CmdCheckIOCS(
         target_path=folder,
         ioc_files=iocs,
         module_name=module,
         disable_version_check=_get_disable_flags(ctx)[0],
         disable_indicator_check=_get_disable_flags(ctx)[1],
-        custom_modules=custom_modules,
-        platform="android",
     )
     cmd.modules = (
         BACKUP_MODULES + BUGREPORT_MODULES + ANDROIDQF_MODULES + INTRUSION_LOGS_MODULES

src/mvt/android/cmd_check_androidqf.py

@@ -13,11 +13,10 @@ from typing import List, Optional
 
 from mvt.android.artifacts.getprop import GetProp
 from mvt.android.cmd_check_intrusion_logs import CmdAndroidCheckIntrusionLogs
-from mvt.android.cmd_check_backup import CmdAndroidCheckBackup, InvalidAndroidBackup
+from mvt.android.cmd_check_backup import CmdAndroidCheckBackup
 from mvt.android.cmd_check_bugreport import CmdAndroidCheckBugreport
 from mvt.common.command import Command
 from mvt.common.indicators import Indicators
-from mvt.common.module import MVTModule
 
 from .modules.androidqf import ANDROIDQF_MODULES
 from .modules.androidqf.base import AndroidQFModule
@@ -51,7 +50,6 @@ class CmdAndroidCheckAndroidQF(Command):
         sub_command: Optional[bool] = False,
         disable_version_check: bool = False,
         disable_indicator_check: bool = False,
-        custom_modules: Optional[list[type[MVTModule]]] = None,
     ) -> None:
         super().__init__(
             target_path=target_path,
@@ -66,10 +64,8 @@ class CmdAndroidCheckAndroidQF(Command):
             log=log,
             disable_version_check=disable_version_check,
             disable_indicator_check=disable_indicator_check,
-            custom_modules=custom_modules,
         )
 
-        self.platform = "android"
         self.name = "check-androidqf"
         self.modules = ANDROIDQF_MODULES
 
@@ -214,7 +210,6 @@ class CmdAndroidCheckAndroidQF(Command):
                 module_options=self.module_options,
                 hashes=self.hashes,
                 sub_command=True,
-                custom_modules=self.custom_modules,
             )
             cmd.from_zip(bugreport)
             cmd.run()
@@ -244,16 +239,8 @@ class CmdAndroidCheckAndroidQF(Command):
             module_options=self.module_options,
             hashes=self.hashes,
             sub_command=True,
-            custom_modules=self.custom_modules,
         )
-        try:
-            cmd.from_ab(backup)
-        except InvalidAndroidBackup as exc:
-            self.log.warning(
-                "Skipping backup modules as backup.ab is malformed: %s", exc
-            )
-            return False
-
+        cmd.from_ab(backup)
         cmd.run()
 
         self.timeline.extend(cmd.timeline)
@@ -324,7 +311,6 @@ class CmdAndroidCheckAndroidQF(Command):
                 module_options=adv_module_options,
                 hashes=self.hashes,
                 sub_command=True,
-                custom_modules=self.custom_modules,
             )
             cmd.run()
 

src/mvt/android/cmd_check_backup.py

@@ -21,17 +21,12 @@ from mvt.android.parsers.backup import (
 )
 from mvt.common.command import Command
 from mvt.common.indicators import Indicators
-from mvt.common.module import MVTModule
 
 from .modules.backup import BACKUP_MODULES
 
 log = logging.getLogger(__name__)
 
 
-class InvalidAndroidBackup(Exception):
-    pass
-
-
 class CmdAndroidCheckBackup(Command):
     def __init__(
         self,
@@ -46,7 +41,6 @@ class CmdAndroidCheckBackup(Command):
         sub_command: Optional[bool] = False,
         disable_version_check: bool = False,
         disable_indicator_check: bool = False,
-        custom_modules: Optional[list[type[MVTModule]]] = None,
     ) -> None:
         super().__init__(
             target_path=target_path,
@@ -61,10 +55,8 @@ class CmdAndroidCheckBackup(Command):
             log=log,
             disable_version_check=disable_version_check,
             disable_indicator_check=disable_indicator_check,
-            custom_modules=custom_modules,
         )
 
-        self.platform = "android"
         self.name = "check-backup"
         self.modules = BACKUP_MODULES
 
@@ -76,10 +68,6 @@ class CmdAndroidCheckBackup(Command):
         self.__type = "ab"
         header = parse_ab_header(ab_file_bytes)
         if not header["backup"]:
-            if self.sub_command:
-                raise InvalidAndroidBackup(
-                    "Invalid backup format, file should be in .ab format"
-                )
             log.critical("Invalid backup format, file should be in .ab format")
             sys.exit(1)
 
@@ -95,25 +83,12 @@ class CmdAndroidCheckBackup(Command):
             log.critical("Invalid backup password")
             sys.exit(1)
         except AndroidBackupParsingError as exc:
-            if self.sub_command:
-                raise InvalidAndroidBackup(
-                    f"Impossible to parse this backup file: {exc}"
-                ) from exc
             log.critical("Impossible to parse this backup file: %s", exc)
             log.critical("Please use Android Backup Extractor (ABE) instead")
             sys.exit(1)
 
         dbytes = io.BytesIO(tardata)
-        try:
-            self.__tar = tarfile.open(fileobj=dbytes)
-        except tarfile.TarError as exc:
-            if self.sub_command:
-                raise InvalidAndroidBackup(
-                    f"Impossible to parse this backup file: {exc}"
-                ) from exc
-            log.critical("Impossible to parse this backup file: %s", exc)
-            log.critical("Please use Android Backup Extractor (ABE) instead")
-            sys.exit(1)
+        self.__tar = tarfile.open(fileobj=dbytes)
         for member in self.__tar:
             self.__files.append(member.name)
 

src/mvt/android/cmd_check_bugreport.py

@@ -12,7 +12,6 @@ from zipfile import ZipFile
 from mvt.android.modules.bugreport.base import BugReportModule
 from mvt.common.command import Command
 from mvt.common.indicators import Indicators
-from mvt.common.module import MVTModule
 
 from .modules.bugreport import BUGREPORT_MODULES
 
@@ -33,7 +32,6 @@ class CmdAndroidCheckBugreport(Command):
         sub_command: Optional[bool] = False,
         disable_version_check: bool = False,
         disable_indicator_check: bool = False,
-        custom_modules: Optional[list[type[MVTModule]]] = None,
     ) -> None:
         super().__init__(
             target_path=target_path,
@@ -48,10 +46,8 @@ class CmdAndroidCheckBugreport(Command):
             log=log,
             disable_version_check=disable_version_check,
             disable_indicator_check=disable_indicator_check,
-            custom_modules=custom_modules,
         )
 
-        self.platform = "android"
         self.name = "check-bugreport"
         self.modules = BUGREPORT_MODULES
 

src/mvt/android/cmd_check_intrusion_logs.py

@@ -9,7 +9,6 @@ from typing import Optional
 
 from mvt.common.command import Command
 from mvt.common.indicators import Indicators
-from mvt.common.module import MVTModule
 
 from .modules.intrusion_logs import (
     INTRUSION_LOGS_MODULES,
@@ -36,7 +35,6 @@ class CmdAndroidCheckIntrusionLogs(Command):
         sub_command: Optional[bool] = False,
         disable_version_check: bool = False,
         disable_indicator_check: bool = False,
-        custom_modules: Optional[list[type[MVTModule]]] = None,
     ) -> None:
         super().__init__(
             target_path=target_path,
@@ -51,10 +49,8 @@ class CmdAndroidCheckIntrusionLogs(Command):
             log=log,
             disable_version_check=disable_version_check,
             disable_indicator_check=disable_indicator_check,
-            custom_modules=custom_modules,
         )
 
-        self.platform = "android"
         self.name = "check-intrusion-logs"
         self.modules = INTRUSION_LOGS_MODULES
         self._all_events: dict[str, list[dict]] = {}

src/mvt/android/modules/androidqf/sms.py

@@ -58,7 +58,7 @@ class SMS(AndroidQFModule):
     def parse_backup(self, data):
         header = parse_ab_header(data)
         if not header["backup"]:
-            self.log.warning("Invalid backup format, backup.ab was not analysed")
+            self.log.critical("Invalid backup format, backup.ab was not analysed")
             return
 
         password = None
@@ -76,7 +76,7 @@ class SMS(AndroidQFModule):
             self.log.critical("Invalid backup password")
             return
         except AndroidBackupParsingError:
-            self.log.warning(
+            self.log.critical(
                 "Impossible to parse this backup file, please use"
                 " Android Backup Extractor instead"
             )

src/mvt/android/parsers/backup.py

@@ -48,16 +48,13 @@ def parse_ab_header(data):
         'encryption': "none", 'version': 4}
     """
     if data.startswith(b"ANDROID BACKUP"):
-        try:
-            [_, version, is_compressed, encryption, _] = data.split(b"\n", 4)
-            return {
-                "backup": True,
-                "compression": (is_compressed == b"1"),
-                "version": int(version),
-                "encryption": encryption.decode("utf-8"),
-            }
-        except (UnicodeDecodeError, ValueError):
-            pass
+        [_, version, is_compressed, encryption, _] = data.split(b"\n", 4)
+        return {
+            "backup": True,
+            "compression": (is_compressed == b"1"),
+            "version": int(version),
+            "encryption": encryption.decode("utf-8"),
+        }
 
     return {"backup": False, "compression": None, "version": None, "encryption": None}
 

src/mvt/common/cmd_check_iocs.py

@@ -8,7 +8,6 @@ import os
 from typing import Optional
 
 from mvt.common.command import Command
-from mvt.common.module import MVTModule
 from mvt.common.utils import exec_or_profile
 
 log = logging.getLogger(__name__)
@@ -27,8 +26,6 @@ class CmdCheckIOCS(Command):
         sub_command: Optional[bool] = False,
         disable_version_check: bool = False,
         disable_indicator_check: bool = False,
-        custom_modules: Optional[list[type[MVTModule]]] = None,
-        platform: str = "",
     ) -> None:
         super().__init__(
             target_path=target_path,
@@ -42,16 +39,14 @@ class CmdCheckIOCS(Command):
             log=log,
             disable_version_check=disable_version_check,
             disable_indicator_check=disable_indicator_check,
-            custom_modules=custom_modules,
         )
 
-        self.platform = platform
         self.name = "check-iocs"
 
     def run(self) -> None:
         assert self.target_path is not None
         all_modules = []
-        for entry in self._available_modules():
+        for entry in self.modules:
             if entry not in all_modules:
                 all_modules.append(entry)
 

src/mvt/common/command.py

@@ -19,7 +19,6 @@ from .alerts import AlertLevel, AlertStore
 from .config import settings
 from .indicators import Indicators
 from .module import EncryptedBackupError, MVTModule, run_module, save_timeline
-from .module_loader import module_supports_command
 from .module_types import ModuleTimeline
 from .utils import (
     CustomJSONEncoder,
@@ -45,12 +44,9 @@ class Command:
         log: logging.Logger = logging.getLogger(__name__),
         disable_version_check: bool = False,
         disable_indicator_check: bool = False,
-        custom_modules: Optional[list[type[MVTModule]]] = None,
     ) -> None:
         self.name = ""
-        self.platform = ""
         self.modules: list[type[MVTModule]] = []
-        self.custom_modules = custom_modules if custom_modules else []
 
         self.target_path = target_path
         self.results_path = results_path
@@ -203,24 +199,9 @@ class Command:
 
     def list_modules(self) -> None:
         self.log.info("Following is the list of available %s modules:", self.name)
-        for module in self._available_modules():
+        for module in self.modules:
             self.log.info(" - %s", module.__name__)
 
-    def _available_modules(self) -> list[type[MVTModule]]:
-        modules = list(self.modules)
-        modules.extend(
-            module
-            for module in self.custom_modules
-            if module_supports_command(module, self.platform, self.name)
-        )
-
-        deduplicated = []
-        for module in modules:
-            if module not in deduplicated:
-                deduplicated.append(module)
-
-        return deduplicated
-
     def init(self) -> None:
         raise NotImplementedError
 
@@ -281,15 +262,14 @@ class Command:
 
     def _ordered_modules(self) -> Optional[list[type[MVTModule]]]:
         """Return enabled modules in stable topological order."""
-        modules = self._available_modules()
-        module_indexes = {module: index for index, module in enumerate(modules)}
+        module_indexes = {module: index for index, module in enumerate(self.modules)}
 
         if self.module_name:
             selected = [
-                module for module in modules if module.__name__ == self.module_name
+                module for module in self.modules if module.__name__ == self.module_name
             ]
         else:
-            selected = [module for module in modules if module.enabled]
+            selected = [module for module in self.modules if module.enabled]
 
         required = set(selected)
         pending = list(selected)

src/mvt/common/help.py

@@ -10,10 +10,6 @@ HELP_MSG_IOC = "Path to indicators file (can be invoked multiple time)"
 HELP_MSG_FAST = "Avoid running time/resource consuming features"
 HELP_MSG_LIST_MODULES = "Print list of available modules and exit"
 HELP_MSG_MODULE = "Name of a single module you would like to run instead of all"
-HELP_MSG_LOAD_MODULE = (
-    "Load custom MVT module(s) from a Python file or folder "
-    "(can be invoked multiple times)"
-)
 HELP_MSG_NONINTERACTIVE = "Don't ask interactive questions during processing"
 HELP_MSG_HASHES = "Generate hashes of all the files analyzed"
 HELP_MSG_VERBOSE = "Verbose mode"

src/mvt/common/module.py

@@ -44,7 +44,6 @@ class MVTModule:
     enabled: bool = True
     slug: Optional[str] = None
     dependencies: Sequence[type["MVTModule"]] = ()
-    supported_commands: Sequence[tuple[str, str]] = ()
 
     def __init__(
         self,

src/mvt/common/module_loader.py

@@ -1,127 +0,0 @@
-# Mobile Verification Toolkit (MVT)
-# Copyright (c) 2021-2026 The MVT Authors.
-# Use of this software is governed by the MVT License 1.1 that can be found at
-#   https://license.mvt.re/1.1/
-
-import hashlib
-import importlib.util
-import inspect
-import os
-import sys
-from pathlib import Path
-from types import ModuleType
-from typing import Iterable, Optional
-
-from .module import MVTModule
-
-MVT_CUSTOM_MODULES_ENV = "MVT_CUSTOM_MODULES"
-
-
-class CustomModuleLoadError(Exception):
-    pass
-
-
-def _module_name_for_path(path: Path) -> str:
-    digest = hashlib.sha256(str(path).encode("utf-8")).hexdigest()[:16]
-    return f"_mvt_custom_module_{path.stem}_{digest}"
-
-
-def _iter_module_files(path: Path) -> Iterable[Path]:
-    if path.is_file():
-        if path.suffix != ".py":
-            raise CustomModuleLoadError(f"Custom module file is not a Python file: {path}")
-        yield path
-        return
-
-    if path.is_dir():
-        for child in sorted(path.iterdir()):
-            if child.name.startswith("."):
-                continue
-            if child.name == "__init__.py":
-                continue
-            if child.is_file() and child.suffix == ".py":
-                yield child
-        return
-
-    raise CustomModuleLoadError(f"Custom module path does not exist: {path}")
-
-
-def _load_python_file(path: Path) -> ModuleType:
-    module_name = _module_name_for_path(path)
-    spec = importlib.util.spec_from_file_location(module_name, path)
-    if spec is None or spec.loader is None:
-        raise CustomModuleLoadError(f"Unable to load custom module file: {path}")
-
-    module = importlib.util.module_from_spec(spec)
-    sys.modules[module_name] = module
-    try:
-        spec.loader.exec_module(module)
-    except Exception as exc:
-        raise CustomModuleLoadError(f"Unable to import custom module {path}: {exc}") from exc
-
-    return module
-
-
-def discover_mvt_modules(module: ModuleType) -> list[type[MVTModule]]:
-    modules = []
-    for _, obj in inspect.getmembers(module, inspect.isclass):
-        if obj is MVTModule:
-            continue
-        if obj.__module__ != module.__name__:
-            continue
-        if not issubclass(obj, MVTModule):
-            continue
-        modules.append(obj)
-
-    return modules
-
-
-def load_custom_modules_from_path(path: str) -> list[type[MVTModule]]:
-    custom_modules: list[type[MVTModule]] = []
-    seen: set[tuple[str, str]] = set()
-    resolved_path = Path(path).expanduser().resolve()
-
-    for module_file in _iter_module_files(resolved_path):
-        loaded_module = _load_python_file(module_file)
-        for module_class in discover_mvt_modules(loaded_module):
-            key = (str(module_file), module_class.__qualname__)
-            if key in seen:
-                continue
-            seen.add(key)
-            custom_modules.append(module_class)
-
-    return custom_modules
-
-
-def load_custom_modules(paths: Optional[Iterable[str]] = None) -> list[type[MVTModule]]:
-    search_paths: list[str] = []
-    env_path = os.environ.get(MVT_CUSTOM_MODULES_ENV)
-    if env_path:
-        search_paths.append(env_path)
-    if paths:
-        search_paths.extend(paths)
-
-    custom_modules: list[type[MVTModule]] = []
-    seen: set[tuple[str, str]] = set()
-    for path in search_paths:
-        for module_class in load_custom_modules_from_path(path):
-            source = Path(inspect.getfile(module_class)).resolve()
-            key = (str(source), module_class.__qualname__)
-            if key in seen:
-                continue
-            seen.add(key)
-            custom_modules.append(module_class)
-
-    return custom_modules
-
-
-def module_supports_command(
-    module_class: type[MVTModule],
-    platform: str,
-    command: str,
-) -> bool:
-    supported_commands = getattr(module_class, "supported_commands", None)
-    if not supported_commands:
-        return True
-
-    return (platform, command) in {tuple(entry) for entry in supported_commands}

src/mvt/ios/cli.py

@@ -31,7 +31,6 @@ from mvt.common.help import (
     HELP_MSG_OUTPUT,
     HELP_MSG_FAST,
     HELP_MSG_LIST_MODULES,
-    HELP_MSG_LOAD_MODULE,
     HELP_MSG_MODULE,
     HELP_MSG_VERBOSE,
     HELP_MSG_CHECK_FS,
@@ -41,7 +40,6 @@ from mvt.common.help import (
     HELP_MSG_DISABLE_UPDATE_CHECK,
     HELP_MSG_DISABLE_INDICATOR_UPDATE_CHECK,
 )
-from mvt.common.module_loader import CustomModuleLoadError, load_custom_modules
 from .cmd_check_backup import CmdIOSCheckBackup
 from .cmd_check_fs import CmdIOSCheckFS
 from .decrypt import DecryptBackup
@@ -67,13 +65,6 @@ def _get_disable_flags(ctx):
     )
 
 
-def _load_custom_modules(load_module):
-    try:
-        return load_custom_modules(load_module)
-    except CustomModuleLoadError as exc:
-        raise click.ClickException(str(exc)) from exc
-
-
 # ==============================================================================
 # Main
 # ==============================================================================
@@ -238,32 +229,15 @@ def extract_key(password, key_file, backup_path):
 @click.option("--fast", "-f", is_flag=True, help=HELP_MSG_FAST)
 @click.option("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
 @click.option("--module", "-m", help=HELP_MSG_MODULE)
-@click.option(
-    "--load-module",
-    type=click.Path(exists=True),
-    multiple=True,
-    default=[],
-    help=HELP_MSG_LOAD_MODULE,
-)
 @click.option("--hashes", "-H", is_flag=True, help=HELP_MSG_HASHES)
 @click.option("--verbose", "-v", is_flag=True, help=HELP_MSG_VERBOSE)
 @click.argument("BACKUP_PATH", type=click.Path(exists=True))
 @click.pass_context
 def check_backup(
-    ctx,
-    iocs,
-    output,
-    fast,
-    list_modules,
-    module,
-    load_module,
-    hashes,
-    verbose,
-    backup_path,
+    ctx, iocs, output, fast, list_modules, module, hashes, verbose, backup_path
 ):
     set_verbose_logging(verbose)
     module_options = {"fast_mode": fast}
-    custom_modules = _load_custom_modules(load_module)
 
     cmd = CmdIOSCheckBackup(
         target_path=backup_path,
@@ -274,7 +248,6 @@ def check_backup(
         hashes=hashes,
         disable_version_check=_get_disable_flags(ctx)[0],
         disable_indicator_check=_get_disable_flags(ctx)[1],
-        custom_modules=custom_modules,
     )
 
     if list_modules:
@@ -304,32 +277,13 @@ def check_backup(
 @click.option("--fast", "-f", is_flag=True, help=HELP_MSG_FAST)
 @click.option("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
 @click.option("--module", "-m", help=HELP_MSG_MODULE)
-@click.option(
-    "--load-module",
-    type=click.Path(exists=True),
-    multiple=True,
-    default=[],
-    help=HELP_MSG_LOAD_MODULE,
-)
 @click.option("--hashes", "-H", is_flag=True, help=HELP_MSG_HASHES)
 @click.option("--verbose", "-v", is_flag=True, help=HELP_MSG_VERBOSE)
 @click.argument("DUMP_PATH", type=click.Path(exists=True))
 @click.pass_context
-def check_fs(
-    ctx,
-    iocs,
-    output,
-    fast,
-    list_modules,
-    module,
-    load_module,
-    hashes,
-    verbose,
-    dump_path,
-):
+def check_fs(ctx, iocs, output, fast, list_modules, module, hashes, verbose, dump_path):
     set_verbose_logging(verbose)
     module_options = {"fast_mode": fast}
-    custom_modules = _load_custom_modules(load_module)
 
     cmd = CmdIOSCheckFS(
         target_path=dump_path,
@@ -340,7 +294,6 @@ def check_fs(
         hashes=hashes,
         disable_version_check=_get_disable_flags(ctx)[0],
         disable_indicator_check=_get_disable_flags(ctx)[1],
-        custom_modules=custom_modules,
     )
 
     if list_modules:
@@ -368,25 +321,15 @@ def check_fs(
 )
 @click.option("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
 @click.option("--module", "-m", help=HELP_MSG_MODULE)
-@click.option(
-    "--load-module",
-    type=click.Path(exists=True),
-    multiple=True,
-    default=[],
-    help=HELP_MSG_LOAD_MODULE,
-)
 @click.argument("FOLDER", type=click.Path(exists=True))
 @click.pass_context
-def check_iocs(ctx, iocs, list_modules, module, load_module, folder):
-    custom_modules = _load_custom_modules(load_module)
+def check_iocs(ctx, iocs, list_modules, module, folder):
     cmd = CmdCheckIOCS(
         target_path=folder,
         ioc_files=iocs,
         module_name=module,
         disable_version_check=_get_disable_flags(ctx)[0],
         disable_indicator_check=_get_disable_flags(ctx)[1],
-        custom_modules=custom_modules,
-        platform="ios",
     )
     cmd.modules = BACKUP_MODULES + FS_MODULES + MIXED_MODULES
 

src/mvt/ios/cmd_check_backup.py

@@ -8,7 +8,6 @@ from typing import Optional
 
 from mvt.common.command import Command
 from mvt.common.indicators import Indicators
-from mvt.common.module import MVTModule
 
 from .modules.backup import BACKUP_MODULES
 from .modules.mixed import MIXED_MODULES
@@ -30,7 +29,6 @@ class CmdIOSCheckBackup(Command):
         sub_command: bool = False,
         disable_version_check: bool = False,
         disable_indicator_check: bool = False,
-        custom_modules: Optional[list[type[MVTModule]]] = None,
     ) -> None:
         super().__init__(
             target_path=target_path,
@@ -45,10 +43,8 @@ class CmdIOSCheckBackup(Command):
             log=log,
             disable_version_check=disable_version_check,
             disable_indicator_check=disable_indicator_check,
-            custom_modules=custom_modules,
         )
 
-        self.platform = "ios"
         self.name = "check-backup"
         self.modules = BACKUP_MODULES + MIXED_MODULES
 

src/mvt/ios/cmd_check_fs.py

@@ -8,7 +8,6 @@ from typing import Optional
 
 from mvt.common.command import Command
 from mvt.common.indicators import Indicators
-from mvt.common.module import MVTModule
 
 from .modules.fs import FS_MODULES
 from .modules.mixed import MIXED_MODULES
@@ -30,7 +29,6 @@ class CmdIOSCheckFS(Command):
         sub_command: bool = False,
         disable_version_check: bool = False,
         disable_indicator_check: bool = False,
-        custom_modules: Optional[list[type[MVTModule]]] = None,
     ) -> None:
         super().__init__(
             target_path=target_path,
@@ -44,10 +42,8 @@ class CmdIOSCheckFS(Command):
             log=log,
             disable_version_check=disable_version_check,
             disable_indicator_check=disable_indicator_check,
-            custom_modules=custom_modules,
         )
 
-        self.platform = "ios"
         self.name = "check-fs"
         self.modules = FS_MODULES + MIXED_MODULES
 

tests/android/test_backup_parser.py

@@ -5,24 +5,12 @@
 
 import hashlib
 
-from mvt.android.parsers.backup import (
-    parse_ab_header,
-    parse_backup_file,
-    parse_tar_for_sms,
-)
+from mvt.android.parsers.backup import parse_backup_file, parse_tar_for_sms
 
 from ..utils import get_artifact
 
 
 class TestBackupParsing:
-    def test_parse_incomplete_header(self):
-        assert parse_ab_header(b"ANDROID BACKUP\n") == {
-            "backup": False,
-            "compression": None,
-            "version": None,
-            "encryption": None,
-        }
-
     def test_parsing_noencryption(self):
         file = get_artifact("android_backup/backup.ab")
         with open(file, "rb") as f:

tests/common/test_command.py

@@ -42,19 +42,6 @@ class IndependentModule(RecordingModule):
     pass
 
 
-class CustomIOSBackupModule(RecordingModule):
-    supported_commands = (("ios", "check-backup"),)
-
-
-class CustomIOSFSModule(RecordingModule):
-    supported_commands = (("ios", "check-fs"),)
-
-
-class CustomDependsOnBuiltin(RecordingModule):
-    supported_commands = (("ios", "check-backup"),)
-    dependencies = (FirstModule,)
-
-
 class RecordingCommand(Command):
     def init(self):
         self.initialized = True
@@ -145,46 +132,3 @@ class TestCommand:
         assert RecordingModule.run_order == []
         assert not hasattr(cmd, "initialized")
         assert "depends on unavailable module UnavailableModule" in caplog.text
-
-    def test_custom_modules_are_filtered_before_ordering(self):
-        cmd = RecordingCommand()
-        cmd.platform = "ios"
-        cmd.name = "check-backup"
-        cmd.modules = [FirstModule]
-        cmd.custom_modules = [CustomIOSBackupModule, CustomIOSFSModule]
-
-        assert [module.__name__ for module in cmd._ordered_modules()] == [
-            "FirstModule",
-            "CustomIOSBackupModule",
-        ]
-
-    def test_selected_custom_module_runs(self):
-        cmd = RecordingCommand(module_name="CustomIOSBackupModule")
-        cmd.platform = "ios"
-        cmd.name = "check-backup"
-        cmd.custom_modules = [CustomIOSBackupModule]
-
-        cmd.run()
-
-        assert RecordingModule.run_order == ["CustomIOSBackupModule"]
-
-    def test_selected_unsupported_custom_module_does_not_run(self):
-        cmd = RecordingCommand(module_name="CustomIOSFSModule")
-        cmd.platform = "ios"
-        cmd.name = "check-backup"
-        cmd.custom_modules = [CustomIOSFSModule]
-
-        cmd.run()
-
-        assert RecordingModule.run_order == []
-
-    def test_custom_module_dependencies_use_topological_order(self):
-        cmd = RecordingCommand(module_name="CustomDependsOnBuiltin")
-        cmd.platform = "ios"
-        cmd.name = "check-backup"
-        cmd.modules = [SecondModule, FirstModule]
-        cmd.custom_modules = [CustomDependsOnBuiltin]
-
-        cmd.run()
-
-        assert RecordingModule.run_order == ["FirstModule", "CustomDependsOnBuiltin"]

tests/common/test_module_loader.py

@@ -1,145 +0,0 @@
-import pytest
-
-from mvt.common.module import MVTModule
-from mvt.common.module_loader import (
-    CustomModuleLoadError,
-    load_custom_modules,
-    load_custom_modules_from_path,
-    module_supports_command,
-)
-
-
-MODULE_TEMPLATE = """
-from mvt.common.module import MVTModule
-
-
-class {name}(MVTModule):
-    supported_commands = {supported_commands!r}
-
-    def run(self):
-        pass
-
-    def check_indicators(self):
-        pass
-
-    def serialize(self, result):
-        return None
-"""
-
-
-def _write_module(path, name, supported_commands=()):
-    path.write_text(
-        MODULE_TEMPLATE.format(
-            name=name,
-            supported_commands=supported_commands,
-        ),
-        encoding="utf-8",
-    )
-    return path
-
-
-def test_load_custom_modules_from_python_file(tmp_path):
-    module_path = _write_module(tmp_path / "custom.py", "FileModule")
-
-    modules = load_custom_modules_from_path(str(module_path))
-
-    assert [module.__name__ for module in modules] == ["FileModule"]
-    assert issubclass(modules[0], MVTModule)
-
-
-def test_load_custom_modules_from_folder_in_sorted_order(tmp_path):
-    _write_module(tmp_path / "b_module.py", "BModule")
-    _write_module(tmp_path / "a_module.py", "AModule")
-    _write_module(tmp_path / ".hidden.py", "HiddenModule")
-    _write_module(tmp_path / "__init__.py", "InitModule")
-    nested = tmp_path / "nested"
-    nested.mkdir()
-    _write_module(nested / "nested_module.py", "NestedModule")
-
-    modules = load_custom_modules_from_path(str(tmp_path))
-
-    assert [module.__name__ for module in modules] == ["AModule", "BModule"]
-
-
-def test_discovery_ignores_imported_base_and_unrelated_classes(tmp_path):
-    module_path = tmp_path / "custom.py"
-    module_path.write_text(
-        """
-from mvt.common.module import MVTModule
-
-
-class Unrelated:
-    pass
-
-
-class DiscoveredModule(MVTModule):
-    def run(self):
-        pass
-
-    def check_indicators(self):
-        pass
-
-    def serialize(self, result):
-        return None
-""",
-        encoding="utf-8",
-    )
-
-    modules = load_custom_modules_from_path(str(module_path))
-
-    assert [module.__name__ for module in modules] == ["DiscoveredModule"]
-
-
-def test_load_custom_modules_deduplicates_same_class(tmp_path):
-    module_path = _write_module(tmp_path / "custom.py", "DuplicateModule")
-
-    modules = load_custom_modules([str(module_path), str(module_path)])
-
-    assert [module.__name__ for module in modules] == ["DuplicateModule"]
-
-
-def test_load_custom_modules_raises_for_missing_path(tmp_path):
-    with pytest.raises(CustomModuleLoadError, match="does not exist"):
-        load_custom_modules_from_path(str(tmp_path / "missing.py"))
-
-
-def test_load_custom_modules_raises_for_import_error(tmp_path):
-    module_path = tmp_path / "broken.py"
-    module_path.write_text("raise RuntimeError('broken import')", encoding="utf-8")
-
-    with pytest.raises(CustomModuleLoadError, match="broken import"):
-        load_custom_modules_from_path(str(module_path))
-
-
-def test_load_custom_modules_loads_env_folder_first(tmp_path, monkeypatch):
-    env_folder = tmp_path / "env"
-    env_folder.mkdir()
-    cli_folder = tmp_path / "cli"
-    cli_folder.mkdir()
-    _write_module(env_folder / "env_module.py", "EnvModule")
-    _write_module(cli_folder / "cli_module.py", "CliModule")
-    monkeypatch.setenv("MVT_CUSTOM_MODULES", str(env_folder))
-
-    modules = load_custom_modules([str(cli_folder)])
-
-    assert [module.__name__ for module in modules] == ["EnvModule", "CliModule"]
-
-
-def test_module_supports_command_defaults_to_all_commands(tmp_path):
-    module_path = _write_module(tmp_path / "custom.py", "DefaultModule")
-    module = load_custom_modules_from_path(str(module_path))[0]
-
-    assert module_supports_command(module, "ios", "check-backup")
-    assert module_supports_command(module, "android", "check-bugreport")
-
-
-def test_module_supports_command_honors_supported_commands(tmp_path):
-    module_path = _write_module(
-        tmp_path / "custom.py",
-        "SpecificModule",
-        (("ios", "check-backup"),),
-    )
-    module = load_custom_modules_from_path(str(module_path))[0]
-
-    assert module_supports_command(module, "ios", "check-backup")
-    assert not module_supports_command(module, "ios", "check-fs")

tests/test_check_android_androidqf.py

@@ -3,9 +3,7 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
-import logging
 import os
-import shutil
 
 from click.testing import CliRunner
 
@@ -70,18 +68,3 @@ class TestCheckAndroidqfCommand:
         assert result.exit_code == 0
         del os.environ["MVT_ANDROID_BACKUP_PASSWORD"]
         settings.__init__()  # Reset settings
-
-    def test_check_malformed_backup_skips_backup_modules(self, tmp_path, caplog):
-        path = tmp_path / "androidqf"
-        shutil.copytree(os.path.join(get_artifact_folder(), "androidqf"), path)
-        (path / "backup.ab").write_bytes(b"")
-
-        runner = CliRunner()
-        with caplog.at_level(logging.WARNING):
-            result = runner.invoke(check_androidqf, [str(path)])
-
-        assert result.exit_code == 0
-        assert "Skipping backup modules as backup.ab is malformed" in caplog.text
-        assert not any(
-            record.levelname in {"CRITICAL", "FATAL"} for record in caplog.records
-        )

tests/test_custom_modules.py

@@ -1,193 +0,0 @@
-from click.testing import CliRunner
-
-from mvt.android.cli import check_bugreport
-from mvt.android.cmd_check_androidqf import CmdAndroidCheckAndroidQF
-from mvt.android.cmd_check_backup import CmdAndroidCheckBackup
-from mvt.android.cmd_check_bugreport import CmdAndroidCheckBugreport
-from mvt.android.cmd_check_intrusion_logs import CmdAndroidCheckIntrusionLogs
-from mvt.common.module import MVTModule
-from mvt.ios.cli import check_backup, check_fs
-
-
-CUSTOM_MODULE = """
-from mvt.common.module import MVTModule
-
-
-class {name}(MVTModule):
-    supported_commands = {supported_commands!r}
-    slug = "{slug}"
-
-    def run(self):
-        self.results = [{{"message": "custom module ran"}}]
-
-    def check_indicators(self):
-        pass
-
-    def serialize(self, result):
-        return None
-"""
-
-
-def _write_custom_module(path, name, supported_commands, slug=None):
-    path.write_text(
-        CUSTOM_MODULE.format(
-            name=name,
-            supported_commands=supported_commands,
-            slug=slug or name.lower(),
-        ),
-        encoding="utf-8",
-    )
-    return path
-
-
-def test_load_module_appears_only_for_supported_cli_command(tmp_path):
-    module_path = _write_custom_module(
-        tmp_path / "custom.py",
-        "IOSBackupOnlyModule",
-        (("ios", "check-backup"),),
-    )
-
-    backup_result = CliRunner().invoke(
-        check_backup,
-        ["--list-modules", "--load-module", str(module_path), str(tmp_path)],
-    )
-    fs_result = CliRunner().invoke(
-        check_fs,
-        ["--list-modules", "--load-module", str(module_path), str(tmp_path)],
-    )
-
-    assert backup_result.exit_code == 0
-    assert "IOSBackupOnlyModule" in backup_result.output
-    assert fs_result.exit_code == 0
-    assert "IOSBackupOnlyModule" not in fs_result.output
-
-
-def test_module_option_runs_supported_custom_module(tmp_path):
-    module_path = _write_custom_module(
-        tmp_path / "custom.py",
-        "CustomRunModule",
-        (("ios", "check-backup"),),
-        slug="custom_run_module",
-    )
-    output_path = tmp_path / "out"
-
-    result = CliRunner().invoke(
-        check_backup,
-        [
-            "--module",
-            "CustomRunModule",
-            "--load-module",
-            str(module_path),
-            "--output",
-            str(output_path),
-            str(tmp_path),
-        ],
-    )
-
-    assert result.exit_code == 0
-    assert (output_path / "custom_run_module.json").exists()
-
-
-def test_custom_modules_load_from_environment_without_cli_flag(tmp_path, monkeypatch):
-    custom_modules_path = tmp_path / "custom_modules"
-    custom_modules_path.mkdir()
-    _write_custom_module(
-        custom_modules_path / "env_module.py",
-        "EnvBugreportModule",
-        (("android", "check-bugreport"),),
-    )
-    monkeypatch.setenv("MVT_CUSTOM_MODULES", str(custom_modules_path))
-
-    result = CliRunner().invoke(check_bugreport, ["--list-modules", str(tmp_path)])
-
-    assert result.exit_code == 0
-    assert "EnvBugreportModule" in result.output
-
-
-class NestedBugreportModule(MVTModule):
-    supported_commands = (("android", "check-bugreport"),)
-
-
-class NestedBackupModule(MVTModule):
-    supported_commands = (("android", "check-backup"),)
-
-
-class NestedIntrusionLogsModule(MVTModule):
-    supported_commands = (("android", "check-intrusion-logs"),)
-
-
-class NestedAndroidQFModule(MVTModule):
-    supported_commands = (("android", "check-androidqf"),)
-
-
-class DummyZip:
-    def close(self):
-        pass
-
-
-def test_androidqf_propagates_custom_modules_to_nested_commands(tmp_path, monkeypatch):
-    records = {}
-    custom_modules = [
-        NestedBugreportModule,
-        NestedBackupModule,
-        NestedIntrusionLogsModule,
-        NestedAndroidQFModule,
-    ]
-    cmd = CmdAndroidCheckAndroidQF(
-        target_path=str(tmp_path),
-        custom_modules=custom_modules,
-    )
-
-    def record_available(name):
-        def _record(command):
-            records[name] = [
-                module.__name__
-                for module in command._available_modules()
-                if module.__name__.startswith("Nested")
-            ]
-
-        return _record
-
-    monkeypatch.setattr(cmd, "load_bugreport", lambda: DummyZip())
-    monkeypatch.setattr(
-        CmdAndroidCheckBugreport,
-        "from_zip",
-        lambda self, bugreport: None,
-    )
-    monkeypatch.setattr(
-        CmdAndroidCheckBugreport,
-        "run",
-        record_available("bugreport"),
-    )
-
-    monkeypatch.setattr(cmd, "load_backup", lambda: b"")
-    monkeypatch.setattr(CmdAndroidCheckBackup, "from_ab", lambda self, backup: None)
-    monkeypatch.setattr(
-        CmdAndroidCheckBackup,
-        "run",
-        record_available("backup"),
-    )
-
-    intrusion_logs_path = tmp_path / "intrusion_logs"
-    intrusion_logs_path.mkdir()
-    setattr(cmd, "_CmdAndroidCheckAndroidQF__format", "dir")
-    setattr(
-        cmd,
-        "_CmdAndroidCheckAndroidQF__files",
-        ["androidqf/intrusion_logs/security.txt"],
-    )
-    monkeypatch.setattr(cmd, "_read_device_timezone", lambda: None)
-    monkeypatch.setattr(
-        CmdAndroidCheckIntrusionLogs,
-        "run",
-        record_available("intrusion_logs"),
-    )
-
-    assert cmd.run_bugreport_cmd()
-    assert cmd.run_backup_cmd()
-    assert cmd.run_intrusion_logs_cmd()
-    assert records == {
-        "bugreport": ["NestedBugreportModule"],
-        "backup": ["NestedBackupModule"],
-        "intrusion_logs": ["NestedIntrusionLogsModule"],
-    }

uv.lock

@@ -73,20 +73,20 @@ wheels = [
 
 [[package]]
 name = "betterproto2"
-version = "0.9.1"
+version = "0.10.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "python-dateutil" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ac/02/4ae507aa18b8aa1681ea6e9f0dec08fabd610a94ade584fd9b071d286bf1/betterproto2-0.9.1.tar.gz", hash = "sha256:59d518cfbdd316e216c3d7f53448a6956432c7bd86ab9918fd8793c88c623cce", size = 143980, upload-time = "2025-10-15T09:36:24.425Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c4/88/7249571b6d525968afbc70f4fc7774cee5cdd55ecebe084a0d49f75513cb/betterproto2-0.10.0.tar.gz", hash = "sha256:fa0bcc3b87b6fd9151cd0058c153e480830f55fddb5afe3fef92e842490be266", size = 16997, upload-time = "2026-05-10T13:02:19.29Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/3e/a3/44f9d1188ee3802d2402efb121e7a9ce4c825eaa34ca739fbfb8979526a2/betterproto2-0.9.1-py3-none-any.whl", hash = "sha256:de0544b4b2b6b5a05ce0c1bfac36d232f745087b02907e748f31466becfc3dbd", size = 19562, upload-time = "2025-10-15T09:36:23.169Z" },
+    { url = "https://files.pythonhosted.org/packages/56/e8/596fde3196b253cee2c7a94df2d434b043d99c5a565fb3110468501b2562/betterproto2-0.10.0-py3-none-any.whl", hash = "sha256:be80a0cb1aee34f1b5e424db43884bde659ce1dbc323676aa0d47930e70a898b", size = 19904, upload-time = "2026-05-10T13:02:17.757Z" },
 ]
 
 [[package]]
 name = "betterproto2-compiler"
-version = "0.10.0"
+version = "0.10.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "betterproto2" },
@@ -95,9 +95,9 @@ dependencies = [
     { name = "strenum", marker = "python_full_version < '3.11'" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b8/38/cdac9ca1cde9bf8a213bc7972985565b381d4faa2214ad097f8f614977b2/betterproto2_compiler-0.10.0.tar.gz", hash = "sha256:063179e0b6732e04f792e8317ed5d2cbfa069cac4eff42a3734f203a51e47599", size = 54682, upload-time = "2026-05-10T13:03:32.821Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/12/ae/66cd7614711c73ef8654e018e8f4bc8344fbf8e1dd80241e1ee61cb91db4/betterproto2_compiler-0.10.1.tar.gz", hash = "sha256:0a6bf4673befac9916e5822598231e5885f2f570e6cb61285f6cd47085f88e81", size = 54675, upload-time = "2026-05-13T17:05:28.747Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9e/7e/a7f247847253983b1adbd084bbb4789ee25dd14e2a7601eb5c7aca531e19/betterproto2_compiler-0.10.0-py3-none-any.whl", hash = "sha256:075252253ca4f730b664546e2c91ab33557a98bb98141f9554ed5621eb8d25a7", size = 66884, upload-time = "2026-05-10T13:03:31.366Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/9b/4a396309d0b5e31ad7f73d74139477b518fadddbdba7c4f54bbd0fdc5350/betterproto2_compiler-0.10.1-py3-none-any.whl", hash = "sha256:0c4666d40a9fe31331b5ab4cfd0367d70f4bf04d273127e14cd23b221e93575d", size = 66888, upload-time = "2026-05-13T17:05:27.301Z" },
 ]
 
 [[package]]
@@ -934,7 +934,7 @@ docs = [
 requires-dist = [
     { name = "adb-shell", extras = ["usb"], specifier = "==0.4.4" },
     { name = "appdirs", specifier = "==1.4.4" },
-    { name = "betterproto2", specifier = "==0.9.1" },
+    { name = "betterproto2", specifier = "==0.10.0" },
     { name = "click", specifier = "==8.3.3" },
     { name = "cryptography", specifier = "==47.0.0" },
     { name = "iosbackup", specifier = "==0.9.925" },