Fix Makefile and PyProtject config for current Ruff

docs/android/adb.md

@@ -25,26 +25,32 @@ mvt-android check-adb --output /path/to/results
 If you have previously started an adb daemon MVT will alert you and require you to kill it with `adb kill-server` and relaunch the command.
 
 !!! warning
+    MVT relies on the Python library [adb-shell](https://pypi.org/project/adb-shell/) to connect to an Android device, which relies on libusb for the USB transport. Because of known driver issues, Windows users [are recommended](https://github.com/JeffLIrion/adb_shell/issues/118) to install appropriate drivers using [Zadig](https://zadig.akeo.ie/). Alternatively, an easier option might be to use the TCP transport and connect over Wi-Fi as describe next.
 
-    The `mvt-android check-adb` command has been deprecated and removed from MVT.
+## Connecting over Wi-FI
 
-The ability to analyze Android devices over ADB (`mvt-android check-adb`) has been removed from MVT due to several technical and forensic limitations.
+When connecting to the device over USB is not possible or not working properly, an alternative option is to connect over the network. In order to do so, first launch an adb daemon at a fixed port number:
 
-## Reasons for Deprecation
+```bash
+adb tcpip 5555
+```
 
-1. **Inconsistent Data Collection Across Devices**
-   Android devices vary significantly in their system architecture, security policies, and available diagnostic logs. This inconsistency makes it difficult to ensure that MVT can reliably collect necessary forensic data across all devices.
+Then you can specify the IP address of the phone with the adb port number to MVT like so:
 
-2. **Incomplete Forensic Data Acquisition**
-   The `check-adb` command did not retrieve a full forensic snapshot of all available data on the device. For example, critical logs such as the **full bugreport** were not systematically collected, leading to potential gaps in forensic analysis. This can be a serious problem in scenarios where the analyst only had one time access to the Android device.
+```bash
+mvt-android check-adb --serial 192.168.1.20:5555 --output /path/to/results
+```
 
-4. **Code Duplication and Difficulty Ensuring Consistent Behavior Across Sources**
-    Similar forensic data such as "dumpsys" logs were being loaded and parsed by MVT's ADB, AndroidQF and Bugreport commands. Multiple modules were needed to handle each source format which created duplication leading to inconsistent
-    behavior and difficulties in maintaining the code base.
+Where `192.168.1.20` is the correct IP address of your device.
 
-5. **Alignment with iOS Workflow**
-   MVT’s forensic workflow for iOS relies on pre-extracted artifacts, such as iTunes backups or filesystem dumps, rather than preforming commands or interactions directly on a live device. Removing the ADB functionality ensures a more consistent methodology across both Android and iOS mobile forensic.
+!!! warning
+    The `check-adb` workflow shown above is deprecated. If you can acquire an AndroidQF acquisition from the device (recommended), use the AndroidQF project to create that acquisition: https://github.com/mvt-project/androidqf/
+    
+    AndroidQF acquisitions provide a more stable, reproducible analysis surface and are the preferred workflow going forward.
 
-## Alternative: Using AndroidQF for Forensic Data Collection
+## MVT modules requiring root privileges
 
-To replace the deprecated ADB-based approach, forensic analysts should use [AndroidQF](https://github.com/mvt-project/androidqf) for comprehensive data collection, followed by MVT for forensic analysis. The workflow is outlined in the MVT [Android methodology](./methodology.md)
+!!! warning
+    Deprecated: many `mvt-android check-adb` workflows are deprecated and will be removed in a future release. Whenever possible, prefer acquiring an AndroidQF acquisition using the AndroidQF project (https://github.com/mvt-project/androidqf/). 
+
+Of the currently available `mvt-android check-adb` modules a handful require root privileges to function correctly. This is because certain files, such as browser history and SMS messages databases are not accessible with user privileges through adb. These modules are to be considered OPTIONALLY available in case the device was already jailbroken. **Do NOT jailbreak your own device unless you are sure of what you are doing!** Jailbreaking your phone exposes it to considerable security risks!

docs/android/methodology.md

@@ -1,53 +1,23 @@
 # Methodology for Android forensic
 
-Unfortunately Android devices provide fewer complete forensically useful datasources than their iOS cousins. Unlike iOS, the Android backup feature only provides a limited about of relevant data.
-
-Android diagnostic logs such as *bugreport files* can be inconsistent in format and structure across different Android versions and device  vendors. The limited diagnostic information available makes it difficult to triage potential compromises, and because of this `mvt-android` capabilities are limited as well.
+Unfortunately Android devices provide much less observability than their iOS cousins. Android stores very little diagnostic information useful to triage potential compromises, and because of this `mvt-android` capabilities are limited as well.
 
 However, not all is lost.
 
-## Check Android devices with AndroidQF and MVT
+## Check installed Apps
 
-The [AndroidQF](https://github.com/mvt-project/androidqf) tool can be used to collect a wide range of forensic artifacts from an Android device including an Android backup, a bugreport file, and a range of system logs. MVT natively supports analyzing the generated AndroidQF output for signs of device compromise.
+Because malware attacks over Android typically take the form of malicious or backdoored apps, the very first thing you might want to do is to extract and verify all installed Android packages and triage quickly if there are any which stand out as malicious or which might be atypical.
 
-### Why Use AndroidQF?
+While it is out of the scope of this documentation to dwell into details on how to analyze Android apps, MVT does allow to easily and automatically extract information about installed apps, download copies of them, and quickly look them up on services such as [VirusTotal](https://www.virustotal.com).
 
-- **Complete and raw data extraction**
-  AndroidQF collects full forensic artifacts using an on-device forensic collection agent, ensuring that no crucial data is overlooked. The data collection does not depended on the shell environment or utilities available on the device.
-
-- **Consistent and standardized output**
-  By collecting a predefined and complete set of forensic files, AndroidQF ensures consistency in data acquisition across different Android devices.
-
-- **Future-proof analysis**
-  Since the full forensic artifacts are preserved, analysts can extract new evidence or apply updated analysis techniques without requiring access to the original device.
-
-- **Cross-platform tool without dependencies**
-  AndroidQF is a standalone Go binary which can be used to remotely collect data from an Android device without the device owner needing to install MVT or a Python environment.
-
-### Workflow for Android Forensic Analysis with AndroidQF
-
-With AndroidQF the analysis process is split into a separate data collection and data analysis stages.
-
-1. **Extract Data Using AndroidQF**
-  Deploy the AndroidQF forensic collector to acquire all relevant forensic artifacts from the Android device.
-
-2. **Analyze Extracted Data with MVT**
-  Use the `mvt-android check-androidqf` command to perform forensic analysis on the extracted artifacts.
-
-By separating artifact collection from forensic analysis, this approach ensures a more reliable and scalable methodology for Android forensic investigations.
-
-For more information, refer to the [AndroidQF project documentation](https://github.com/mvt-project/androidqf).
+!!! info "Using VirusTotal"
+	Please note that in order to use VirusTotal lookups you are required to provide your own API key through the `MVT_VT_API_KEY` environment variable. You should also note that VirusTotal enforces strict API usage. Be mindful that MVT might consume your hourly search quota.
 
 ## Check the device over Android Debug Bridge
 
-The ability to analyze Android devices over ADB (`mvt-android check-adb`) has been removed from MVT.
+Some additional diagnostic information can be extracted from the phone using the [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb). `mvt-android` allows to automatically extract information including [dumpsys](https://developer.android.com/studio/command-line/dumpsys) results, details on installed packages (without download), running processes, presence of root binaries and packages, and more.
 
-See the [Android ADB documentation](./adb.md) for more information.
 
 ## Check an Android Backup (SMS messages)
 
-Although Android backups are becoming deprecated, it is still possible to generate one. Unfortunately, because apps these days typically favor backup over the cloud, the amount of data available is limited.
-
-The `mvt-android check-androidqf` command will automatically check an Android backup and SMS messages if an SMS backup is included in the AndroidQF extraction.
-
-The  `mvt-android check-backup` command can also be used directly with an Android backup file.
+Although Android backups are becoming deprecated, it is still possible to generate one. Unfortunately, because apps these days typically favor backup over the cloud, the amount of data available is limited. Currently, `mvt-android check-backup` only supports checking SMS messages containing links.

docs/docker.md

@@ -31,4 +31,21 @@ Test if the image was created successfully:
 docker run -it mvt
 ```
 
-If a prompt is spawned successfully, you can close it with `exit`.
+If a prompt is spawned successfully, you can close it with `exit`.
+
+
+## Docker usage with Android devices
+
+If you wish to use MVT to test an Android device you will need to enable the container's access to the host's USB devices. You can do so by enabling the `--privileged` flag and mounting the USB bus device as a volume:
+
+```bash
+docker run -it --privileged -v /dev/bus/usb:/dev/bus/usb mvt
+```
+
+**Please note:** the `--privileged` parameter is generally regarded as a security risk. If you want to learn more about this check out [this explainer on container escapes](https://blog.trailofbits.com/2019/07/19/understanding-docker-container-escapes/) as it gives access to the whole system.
+
+Recent versions of Docker provide a `--device` parameter allowing to specify a precise USB device without enabling `--privileged`:
+
+```bash
+docker run -it --device=/dev/<your_usb_port> mvt
+```

src/mvt/android/artifacts/artifact.py

@@ -20,39 +20,23 @@ class AndroidArtifact(Artifact):
         :param binary: whether the dumpsys should be pared as binary or not (bool)
         :return: section extracted (string or bytes)
         """
+        lines = []
         in_section = False
-        delimiter_str = "------------------------------------------------------------------------------"
-        delimiter_bytes = b"------------------------------------------------------------------------------"
-
+        delimiter = "------------------------------------------------------------------------------"
         if binary:
-            lines_bytes = []
-            for line in dumpsys.splitlines():  # type: ignore[union-attr]
-                if line.strip() == separator:  # type: ignore[arg-type]
-                    in_section = True
-                    continue
+            delimiter = delimiter.encode("utf-8")
 
-                if not in_section:
-                    continue
+        for line in dumpsys.splitlines():
+            if line.strip() == separator:
+                in_section = True
+                continue
 
-                if line.strip().startswith(delimiter_bytes):  # type: ignore[arg-type]
-                    break
+            if not in_section:
+                continue
 
-                lines_bytes.append(line)  # type: ignore[arg-type]
+            if line.strip().startswith(delimiter):
+                break
 
-            return b"\n".join(lines_bytes)  # type: ignore[return-value,arg-type]
-        else:
-            lines_str = []
-            for line in dumpsys.splitlines():  # type: ignore[union-attr]
-                if line.strip() == separator:  # type: ignore[arg-type]
-                    in_section = True
-                    continue
+            lines.append(line)
 
-                if not in_section:
-                    continue
-
-                if line.strip().startswith(delimiter_str):  # type: ignore[arg-type]
-                    break
-
-                lines_str.append(line)  # type: ignore[arg-type]
-
-            return "\n".join(lines_str)  # type: ignore[return-value,arg-type]
+        return b"\n".join(lines) if binary else "\n".join(lines)

src/mvt/android/artifacts/dumpsys_accessibility.py

@@ -14,11 +14,10 @@ class DumpsysAccessibilityArtifact(AndroidArtifact):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_app_id(result["package_name"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_app_id(result["package_name"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
     def parse(self, content: str) -> None:

src/mvt/android/artifacts/dumpsys_adb.py

@@ -84,7 +84,7 @@ class DumpsysADBArtifact(AndroidArtifact):
         return keystore
 
     @staticmethod
-    def calculate_key_info(user_key: bytes) -> dict:
+    def calculate_key_info(user_key: bytes) -> str:
         if b" " in user_key:
             key_base64, user = user_key.split(b" ", 1)
         else:

src/mvt/android/artifacts/dumpsys_appops.py

@@ -4,13 +4,13 @@
 #   https://license.mvt.re/1.1/
 
 from datetime import datetime
-from typing import Any
+from typing import Any, Dict, List, Union
 
-from mvt.common.module_types import ModuleAtomicResult, ModuleSerializedResult
 from mvt.common.utils import convert_datetime_to_iso
 
 from .artifact import AndroidArtifact
 
+
 RISKY_PERMISSIONS = ["REQUEST_INSTALL_PACKAGES"]
 RISKY_PACKAGES = ["com.android.shell"]
 
@@ -20,9 +20,9 @@ class DumpsysAppopsArtifact(AndroidArtifact):
     Parser for dumpsys app ops info
     """
 
-    def serialize(self, result: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         records = []
-        for perm in result["permissions"]:
+        for perm in record["permissions"]:
             if "entries" not in perm:
                 continue
 
@@ -33,7 +33,7 @@ class DumpsysAppopsArtifact(AndroidArtifact):
                             "timestamp": entry["timestamp"],
                             "module": self.__class__.__name__,
                             "event": entry["access"],
-                            "data": f"{result['package_name']} access to "
+                            "data": f"{record['package_name']} access to "
                             f"{perm['name']}: {entry['access']}",
                         }
                     )
@@ -43,51 +43,51 @@ class DumpsysAppopsArtifact(AndroidArtifact):
     def check_indicators(self) -> None:
         for result in self.results:
             if self.indicators:
-                ioc_match = self.indicators.check_app_id(result.get("package_name"))
-                if ioc_match:
-                    self.alertstore.critical(
-                        ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                    )
+                ioc = self.indicators.check_app_id(result.get("package_name"))
+                if ioc:
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
                     continue
 
-            # We use a placeholder entry to create a basic alert even without permission entries.
-            placeholder_entry = {"access": "Unknown", "timestamp": ""}
-
+            detected_permissions = []
             for perm in result["permissions"]:
                 if (
                     perm["name"] in RISKY_PERMISSIONS
                     # and perm["access"] == "allow"
                 ):
-                    for entry in sorted(
-                        perm["entries"] or [placeholder_entry],
-                        key=lambda x: x["timestamp"],
-                    ):
-                        cleaned_result = result.copy()
-                        cleaned_result["permissions"] = [perm]
-                        self.alertstore.medium(
-                            f"Package '{result['package_name']}' had risky permission '{perm['name']}' set to '{entry['access']}' at {entry['timestamp']}",
+                    detected_permissions.append(perm)
+                    for entry in sorted(perm["entries"], key=lambda x: x["timestamp"]):
+                        self.log.warning(
+                            "Package '%s' had risky permission '%s' set to '%s' at %s",
+                            result["package_name"],
+                            perm["name"],
+                            entry["access"],
                             entry["timestamp"],
-                            cleaned_result,
                         )
 
                 elif result["package_name"] in RISKY_PACKAGES:
-                    for entry in sorted(
-                        perm["entries"] or [placeholder_entry],
-                        key=lambda x: x["timestamp"],
-                    ):
-                        cleaned_result = result.copy()
-                        cleaned_result["permissions"] = [perm]
-                        self.alertstore.medium(
-                            f"Risky package '{result['package_name']}' had '{perm['name']}' permission set to '{entry['access']}' at {entry['timestamp']}",
+                    detected_permissions.append(perm)
+                    for entry in sorted(perm["entries"], key=lambda x: x["timestamp"]):
+                        self.log.warning(
+                            "Risky package '%s' had '%s' permission set to '%s' at %s",
+                            result["package_name"],
+                            perm["name"],
+                            entry["access"],
                             entry["timestamp"],
-                            cleaned_result,
                         )
 
+            if detected_permissions:
+                # We clean the result to only include the risky permission, otherwise the timeline
+                # will be polluted with all the other irrelevant permissions
+                cleaned_result = result.copy()
+                cleaned_result["permissions"] = detected_permissions
+                self.detected.append(cleaned_result)
+
     def parse(self, output: str) -> None:
-        # self.results: List[Dict[str, Any]] = []
-        perm: dict[str, Any] = {}
-        package: dict[str, Any] = {}
-        entry: dict[str, Any] = {}
+        self.results: List[Dict[str, Any]] = []
+        perm = {}
+        package = {}
+        entry = {}
         uid = None
         in_packages = False
 

src/mvt/android/artifacts/dumpsys_battery_daily.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/
 
-from typing import Any
-
-from mvt.common.module_types import ModuleAtomicResult, ModuleSerializedResult
+from typing import Union
 
 from .artifact import AndroidArtifact
 
@@ -15,7 +13,7 @@ class DumpsysBatteryDailyArtifact(AndroidArtifact):
     Parser for dumpsys dattery daily updates.
     """
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["from"],
             "module": self.__class__.__name__,
@@ -29,16 +27,15 @@ class DumpsysBatteryDailyArtifact(AndroidArtifact):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_app_id(result["package_name"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_app_id(result["package_name"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
     def parse(self, output: str) -> None:
         daily = None
-        daily_updates: list[dict[str, Any]] = []
+        daily_updates = []
         for line in output.splitlines():
             if line.startswith("  Daily from "):
                 if len(daily_updates) > 0:

src/mvt/android/artifacts/dumpsys_battery_history.py

@@ -16,11 +16,10 @@ class DumpsysBatteryHistoryArtifact(AndroidArtifact):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_app_id(result["package_name"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_app_id(result["package_name"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
     def parse(self, data: str) -> None:

src/mvt/android/artifacts/dumpsys_dbinfo.py

@@ -20,11 +20,10 @@ class DumpsysDBInfoArtifact(AndroidArtifact):
         for result in self.results:
             path = result.get("path", "")
             for part in path.split("/"):
-                ioc_match = self.indicators.check_app_id(part)
-                if ioc_match:
-                    self.alertstore.critical(
-                        ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                    )
+                ioc = self.indicators.check_app_id(part)
+                if ioc:
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
                     continue
 
     def parse(self, output: str) -> None:

src/mvt/android/artifacts/dumpsys_package_activities.py

@@ -12,11 +12,10 @@ class DumpsysPackageActivitiesArtifact(AndroidArtifact):
             return
 
         for activity in self.results:
-            ioc_match = self.indicators.check_app_id(activity["package_name"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", activity, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_app_id(activity["package_name"])
+            if ioc:
+                activity["matched_indicator"] = ioc
+                self.detected.append(activity)
                 continue
 
     def parse(self, content: str):

src/mvt/android/artifacts/dumpsys_packages.py

@@ -4,10 +4,9 @@
 #   https://license.mvt.re/1.1/
 
 import re
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Union
 
 from mvt.android.utils import ROOT_PACKAGES
-from mvt.common.module_types import ModuleAtomicResult, ModuleSerializedResult
 
 from .artifact import AndroidArtifact
 
@@ -15,28 +14,25 @@ from .artifact import AndroidArtifact
 class DumpsysPackagesArtifact(AndroidArtifact):
     def check_indicators(self) -> None:
         for result in self.results:
-            # XXX: De-duplication Package detections
             if result["package_name"] in ROOT_PACKAGES:
-                self.alertstore.medium(
-                    f'Found an installed package related to rooting/jailbreaking: "{result["package_name"]}"',
-                    "",
-                    result,
+                self.log.warning(
+                    'Found an installed package related to rooting/jailbreaking: "%s"',
+                    result["package_name"],
                 )
-                self.alertstore.log_latest()
+                self.detected.append(result)
                 continue
 
             if not self.indicators:
                 continue
 
-            ioc_match = self.indicators.check_app_id(result.get("package_name", ""))
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
-                self.alertstore.log_latest()
+            ioc = self.indicators.check_app_id(result.get("package_name", ""))
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         records = []
+
         timestamps = [
             {"event": "package_install", "timestamp": record["timestamp"]},
             {
@@ -63,15 +59,15 @@ class DumpsysPackagesArtifact(AndroidArtifact):
         """
         Parse one entry of a dumpsys package information
         """
-        details: Dict[str, Any] = {
+        details = {
             "uid": "",
             "version_name": "",
             "version_code": "",
             "timestamp": "",
             "first_install_time": "",
             "last_update_time": "",
-            "permissions": list(),
-            "requested_permissions": list(),
+            "permissions": [],
+            "requested_permissions": [],
         }
         in_install_permissions = False
         in_runtime_permissions = False
@@ -149,7 +145,7 @@ class DumpsysPackagesArtifact(AndroidArtifact):
         results = []
         package_name = None
         package = {}
-        lines: list[str] = []
+        lines = []
         for line in output.splitlines():
             if line.startswith("  Package ["):
                 if len(lines) > 0:

src/mvt/android/artifacts/dumpsys_platform_compat.py

@@ -16,11 +16,10 @@ class DumpsysPlatformCompatArtifact(AndroidArtifact):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_app_id(result["package_name"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_app_id(result["package_name"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
     def parse(self, data: str) -> None:

src/mvt/android/artifacts/dumpsys_receivers.py

@@ -50,18 +50,14 @@ class DumpsysReceiversArtifact(AndroidArtifact):
                 if not self.indicators:
                     continue
 
-                ioc_match = self.indicators.check_app_id(receiver["package_name"])
-                if ioc_match:
-                    self.alertstore.critical(
-                        ioc_match.message,
-                        "",
-                        {intent: receiver},
-                        matched_indicator=ioc_match.ioc,
-                    )
+                ioc = self.indicators.check_app_id(receiver["package_name"])
+                if ioc:
+                    receiver["matched_indicator"] = ioc
+                    self.detected.append({intent: receiver})
                     continue
 
     def parse(self, output: str) -> None:
-        self.results: dict[str, list[dict[str, str]]] = {}
+        self.results = {}
 
         in_receiver_resolver_table = False
         in_non_data_actions = False

src/mvt/android/artifacts/file_timestamps.py

@@ -2,13 +2,13 @@
 # Copyright (c) 2021-2023 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/
+from typing import Union
 
 from .artifact import AndroidArtifact
-from mvt.common.module_types import ModuleAtomicResult, ModuleSerializedResult
 
 
 class FileTimestampsArtifact(AndroidArtifact):
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         records = []
 
         for ts in set(

src/mvt/android/artifacts/getprop.py

@@ -39,10 +39,10 @@ class GetProp(AndroidArtifact):
             if not matches or len(matches[0]) != 2:
                 continue
 
-            prop_entry = {"name": matches[0][0], "value": matches[0][1]}
-            self.results.append(prop_entry)
+            entry = {"name": matches[0][0], "value": matches[0][1]}
+            self.results.append(entry)
 
-    def get_device_timezone(self) -> str | None:
+    def get_device_timezone(self) -> str:
         """
         Get the device timezone from the getprop results
 
@@ -59,18 +59,13 @@ class GetProp(AndroidArtifact):
                 self.log.info("%s: %s", entry["name"], entry["value"])
 
             if entry["name"] == "ro.build.version.security_patch":
-                warning_message = warn_android_patch_level(entry["value"], self.log)
-                if isinstance(warning_message, str):
-                    self.alertstore.medium(warning_message, "", entry)
+                warn_android_patch_level(entry["value"], self.log)
 
         if not self.indicators:
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_android_property_name(
-                result.get("name", "")
-            )
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_android_property_name(result.get("name", ""))
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)

src/mvt/android/artifacts/mounts.py

@@ -133,16 +133,13 @@ class Mounts(AndroidArtifact):
             if mount["is_system_partition"] and mount["is_read_write"]:
                 system_rw_mounts.append(mount)
                 if mount_point == "/system":
-                    self.alertstore.high(
-                        "Root detected /system partition is mounted as read-write (rw)",
-                        "",
-                        mount,
+                    self.log.warning(
+                        "Root detected /system partition is mounted as read-write (rw). "
                     )
                 else:
-                    self.alertstore.high(
-                        f"System partition {mount_point} is mounted as read-write (rw). This may indicate system modifications.",
-                        "",
-                        mount,
+                    self.log.warning(
+                        "System partition %s is mounted as read-write (rw). This may indicate system modifications.",
+                        mount_point,
                     )
 
             # Check for other suspicious mount options
@@ -154,10 +151,10 @@ class Mounts(AndroidArtifact):
                 ):
                     continue
                 suspicious_mounts.append(mount)
-                self.alertstore.high(
-                    f"Suspicious mount options found for {mount_point}: {', '.join(suspicious_opts)}",
-                    "",
-                    mount,
+                self.log.warning(
+                    "Suspicious mount options found for %s: %s",
+                    mount_point,
+                    ", ".join(suspicious_opts),
                 )
 
             # Log interesting mount information
@@ -179,19 +176,11 @@ class Mounts(AndroidArtifact):
             # Check if any mount points match indicators
             ioc = self.indicators.check_file_path(mount.get("mount_point", ""))
             if ioc:
-                self.alertstore.critical(
-                    f"Mount point matches indicator: {mount.get('mount_point', '')}",
-                    "",
-                    mount,
-                    matched_indicator=ioc,
-                )
+                mount["matched_indicator"] = ioc
+                self.detected.append(mount)
 
             # Check device paths for indicators
             ioc = self.indicators.check_file_path(mount.get("device", ""))
             if ioc:
-                self.alertstore.critical(
-                    f"Device path matches indicator: {mount.get('device', '')}",
-                    "",
-                    mount,
-                    matched_indicator=ioc,
-                )
+                mount["matched_indicator"] = ioc
+                self.detected.append(mount)

src/mvt/android/artifacts/processes.py

@@ -58,15 +58,13 @@ class Processes(AndroidArtifact):
             if result["proc_name"] == "gatekeeperd":
                 continue
 
-            ioc_match = self.indicators.check_app_id(proc_name)
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_app_id(proc_name)
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
-            ioc_match = self.indicators.check_process(proc_name)
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_process(proc_name)
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)

src/mvt/android/artifacts/tombstone_crashes.py

@@ -4,18 +4,17 @@
 #   https://license.mvt.re/1.1/
 
 import datetime
-from typing import List, Optional
+from typing import List, Optional, Union
 
-import betterproto
 import pydantic
+import betterproto
 from dateutil import parser
 
-from mvt.android.parsers.proto.tombstone import Tombstone
-from mvt.common.module_types import ModuleAtomicResult, ModuleSerializedResult
 from mvt.common.utils import convert_datetime_to_iso
-
+from mvt.android.parsers.proto.tombstone import Tombstone
 from .artifact import AndroidArtifact
 
+
 TOMBSTONE_DELIMITER = "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***"
 
 # Map the legacy crash file keys to the new format.
@@ -77,7 +76,7 @@ class TombstoneCrashArtifact(AndroidArtifact):
     This parser can parse both text and protobuf tombstone crash files.
     """
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["timestamp"],
             "module": self.__class__.__name__,
@@ -93,21 +92,18 @@ class TombstoneCrashArtifact(AndroidArtifact):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_process(result["process_name"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_process(result["process_name"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
             if result.get("command_line", []):
                 command_name = result.get("command_line")[0].split("/")[-1]
-                command_name = result["command_line"][0]
-                ioc_match = self.indicators.check_process(command_name)
-                if ioc_match:
-                    self.alertstore.critical(
-                        ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                    )
+                ioc = self.indicators.check_process(command_name)
+                if ioc:
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
                     continue
 
             SUSPICIOUS_UIDS = [
@@ -116,14 +112,11 @@ class TombstoneCrashArtifact(AndroidArtifact):
                 2000,  # shell
             ]
             if result["uid"] in SUSPICIOUS_UIDS:
-                self.alertstore.medium(
-                    (
-                        f"Potentially suspicious crash in process '{result['process_name']}' "
-                        f"running as UID '{result['uid']}' in tombstone '{result['file_name']}' at {result['timestamp']}"
-                    ),
-                    "",
-                    result,
+                self.log.warning(
+                    f"Potentially suspicious crash in process '{result['process_name']}' "
+                    f"running as UID '{result['uid']}' in tombstone '{result['file_name']}' at {result['timestamp']}"
                 )
+                self.detected.append(result)
 
     def parse_protobuf(
         self, file_name: str, file_timestamp: datetime.datetime, data: bytes

src/mvt/android/cli.py

@@ -10,32 +10,41 @@ import click
 from mvt.common.cmd_check_iocs import CmdCheckIOCS
 from mvt.common.help import (
     HELP_MSG_ANDROID_BACKUP_PASSWORD,
-    HELP_MSG_CHECK_ADB_REMOVED,
-    HELP_MSG_CHECK_ADB_REMOVED_DESCRIPTION,
+    HELP_MSG_APK_OUTPUT,
+    HELP_MSG_APKS_FROM_FILE,
+    HELP_MSG_CHECK_ADB,
     HELP_MSG_CHECK_ANDROID_BACKUP,
     HELP_MSG_CHECK_ANDROIDQF,
     HELP_MSG_CHECK_BUGREPORT,
     HELP_MSG_CHECK_IOCS,
     HELP_MSG_DISABLE_INDICATOR_UPDATE_CHECK,
     HELP_MSG_DISABLE_UPDATE_CHECK,
+    HELP_MSG_DOWNLOAD_ALL_APKS,
+    HELP_MSG_DOWNLOAD_APKS,
+    HELP_MSG_FAST,
     HELP_MSG_HASHES,
     HELP_MSG_IOC,
     HELP_MSG_LIST_MODULES,
     HELP_MSG_MODULE,
     HELP_MSG_NONINTERACTIVE,
     HELP_MSG_OUTPUT,
+    HELP_MSG_SERIAL,
     HELP_MSG_STIX2,
     HELP_MSG_VERBOSE,
     HELP_MSG_VERSION,
+    HELP_MSG_VIRUS_TOTAL,
 )
 from mvt.common.logo import logo
 from mvt.common.updates import IndicatorsUpdates
 from mvt.common.utils import init_logging, set_verbose_logging
 
+from .cmd_check_adb import CmdAndroidCheckADB
 from .cmd_check_androidqf import CmdAndroidCheckAndroidQF
 from .cmd_check_backup import CmdAndroidCheckBackup
 from .cmd_check_bugreport import CmdAndroidCheckBugreport
-from .modules.androidqf import ANDROIDQF_MODULES
+from .cmd_download_apks import DownloadAPKs
+from .modules.adb import ADB_MODULES
+from .modules.adb.packages import Packages
 from .modules.backup import BACKUP_MODULES
 from .modules.backup.helpers import cli_load_android_backup_password
 from .modules.bugreport import BUGREPORT_MODULES
@@ -88,14 +97,124 @@ def version():
 
 
 # ==============================================================================
-# Command: check-adb (removed)
+# Command: download-apks
 # ==============================================================================
 @cli.command(
-    "check-adb", context_settings=CONTEXT_SETTINGS, help=HELP_MSG_CHECK_ADB_REMOVED
+    "download-apks", context_settings=CONTEXT_SETTINGS, help=HELP_MSG_DOWNLOAD_APKS
 )
+@click.option("--serial", "-s", type=str, help=HELP_MSG_SERIAL)
+@click.option("--all-apks", "-a", is_flag=True, help=HELP_MSG_DOWNLOAD_ALL_APKS)
+@click.option("--virustotal", "-V", is_flag=True, help=HELP_MSG_VIRUS_TOTAL)
+@click.option("--output", "-o", type=click.Path(exists=False), help=HELP_MSG_APK_OUTPUT)
+@click.option(
+    "--from-file", "-f", type=click.Path(exists=True), help=HELP_MSG_APKS_FROM_FILE
+)
+@click.option("--verbose", "-v", is_flag=True, help=HELP_MSG_VERBOSE)
 @click.pass_context
-def check_adb(ctx):
-    log.error(HELP_MSG_CHECK_ADB_REMOVED_DESCRIPTION)
+def download_apks(ctx, all_apks, virustotal, output, from_file, serial, verbose):
+    set_verbose_logging(verbose)
+    try:
+        if from_file:
+            download = DownloadAPKs.from_json(from_file)
+        else:
+            # TODO: Do we actually want to be able to run without storing any
+            #       file?
+            if not output:
+                log.critical("You need to specify an output folder with --output!")
+                ctx.exit(1)
+
+            download = DownloadAPKs(results_path=output, all_apks=all_apks)
+            if serial:
+                download.serial = serial
+            download.run()
+
+        packages_to_lookup = []
+        if all_apks:
+            packages_to_lookup = download.packages
+        else:
+            for package in download.packages:
+                if not package.get("system", False):
+                    packages_to_lookup.append(package)
+
+            if len(packages_to_lookup) == 0:
+                return
+
+        if virustotal:
+            m = Packages()
+            m.check_virustotal(packages_to_lookup)
+    except KeyboardInterrupt:
+        print("")
+        ctx.exit(1)
+
+
+# ==============================================================================
+# Command: check-adb
+# ==============================================================================
+@cli.command("check-adb", context_settings=CONTEXT_SETTINGS, help=HELP_MSG_CHECK_ADB)
+@click.option("--serial", "-s", type=str, help=HELP_MSG_SERIAL)
+@click.option(
+    "--iocs",
+    "-i",
+    type=click.Path(exists=True),
+    multiple=True,
+    default=[],
+    help=HELP_MSG_IOC,
+)
+@click.option("--output", "-o", type=click.Path(exists=False), help=HELP_MSG_OUTPUT)
+@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("--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)
+@click.pass_context
+def check_adb(
+    ctx,
+    serial,
+    iocs,
+    output,
+    fast,
+    list_modules,
+    module,
+    non_interactive,
+    backup_password,
+    verbose,
+):
+    set_verbose_logging(verbose)
+    module_options = {
+        "fast_mode": fast,
+        "interactive": not non_interactive,
+        "backup_password": cli_load_android_backup_password(log, backup_password),
+    }
+
+    cmd = CmdAndroidCheckADB(
+        results_path=output,
+        ioc_files=iocs,
+        module_name=module,
+        serial=serial,
+        module_options=module_options,
+        disable_version_check=_get_disable_flags(ctx)[0],
+        disable_indicator_check=_get_disable_flags(ctx)[1],
+    )
+
+    if list_modules:
+        cmd.list_modules()
+        return
+
+    log.warning(
+        "DEPRECATION: The 'check-adb' command is deprecated and may be removed in a future release. "
+        "Prefer acquiring device data using the AndroidQF project (https://github.com/mvt-project/androidqf/) and analyzing that acquisition with MVT."
+    )
+
+    log.info("Checking Android device over debug bridge")
+
+    cmd.run()
+
+    if cmd.detected_count > 0:
+        log.warning(
+            "The analysis of the Android device produced %d detections!",
+            cmd.detected_count,
+        )
 
 
 # ==============================================================================
@@ -138,8 +257,12 @@ def check_bugreport(ctx, iocs, output, list_modules, module, verbose, bugreport_
     log.info("Checking Android bug report at path: %s", bugreport_path)
 
     cmd.run()
-    cmd.show_alerts_brief()
-    cmd.show_support_message()
+
+    if cmd.detected_count > 0:
+        log.warning(
+            "The analysis of the Android bug report produced %d detections!",
+            cmd.detected_count,
+        )
 
 
 # ==============================================================================
@@ -198,8 +321,12 @@ def check_backup(
     log.info("Checking Android backup at path: %s", backup_path)
 
     cmd.run()
-    cmd.show_alerts_brief()
-    cmd.show_support_message()
+
+    if cmd.detected_count > 0:
+        log.warning(
+            "The analysis of the Android backup produced %d detections!",
+            cmd.detected_count,
+        )
 
 
 # ==============================================================================
@@ -260,9 +387,12 @@ def check_androidqf(
     log.info("Checking AndroidQF acquisition at path: %s", androidqf_path)
 
     cmd.run()
-    cmd.show_alerts_brief()
-    cmd.show_disable_adb_warning()
-    cmd.show_support_message()
+
+    if cmd.detected_count > 0:
+        log.warning(
+            "The analysis of the AndroidQF acquisition produced %d detections!",
+            cmd.detected_count,
+        )
 
 
 # ==============================================================================
@@ -282,16 +412,20 @@ def check_androidqf(
 @click.argument("FOLDER", type=click.Path(exists=True))
 @click.pass_context
 def check_iocs(ctx, iocs, list_modules, module, folder):
-    cmd = CmdCheckIOCS(target_path=folder, ioc_files=iocs, module_name=module)
-    cmd.modules = BACKUP_MODULES + BUGREPORT_MODULES + ANDROIDQF_MODULES
+    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],
+    )
+    cmd.modules = BACKUP_MODULES + ADB_MODULES + BUGREPORT_MODULES
 
     if list_modules:
         cmd.list_modules()
         return
 
     cmd.run()
-    cmd.show_alerts_brief()
-    cmd.show_support_message()
 
 
 # ==============================================================================

src/mvt/android/cmd_check_adb.py

@@ -0,0 +1,48 @@
+# Mobile Verification Toolkit (MVT)
+# Copyright (c) 2021-2023 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 logging
+from typing import Optional
+
+from mvt.common.command import Command
+from mvt.common.indicators import Indicators
+
+from .modules.adb import ADB_MODULES
+
+log = logging.getLogger(__name__)
+
+
+class CmdAndroidCheckADB(Command):
+    def __init__(
+        self,
+        target_path: Optional[str] = None,
+        results_path: Optional[str] = None,
+        ioc_files: Optional[list] = None,
+        iocs: Optional[Indicators] = None,
+        module_name: Optional[str] = None,
+        serial: Optional[str] = None,
+        module_options: Optional[dict] = None,
+        hashes: Optional[bool] = False,
+        sub_command: Optional[bool] = False,
+        disable_version_check: bool = False,
+        disable_indicator_check: bool = False,
+    ) -> None:
+        super().__init__(
+            target_path=target_path,
+            results_path=results_path,
+            ioc_files=ioc_files,
+            iocs=iocs,
+            module_name=module_name,
+            serial=serial,
+            module_options=module_options,
+            hashes=hashes,
+            sub_command=sub_command,
+            log=log,
+            disable_version_check=disable_version_check,
+            disable_indicator_check=disable_indicator_check,
+        )
+
+        self.name = "check-adb"
+        self.modules = ADB_MODULES

src/mvt/android/cmd_check_androidqf.py

@@ -70,9 +70,6 @@ class CmdAndroidCheckAndroidQF(Command):
         self.__files: List[str] = []
 
     def init(self):
-        if not self.target_path:
-            raise NoAndroidQFTargetPath
-
         if os.path.isdir(self.target_path):
             self.__format = "dir"
             parent_path = Path(self.target_path).absolute().parent.as_posix()
@@ -140,7 +137,6 @@ class CmdAndroidCheckAndroidQF(Command):
         raise NoAndroidQFBackup
 
     def run_bugreport_cmd(self) -> bool:
-        bugreport = None
         try:
             bugreport = self.load_bugreport()
         except NoAndroidQFBugReport:
@@ -161,13 +157,9 @@ class CmdAndroidCheckAndroidQF(Command):
             cmd.from_zip(bugreport)
             cmd.run()
 
+            self.detected_count += cmd.detected_count
             self.timeline.extend(cmd.timeline)
-            self.alertstore.extend(cmd.alertstore.alerts)
-        finally:
-            if bugreport:
-                bugreport.close()
-
-        return True
+            self.timeline_detected.extend(cmd.timeline_detected)
 
     def run_backup_cmd(self) -> bool:
         try:
@@ -177,22 +169,22 @@ class CmdAndroidCheckAndroidQF(Command):
                 "Skipping backup modules as no backup.ab found in AndroidQF data."
             )
             return False
+        else:
+            cmd = CmdAndroidCheckBackup(
+                target_path=None,
+                results_path=self.results_path,
+                ioc_files=self.ioc_files,
+                iocs=self.iocs,
+                module_options=self.module_options,
+                hashes=self.hashes,
+                sub_command=True,
+            )
+            cmd.from_ab(backup)
+            cmd.run()
 
-        cmd = CmdAndroidCheckBackup(
-            target_path=None,
-            results_path=self.results_path,
-            ioc_files=self.ioc_files,
-            iocs=self.iocs,
-            module_options=self.module_options,
-            hashes=self.hashes,
-            sub_command=True,
-        )
-        cmd.from_ab(backup)
-        cmd.run()
-
-        self.timeline.extend(cmd.timeline)
-        self.alertstore.extend(cmd.alertstore.alerts)
-        return True
+            self.detected_count += cmd.detected_count
+            self.timeline.extend(cmd.timeline)
+            self.timeline_detected.extend(cmd.timeline_detected)
 
     def finish(self) -> None:
         """

src/mvt/android/cmd_check_backup.py

@@ -11,7 +11,7 @@ import tarfile
 from pathlib import Path
 from typing import List, Optional
 
-from mvt.android.modules.backup.base import BackupModule
+from mvt.android.modules.backup.base import BackupExtraction
 from mvt.android.modules.backup.helpers import prompt_or_load_android_backup_password
 from mvt.android.parsers.backup import (
     AndroidBackupParsingError,
@@ -60,12 +60,12 @@ class CmdAndroidCheckBackup(Command):
         self.name = "check-backup"
         self.modules = BACKUP_MODULES
 
-        self.__type: str = ""
-        self.__tar: Optional[tarfile.TarFile] = None
-        self.__files: List[str] = []
+        self.backup_type: str = ""
+        self.backup_archive: Optional[tarfile.TarFile] = None
+        self.backup_files: List[str] = []
 
     def from_ab(self, ab_file_bytes: bytes) -> None:
-        self.__type = "ab"
+        self.backup_type = "ab"
         header = parse_ab_header(ab_file_bytes)
         if not header["backup"]:
             log.critical("Invalid backup format, file should be in .ab format")
@@ -88,33 +88,27 @@ class CmdAndroidCheckBackup(Command):
             sys.exit(1)
 
         dbytes = io.BytesIO(tardata)
-        self.__tar = tarfile.open(fileobj=dbytes)
-        for member in self.__tar:
-            self.__files.append(member.name)
+        self.backup_archive = tarfile.open(fileobj=dbytes)
+        for member in self.backup_archive:
+            self.backup_files.append(member.name)
 
     def init(self) -> None:
-        if not self.target_path:  # type: ignore[has-type]
+        if not self.target_path:
             return
 
-        # Type guard: we know it's not None here after the check above
-        assert self.target_path is not None  # type: ignore[has-type]
-        # Use a different local variable name to avoid any scoping issues
-        backup_path: str = self.target_path  # type: ignore[has-type]
-
-        if os.path.isfile(backup_path):
-            self.__type = "ab"
-            with open(backup_path, "rb") as handle:
+        if os.path.isfile(self.target_path):
+            self.backup_type = "ab"
+            with open(self.target_path, "rb") as handle:
                 ab_file_bytes = handle.read()
             self.from_ab(ab_file_bytes)
 
-        elif os.path.isdir(backup_path):
-            self.__type = "folder"
-            backup_path = Path(backup_path).absolute().as_posix()
-            self.target_path = backup_path
-            for root, subdirs, subfiles in os.walk(os.path.abspath(backup_path)):
+        elif os.path.isdir(self.target_path):
+            self.backup_type = "folder"
+            self.target_path = Path(self.target_path).absolute().as_posix()
+            for root, subdirs, subfiles in os.walk(os.path.abspath(self.target_path)):
                 for fname in subfiles:
-                    self.__files.append(
-                        os.path.relpath(os.path.join(root, fname), backup_path)
+                    self.backup_files.append(
+                        os.path.relpath(os.path.join(root, fname), self.target_path)
                     )
         else:
             log.critical(
@@ -123,12 +117,8 @@ class CmdAndroidCheckBackup(Command):
             )
             sys.exit(1)
 
-    def module_init(self, module: BackupModule) -> None:  # type: ignore[override]
-        if self.__type == "folder":
-            module.from_dir(self.target_path, self.__files)
+    def module_init(self, module: BackupExtraction) -> None:  # type: ignore[override]
+        if self.backup_type == "folder":
+            module.from_dir(self.target_path, self.backup_files)
         else:
-            module.from_ab(self.target_path, self.__tar, self.__files)
-
-    def finish(self) -> None:
-        if self.__tar:
-            self.__tar.close()
+            module.from_ab(self.target_path, self.backup_archive, self.backup_files)

src/mvt/android/cmd_check_bugreport.py

@@ -96,8 +96,6 @@ class CmdAndroidCheckBugreport(Command):
         if self.__format == "zip":
             module.from_zip(self.__zip, self.__files)
         else:
-            if not self.target_path:
-                raise ValueError("target_path is not set")
             module.from_dir(self.target_path, self.__files)
 
     def finish(self) -> None:

src/mvt/android/cmd_download_apks.py

@@ -0,0 +1,184 @@
+# Mobile Verification Toolkit (MVT)
+# Copyright (c) 2021-2023 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 json
+import logging
+import os
+from typing import Callable, Optional, Union
+
+from rich.progress import track
+
+from mvt.common.module import InsufficientPrivileges
+
+from .modules.adb.base import AndroidExtraction
+from .modules.adb.packages import Packages
+
+log = logging.getLogger(__name__)
+
+
+class DownloadAPKs(AndroidExtraction):
+    """DownloadAPKs is the main class operating the download of APKs
+    from the device.
+    """
+
+    def __init__(
+        self,
+        results_path: Optional[str] = None,
+        all_apks: bool = False,
+        packages: Optional[list] = None,
+    ) -> None:
+        """Initialize module.
+        :param results_path: Path to the folder where data should be stored
+        :param all_apks: Boolean indicating whether to download all packages
+                         or filter known-goods
+        :param packages: Provided list of packages, typically for JSON checks
+        """
+        super().__init__(results_path=results_path, log=log)
+
+        self.packages = packages
+        self.all_apks = all_apks
+        self.results_path_apks = None
+
+    @classmethod
+    def from_json(cls, json_path: str) -> Callable:
+        """Initialize this class from an existing apks.json file.
+
+        :param json_path: Path to the apks.json file to parse.
+
+        """
+        with open(json_path, "r", encoding="utf-8") as handle:
+            packages = json.load(handle)
+            return cls(packages=packages)
+
+    def pull_package_file(
+        self, package_name: str, remote_path: str
+    ) -> Union[str, None]:
+        """Pull files related to specific package from the device.
+
+        :param package_name: Name of the package to download
+        :param remote_path: Path to the file to download
+        :returns: Path to the local copy
+
+        """
+        log.info("Downloading %s ...", remote_path)
+
+        file_name = ""
+        if "==/" in remote_path:
+            file_name = "_" + remote_path.split("==/")[1].replace(".apk", "")
+
+        local_path = os.path.join(
+            self.results_path_apks, f"{package_name}{file_name}.apk"
+        )
+        name_counter = 0
+        while True:
+            if not os.path.exists(local_path):
+                break
+
+            name_counter += 1
+            local_path = os.path.join(
+                self.results_path_apks, f"{package_name}{file_name}_{name_counter}.apk"
+            )
+
+        try:
+            self._adb_download(remote_path, local_path)
+        except InsufficientPrivileges:
+            log.error(
+                "Unable to pull package file from %s: insufficient privileges, "
+                "it might be a system app",
+                remote_path,
+            )
+            self._adb_reconnect()
+            return None
+        except Exception as exc:
+            log.exception("Failed to pull package file from %s: %s", remote_path, exc)
+            self._adb_reconnect()
+            return None
+
+        return local_path
+
+    def get_packages(self) -> None:
+        """Use the Packages adb module to retrieve the list of packages.
+        We reuse the same extraction logic to then download the APKs.
+        """
+        self.log.info("Retrieving list of installed packages...")
+
+        m = Packages()
+        m.log = self.log
+        m.serial = self.serial
+        m.run()
+
+        self.packages = m.results
+
+    def pull_packages(self) -> None:
+        """Download all files of all selected packages from the device."""
+        log.info(
+            "Starting extraction of installed APKs at folder %s", self.results_path
+        )
+
+        # If the user provided the flag --all-apks we select all packages.
+        packages_selection = []
+        if self.all_apks:
+            log.info("Selected all %d available packages", len(self.packages))
+            packages_selection = self.packages
+        else:
+            # Otherwise we loop through the packages and get only those that
+            # are not marked as system.
+            for package in self.packages:
+                if not package.get("system", False):
+                    packages_selection.append(package)
+
+            log.info(
+                'Selected only %d packages which are not marked as "system"',
+                len(packages_selection),
+            )
+
+        if len(packages_selection) == 0:
+            log.info("No packages were selected for download")
+            return
+
+        log.info("Downloading packages from device. This might take some time ...")
+
+        self.results_path_apks = os.path.join(self.results_path, "apks")
+        if not os.path.exists(self.results_path_apks):
+            os.makedirs(self.results_path_apks, exist_ok=True)
+
+        for i in track(
+            range(len(packages_selection)),
+            description=f"Downloading {len(packages_selection)} packages...",
+        ):
+            package = packages_selection[i]
+
+            log.info(
+                "[%d/%d] Package: %s",
+                i,
+                len(packages_selection),
+                package["package_name"],
+            )
+
+            # Sometimes the package path contains multiple lines for multiple
+            # apks. We loop through each line and download each file.
+            for package_file in package["files"]:
+                device_path = package_file["path"]
+                local_path = self.pull_package_file(
+                    package["package_name"], device_path
+                )
+                if not local_path:
+                    continue
+
+                package_file["local_path"] = local_path
+
+        log.info("Download of selected packages completed")
+
+    def save_json(self) -> None:
+        json_path = os.path.join(self.results_path, "apks.json")
+        with open(json_path, "w", encoding="utf-8") as handle:
+            json.dump(self.packages, handle, indent=4)
+
+    def run(self) -> None:
+        self.get_packages()
+        self._adb_connect()
+        self.pull_packages()
+        self.save_json()
+        self._adb_disconnect()

src/mvt/android/modules/adb/base.py

@@ -0,0 +1,355 @@
+# Mobile Verification Toolkit (MVT)
+# Copyright (c) 2021-2023 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 base64
+import logging
+import os
+import random
+import string
+import sys
+import tempfile
+import time
+from typing import Callable, Optional
+
+from adb_shell.adb_device import AdbDeviceTcp, AdbDeviceUsb
+from adb_shell.auth.keygen import keygen, write_public_keyfile
+from adb_shell.auth.sign_pythonrsa import PythonRSASigner
+from adb_shell.exceptions import (
+    AdbCommandFailureException,
+    DeviceAuthError,
+    UsbDeviceNotFoundError,
+    UsbReadFailedError,
+)
+from usb1 import USBErrorAccess, USBErrorBusy
+
+from mvt.android.modules.backup.helpers import prompt_or_load_android_backup_password
+from mvt.android.parsers.backup import (
+    InvalidBackupPassword,
+    parse_ab_header,
+    parse_backup_file,
+)
+from mvt.common.module import InsufficientPrivileges, MVTModule
+
+ADB_KEY_PATH = os.path.expanduser("~/.android/adbkey")
+ADB_PUB_KEY_PATH = os.path.expanduser("~/.android/adbkey.pub")
+
+
+class AndroidExtraction(MVTModule):
+    """This class provides a base for all Android extraction modules."""
+
+    def __init__(
+        self,
+        file_path: Optional[str] = None,
+        target_path: Optional[str] = None,
+        results_path: Optional[str] = None,
+        module_options: Optional[dict] = None,
+        log: logging.Logger = logging.getLogger(__name__),
+        results: Optional[list] = None,
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+        self.device = None
+        self.serial = None
+
+    @staticmethod
+    def _adb_check_keys() -> None:
+        """Make sure Android adb keys exist."""
+        if not os.path.isdir(os.path.dirname(ADB_KEY_PATH)):
+            os.makedirs(os.path.dirname(ADB_KEY_PATH))
+
+        if not os.path.exists(ADB_KEY_PATH):
+            keygen(ADB_KEY_PATH)
+
+        if not os.path.exists(ADB_PUB_KEY_PATH):
+            write_public_keyfile(ADB_KEY_PATH, ADB_PUB_KEY_PATH)
+
+    def _adb_connect(self) -> None:
+        """Connect to the device over adb."""
+        self._adb_check_keys()
+
+        with open(ADB_KEY_PATH, "rb") as handle:
+            priv_key = handle.read()
+
+        with open(ADB_PUB_KEY_PATH, "rb") as handle:
+            pub_key = handle.read()
+
+        signer = PythonRSASigner(pub_key, priv_key)
+
+        # If no serial was specified or if the serial does not seem to be
+        # a HOST:PORT definition, we use the USB transport.
+        if not self.serial or ":" not in self.serial:
+            try:
+                self.device = AdbDeviceUsb(serial=self.serial)
+            except UsbDeviceNotFoundError:
+                self.log.critical(
+                    "No device found. Make sure it is connected and unlocked."
+                )
+                sys.exit(-1)
+        # Otherwise we try to use the TCP transport.
+        else:
+            addr = self.serial.split(":")
+            if len(addr) < 2:
+                raise ValueError(
+                    "TCP serial number must follow the format: `address:port`"
+                )
+
+            self.device = AdbDeviceTcp(
+                addr[0], int(addr[1]), default_transport_timeout_s=30.0
+            )
+
+        while True:
+            try:
+                self.device.connect(rsa_keys=[signer], auth_timeout_s=5)
+            except (USBErrorBusy, USBErrorAccess):
+                self.log.critical(
+                    "Device is busy, maybe run `adb kill-server` and try again."
+                )
+                sys.exit(-1)
+            except DeviceAuthError:
+                self.log.error(
+                    "You need to authorize this computer on the Android device. "
+                    "Retrying in 5 seconds..."
+                )
+                time.sleep(5)
+            except UsbReadFailedError:
+                self.log.error(
+                    "Unable to connect to the device over USB. "
+                    "Try to unplug, plug the device and start again."
+                )
+                sys.exit(-1)
+            except OSError as exc:
+                if exc.errno == 113 and self.serial:
+                    self.log.critical(
+                        "Unable to connect to the device %s: "
+                        "did you specify the correct IP address?",
+                        self.serial,
+                    )
+                    sys.exit(-1)
+            else:
+                break
+
+    def _adb_disconnect(self) -> None:
+        """Close adb connection to the device."""
+        self.device.close()
+
+    def _adb_reconnect(self) -> None:
+        """Reconnect to device using adb."""
+        self.log.info("Reconnecting ...")
+        self._adb_disconnect()
+        self._adb_connect()
+
+    def _adb_command(self, command: str, decode: bool = True) -> str:
+        """Execute an adb shell command.
+
+        :param command: Shell command to execute
+        :returns: Output of command
+
+        """
+        return self.device.shell(command, read_timeout_s=200.0, decode=decode)
+
+    def _adb_check_if_root(self) -> bool:
+        """Check if we have a `su` binary on the Android device.
+
+
+        :returns: Boolean indicating whether a `su` binary is present or not
+
+        """
+        result = self._adb_command("command -v su && su -c true")
+        return bool(result) and "Permission denied" not in result
+
+    def _adb_root_or_die(self) -> None:
+        """Check if we have a `su` binary, otherwise raise an Exception."""
+        if not self._adb_check_if_root():
+            raise InsufficientPrivileges(
+                "This module is optionally available "
+                "in case the device is already rooted."
+                " Do NOT root your own device!"
+            )
+
+    def _adb_command_as_root(self, command):
+        """Execute an adb shell command.
+
+        :param command: Shell command to execute as root
+        :returns: Output of command
+
+        """
+        return self._adb_command(f"su -c {command}")
+
+    def _adb_check_file_exists(self, file: str) -> bool:
+        """Verify that a file exists.
+
+        :param file: Path of the file
+        :returns: Boolean indicating whether the file exists or not
+
+        """
+
+        # TODO: Need to support checking files without root privileges as well.
+
+        # Check if we have root, if not raise an Exception.
+        self._adb_root_or_die()
+
+        return bool(self._adb_command_as_root(f"[ ! -f {file} ] || echo 1"))
+
+    def _adb_download(
+        self,
+        remote_path: str,
+        local_path: str,
+        progress_callback: Optional[Callable] = None,
+        retry_root: Optional[bool] = True,
+    ) -> None:
+        """Download a file form the device.
+
+        :param remote_path: Path to download from the device
+        :param local_path: Path to where to locally store the copy of the file
+        :param progress_callback: Callback for download progress bar
+                                  (Default value = None)
+        :param retry_root: Default value = True)
+
+        """
+        try:
+            self.device.pull(remote_path, local_path, progress_callback)
+        except AdbCommandFailureException as exc:
+            if retry_root:
+                self._adb_download_root(remote_path, local_path, progress_callback)
+            else:
+                raise Exception(
+                    f"Unable to download file {remote_path}: {exc}"
+                ) from exc
+
+    def _adb_download_root(
+        self,
+        remote_path: str,
+        local_path: str,
+        progress_callback: Optional[Callable] = None,
+    ) -> None:
+        try:
+            # Check if we have root, if not raise an Exception.
+            self._adb_root_or_die()
+
+            # We generate a random temporary filename.
+            allowed_chars = (
+                string.ascii_uppercase + string.ascii_lowercase + string.digits
+            )
+            tmp_filename = "tmp_" + "".join(random.choices(allowed_chars, k=10))
+
+            # We create a temporary local file.
+            new_remote_path = f"/sdcard/{tmp_filename}"
+
+            # We copy the file from the data folder to /sdcard/.
+            cp_output = self._adb_command_as_root(f"cp {remote_path} {new_remote_path}")
+            if (
+                cp_output.startswith("cp: ")
+                and "No such file or directory" in cp_output
+            ):
+                raise Exception(f"Unable to process file {remote_path}: File not found")
+            if cp_output.startswith("cp: ") and "Permission denied" in cp_output:
+                raise Exception(
+                    f"Unable to process file {remote_path}: Permission denied"
+                )
+
+            # We download from /sdcard/ to the local temporary file.
+            # If it doesn't work now, don't try again (retry_root=False)
+            self._adb_download(
+                new_remote_path, local_path, progress_callback, retry_root=False
+            )
+
+            # Delete the copy on /sdcard/.
+            self._adb_command(f"rm -rf {new_remote_path}")
+
+        except AdbCommandFailureException as exc:
+            raise Exception(f"Unable to download file {remote_path}: {exc}") from exc
+
+    def _adb_process_file(self, remote_path: str, process_routine: Callable) -> None:
+        """Download a local copy of a file which is only accessible as root.
+        This is a wrapper around process_routine.
+
+        :param remote_path: Path of the file on the device to process
+        :param process_routine: Function to be called on the local copy of the
+                                downloaded file
+
+        """
+        # Connect to the device over adb.
+        # Check if we have root, if not raise an Exception.
+        self._adb_root_or_die()
+
+        # We create a temporary local file.
+        tmp = tempfile.NamedTemporaryFile()
+        local_path = tmp.name
+        local_name = os.path.basename(tmp.name)
+        new_remote_path = f"/sdcard/Download/{local_name}"
+
+        # We copy the file from the data folder to /sdcard/.
+        cp_output = self._adb_command_as_root(f"cp {remote_path} {new_remote_path}")
+        if cp_output.startswith("cp: ") and "No such file or directory" in cp_output:
+            raise Exception(f"Unable to process file {remote_path}: File not found")
+        if cp_output.startswith("cp: ") and "Permission denied" in cp_output:
+            raise Exception(f"Unable to process file {remote_path}: Permission denied")
+
+        # We download from /sdcard/ to the local temporary file.
+        self._adb_download(new_remote_path, local_path)
+
+        # Launch the provided process routine!
+        process_routine(local_path)
+
+        # Delete the local copy.
+        tmp.close()
+        # Delete the copy on /sdcard/.
+        self._adb_command(f"rm -f {new_remote_path}")
+
+    def _generate_backup(self, package_name: str) -> bytes:
+        self.log.info(
+            "Please check phone and accept Android backup prompt. "
+            "You may need to set a backup password. \a"
+        )
+
+        if self.module_options.get("backup_password", None):
+            self.log.warning(
+                "Backup password already set from command line or environment "
+                "variable. You should use the same password if enabling encryption!"
+            )
+
+        # TODO: Base64 encoding as temporary fix to avoid byte-mangling over
+        #       the shell transport...
+        cmd = f"/system/bin/bu backup -nocompress '{package_name}' | base64"
+        backup_output_b64 = self._adb_command(cmd)
+        backup_output = base64.b64decode(backup_output_b64)
+        header = parse_ab_header(backup_output)
+
+        if not header["backup"]:
+            self.log.error(
+                "Extracting SMS via Android backup failed. No valid backup data found."
+            )
+            return None
+
+        if header["encryption"] == "none":
+            return parse_backup_file(backup_output, password=None)
+
+        for _ in range(0, 3):
+            backup_password = prompt_or_load_android_backup_password(
+                self.log, self.module_options
+            )
+            if not backup_password:
+                # Fail as no backup password loaded for this encrypted backup
+                self.log.critical("No backup password provided.")
+            try:
+                decrypted_backup_tar = parse_backup_file(backup_output, backup_password)
+                return decrypted_backup_tar
+            except InvalidBackupPassword:
+                self.log.error("You provided the wrong password! Please try again...")
+
+        self.log.error("All attempts to decrypt backup with password failed!")
+
+        return None
+
+    def run(self) -> None:
+        """Run the main procedure."""
+        raise NotImplementedError

src/mvt/android/modules/adb/chrome_history.py

@@ -6,13 +6,8 @@
 import logging
 import os
 import sqlite3
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_chrometime_to_datetime, convert_datetime_to_iso
 
 from .base import AndroidExtraction
@@ -30,7 +25,7 @@ class ChromeHistory(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -40,9 +35,9 @@ class ChromeHistory(AndroidExtraction):
             log=log,
             results=results,
         )
-        self.results: list = []
+        self.results = []
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["isodate"],
             "module": self.__class__.__name__,
@@ -56,11 +51,9 @@ class ChromeHistory(AndroidExtraction):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_url(result["url"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            if self.indicators.check_url(result["url"]):
+                self.detected.append(result)
+                continue
 
     def _parse_db(self, db_path: str) -> None:
         """Parse a Chrome History database file.

src/mvt/android/modules/adb/dumpsys_full.py

@@ -8,7 +8,6 @@ import os
 from typing import Optional
 
 from .base import AndroidExtraction
-from mvt.common.module_types import ModuleResults
 
 
 class DumpsysFull(AndroidExtraction):
@@ -21,7 +20,7 @@ class DumpsysFull(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/adb/files.py

@@ -8,7 +8,6 @@ import os
 import stat
 from typing import Optional, Union
 
-from mvt.common.module_types import ModuleResults
 from mvt.common.utils import convert_unix_to_iso
 
 from .base import AndroidExtraction
@@ -33,7 +32,7 @@ class Files(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -64,15 +63,11 @@ class Files(AndroidExtraction):
                     result["path"],
                 )
 
-            if self.indicators:
-                ioc_match = self.indicators.check_file_path(result["path"])
-                if ioc_match:
-                    self.alertstore.critical(
-                        f'Found a known suspicious file at path: "{result["path"]}"',
-                        "",
-                        result,
-                        matched_indicator=ioc_match,
-                    )
+            if self.indicators and self.indicators.check_file_path(result["path"]):
+                self.log.warning(
+                    'Found a known suspicous file at path: "%s"', result["path"]
+                )
+                self.detected.append(result)
 
     def backup_file(self, file_path: str) -> None:
         if not self.results_path:

src/mvt/android/modules/adb/getprop.py

@@ -9,7 +9,6 @@ from typing import Optional
 from mvt.android.artifacts.getprop import GetProp as GetPropArtifact
 
 from .base import AndroidExtraction
-from mvt.common.module_types import ModuleResults
 
 
 class Getprop(GetPropArtifact, AndroidExtraction):
@@ -22,7 +21,7 @@ class Getprop(GetPropArtifact, AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/adb/logcat.py

@@ -8,7 +8,6 @@ import os
 from typing import Optional
 
 from .base import AndroidExtraction
-from mvt.common.module_types import ModuleResults
 
 
 class Logcat(AndroidExtraction):
@@ -21,7 +20,7 @@ class Logcat(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/adb/packages.py

@@ -4,7 +4,12 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-from typing import Optional
+from typing import Optional, Union
+
+from rich.console import Console
+from rich.progress import track
+from rich.table import Table
+from rich.text import Text
 
 from mvt.android.artifacts.dumpsys_packages import DumpsysPackagesArtifact
 from mvt.android.utils import (
@@ -14,11 +19,7 @@ from mvt.android.utils import (
     SECURITY_PACKAGES,
     SYSTEM_UPDATE_PACKAGES,
 )
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
+from mvt.common.virustotal import VTNoKey, VTQuotaExceeded, virustotal_lookup
 
 from .base import AndroidExtraction
 
@@ -33,7 +34,7 @@ class Packages(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -45,7 +46,7 @@ class Packages(AndroidExtraction):
         )
         self._user_needed = False
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         records = []
 
         timestamps = [
@@ -94,71 +95,76 @@ class Packages(AndroidExtraction):
             if not self.indicators:
                 continue
 
-            ioc_match = self.indicators.check_app_id(result["package_name"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_app_id(result.get("package_name"))
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
+                continue
 
             for package_file in result.get("files", []):
-                ioc_match = self.indicators.check_file_hash(package_file["sha256"])
-                if ioc_match:
-                    self.alertstore.critical(
-                        ioc_match.message, "", result, matched_indicator=ioc_match.ioc
+                ioc = self.indicators.check_file_hash(package_file["sha256"])
+                if ioc:
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
+
+    def check_virustotal(self, packages: list) -> None:
+        hashes = []
+        for package in packages:
+            for file in package.get("files", []):
+                if file["sha256"] not in hashes:
+                    hashes.append(file["sha256"])
+
+        total_hashes = len(hashes)
+        detections = {}
+
+        progress_desc = f"Looking up {total_hashes} files..."
+        for i in track(range(total_hashes), description=progress_desc):
+            try:
+                results = virustotal_lookup(hashes[i])
+            except VTNoKey:
+                return
+            except VTQuotaExceeded as exc:
+                print("Unable to continue: %s", exc)
+                break
+
+            if not results:
+                continue
+
+            positives = results["attributes"]["last_analysis_stats"]["malicious"]
+            total = len(results["attributes"]["last_analysis_results"])
+
+            detections[hashes[i]] = f"{positives}/{total}"
+
+        table = Table(title="VirusTotal Packages Detections")
+        table.add_column("Package name")
+        table.add_column("File path")
+        table.add_column("Detections")
+
+        for package in packages:
+            for file in package.get("files", []):
+                if "package_name" in package:
+                    row = [package["package_name"], file["path"]]
+                elif "name" in package:
+                    row = [package["name"], file["path"]]
+                else:
+                    self.log.error(
+                        f"Package {package} has no name or package_name. packages.json or apks.json is malformed"
                     )
+                    continue
+                if file["sha256"] in detections:
+                    detection = detections[file["sha256"]]
+                    positives = detection.split("/")[0]
+                    if int(positives) > 0:
+                        row.append(Text(detection, "red bold"))
+                    else:
+                        row.append(detection)
+                else:
+                    row.append("not found")
 
-    # @staticmethod
-    # def check_virustotal(packages: list) -> None:
-    #     hashes = []
-    #     for package in packages:
-    #         for file in package.get("files", []):
-    #             if file["sha256"] not in hashes:
-    #                 hashes.append(file["sha256"])
+                table.add_row(*row)
 
-    #     total_hashes = len(hashes)
-    #     detections = {}
-
-    #     progress_desc = f"Looking up {total_hashes} files..."
-    #     for i in track(range(total_hashes), description=progress_desc):
-    #         try:
-    #             results = virustotal_lookup(hashes[i])
-    #         except VTNoKey:
-    #             return
-    #         except VTQuotaExceeded as exc:
-    #             print("Unable to continue: %s", exc)
-    #             break
-
-    #         if not results:
-    #             continue
-
-    #         positives = results["attributes"]["last_analysis_stats"]["malicious"]
-    #         total = len(results["attributes"]["last_analysis_results"])
-
-    #         detections[hashes[i]] = f"{positives}/{total}"
-
-    #     table = Table(title="VirusTotal Packages Detections")
-    #     table.add_column("Package name")
-    #     table.add_column("File path")
-    #     table.add_column("Detections")
-
-    #     for package in packages:
-    #         for file in package.get("files", []):
-    #             row = [package["package_name"], file["path"]]
-
-    #             if file["sha256"] in detections:
-    #                 detection = detections[file["sha256"]]
-    #                 positives = detection.split("/")[0]
-    #                 if int(positives) > 0:
-    #                     row.append(Text(detection, "red bold"))
-    #                 else:
-    #                     row.append(detection)
-    #             else:
-    #                 row.append("not found")
-
-    #             table.add_row(*row)
-
-    #     console = Console()
-    #     console.print(table)
+        console = Console()
+        console.print(table)
 
     @staticmethod
     def parse_package_for_details(output: str) -> dict:

src/mvt/android/modules/adb/processes.py

@@ -9,7 +9,6 @@ from typing import Optional
 from mvt.android.artifacts.processes import Processes as ProcessesArtifact
 
 from .base import AndroidExtraction
-from mvt.common.module_types import ModuleResults
 
 
 class Processes(ProcessesArtifact, AndroidExtraction):
@@ -22,7 +21,7 @@ class Processes(ProcessesArtifact, AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/adb/root_binaries.py

@@ -6,8 +6,6 @@
 import logging
 from typing import Optional
 
-from mvt.common.module_types import ModuleResults
-
 from .base import AndroidExtraction
 
 
@@ -21,7 +19,7 @@ class RootBinaries(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -34,11 +32,8 @@ class RootBinaries(AndroidExtraction):
 
     def check_indicators(self) -> None:
         for root_binary in self.results:
-            self.alertstore.high(
-                f'Found root binary "{root_binary}"',
-                "",
-                root_binary,
-            )
+            self.detected.append(root_binary)
+            self.log.warning('Found root binary "%s"', root_binary)
 
     def run(self) -> None:
         root_binaries = [

src/mvt/android/modules/adb/selinux_status.py

@@ -6,8 +6,6 @@
 import logging
 from typing import Optional
 
-from mvt.common.module_types import ModuleResults
-
 from .base import AndroidExtraction
 
 
@@ -23,7 +21,7 @@ class SELinuxStatus(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -34,7 +32,7 @@ class SELinuxStatus(AndroidExtraction):
             results=results,
         )
 
-        self.results: dict = {}
+        self.results = {} if not results else results
 
     def run(self) -> None:
         self._adb_connect()

src/mvt/android/modules/adb/settings.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.settings import Settings as SettingsArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import AndroidExtraction
 
@@ -22,7 +21,7 @@ class Settings(SettingsArtifact, AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

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

@@ -6,15 +6,10 @@
 import logging
 import os
 import sqlite3
-from typing import Optional
+from typing import Optional, Union
 
 from mvt.android.parsers.backup import AndroidBackupParsingError, parse_tar_for_sms
 from mvt.common.module import InsufficientPrivileges
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import check_for_links, convert_unix_to_iso
 
 from .base import AndroidExtraction
@@ -56,7 +51,7 @@ class SMS(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -69,7 +64,7 @@ class SMS(AndroidExtraction):
 
         self.sms_db_type = 0
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         body = record["body"].replace("\n", "\\n")
         return {
             "timestamp": record["isodate"],
@@ -90,11 +85,9 @@ class SMS(AndroidExtraction):
             if message_links == []:
                 message_links = check_for_links(message["body"])
 
-            ioc_match = self.indicators.check_urls(message_links)
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", message, matched_indicator=ioc_match.ioc
-                )
+            if self.indicators.check_urls(message_links):
+                self.detected.append(message)
+                continue
 
     def _parse_db(self, db_path: str) -> None:
         """Parse an Android bugle_db SMS database file.

src/mvt/android/modules/adb/whatsapp.py

@@ -7,13 +7,8 @@ import base64
 import logging
 import os
 import sqlite3
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import check_for_links, convert_unix_to_iso
 
 from .base import AndroidExtraction
@@ -31,7 +26,7 @@ class Whatsapp(AndroidExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -42,7 +37,7 @@ class Whatsapp(AndroidExtraction):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         text = record["data"].replace("\n", "\\n")
         return {
             "timestamp": record["isodate"],
@@ -60,11 +55,8 @@ class Whatsapp(AndroidExtraction):
                 continue
 
             message_links = check_for_links(message["data"])
-            ioc_match = self.indicators.check_urls(message_links)
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", message, matched_indicator=ioc_match.ioc
-                )
+            if self.indicators.check_urls(message_links):
+                self.detected.append(message)
                 continue
 
     def _parse_db(self, db_path: str) -> None:

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

@@ -10,15 +10,10 @@ import logging
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo  # type: ignore
-from typing import Optional
+    from backports import zoneinfo
+from typing import Optional, Union
 
 from mvt.android.modules.androidqf.base import AndroidQFModule
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_datetime_to_iso
 
 SUSPICIOUS_PATHS = [
@@ -41,7 +36,7 @@ class AQFFiles(AndroidQFModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -52,7 +47,7 @@ class AQFFiles(AndroidQFModule):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         records = []
 
         for ts in set(
@@ -87,12 +82,10 @@ class AQFFiles(AndroidQFModule):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_file_path(result["path"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
-                self.alertstore.log_latest()
+            ioc = self.indicators.check_file_path(result["path"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
             # NOTE: Update with final path used for Android collector.
@@ -105,18 +98,20 @@ class AQFFiles(AndroidQFModule):
                     if self.file_is_executable(result["mode"]):
                         file_type = "executable "
 
-                    msg = f'Found {file_type}file at suspicious path "{result["path"]}"'
-                    self.alertstore.high(msg, "", result)
-                    self.alertstore.log_latest()
+                    self.log.warning(
+                        'Found %sfile at suspicious path "%s".',
+                        file_type,
+                        result["path"],
+                    )
+                    self.detected.append(result)
 
             if result.get("sha256", "") == "":
                 continue
 
-            ioc_match = self.indicators.check_file_hash(result.get("sha256") or "")
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_file_hash(result["sha256"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
 
             # TODO: adds SHA1 and MD5 when available in MVT
 

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

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.getprop import GetProp as GetPropArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import AndroidQFModule
 
@@ -22,7 +21,7 @@ class AQFGetProp(GetPropArtifact, AndroidQFModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -32,7 +31,7 @@ class AQFGetProp(GetPropArtifact, AndroidQFModule):
             log=log,
             results=results,
         )
-        self.results: list = []
+        self.results = []
 
     def run(self) -> None:
         getprop_files = self._get_files_by_pattern("*/getprop.txt")

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

@@ -3,16 +3,14 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
+import os
 import datetime
 import logging
-import os
 from typing import Optional
 
-from mvt.android.artifacts.file_timestamps import FileTimestampsArtifact
-from mvt.common.module_types import ModuleResults
 from mvt.common.utils import convert_datetime_to_iso
-
 from .base import AndroidQFModule
+from mvt.android.artifacts.file_timestamps import FileTimestampsArtifact
 
 
 class AQFLogTimestamps(FileTimestampsArtifact, AndroidQFModule):
@@ -27,7 +25,7 @@ class AQFLogTimestamps(FileTimestampsArtifact, AndroidQFModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -38,13 +36,11 @@ class AQFLogTimestamps(FileTimestampsArtifact, AndroidQFModule):
             results=results,
         )
 
-    def _get_file_modification_time(self, file_path: str) -> datetime.datetime:
+    def _get_file_modification_time(self, file_path: str) -> dict:
         if self.archive:
             file_timetuple = self.archive.getinfo(file_path).date_time
             return datetime.datetime(*file_timetuple)
         else:
-            if not self.parent_path:
-                raise ValueError("parent_path is not set")
             file_stat = os.stat(os.path.join(self.parent_path, file_path))
             return datetime.datetime.fromtimestamp(file_stat.st_mtime)
 

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

@@ -11,11 +11,10 @@ from mvt.android.utils import (
     BROWSER_INSTALLERS,
     PLAY_STORE_INSTALLERS,
     ROOT_PACKAGES,
+    THIRD_PARTY_STORE_INSTALLERS,
     SECURITY_PACKAGES,
     SYSTEM_UPDATE_PACKAGES,
-    THIRD_PARTY_STORE_INSTALLERS,
 )
-from mvt.common.module_types import ModuleResults
 
 from .base import AndroidQFModule
 
@@ -30,7 +29,7 @@ class AQFPackages(AndroidQFModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -44,96 +43,79 @@ class AQFPackages(AndroidQFModule):
     def check_indicators(self) -> None:
         for result in self.results:
             if result["name"] in ROOT_PACKAGES:
-                self.alertstore.medium(
-                    f'Found an installed package related to rooting/jailbreaking: "{result["name"]}"',
-                    "",
-                    result,
+                self.log.warning(
+                    'Found an installed package related to rooting/jailbreaking: "%s"',
+                    result["name"],
                 )
-                self.alertstore.log_latest()
+                self.detected.append(result)
                 continue
 
-            # Detections for apps installed via unusual methods.
+            # Detections for apps installed via unusual methods
             if result["installer"] in THIRD_PARTY_STORE_INSTALLERS:
-                self.alertstore.info(
-                    f'Found a package installed via a third party store (installer="{result["installer"]}"): "{result["name"]}"',
-                    "",
-                    result,
+                self.log.warning(
+                    'Found a package installed via a third party store (installer="%s"): "%s"',
+                    result["installer"],
+                    result["name"],
                 )
-                self.alertstore.log_latest()
             elif result["installer"] in BROWSER_INSTALLERS:
-                self.alertstore.medium(
-                    f'Found a package installed via a browser (installer="{result["installer"]}"): "{result["name"]}"',
-                    "",
-                    result,
+                self.log.warning(
+                    'Found a package installed via a browser (installer="%s"): "%s"',
+                    result["installer"],
+                    result["name"],
                 )
-                self.alertstore.log_latest()
+                self.detected.append(result)
             elif result["installer"] == "null" and result["system"] is False:
-                self.alertstore.high(
-                    f'Found a non-system package installed via adb or another method: "{result["name"]}"',
-                    "",
-                    result,
+                self.log.warning(
+                    'Found a non-system package installed via adb or another method: "%s"',
+                    result["name"],
                 )
-                self.alertstore.log_latest()
+                self.detected.append(result)
             elif result["installer"] in PLAY_STORE_INSTALLERS:
                 pass
 
-            # Check for disabled security or software update packages.
+            # Check for disabled security or software update packages
             package_disabled = result.get("disabled", None)
             if result["name"] in SECURITY_PACKAGES and package_disabled:
-                self.alertstore.high(
-                    f'Security package "{result["name"]}" disabled on the phone',
-                    "",
-                    result,
+                self.log.warning(
+                    'Security package "%s" disabled on the phone', result["name"]
                 )
-                self.alertstore.log_latest()
 
             if result["name"] in SYSTEM_UPDATE_PACKAGES and package_disabled:
-                self.alertstore.high(
-                    f'System OTA update package "{result["name"]}" disabled on the phone',
-                    "",
-                    result,
+                self.log.warning(
+                    'System OTA update package "%s" disabled on the phone',
+                    result["name"],
                 )
-                self.alertstore.log_latest()
 
             if not self.indicators:
                 continue
 
-            ioc_match = self.indicators.check_app_id(result.get("name") or "")
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
-                self.alertstore.log_latest()
+            ioc = self.indicators.check_app_id(result.get("name"))
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
 
             for package_file in result.get("files", []):
-                ioc_match = self.indicators.check_file_hash(
-                    package_file.get("sha256") or ""
-                )
-                if ioc_match:
-                    self.alertstore.critical(
-                        ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                    )
-                    self.alertstore.log_latest()
+                ioc = self.indicators.check_file_hash(package_file["sha256"])
+                if ioc:
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
 
                 if "certificate" not in package_file:
                     continue
 
-                # The keys generated by AndroidQF have a leading uppercase character.
+                # The keys generated by AndroidQF have a leading uppercase character
                 for hash_type in ["Md5", "Sha1", "Sha256"]:
                     certificate_hash = package_file["certificate"][hash_type]
-                    ioc_match = self.indicators.check_app_certificate_hash(
-                        certificate_hash
-                    )
-                    if ioc_match:
-                        self.alertstore.critical(
-                            ioc_match.message,
-                            "",
-                            result,
-                            matched_indicator=ioc_match.ioc,
-                        )
-                        self.alertstore.log_latest()
+                    ioc = self.indicators.check_app_certificate_hash(certificate_hash)
+                    if ioc:
+                        result["matched_indicator"] = ioc
+                        self.detected.append(result)
                         break
 
+        # Deduplicate the detected packages
+        dedupe_detected_dict = {str(item): item for item in self.detected}
+        self.detected = list(dedupe_detected_dict.values())
+
     def run(self) -> None:
         packages = self._get_files_by_pattern("*/packages.json")
         if not packages:

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

@@ -9,7 +9,6 @@ from typing import Optional
 from mvt.android.artifacts.processes import Processes as ProcessesArtifact
 
 from .base import AndroidQFModule
-from mvt.common.module_types import ModuleResults
 
 
 class AQFProcesses(ProcessesArtifact, AndroidQFModule):
@@ -22,7 +21,7 @@ class AQFProcesses(ProcessesArtifact, AndroidQFModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

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

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.settings import Settings as SettingsArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import AndroidQFModule
 
@@ -22,7 +21,7 @@ class AQFSettings(SettingsArtifact, AndroidQFModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -32,7 +31,7 @@ class AQFSettings(SettingsArtifact, AndroidQFModule):
             log=log,
             results=results,
         )
-        self.results: dict = {}
+        self.results = {}
 
     def run(self) -> None:
         for setting_file in self._get_files_by_pattern("*/settings_*.txt"):

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

@@ -7,10 +7,9 @@ import fnmatch
 import logging
 import os
 import zipfile
-from typing import List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from mvt.common.module import MVTModule
-from mvt.common.module_types import ModuleResults
 
 
 class AndroidQFModule(MVTModule):
@@ -23,7 +22,7 @@ class AndroidQFModule(MVTModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Union[List[Dict[str, Any]], Dict[str, Any], None] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -33,8 +32,8 @@ class AndroidQFModule(MVTModule):
             log=log,
             results=results,
         )
-        self.parent_path: Optional[str] = None
-        self._path: Optional[str] = target_path
+        self.parent_path = None
+        self._path: str = target_path
         self.files: List[str] = []
         self.archive: Optional[zipfile.ZipFile] = None
 

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

@@ -3,8 +3,8 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
-import json
 import logging
+import json
 from typing import Optional
 
 from mvt.android.artifacts.mounts import Mounts as MountsArtifact
@@ -32,7 +32,7 @@ class Mounts(MountsArtifact, AndroidQFModule):
             log=log,
             results=results,
         )
-        self.results: list = []
+        self.results = []
 
     def run(self) -> None:
         """

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

@@ -46,17 +46,17 @@ class RootBinaries(AndroidQFModule):
 
         # All found root binaries are considered indicators of rooting
         for result in self.results:
-            self.alertstore.high(
-                f'Found root binary "{result["binary_name"]}" at path "{result["path"]}"',
-                "",
-                result,
+            self.log.warning(
+                'Found root binary "%s" at path "%s"',
+                result["binary_name"],
+                result["path"],
             )
-            self.alertstore.log_latest()
+            self.detected.append(result)
 
-        if self.results:
+        if self.detected:
             self.log.warning(
                 "Device shows signs of rooting with %d root binaries found",
-                len(self.results),
+                len(self.detected),
             )
 
     def run(self) -> None:

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

@@ -53,11 +53,8 @@ class SMS(AndroidQFModule):
             if "body" not in message:
                 continue
 
-            ioc_match = self.indicators.check_domains(message.get("links", []))
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", message, matched_indicator=ioc_match.ioc
-                )
+            if self.indicators.check_domains(message.get("links", [])):
+                self.detected.append(message)
 
     def parse_backup(self, data):
         header = parse_ab_header(data)

src/mvt/android/modules/backup/base.py

@@ -9,10 +9,10 @@ import os
 from tarfile import TarFile
 from typing import List, Optional
 
-from mvt.common.module import ModuleResults, MVTModule
+from mvt.common.module import MVTModule
 
 
-class BackupModule(MVTModule):
+class BackupExtraction(MVTModule):
     """This class provides a base for all backup extractios modules"""
 
     def __init__(
@@ -22,7 +22,7 @@ class BackupModule(MVTModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -32,10 +32,10 @@ class BackupModule(MVTModule):
             log=log,
             results=results,
         )
-        self.ab: Optional[str] = None
-        self.backup_path: Optional[str] = None
-        self.tar: Optional[TarFile] = None
-        self.files: list = []
+        self.ab = None
+        self.backup_path = None
+        self.tar = None
+        self.files = []
 
     def from_dir(self, backup_path: Optional[str], files: List[str]) -> None:
         self.backup_path = backup_path
@@ -55,15 +55,12 @@ class BackupModule(MVTModule):
         return fnmatch.filter(self.files, pattern)
 
     def _get_file_content(self, file_path: str) -> bytes:
-        handle = None
         if self.tar:
             try:
                 member = self.tar.getmember(file_path)
-                handle = self.tar.extractfile(member)
-                if not handle:
-                    raise ValueError(f"Could not extract file: {file_path}")
             except KeyError:
-                raise FileNotFoundError(f"File not found in tar: {file_path}")
+                return None
+            handle = self.tar.extractfile(member)
         elif self.backup_path:
             handle = open(os.path.join(self.backup_path, file_path), "rb")
         else:

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

@@ -4,15 +4,14 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-from typing import Any, Optional
+from typing import Optional
 
-from mvt.android.modules.backup.base import BackupModule
+from mvt.android.modules.backup.base import BackupExtraction
 from mvt.android.parsers.backup import parse_sms_file
-from mvt.common.module_types import ModuleResults
 from mvt.common.utils import check_for_links
 
 
-class SMS(BackupModule):
+class SMS(BackupExtraction):
     def __init__(
         self,
         file_path: Optional[str] = None,
@@ -20,7 +19,7 @@ class SMS(BackupModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -30,7 +29,7 @@ class SMS(BackupModule):
             log=log,
             results=results,
         )
-        self.results: list[dict[str, Any]] = []
+        self.results = []
 
     def check_indicators(self) -> None:
         if not self.indicators:
@@ -44,11 +43,8 @@ class SMS(BackupModule):
             if message_links == []:
                 message_links = check_for_links(message.get("text", ""))
 
-            ioc_match = self.indicators.check_urls(message_links)
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", message, matched_indicator=ioc_match.ioc
-                )
+            if self.indicators.check_urls(message_links):
+                self.detected.append(message)
                 continue
 
     def run(self) -> None:

src/mvt/android/modules/bugreport/base.py

@@ -6,10 +6,11 @@ import datetime
 import fnmatch
 import logging
 import os
+
 from typing import List, Optional
 from zipfile import ZipFile
 
-from mvt.common.module import ModuleResults, MVTModule
+from mvt.common.module import MVTModule
 
 
 class BugReportModule(MVTModule):
@@ -22,7 +23,7 @@ class BugReportModule(MVTModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -68,8 +69,6 @@ class BugReportModule(MVTModule):
         if self.zip_archive:
             handle = self.zip_archive.open(file_path)
         else:
-            if not self.extract_path:
-                raise ValueError("extract_path is not set")
             handle = open(os.path.join(self.extract_path, file_path), "rb")
 
         data = handle.read()
@@ -77,7 +76,7 @@ class BugReportModule(MVTModule):
 
         return data
 
-    def _get_dumpstate_file(self) -> Optional[bytes]:
+    def _get_dumpstate_file(self) -> bytes:
         main = self._get_files_by_pattern("main_entry.txt")
         if main:
             main_content = self._get_file_content(main[0])
@@ -92,12 +91,10 @@ class BugReportModule(MVTModule):
 
             return self._get_file_content(dumpstate_logs[0])
 
-    def _get_file_modification_time(self, file_path: str) -> datetime.datetime:
+    def _get_file_modification_time(self, file_path: str) -> dict:
         if self.zip_archive:
             file_timetuple = self.zip_archive.getinfo(file_path).date_time
             return datetime.datetime(*file_timetuple)
         else:
-            if not self.extract_path:
-                raise ValueError("extract_path is not set")
             file_stat = os.stat(os.path.join(self.extract_path, file_path))
             return datetime.datetime.fromtimestamp(file_stat.st_mtime)

src/mvt/android/modules/bugreport/dumpsys_accessibility.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibilityArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -22,7 +21,7 @@ class DumpsysAccessibility(DumpsysAccessibilityArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_activities.py

@@ -9,7 +9,6 @@ from typing import Optional
 from mvt.android.artifacts.dumpsys_package_activities import (
     DumpsysPackageActivitiesArtifact,
 )
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -24,7 +23,7 @@ class DumpsysActivities(DumpsysPackageActivitiesArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_adb_state.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.dumpsys_adb import DumpsysADBArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -22,7 +21,7 @@ class DumpsysADBState(DumpsysADBArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_appops.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.dumpsys_appops import DumpsysAppopsArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -22,7 +21,7 @@ class DumpsysAppops(DumpsysAppopsArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_battery_daily.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.dumpsys_battery_daily import DumpsysBatteryDailyArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -22,7 +21,7 @@ class DumpsysBatteryDaily(DumpsysBatteryDailyArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_battery_history.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.dumpsys_battery_history import DumpsysBatteryHistoryArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -22,7 +21,7 @@ class DumpsysBatteryHistory(DumpsysBatteryHistoryArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_dbinfo.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfoArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -24,7 +23,7 @@ class DumpsysDBInfo(DumpsysDBInfoArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_getprop.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.getprop import GetProp as GetPropArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -22,7 +21,7 @@ class DumpsysGetProp(GetPropArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_packages.py

@@ -8,7 +8,6 @@ from typing import Optional
 
 from mvt.android.artifacts.dumpsys_packages import DumpsysPackagesArtifact
 from mvt.android.utils import DANGEROUS_PERMISSIONS, DANGEROUS_PERMISSIONS_THRESHOLD
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -23,7 +22,7 @@ class DumpsysPackages(DumpsysPackagesArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -43,9 +42,8 @@ class DumpsysPackages(DumpsysPackagesArtifact, BugReportModule):
             )
             return
 
-        content = self.extract_dumpsys_section(
-            data.decode("utf-8", errors="replace"), "DUMP OF SERVICE package:"
-        )
+        data = data.decode("utf-8", errors="replace")
+        content = self.extract_dumpsys_section(data, "DUMP OF SERVICE package:")
         self.parse(content)
 
         for result in self.results:

src/mvt/android/modules/bugreport/dumpsys_platform_compat.py

@@ -9,7 +9,6 @@ from typing import Optional
 from mvt.android.artifacts.dumpsys_platform_compat import DumpsysPlatformCompatArtifact
 
 from mvt.android.modules.bugreport.base import BugReportModule
-from mvt.common.module_types import ModuleResults
 
 
 class DumpsysPlatformCompat(DumpsysPlatformCompatArtifact, BugReportModule):
@@ -22,7 +21,7 @@ class DumpsysPlatformCompat(DumpsysPlatformCompatArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/dumpsys_receivers.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.dumpsys_receivers import DumpsysReceiversArtifact
-from mvt.common.module_types import ModuleResults
 
 from .base import BugReportModule
 
@@ -22,7 +21,7 @@ class DumpsysReceivers(DumpsysReceiversArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -35,20 +34,6 @@ class DumpsysReceivers(DumpsysReceiversArtifact, BugReportModule):
 
         self.results = results if results else {}
 
-    def check_indicators(self) -> None:
-        for result in self.results:
-            if self.indicators:
-                receiver_name = self.results[result][0]["receiver"]
-
-                # return IoC if the stix2 process name a substring of the receiver name
-                ioc = self.indicators.check_receiver_prefix(receiver_name)
-                if ioc:
-                    self.results[result][0]["matched_indicator"] = ioc
-                    self.detected.append(result)
-                    continue
-
-
-
     def run(self) -> None:
         content = self._get_dumpstate_file()
         if not content:

src/mvt/android/modules/bugreport/fs_timestamps.py

@@ -8,7 +8,6 @@ from typing import Optional
 
 from mvt.common.utils import convert_datetime_to_iso
 from .base import BugReportModule
-from mvt.common.module_types import ModuleResults
 from mvt.android.artifacts.file_timestamps import FileTimestampsArtifact
 
 
@@ -24,7 +23,7 @@ class BugReportTimestamps(FileTimestampsArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/modules/bugreport/tombstones.py

@@ -7,7 +7,6 @@ import logging
 from typing import Optional
 
 from mvt.android.artifacts.tombstone_crashes import TombstoneCrashArtifact
-from mvt.common.module_types import ModuleResults
 from .base import BugReportModule
 
 
@@ -23,7 +22,7 @@ class Tombstones(TombstoneCrashArtifact, BugReportModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/android/utils.py

@@ -6,15 +6,16 @@ from datetime import datetime, timedelta
 from typing import List
 
 
-def warn_android_patch_level(patch_level: str, log) -> str | bool:
+def warn_android_patch_level(patch_level: str, log) -> bool:
     """Alert if Android patch level out-of-date"""
     patch_date = datetime.strptime(patch_level, "%Y-%m-%d")
     if (datetime.now() - patch_date) > timedelta(days=6 * 31):
-        warning_message = (
-            f"This phone has not received security updates "
-            f"for more than six months (last update: {patch_level})."
+        log.warning(
+            "This phone has not received security updates "
+            "for more than six months (last update: %s)",
+            patch_level,
         )
-        return warning_message
+        return True
 
     return False
 

src/mvt/common/alerts.py

@@ -1,243 +0,0 @@
-# Mobile Verification Toolkit (MVT)
-# Copyright (c) 2021-2025 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 csv
-import inspect
-import logging
-from dataclasses import asdict, dataclass
-from enum import Enum
-from typing import Any, Dict, List, Optional
-
-from .log import CRITICAL_ALERT, HIGH_ALERT, INFO_ALERT, LOW_ALERT, MEDIUM_ALERT
-from .module_types import ModuleAtomicResult
-
-
-class AlertLevel(Enum):
-    INFORMATIONAL = 0
-    LOW = 10
-    MEDIUM = 20
-    HIGH = 30
-    CRITICAL = 40
-
-
-@dataclass
-class Alert:
-    level: AlertLevel
-    module: str
-    message: str
-    event_time: str
-    event: ModuleAtomicResult
-    matched_indicator: Optional[Any] = None
-
-
-class AlertStore:
-    def __init__(self, log: Optional[logging.Logger] = None) -> None:
-        self.__alerts: List[Alert] = []
-        self.__log = log
-
-    def _get_calling_module(self) -> str:
-        """
-        Automatically detect the calling MVT module and return its slug.
-
-        Walks up the call stack to find the first frame that belongs to an MVT module
-        (artifact or extraction module) and extracts its slug.
-
-        :return: Module slug string
-        """
-        frame = inspect.currentframe()
-        try:
-            # Walk up the call stack
-            while frame is not None:
-                frame = frame.f_back
-                if frame is None:
-                    break
-
-                # Get the 'self' object from the frame's local variables
-                frame_locals = frame.f_locals
-                if "self" in frame_locals:
-                    obj = frame_locals["self"]
-                    # Check if it has a get_slug method (MVT modules have this)
-                    if hasattr(obj, "get_slug") and callable(obj.get_slug):
-                        try:
-                            return str(obj.get_slug())
-                        except Exception:
-                            pass
-
-            # Fallback: return "unknown" if we can't find the module
-            return "unknown"
-        finally:
-            del frame
-
-    @property
-    def alerts(self) -> List[Alert]:
-        return self.__alerts
-
-    def add(self, alert: Alert) -> None:
-        self.__alerts.append(alert)
-        self.log(alert)
-
-    def extend(self, alerts: List[Alert]) -> None:
-        for alert in alerts:
-            self.add(alert)
-
-    def info(
-        self,
-        message: str,
-        event_time: str,
-        event: ModuleAtomicResult,
-        matched_indicator: Optional[Any] = None,
-    ):
-        self.add(
-            Alert(
-                level=AlertLevel.INFORMATIONAL,
-                module=self._get_calling_module(),
-                message=message,
-                event_time=event_time,
-                event=event,
-                matched_indicator=matched_indicator,
-            )
-        )
-
-    def low(
-        self,
-        message: str,
-        event_time: str,
-        event: ModuleAtomicResult,
-        matched_indicator: Optional[Any] = None,
-    ):
-        self.add(
-            Alert(
-                level=AlertLevel.LOW,
-                module=self._get_calling_module(),
-                message=message,
-                event_time=event_time,
-                event=event,
-                matched_indicator=matched_indicator,
-            )
-        )
-
-    def medium(
-        self,
-        message: str,
-        event_time: str,
-        event: ModuleAtomicResult,
-        matched_indicator: Optional[Any] = None,
-    ):
-        self.add(
-            Alert(
-                level=AlertLevel.MEDIUM,
-                module=self._get_calling_module(),
-                message=message,
-                event_time=event_time,
-                event=event,
-                matched_indicator=matched_indicator,
-            )
-        )
-
-    def high(
-        self,
-        message: str,
-        event_time: str,
-        event: ModuleAtomicResult,
-        matched_indicator: Optional[Any] = None,
-    ):
-        self.add(
-            Alert(
-                level=AlertLevel.HIGH,
-                module=self._get_calling_module(),
-                message=message,
-                event_time=event_time,
-                event=event,
-                matched_indicator=matched_indicator,
-            )
-        )
-
-    def critical(
-        self,
-        message: str,
-        event_time: str,
-        event: ModuleAtomicResult,
-        matched_indicator: Optional[Any] = None,
-    ):
-        self.add(
-            Alert(
-                level=AlertLevel.CRITICAL,
-                module=self._get_calling_module(),
-                message=message,
-                event_time=event_time,
-                event=event,
-                matched_indicator=matched_indicator,
-            )
-        )
-
-    def log(self, alert: Alert) -> None:
-        if not self.__log:
-            return
-
-        if not alert.message:
-            return
-
-        if alert.level == AlertLevel.INFORMATIONAL:
-            self.__log.log(INFO_ALERT, alert.message)
-        elif alert.level == AlertLevel.LOW:
-            self.__log.log(LOW_ALERT, alert.message)
-        elif alert.level == AlertLevel.MEDIUM:
-            self.__log.log(MEDIUM_ALERT, alert.message)
-        elif alert.level == AlertLevel.HIGH:
-            self.__log.log(HIGH_ALERT, alert.message)
-        elif alert.level == AlertLevel.CRITICAL:
-            self.__log.log(CRITICAL_ALERT, alert.message)
-
-    def log_latest(self) -> None:
-        self.log(self.__alerts[-1])
-
-    def count(self, level: AlertLevel) -> int:
-        count = 0
-        for alert in self.__alerts:
-            if alert.level == level:
-                count += 1
-
-        return count
-
-    def as_json(self) -> List[Dict[str, Any]]:
-        alerts = []
-        for alert in self.__alerts:
-            alert_dict = asdict(alert)
-            # This is required because an Enum is not JSON serializable.
-            alert_dict["level"] = alert.level.name
-            alerts.append(alert_dict)
-
-        return alerts
-
-    def save_timeline(self, timeline_path: str) -> None:
-        with open(timeline_path, "a+", encoding="utf-8") as handle:
-            csvoutput = csv.writer(
-                handle,
-                delimiter=",",
-                quotechar='"',
-                quoting=csv.QUOTE_ALL,
-                escapechar="\\",
-            )
-            csvoutput.writerow(["Event Time", "Module", "Message", "Event"])
-
-            timed_alerts = []
-            for alert in self.alerts:
-                if not alert.event_time:
-                    continue
-
-                timed_alerts.append(asdict(alert))
-
-            for event in sorted(
-                timed_alerts,
-                key=lambda x: x["event_time"] if x["event_time"] is not None else "",
-            ):
-                csvoutput.writerow(
-                    [
-                        event.get("event_time"),
-                        event.get("module"),
-                        event.get("message"),
-                        event.get("event"),
-                    ]
-                )

src/mvt/common/artifact.py

@@ -2,11 +2,27 @@
 # Copyright (c) 2021-2023 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/
-from .module import MVTModule
 
 
-class Artifact(MVTModule):
-    """Base class for artifacts.
-
-    XXX: Inheriting from MVTModule to have the same signature as other modules. Not sure if this is a good idea.
+class Artifact:
     """
+    Main artifact class
+    """
+
+    def __init__(self, *args, **kwargs):
+        self.results = []
+        self.detected = []
+        self.indicators = None
+        super().__init__(*args, **kwargs)
+
+    def parse(self, entry: str):
+        """
+        Parse the artifact, adds the parsed information to self.results
+        """
+        raise NotImplementedError
+
+    def check_indicators(self) -> None:
+        """Check the results of this module against a provided list of
+        indicators coming from self.indicators
+        """
+        raise NotImplementedError

src/mvt/common/cmd_check_iocs.py

@@ -86,7 +86,7 @@ class CmdCheckIOCS(Command):
                 except NotImplementedError:
                     continue
                 else:
-                    total_detections += len(m.alertstore.alerts)
+                    total_detections += len(m.detected)
 
         if total_detections > 0:
             log.warning(

src/mvt/common/command.py

@@ -8,22 +8,17 @@ import logging
 import os
 import sys
 from datetime import datetime
-from typing import Any, Optional
+from typing import Optional
 
-from rich.console import Console
-from rich.panel import Panel
-from rich.text import Text
-
-from .alerts import AlertLevel, AlertStore
-from .config import settings
-from .indicators import Indicators
-from .module import MVTModule, run_module, save_timeline
-from .utils import (
+from mvt.common.indicators import Indicators
+from mvt.common.module import MVTModule, run_module, save_timeline
+from mvt.common.utils import (
     convert_datetime_to_iso,
     generate_hashes_from_path,
     get_sha256_from_file_path,
 )
-from .version import MVT_VERSION
+from mvt.common.config import settings
+from mvt.common.version import MVT_VERSION
 
 
 class Command:
@@ -43,7 +38,7 @@ class Command:
         disable_indicator_check: bool = False,
     ) -> None:
         self.name = ""
-        self.modules: list[Any] = []
+        self.modules = []
 
         self.target_path = target_path
         self.results_path = results_path
@@ -62,10 +57,12 @@ class Command:
 
         # This list will contain all executed modules.
         # We can use this to reference e.g. self.executed[0].results.
-        self.executed: list[Any] = []
+        self.executed = []
+        self.detected_count = 0
         self.hashes = hashes
-        self.hash_values: list[dict[str, Any]] = []
-        self.timeline: list[dict[str, Any]] = []
+        self.hash_values = []
+        self.timeline = []
+        self.timeline_detected = []
 
         # Load IOCs
         self._create_storage()
@@ -77,14 +74,12 @@ class Command:
             self.iocs = Indicators(self.log)
             self.iocs.load_indicators_files(self.ioc_files)
 
-        self.alertstore = AlertStore()
-
     def _create_storage(self) -> None:
         if self.results_path and not os.path.exists(self.results_path):
             try:
                 os.makedirs(self.results_path)
             except Exception as exc:
-                self.log.fatal(
+                self.log.critical(
                     "Unable to create output folder %s: %s", self.results_path, exc
                 )
                 sys.exit(1)
@@ -103,14 +98,14 @@ class Command:
         file_handler.setLevel(logging.DEBUG)
         file_handler.setFormatter(formatter)
 
-        # MVT can be run in a loop.
-        # Old file handlers stick around in subsequent loops.
-        # Remove any existing logging.FileHandler instances.
+        # MVT can be run in a loop
+        # Old file handlers stick around in subsequent loops
+        # Remove any existing logging.FileHandler instances
         for handler in logger.handlers:
             if isinstance(handler, logging.FileHandler):
                 logger.removeHandler(handler)
 
-        # And finally add the new one.
+        # And finally add the new one
         logger.addHandler(file_handler)
 
     def _store_timeline(self) -> None:
@@ -131,34 +126,22 @@ class Command:
                 is_utc=is_utc,
             )
 
-    def _store_alerts(self) -> None:
-        if not self.results_path:
-            return
-
-        alerts = self.alertstore.as_json()
-        if not alerts:
-            return
-
-        alerts_path = os.path.join(self.results_path, "alerts.json")
-        with open(alerts_path, "w+", encoding="utf-8") as handle:
-            json.dump(alerts, handle, indent=4)
-
-    def _store_alerts_timeline(self) -> None:
-        if not self.results_path:
-            return
-
-        alerts_timeline_path = os.path.join(self.results_path, "alerts_timeline.csv")
-        self.alertstore.save_timeline(alerts_timeline_path)
+        if len(self.timeline_detected) > 0:
+            save_timeline(
+                self.timeline_detected,
+                os.path.join(self.results_path, "timeline_detected.csv"),
+                is_utc=is_utc,
+            )
 
     def _store_info(self) -> None:
         if not self.results_path:
             return
 
-        target_path: Optional[str] = None
+        target_path = None
         if self.target_path:
             target_path = os.path.abspath(self.target_path)
 
-        info: dict[str, Any] = {
+        info = {
             "target_path": target_path,
             "mvt_version": MVT_VERSION,
             "date": convert_datetime_to_iso(datetime.now()),
@@ -208,54 +191,26 @@ class Command:
     def finish(self) -> None:
         raise NotImplementedError
 
-    def show_alerts_brief(self) -> None:
-        console = Console()
-
-        message = Text()
-        for i, level in enumerate(AlertLevel):
-            message.append(
-                f"MVT produced {self.alertstore.count(level)} {level.name} alerts."
+    def _show_disable_adb_warning(self) -> None:
+        """Warn if ADB is enabled"""
+        if type(self).__name__ in ["CmdAndroidCheckADB", "CmdAndroidCheckAndroidQF"]:
+            self.log.info(
+                "Please disable Developer Options and ADB (Android Debug Bridge) on the device once finished with the acquisition. "
+                "ADB is a powerful tool which can allow unauthorized access to the device."
             )
-            if i < len(AlertLevel) - 1:
-                message.append("\n")
-
-        panel = Panel(
-            message, title="ALERTS", style="sandy_brown", border_style="sandy_brown"
-        )
-        console.print("")
-        console.print(panel)
-
-    def show_disable_adb_warning(self) -> None:
-        console = Console()
-        message = Text(
-            "Please disable Developer Options and ADB (Android Debug Bridge) on the device once finished with the acquisition. "
-            "ADB is a powerful tool which can allow unauthorized access to the device."
-        )
-        panel = Panel(message, title="NOTE", style="yellow", border_style="yellow")
-        console.print("")
-        console.print(panel)
-
-    def show_support_message(self) -> None:
-        console = Console()
-        message = Text()
 
+    def _show_support_message(self) -> None:
         support_message = "Please seek reputable expert help if you have serious concerns about a possible spyware attack. Such support is available to human rights defenders and civil society through Amnesty International's Security Lab at https://securitylab.amnesty.org/get-help/?c=mvt"
-        if (
-            self.alertstore.count(AlertLevel.HIGH) > 0
-            or self.alertstore.count(AlertLevel.CRITICAL) > 0
-        ):
-            message.append(
-                f"MVT produced HIGH or CRITICAL alerts. Only expert review can confirm if the detected indicators are signs of an attack.\n\n{support_message}",
+        if self.detected_count == 0:
+            self.log.info(
+                f"[bold]NOTE:[/bold] Using MVT with public indicators of compromise (IOCs) [bold]WILL NOT[/bold] automatically detect advanced attacks.\n\n{support_message}",
+                extra={"markup": True},
             )
-            panel = Panel(message, title="WARNING", style="red", border_style="red")
         else:
-            message.append(
-                f"The lack of severe alerts does not equate to a clean bill of health.\n\n{support_message}",
+            self.log.warning(
+                f"[bold]NOTE: Detected indicators of compromise[/bold]. Only expert review can confirm if the detected indicators are signs of an attack.\n\n{support_message}",
+                extra={"markup": True},
             )
-            panel = Panel(message, title="NOTE", style="yellow", border_style="yellow")
-
-        console.print("")
-        console.print(panel)
 
     def run(self) -> None:
         try:
@@ -267,11 +222,6 @@ class Command:
             if self.module_name and module.__name__ != self.module_name:
                 continue
 
-            if not module.enabled and not (
-                self.module_name and module.__name__ == self.module_name
-            ):
-                continue
-
             # FIXME: do we need the logger here
             module_logger = logging.getLogger(module.__module__)
 
@@ -297,8 +247,11 @@ class Command:
             run_module(m)
 
             self.executed.append(m)
+
+            self.detected_count += len(m.detected)
+
             self.timeline.extend(m.timeline)
-            self.alertstore.extend(m.alertstore.alerts)
+            self.timeline_detected.extend(m.timeline_detected)
 
         try:
             self.finish()
@@ -310,6 +263,7 @@ class Command:
             return
 
         self._store_timeline()
-        self._store_alerts_timeline()
-        self._store_alerts()
         self._store_info()
+
+        self._show_disable_adb_warning()
+        self._show_support_message()

src/mvt/common/config.py

@@ -1,12 +1,13 @@
-import json
 import os
-from typing import Optional, Tuple, Type
-
 import yaml
+import json
+
+from typing import Tuple, Type, Optional
 from appdirs import user_config_dir
-from pydantic import Field
+from pydantic import AnyHttpUrl, Field
 from pydantic_settings import (
     BaseSettings,
+    InitSettingsSource,
     PydanticBaseSettingsSource,
     SettingsConfigDict,
     YamlConfigSettingsSource,
@@ -21,51 +22,51 @@ class MVTSettings(BaseSettings):
         env_prefix="MVT_",
         env_nested_delimiter="_",
         extra="ignore",
+        nested_model_default_partial_updates=True,
     )
     # Allow to decided if want to load environment variables
     load_env: bool = Field(True, exclude=True)
 
     # General settings
-    PYPI_UPDATE_URL: str = Field(
-        default="https://pypi.org/pypi/mvt/json",
+    PYPI_UPDATE_URL: AnyHttpUrl = Field(
+        "https://pypi.org/pypi/mvt/json",
+        validate_default=False,
     )
     NETWORK_ACCESS_ALLOWED: bool = True
     NETWORK_TIMEOUT: int = 15
 
     # Command default settings, all can be specified by MVT_ prefixed environment variables too.
     IOS_BACKUP_PASSWORD: Optional[str] = Field(
-        default=None, description="Default password to use to decrypt iOS backups"
+        None, description="Default password to use to decrypt iOS backups"
     )
     ANDROID_BACKUP_PASSWORD: Optional[str] = Field(
-        default=None, description="Default password to use to decrypt Android backups"
+        None, description="Default password to use to decrypt Android backups"
     )
     STIX2: Optional[str] = Field(
-        default=None, description="List of directories where STIX2 files are stored"
+        None, description="List of directories where STIX2 files are stored"
     )
     VT_API_KEY: Optional[str] = Field(
-        default=None, description="API key to use for VirusTotal lookups"
+        None, description="API key to use for VirusTotal lookups"
     )
-    PROFILE: bool = Field(
-        default=False, description="Profile the execution of MVT modules"
-    )
-    HASH_FILES: bool = Field(default=False, description="Should MVT hash output files")
+    PROFILE: bool = Field(False, description="Profile the execution of MVT modules")
+    HASH_FILES: bool = Field(False, description="Should MVT hash output files")
 
     @classmethod
     def settings_customise_sources(
         cls,
         settings_cls: Type[BaseSettings],
-        init_settings: PydanticBaseSettingsSource,
+        init_settings: InitSettingsSource,
         env_settings: PydanticBaseSettingsSource,
         dotenv_settings: PydanticBaseSettingsSource,
         file_secret_settings: PydanticBaseSettingsSource,
     ) -> Tuple[PydanticBaseSettingsSource, ...]:
-        yaml_source = YamlConfigSettingsSource(settings_cls, MVT_CONFIG_PATH)
-        sources: Tuple[PydanticBaseSettingsSource, ...] = (
-            yaml_source,
+        sources = (
+            YamlConfigSettingsSource(settings_cls, MVT_CONFIG_PATH),
             init_settings,
         )
-        # Always load env variables by default
-        sources = (env_settings,) + sources
+        # Load env variables if enabled
+        if init_settings.init_kwargs.get("load_env", True):
+            sources = (env_settings,) + sources
         return sources
 
     def save_settings(
@@ -93,11 +94,11 @@ class MVTSettings(BaseSettings):
         Afterwards we load the settings again, this time including the env variables.
         """
         # Set invalid env prefix to avoid loading env variables.
-        settings = cls(load_env=False)
+        settings = MVTSettings(load_env=False)
         settings.save_settings()
 
         # Load the settings again with any ENV variables.
-        settings = cls(load_env=True)
+        settings = MVTSettings(load_env=True)
         return settings
 
 

src/mvt/common/help.py

@@ -35,15 +35,19 @@ HELP_MSG_CHECK_IOS_BACKUP = "Extract artifacts from an iTunes backup"
 HELP_MSG_CHECK_FS = "Extract artifacts from a full filesystem dump"
 
 # Android Specific
+HELP_MSG_SERIAL = "Specify a device serial number or HOST:PORT connection string"
+HELP_MSG_DOWNLOAD_APKS = "Download all or only non-system installed APKs"
 HELP_MSG_ANDROID_BACKUP_PASSWORD = "The backup password to use for an Android backup"
-HELP_MSG_CHECK_ADB_REMOVED = "REMOVED: Check an Android device over ADB"
-HELP_MSG_CHECK_ADB_REMOVED_DESCRIPTION = (
-    "The 'mvt-android check-adb' command has been removed from MVT. "
-    "Use AndroidQF to collect full forensic artifacts from an Android device. \n\n"
-    "The 'mvt-android check-androidqf' command in MVT can be used to fully analyze "
-    "forensic data collected with AndroidQF. Minimal checks can also be performed "
-    "on an Android bugreport using the 'mvt-android check-bugreport' command."
+HELP_MSG_DOWNLOAD_ALL_APKS = (
+    "Extract all packages installed on the phone, including system packages"
 )
+HELP_MSG_VIRUS_TOTAL = "Check packages on VirusTotal"
+HELP_MSG_APK_OUTPUT = "Specify a path to a folder where you want to store the APKs"
+HELP_MSG_APKS_FROM_FILE = (
+    "Instead of acquiring APKs from a phone, load an existing packages.json file for "
+    "lookups (mainly for debug purposes)"
+)
+HELP_MSG_CHECK_ADB = "Deprecated: Check an Android device over ADB. Prefer using the external AndroidQF project (https://github.com/mvt-project/androidqf) to acquire AndroidQF images for analysis."
 HELP_MSG_CHECK_BUGREPORT = "Check an Android Bug Report"
 HELP_MSG_CHECK_ANDROID_BACKUP = "Check an Android Backup"
 HELP_MSG_CHECK_ANDROIDQF = "Check data collected with AndroidQF"

src/mvt/common/indicators.py

@@ -7,15 +7,14 @@ import glob
 import json
 import logging
 import os
-from dataclasses import dataclass
 from functools import lru_cache
 from typing import Any, Dict, Iterator, List, Optional, Union
 
 import ahocorasick
 from appdirs import user_data_dir
 
-from .config import settings
 from .url import URL
+from .config import settings
 
 MVT_DATA_FOLDER = user_data_dir("mvt")
 MVT_INDICATORS_FOLDER = os.path.join(MVT_DATA_FOLDER, "indicators")
@@ -23,20 +22,6 @@ MVT_INDICATORS_FOLDER = os.path.join(MVT_DATA_FOLDER, "indicators")
 logger = logging.getLogger(__name__)
 
 
-@dataclass
-class Indicator:
-    value: str
-    type: str
-    name: str
-    stix2_file_name: str
-
-
-@dataclass
-class IndicatorMatch:
-    ioc: Indicator
-    message: str
-
-
 class Indicators:
     """This class is used to parse indicators from a STIX2 file and provide
     functions to compare extracted artifacts to the indicators.
@@ -68,12 +53,12 @@ class Indicators:
                 self.parse_stix2(path)
             elif os.path.isdir(path):
                 for file in glob.glob(
-                    os.path.join(path, "**", "*.stix2"), recursive=True
+                    os.path.join(path, "**", "*.stix2", recursive=True)
                 ):
                     self.parse_stix2(file)
             else:
                 self.log.error(
-                    "Path specified with env MVT_STIX2 is not a valid path: '%s'", path
+                    "Path specified with env MVT_STIX2 is not a valid path: %s", path
                 )
 
     def _new_collection(
@@ -212,13 +197,13 @@ class Indicators:
         :type file_path: str
 
         """
-        self.log.info("Parsing STIX2 indicators file at path '%s'", file_path)
+        self.log.info("Parsing STIX2 indicators file at path %s", file_path)
 
         with open(file_path, "r", encoding="utf-8") as handle:
             try:
                 data = json.load(handle)
             except json.decoder.JSONDecodeError:
-                self.log.warning(
+                self.log.critical(
                     "Unable to parse STIX2 indicator file. "
                     "The file is corrupted or in the wrong format!"
                 )
@@ -329,7 +314,7 @@ class Indicators:
             if os.path.isfile(file_path):
                 self.parse_stix2(file_path)
             else:
-                self.log.error("No indicators file exists at path %s", file_path)
+                self.log.warning("No indicators file exists at path %s", file_path)
 
         # Load downloaded indicators and any indicators from env variable.
         if load_default:
@@ -338,19 +323,19 @@ class Indicators:
         self._check_stix2_env_variable()
         self.log.info("Loaded a total of %d unique indicators", self.total_ioc_count)
 
-    def get_iocs(self, ioc_type: str) -> Iterator[Indicator]:
+    def get_iocs(self, ioc_type: str) -> Iterator[Dict[str, Any]]:
         for ioc_collection in self.ioc_collections:
             for ioc in ioc_collection.get(ioc_type, []):
-                yield Indicator(
-                    value=ioc,
-                    type=ioc_type,
-                    name=ioc_collection["name"],
-                    stix2_file_name=ioc_collection["stix2_file_name"],
-                )
+                yield {
+                    "value": ioc,
+                    "type": ioc_type,
+                    "name": ioc_collection["name"],
+                    "stix2_file_name": ioc_collection["stix2_file_name"],
+                }
 
     @lru_cache()
     def get_ioc_matcher(
-        self, ioc_type: Optional[str] = None, ioc_list: Optional[List[Indicator]] = None
+        self, ioc_type: Optional[str] = None, ioc_list: Optional[list] = None
     ) -> ahocorasick.Automaton:
         """
         Build an Aho-Corasick automaton from a list of iocs (i.e indicators)
@@ -370,19 +355,19 @@ class Indicators:
         """
         automaton = ahocorasick.Automaton()
         if ioc_type:
-            iocs: Iterator[Indicator] = self.get_iocs(ioc_type)
+            iocs = self.get_iocs(ioc_type)
         elif ioc_list:
-            iocs = iter(ioc_list)
+            iocs = ioc_list
         else:
             raise ValueError("Must provide either ioc_type or ioc_list")
 
         for ioc in iocs:
-            automaton.add_word(ioc.value, ioc)
+            automaton.add_word(ioc["value"], ioc)
         automaton.make_automaton()
         return automaton
 
     @lru_cache()
-    def check_url(self, url: str) -> Optional[IndicatorMatch]:
+    def check_url(self, url: str) -> Union[dict, None]:
         """Check if a given URL matches any of the provided domain indicators.
 
         :param url: URL to match against domain indicators
@@ -390,16 +375,21 @@ class Indicators:
         :returns: Indicator details if matched, otherwise None
 
         """
-        if not url or not isinstance(url, str):
+        if not url:
+            return None
+        if not isinstance(url, str):
             return None
 
         # Check the URL first
         for ioc in self.get_iocs("urls"):
-            if ioc.value == url:
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious URL {url} matching indicator "{ioc.value}" from "{ioc.name}"',
+            if ioc["value"] == url:
+                self.log.warning(
+                    'Found a known suspicious URL %s matching indicator "%s" from "%s"',
+                    url,
+                    ioc["value"],
+                    ioc["name"],
                 )
+                return ioc
 
         # Then check the domain
         # Create an Aho-Corasick automaton from the list of urls
@@ -436,41 +426,71 @@ class Indicators:
         except Exception:
             # If URL parsing failed, we just try to do a simple substring
             # match.
-            for _, ioc in domain_matcher.iter(url):
-                if ioc.value.lower() in url:
-                    return IndicatorMatch(
-                        ioc=ioc,
-                        message=f'Maybe found a known suspicious domain {url} matching indicator "{ioc.value}" from "{ioc.name}"',
+            for idx, ioc in domain_matcher.iter(url):
+                if ioc["value"].lower() in url:
+                    self.log.warning(
+                        "Maybe found a known suspicious domain %s "
+                        'matching indicator "%s" from "%s"',
+                        url,
+                        ioc["value"],
+                        ioc["name"],
                     )
+                    return ioc
 
             # If nothing matched, we can quit here.
             return None
 
         # If all parsing worked, we start walking through available domain
         # indicators.
-        for _, ioc in domain_matcher.iter(final_url.domain.lower()):
+        for idx, ioc in domain_matcher.iter(final_url.domain.lower()):
             # First we check the full domain.
-            if final_url.domain.lower() == ioc.value:
+            if final_url.domain.lower() == ioc["value"]:
                 if orig_url.is_shortened and orig_url.url != final_url.url:
-                    message = f'Found a known suspicious domain {final_url.url} shortened as {orig_url.url} matching indicator "{ioc.value}" from "{ioc.name}"'
+                    self.log.warning(
+                        "Found a known suspicious domain %s "
+                        'shortened as %s matching indicator "%s" from "%s"',
+                        final_url.url,
+                        orig_url.url,
+                        ioc["value"],
+                        ioc["name"],
+                    )
                 else:
-                    message = f'Found a known suspicious domain {final_url.url} matching indicator "{ioc.value}" from "{ioc.name}"'
-
-                return IndicatorMatch(ioc=ioc, message=message)
+                    self.log.warning(
+                        "Found a known suspicious domain %s "
+                        'matching indicator "%s" from "%s"',
+                        final_url.url,
+                        ioc["value"],
+                        ioc["name"],
+                    )
+                return ioc
 
         # Then we just check the top level domain.
-        for _, ioc in domain_matcher.iter(final_url.top_level.lower()):
-            if final_url.top_level.lower() == ioc.value:
+        for idx, ioc in domain_matcher.iter(final_url.top_level.lower()):
+            if final_url.top_level.lower() == ioc["value"]:
                 if orig_url.is_shortened and orig_url.url != final_url.url:
-                    message = f'Found a sub-domain with suspicious top level {final_url.url} shortened as {orig_url.url} matching indicator "{ioc.value}" from "{ioc.name}"'
+                    self.log.warning(
+                        "Found a sub-domain with suspicious top "
+                        "level %s shortened as %s matching "
+                        'indicator "%s" from "%s"',
+                        final_url.url,
+                        orig_url.url,
+                        ioc["value"],
+                        ioc["name"],
+                    )
                 else:
-                    message = f'Found a sub-domain with a suspicious top level {final_url.url} matching indicator "{ioc.value}" from "{ioc.name}"'
+                    self.log.warning(
+                        "Found a sub-domain with a suspicious top "
+                        'level %s matching indicator "%s" from "%s"',
+                        final_url.url,
+                        ioc["value"],
+                        ioc["name"],
+                    )
 
-                return IndicatorMatch(ioc=ioc, message=message)
+                return ioc
 
         return None
 
-    def check_urls(self, urls: list) -> Optional[IndicatorMatch]:
+    def check_urls(self, urls: list) -> Union[dict, None]:
         """Check a list of URLs against the provided list of domain indicators.
 
         :param urls: List of URLs to check against domain indicators
@@ -488,7 +508,7 @@ class Indicators:
 
         return None
 
-    def check_process(self, process: str) -> Optional[IndicatorMatch]:
+    def check_process(self, process: str) -> Union[dict, None]:
         """Check the provided process name against the list of process
         indicators.
 
@@ -502,22 +522,28 @@ class Indicators:
 
         proc_name = os.path.basename(process)
         for ioc in self.get_iocs("processes"):
-            if proc_name == ioc.value:
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious process name "{process}" matching indicators from "{ioc.name}"',
+            if proc_name == ioc["value"]:
+                self.log.warning(
+                    'Found a known suspicious process name "%s" '
+                    'matching indicators from "%s"',
+                    process,
+                    ioc["name"],
                 )
+                return ioc
 
             if len(proc_name) == 16:
-                if ioc.value.startswith(proc_name):
-                    return IndicatorMatch(
-                        ioc=ioc,
-                        message=f'Found a truncated known suspicious process name "{process}" matching indicators from "{ioc.name}"',
+                if ioc["value"].startswith(proc_name):
+                    self.log.warning(
+                        "Found a truncated known suspicious "
+                        'process name "%s" matching indicators from "%s"',
+                        process,
+                        ioc["name"],
                     )
+                    return ioc
 
         return None
 
-    def check_processes(self, processes: list) -> Optional[IndicatorMatch]:
+    def check_processes(self, processes: list) -> Union[dict, None]:
         """Check the provided list of processes against the list of
         process indicators.
 
@@ -536,7 +562,7 @@ class Indicators:
 
         return None
 
-    def check_email(self, email: str) -> Optional[IndicatorMatch]:
+    def check_email(self, email: str) -> Union[dict, None]:
         """Check the provided email against the list of email indicators.
 
         :param email: Email address to check against email indicators
@@ -548,15 +574,18 @@ class Indicators:
             return None
 
         for ioc in self.get_iocs("emails"):
-            if email.lower() == ioc.value.lower():
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious email address "{email}" matching indicators from "{ioc.name}"',
+            if email.lower() == ioc["value"].lower():
+                self.log.warning(
+                    'Found a known suspicious email address "%s" '
+                    'matching indicators from "%s"',
+                    email,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_file_name(self, file_name: str) -> Optional[IndicatorMatch]:
+    def check_file_name(self, file_name: str) -> Union[dict, None]:
         """Check the provided file name against the list of file indicators.
 
         :param file_name: File name to check against file
@@ -569,15 +598,18 @@ class Indicators:
             return None
 
         for ioc in self.get_iocs("file_names"):
-            if ioc.value == file_name:
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious file name "{file_name}" matching indicators from "{ioc.name}"',
+            if ioc["value"] == file_name:
+                self.log.warning(
+                    'Found a known suspicious file name "%s" '
+                    'matching indicators from "%s"',
+                    file_name,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_file_path(self, file_path: str) -> Optional[IndicatorMatch]:
+    def check_file_path(self, file_path: str) -> Union[dict, None]:
         """Check the provided file path against the list of file indicators
         (both path and name).
 
@@ -590,22 +622,25 @@ class Indicators:
         if not file_path:
             return None
 
-        ioc_match = self.check_file_name(os.path.basename(file_path))
-        if ioc_match:
-            return ioc_match
+        ioc = self.check_file_name(os.path.basename(file_path))
+        if ioc:
+            return ioc
 
         for ioc in self.get_iocs("file_paths"):
             # Strip any trailing slash from indicator paths to match
             # directories.
-            if file_path.startswith(ioc.value.rstrip("/")):
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious file path "{file_path}" matching indicators form "{ioc.name}"',
+            if file_path.startswith(ioc["value"].rstrip("/")):
+                self.log.warning(
+                    'Found a known suspicious file path "%s" '
+                    'matching indicators form "%s"',
+                    file_path,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_file_path_process(self, file_path: str) -> Optional[IndicatorMatch]:
+    def check_file_path_process(self, file_path: str) -> Optional[Dict[str, Any]]:
         """Check the provided file path contains a process name from the
         list of indicators
 
@@ -620,15 +655,18 @@ class Indicators:
 
         for ioc in self.get_iocs("processes"):
             parts = file_path.split("/")
-            if ioc.value in parts:
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found known suspicious process name mentioned in file at path "{file_path}" matching indicators from "{ioc.name}"',
+            if ioc["value"] in parts:
+                self.log.warning(
+                    "Found known suspicious process name mentioned in file at "
+                    'path "%s" matching indicators from "%s"',
+                    file_path,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_profile(self, profile_uuid: str) -> Optional[IndicatorMatch]:
+    def check_profile(self, profile_uuid: str) -> Union[dict, None]:
         """Check the provided configuration profile UUID against the list of
         indicators.
 
@@ -642,15 +680,18 @@ class Indicators:
             return None
 
         for ioc in self.get_iocs("ios_profile_ids"):
-            if profile_uuid in ioc.value:
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious profile ID "{profile_uuid}" matching indicators from "{ioc.name}"',
+            if profile_uuid in ioc["value"]:
+                self.log.warning(
+                    'Found a known suspicious profile ID "%s" '
+                    'matching indicators from "%s"',
+                    profile_uuid,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_file_hash(self, file_hash: str) -> Optional[IndicatorMatch]:
+    def check_file_hash(self, file_hash: str) -> Union[dict, None]:
         """Check the provided file hash against the list of indicators.
 
         :param file_hash: hash to check
@@ -669,15 +710,18 @@ class Indicators:
             hash_type = "sha256"
 
         for ioc in self.get_iocs("files_" + hash_type):
-            if file_hash.lower() == ioc.value.lower():
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious file with hash "{file_hash}" matching indicators from "{ioc.name}"',
+            if file_hash.lower() == ioc["value"].lower():
+                self.log.warning(
+                    'Found a known suspicious file with hash "%s" '
+                    'matching indicators from "%s"',
+                    file_hash,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_app_certificate_hash(self, cert_hash: str) -> Optional[IndicatorMatch]:
+    def check_app_certificate_hash(self, cert_hash: str) -> Union[dict, None]:
         """Check the provided cert hash against the list of indicators.
 
         :param cert_hash: hash to check
@@ -689,15 +733,18 @@ class Indicators:
             return None
 
         for ioc in self.get_iocs("app_cert_hashes"):
-            if cert_hash.lower() == ioc.value.lower():
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious app certfificate with hash "{cert_hash}" matching indicators from "{ioc.name}"',
+            if cert_hash.lower() == ioc["value"].lower():
+                self.log.warning(
+                    'Found a known suspicious app certfificate with hash "%s" '
+                    'matching indicators from "%s"',
+                    cert_hash,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_app_id(self, app_id: str) -> Optional[IndicatorMatch]:
+    def check_app_id(self, app_id: str) -> Union[dict, None]:
         """Check the provided app identifier (typically an Android package name)
         against the list of indicators.
 
@@ -710,31 +757,11 @@ class Indicators:
             return None
 
         for ioc in self.get_iocs("app_ids"):
-            if app_id.lower() == ioc.value.lower():
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious app with ID "{app_id}" matching indicators from "{ioc.name}"',
-                )
-
-        return None
-
-    def check_receiver_prefix(self, receiver_name: str) -> Union[dict, None]:
-        """Check the provided receiver name against the list of indicators.
-        An IoC match is detected when a substring of the receiver matches the indicator
-        :param app_id: App ID to check against the list of indicators
-        :type app_id: str
-        :returns: Indicator details if matched, otherwise None
-
-        """
-        if not receiver_name:
-            return None
-
-        for ioc in self.get_iocs("app_ids"):
-            if ioc["value"].lower() in receiver_name.lower():
+            if app_id.lower() == ioc["value"].lower():
                 self.log.warning(
-                    'Found a known suspicious receiver with name "%s" '
+                    'Found a known suspicious app with ID "%s" '
                     'matching indicators from "%s"',
-                    receiver_name,
+                    app_id,
                     ioc["name"],
                 )
                 return ioc
@@ -753,21 +780,24 @@ class Indicators:
             return None
 
         for ioc in self.get_iocs("android_property_names"):
-            if property_name.lower() == ioc.value.lower():
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious Android property "{property_name}" matching indicators from "{ioc.name}"',
+            if property_name.lower() == ioc["value"].lower():
+                self.log.warning(
+                    'Found a known suspicious Android property "%s" '
+                    'matching indicators from "%s"',
+                    property_name,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_domain(self, url: str) -> Optional[IndicatorMatch]:
+    def check_domain(self, url: str) -> Union[dict, None]:
         """
         Renamed check_url now, kept for compatibility
         """
         return self.check_url(url)
 
-    def check_domains(self, urls: list) -> Optional[IndicatorMatch]:
+    def check_domains(self, urls: list) -> Union[dict, None]:
         """
         Renamed check_domains, kept for compatibility
         """

src/mvt/common/log.py

@@ -1,65 +0,0 @@
-# Mobile Verification Toolkit (MVT)
-# Copyright (c) 2021-2025 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 logging
-from rich.console import Console
-from rich.logging import RichHandler
-from typing import Optional
-
-INFO = logging.INFO
-DEBUG = logging.DEBUG
-ERROR = logging.ERROR
-FATAL = logging.CRITICAL
-WARNING = logging.WARNING
-
-INFO_ALERT = 25
-LOW_ALERT = 35
-MEDIUM_ALERT = 45
-HIGH_ALERT = 55
-CRITICAL_ALERT = 65
-
-logging.addLevelName(INFO_ALERT, "INFO")
-logging.addLevelName(LOW_ALERT, "LOW")
-logging.addLevelName(MEDIUM_ALERT, "MEDIUM")
-logging.addLevelName(HIGH_ALERT, "HIGH")
-logging.addLevelName(CRITICAL_ALERT, "CRITICAL")
-
-
-class MVTLogHandler(RichHandler):
-    def __init__(self, console: Optional[Console] = None, level: int = logging.DEBUG):
-        super().__init__(console=console, level=level)
-
-    def __add_prefix_space(self, level: str) -> str:
-        max_length = len("CRITICAL ALERT")
-        space = max_length - len(level)
-        return f"{level}{' ' * space}"
-
-    def emit(self, record: logging.LogRecord):
-        try:
-            msg = rf"[grey50]\[{record.name}][/] {self.format(record)}"
-
-            if record.levelno == ERROR:
-                msg = f"[bold red]{self.__add_prefix_space('ERROR')}[/bold red] {msg}"
-            elif record.levelno == FATAL:
-                msg = f"[bold red]{self.__add_prefix_space('FATAL')}[/bold red] {msg}"
-            elif record.levelno == WARNING:
-                msg = f"[yellow]{self.__add_prefix_space('WARNING')}[/yellow] {msg}"
-            elif record.levelno == INFO_ALERT:
-                msg = f"[blue]{self.__add_prefix_space('INFO ALERT')}[/blue] {msg}"
-            elif record.levelno == LOW_ALERT:
-                msg = f"[yellow]{self.__add_prefix_space('LOW ALERT')}[/yellow] {msg}"
-            elif record.levelno == MEDIUM_ALERT:
-                msg = f"[sandy_brown]{self.__add_prefix_space('MEDIUM ALERT')}[/sandy_brown] {msg}"
-            elif record.levelno == HIGH_ALERT:
-                msg = f"[red]{self.__add_prefix_space('HIGH ALERT')}[/red] {msg}"
-            elif record.levelno == CRITICAL_ALERT:
-                msg = f"[bold red]{self.__add_prefix_space('CRITICAL ALERT')}[/bold red] {msg}"
-            else:
-                msg = f"{self.__add_prefix_space('')} {msg}"
-
-            self.console.print(msg)
-
-        except Exception:
-            self.handleError(record)

src/mvt/common/module.py

@@ -8,17 +8,8 @@ import json
 import logging
 import os
 import re
-from dataclasses import asdict, is_dataclass
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional, Union
 
-from .alerts import AlertStore
-from .indicators import Indicators
-from .module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-    ModuleTimeline,
-)
 from .utils import CustomJSONEncoder, exec_or_profile
 
 
@@ -37,7 +28,7 @@ class InsufficientPrivileges(Exception):
 class MVTModule:
     """This class provides a base for all extraction modules."""
 
-    enabled: bool = True
+    enabled = True
     slug: Optional[str] = None
 
     def __init__(
@@ -47,7 +38,7 @@ class MVTModule:
         results_path: Optional[str] = None,
         module_options: Optional[Dict[str, Any]] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Union[List[Dict[str, Any]], Dict[str, Any], None] = None,
     ) -> None:
         """Initialize module.
 
@@ -55,7 +46,7 @@ class MVTModule:
         :type file_path: str
         :param target_path: Path to the target folder (backup or filesystem
                             dump)
-        :type target_path: str
+        :type file_path: str
         :param results_path: Folder where results will be stored
         :type results_path: str
         :param fast_mode: Flag to enable or disable slow modules
@@ -64,31 +55,32 @@ class MVTModule:
         :param results: Provided list of results entries
         :type results: list
         """
-        self.file_path: Optional[str] = file_path
-        self.target_path: Optional[str] = target_path
-        self.results_path: Optional[str] = results_path
-        self.module_options: Optional[Dict[str, Any]] = (
-            module_options if module_options else {}
-        )
-
+        self.file_path = file_path
+        self.target_path = target_path
+        self.results_path = results_path
+        self.module_options = module_options if module_options else {}
         self.log = log
-        self.indicators: Optional[Indicators] = None
-        self.alertstore: AlertStore = AlertStore(log=log)
-
-        self.results: ModuleResults = results if results else []
-        self.timeline: ModuleTimeline = []
+        self.indicators = None
+        self.results = results if results else []
+        self.detected: List[Dict[str, Any]] = []
+        self.timeline: List[Dict[str, str]] = []
+        self.timeline_detected: List[Dict[str, str]] = []
 
     @classmethod
     def from_json(cls, json_path: str, log: logging.Logger):
         with open(json_path, "r", encoding="utf-8") as handle:
-            results = json.load(handle)
-            if log:
-                log.info('Loaded %d results from "%s"', len(results), json_path)
-
-            return cls(results=results, log=log)
+            try:
+                results = json.load(handle)
+                if log:
+                    log.info('Loaded %d results from "%s"', len(results), json_path)
+                return cls(results=results, log=log)
+            except json.decoder.JSONDecodeError as err:
+                log.error('Error to decode the json "%s" file: "%s"', json_path, err)
+                return None
 
     @classmethod
     def get_slug(cls) -> str:
+        """Use the module's class name to retrieve a slug"""
         if cls.slug:
             return cls.slug
 
@@ -96,26 +88,26 @@ class MVTModule:
         return re.sub("([a-z0-9])([A-Z])", r"\1_\2", sub).lower()
 
     def check_indicators(self) -> None:
+        """Check the results of this module against a provided list of
+        indicators.
+
+
+        """
         raise NotImplementedError
 
     def save_to_json(self) -> None:
+        """Save the collected results to a json file."""
         if not self.results_path:
             return
 
         name = self.get_slug()
 
         if self.results:
-            converted_results = [
-                asdict(result) if is_dataclass(result) else result
-                for result in self.results
-            ]
             results_file_name = f"{name}.json"
             results_json_path = os.path.join(self.results_path, results_file_name)
             with open(results_json_path, "w", encoding="utf-8") as handle:
                 try:
-                    json.dump(
-                        converted_results, handle, indent=4, cls=CustomJSONEncoder
-                    )
+                    json.dump(self.results, handle, indent=4, cls=CustomJSONEncoder)
                 except Exception as exc:
                     self.log.error(
                         "Unable to store results of module %s to file %s: %s",
@@ -124,15 +116,13 @@ class MVTModule:
                         exc,
                     )
 
-        if self.alertstore.alerts:
+        if self.detected:
             detected_file_name = f"{name}_detected.json"
             detected_json_path = os.path.join(self.results_path, detected_file_name)
             with open(detected_json_path, "w", encoding="utf-8") as handle:
-                json.dump(
-                    self.alertstore.alerts, handle, indent=4, cls=CustomJSONEncoder
-                )
+                json.dump(self.detected, handle, indent=4, cls=CustomJSONEncoder)
 
-    def serialize(self, result: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list, None]:
         raise NotImplementedError
 
     @staticmethod
@@ -144,32 +134,30 @@ class MVTModule:
         """
         timeline_set = set()
         for record in timeline:
-            timeline_set.add(
-                json.dumps(
-                    asdict(record)
-                    if is_dataclass(record) and not isinstance(record, type)
-                    else record,
-                    sort_keys=True,
-                )
-            )
-
+            timeline_set.add(json.dumps(record, sort_keys=True))
         return [json.loads(record) for record in timeline_set]
 
     def to_timeline(self) -> None:
         """Convert results into a timeline."""
-        if not self.results:
-            return
-
         for result in self.results:
-            record: ModuleSerializedResult = self.serialize(result)
+            record = self.serialize(result)
             if record:
                 if isinstance(record, list):
-                    self.timeline.extend(record)  # type: ignore[arg-type]
+                    self.timeline.extend(record)
                 else:
-                    self.timeline.append(record)  # type: ignore[arg-type]
+                    self.timeline.append(record)
+
+        for detected in self.detected:
+            record = self.serialize(detected)
+            if record:
+                if isinstance(record, list):
+                    self.timeline_detected.extend(record)
+                else:
+                    self.timeline_detected.append(record)
 
         # De-duplicate timeline entries.
         self.timeline = self._deduplicate_timeline(self.timeline)
+        self.timeline_detected = self._deduplicate_timeline(self.timeline_detected)
 
     def run(self) -> None:
         """Run the main module procedure."""
@@ -224,7 +212,7 @@ def run_module(module: MVTModule) -> None:
             )
 
         else:
-            if module.indicators and not module.alertstore.alerts:
+            if module.indicators and not module.detected:
                 module.log.info(
                     "The %s module produced no detections!", module.__class__.__name__
                 )

src/mvt/common/module_types.py

@@ -1,34 +0,0 @@
-# Mobile Verification Toolkit (MVT)
-# Copyright (c) 2021-2025 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/
-
-from dataclasses import dataclass
-from typing import Any, Dict, List, Union
-
-
-# ModuleAtomicResult is a flexible dictionary that can contain any data.
-# Common fields include:
-# - timestamp: Optional[str] - timestamp string
-# - isodate: Optional[str] - ISO formatted date string
-# - matched_indicator: Optional[Indicator] - indicator that matched this result
-# - Any other module-specific fields
-ModuleAtomicResult = Dict[str, Any]
-
-
-ModuleResults = List[ModuleAtomicResult]
-
-
-@dataclass
-class ModuleAtomicTimeline:
-    timestamp: str
-    module: str
-    event: str
-    data: str
-
-
-ModuleTimeline = List[ModuleAtomicTimeline]
-# ModuleSerializedResult can be a proper timeline object or a plain dict for compatibility
-ModuleSerializedResult = Union[
-    ModuleAtomicTimeline, ModuleTimeline, Dict[str, Any], List[Dict[str, Any]]
-]

src/mvt/common/updates.py

@@ -12,9 +12,9 @@ import requests
 import yaml
 from packaging import version
 
-from .config import settings
 from .indicators import MVT_DATA_FOLDER, MVT_INDICATORS_FOLDER
 from .version import MVT_VERSION
+from .config import settings
 
 log = logging.getLogger(__name__)
 
@@ -25,7 +25,7 @@ INDICATORS_CHECK_FREQUENCY = 12
 class MVTUpdates:
     def check(self) -> str:
         try:
-            res = requests.get(str(settings.PYPI_UPDATE_URL), timeout=5)
+            res = requests.get(settings.PYPI_UPDATE_URL, timeout=5)
         except requests.exceptions.RequestException as e:
             log.error("Failed to check for updates, skipping updates: %s", e)
             return ""

src/mvt/common/url.py

@@ -338,12 +338,11 @@ class URL:
         :rtype: str
 
         """
-        tld_obj = get_tld(self.url, as_object=True, fix_protocol=True)
-        if isinstance(tld_obj, str):
-            return tld_obj
-        if tld_obj is None:
-            return ""
-        return tld_obj.parsed_url.netloc.lower().lstrip("www.")
+        return (
+            get_tld(self.url, as_object=True, fix_protocol=True)
+            .parsed_url.netloc.lower()
+            .lstrip("www.")
+        )
 
     def get_top_level(self) -> str:
         """Get only the top-level domain from a URL.
@@ -352,12 +351,7 @@ class URL:
         :rtype: str
 
         """
-        tld_obj = get_tld(self.url, as_object=True, fix_protocol=True)
-        if isinstance(tld_obj, str):
-            return tld_obj
-        if tld_obj is None:
-            return ""
-        return tld_obj.fld.lower()
+        return get_tld(self.url, as_object=True, fix_protocol=True).fld.lower()
 
     def check_if_shortened(self) -> bool:
         """Check if the URL is among list of shortener services.

src/mvt/common/utils.py

@@ -12,7 +12,7 @@ import os
 import re
 from typing import Any, Iterator, Union
 
-from .log import MVTLogHandler
+from rich.logging import RichHandler
 from mvt.common.config import settings
 
 
@@ -234,10 +234,11 @@ def init_logging(verbose: bool = False):
     """
     Initialise logging for the MVT module
     """
+    # Setup logging using Rich.
     log = logging.getLogger("mvt")
-    log.setLevel(logging.INFO)
-    consoleHandler = MVTLogHandler()
-    consoleHandler.setFormatter(logging.Formatter("%(message)s"))
+    log.setLevel(logging.DEBUG)
+    consoleHandler = RichHandler(show_path=False, log_time_format="%X")
+    consoleHandler.setFormatter(logging.Formatter("[%(name)s] %(message)s"))
     if verbose:
         consoleHandler.setLevel(logging.DEBUG)
     else:

src/mvt/common/version.py

@@ -3,4 +3,4 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
-MVT_VERSION = "3.0.0"
+MVT_VERSION = "2.6.1"

src/mvt/common/virustotal.py

@@ -0,0 +1,52 @@
+# Mobile Verification Toolkit (MVT)
+# Copyright (c) 2021-2023 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 logging
+import os
+
+import requests
+
+log = logging.getLogger(__name__)
+
+MVT_VT_API_KEY = "MVT_VT_API_KEY"
+
+
+class VTNoKey(Exception):
+    pass
+
+
+class VTQuotaExceeded(Exception):
+    pass
+
+
+def virustotal_lookup(file_hash: str):
+    if MVT_VT_API_KEY not in os.environ:
+        raise VTNoKey(
+            "No VirusTotal API key provided: to use VirusTotal "
+            "lookups please provide your API key with "
+            "`export MVT_VT_API_KEY=<key>`"
+        )
+
+    headers = {
+        "User-Agent": "VirusTotal",
+        "Content-Type": "application/json",
+        "x-apikey": os.environ[MVT_VT_API_KEY],
+    }
+    res = requests.get(
+        f"https://www.virustotal.com/api/v3/files/{file_hash}", headers=headers
+    )
+
+    if res.status_code == 200:
+        report = res.json()
+        return report["data"]
+
+    if res.status_code == 404:
+        log.info("Could not find results for file with hash %s", file_hash)
+    elif res.status_code == 429:
+        raise VTQuotaExceeded("You have exceeded the quota for your VirusTotal API key")
+    else:
+        raise Exception(f"Unexpected response from VirusTotal: {res.status_code}")
+
+    return None

src/mvt/ios/cli.py

@@ -257,8 +257,11 @@ def check_backup(
     log.info("Checking iTunes backup located at: %s", backup_path)
 
     cmd.run()
-    cmd.show_alerts_brief()
-    cmd.show_support_message()
+
+    if cmd.detected_count > 0:
+        log.warning(
+            "The analysis of the backup produced %d detections!", cmd.detected_count
+        )
 
 
 # ==============================================================================
@@ -303,8 +306,12 @@ def check_fs(ctx, iocs, output, fast, list_modules, module, hashes, verbose, dum
     log.info("Checking iOS filesystem located at: %s", dump_path)
 
     cmd.run()
-    cmd.show_alerts_brief()
-    cmd.show_support_message()
+
+    if cmd.detected_count > 0:
+        log.warning(
+            "The analysis of the iOS filesystem produced %d detections!",
+            cmd.detected_count,
+        )
 
 
 # ==============================================================================
@@ -338,8 +345,6 @@ def check_iocs(ctx, iocs, list_modules, module, folder):
         return
 
     cmd.run()
-    cmd.show_alerts_brief()
-    cmd.show_support_message()
 
 
 # ==============================================================================

src/mvt/ios/decrypt.py

@@ -58,7 +58,6 @@ class DecryptBackup:
     def _process_file(
         self, relative_path: str, domain: str, item, file_id: str, item_folder: str
     ) -> None:
-        assert self._backup is not None
         self._backup.getFileDecryptedCopy(
             manifestEntry=item, targetName=file_id, targetFolder=item_folder
         )
@@ -71,9 +70,6 @@ class DecryptBackup:
         )
 
     def process_backup(self) -> None:
-        assert self._backup is not None
-        assert self.dest_path is not None
-
         if not os.path.exists(self.dest_path):
             os.makedirs(self.dest_path)
 
@@ -101,7 +97,7 @@ class DecryptBackup:
                     )
                     continue
 
-                item_folder = os.path.join(self.dest_path, file_id[0:2])  # type: ignore[arg-type]
+                item_folder = os.path.join(self.dest_path, file_id[0:2])
                 if not os.path.exists(item_folder):
                     os.makedirs(item_folder)
 

src/mvt/ios/modules/backup/backup_info.py

@@ -9,7 +9,6 @@ import plistlib
 from typing import Optional
 
 from mvt.common.module import DatabaseNotFoundError
-from mvt.common.module_types import ModuleResults
 from mvt.ios.versions import get_device_desc_from_id, is_ios_version_outdated
 
 from ..base import IOSExtraction
@@ -25,7 +24,7 @@ class BackupInfo(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -36,11 +35,9 @@ class BackupInfo(IOSExtraction):
             results=results,
         )
 
-        self.results: dict = {}
+        self.results = {}
 
     def run(self) -> None:
-        if not self.target_path:
-            raise DatabaseNotFoundError("target_path is not set")
         info_path = os.path.join(self.target_path, "Info.plist")
         if not os.path.exists(info_path):
             raise DatabaseNotFoundError(

src/mvt/ios/modules/backup/configuration_profiles.py

@@ -7,13 +7,8 @@ import logging
 import os
 import plistlib
 from base64 import b64encode
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_datetime_to_iso
 
 from ..base import IOSExtraction
@@ -33,7 +28,7 @@ class ConfigurationProfiles(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -44,7 +39,7 @@ class ConfigurationProfiles(IOSExtraction):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         if not record["install_date"]:
             return {}
 
@@ -68,24 +63,28 @@ class ConfigurationProfiles(IOSExtraction):
 
                 # Alert on any known malicious configuration profiles in the
                 # indicator list.
-                ioc_match = self.indicators.check_profile(
-                    result["plist"]["PayloadUUID"]
-                )
-                if ioc_match:
-                    warning_message = f'Found a known malicious configuration profile "{result["plist"]["PayloadDisplayName"]}" with UUID "{result["plist"]["PayloadUUID"]}"'
-                    result["matched_indicator"] = ioc_match.ioc
-                    self.alertstore.critical(
-                        warning_message, "", result, matched_indicator=ioc_match.ioc
+                ioc = self.indicators.check_profile(result["plist"]["PayloadUUID"])
+                if ioc:
+                    self.log.warning(
+                        "Found a known malicious configuration "
+                        'profile "%s" with UUID %s',
+                        result["plist"]["PayloadDisplayName"],
+                        result["plist"]["PayloadUUID"],
                     )
-                    self.alertstore.log_latest()
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
                     continue
 
                 # Highlight suspicious configuration profiles which may be used
                 # to hide notifications.
                 if payload_content["PayloadType"] in ["com.apple.notificationsettings"]:
-                    warning_message = f'Found a potentially suspicious configuration profile "{result["plist"]["PayloadDisplayName"]}" with payload type {payload_content["PayloadType"]}'
-                    self.alertstore.medium(warning_message, "", result)
-                    self.alertstore.log_latest()
+                    self.log.warning(
+                        "Found a potentially suspicious configuration profile "
+                        '"%s" with payload type %s',
+                        result["plist"]["PayloadDisplayName"],
+                        payload_content["PayloadType"],
+                    )
+                    self.detected.append(result)
                     continue
 
     def run(self) -> None:

src/mvt/ios/modules/backup/manifest.py

@@ -11,11 +11,6 @@ import plistlib
 from typing import Optional
 
 from mvt.common.module import DatabaseNotFoundError
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.url import URL
 from mvt.common.utils import convert_datetime_to_iso, convert_unix_to_iso
 
@@ -32,7 +27,7 @@ class Manifest(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -65,8 +60,8 @@ class Manifest(IOSExtraction):
 
         return convert_unix_to_iso(timestamp_or_unix_time_int)
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
-        records: list = []
+    def serialize(self, record: dict) -> []:
+        records = []
         if "modified" not in record or "status_changed" not in record:
             return records
 
@@ -100,12 +95,8 @@ class Manifest(IOSExtraction):
             if not self.indicators:
                 continue
 
-            ioc_match = self.indicators.check_file_path("/" + result["relative_path"])
-            if ioc_match:
-                result["matched_indicator"] = ioc_match.ioc
-                self.alertstore.high(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            if self.indicators.check_file_path("/" + result["relative_path"]):
+                self.detected.append(result)
                 continue
 
             rel_path = result["relative_path"].lower()
@@ -116,19 +107,17 @@ class Manifest(IOSExtraction):
                 except Exception:
                     continue
 
-                ioc_match = self.indicators.check_url(part)
-                if ioc_match:
-                    result["matched_indicator"] = ioc_match.ioc
-                    self.alertstore.high(
-                        f'Found mention of domain "{ioc_match.ioc.value}" in a backup file with path: {rel_path}',
-                        "",
-                        result,
-                        matched_indicator=ioc_match.ioc,
+                ioc = self.indicators.check_url(part)
+                if ioc:
+                    self.log.warning(
+                        'Found mention of domain "%s" in a backup file with path: %s',
+                        ioc["value"],
+                        rel_path,
                     )
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
 
     def run(self) -> None:
-        if not self.target_path:
-            raise DatabaseNotFoundError("target_path is not set")
         manifest_db_path = os.path.join(self.target_path, "Manifest.db")
         if not os.path.isfile(manifest_db_path):
             raise DatabaseNotFoundError("unable to find backup's Manifest.db")

src/mvt/ios/modules/backup/profile_events.py

@@ -5,13 +5,8 @@
 
 import logging
 import plistlib
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_datetime_to_iso
 
 from ..base import IOSExtraction
@@ -34,7 +29,7 @@ class ProfileEvents(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -45,7 +40,7 @@ class ProfileEvents(IOSExtraction):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record.get("timestamp"),
             "module": self.__class__.__name__,
@@ -56,33 +51,24 @@ class ProfileEvents(IOSExtraction):
         }
 
     def check_indicators(self) -> None:
-        for result in self.results:
-            message = f'On {result.get("timestamp")} process "{result.get("process")}" started operation "{result.get("operation")}" of profile "{result.get("profile_id")}"'
-            self.alertstore.low(message, result.get("timestamp") or "", result)
-            self.alertstore.log_latest()
-
         if not self.indicators:
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_process(result.get("process") or "")
-            if ioc_match:
-                result["matched_indicator"] = ioc_match.ioc
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_process(result.get("process"))
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
-            ioc_match = self.indicators.check_profile(result.get("profile_id") or "")
-            if ioc_match:
-                result["matched_indicator"] = ioc_match.ioc
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+            ioc = self.indicators.check_profile(result.get("profile_id"))
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
 
     @staticmethod
     def parse_profile_events(file_data: bytes) -> list:
-        results: list = []
+        results = []
 
         events_plist = plistlib.loads(file_data)
 
@@ -123,4 +109,13 @@ class ProfileEvents(IOSExtraction):
             with open(events_file_path, "rb") as handle:
                 self.results.extend(self.parse_profile_events(handle.read()))
 
+        for result in self.results:
+            self.log.info(
+                'On %s process "%s" started operation "%s" of profile "%s"',
+                result.get("timestamp"),
+                result.get("process"),
+                result.get("operation"),
+                result.get("profile_id"),
+            )
+
         self.log.info("Extracted %d profile events", len(self.results))

src/mvt/ios/modules/base.py

@@ -11,12 +11,7 @@ import sqlite3
 import subprocess
 from typing import Iterator, Optional, Union
 
-from mvt.common.module import (
-    DatabaseCorruptedError,
-    DatabaseNotFoundError,
-    ModuleResults,
-    MVTModule,
-)
+from mvt.common.module import DatabaseCorruptedError, DatabaseNotFoundError, MVTModule
 
 
 class IOSExtraction(MVTModule):
@@ -30,7 +25,7 @@ class IOSExtraction(MVTModule):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -114,8 +109,6 @@ class IOSExtraction(MVTModule):
                        (Default value = None)
 
         """
-        if not self.target_path:
-            raise DatabaseNotFoundError("target_path is not set")
         manifest_db_path = os.path.join(self.target_path, "Manifest.db")
         if not os.path.exists(manifest_db_path):
             raise DatabaseNotFoundError("unable to find backup's Manifest.db")
@@ -152,8 +145,6 @@ class IOSExtraction(MVTModule):
             }
 
     def _get_backup_file_from_id(self, file_id: str) -> Union[str, None]:
-        if not self.target_path:
-            return None
         file_path = os.path.join(self.target_path, file_id[0:2], file_id)
         if os.path.exists(file_path):
             return file_path
@@ -161,8 +152,6 @@ class IOSExtraction(MVTModule):
         return None
 
     def _get_fs_files_from_patterns(self, root_paths: list) -> Iterator[str]:
-        if not self.target_path:
-            return
         for root_path in root_paths:
             for found_path in glob.glob(os.path.join(self.target_path, root_path)):
                 if not os.path.exists(found_path):
@@ -184,10 +173,9 @@ class IOSExtraction(MVTModule):
         :param backup_ids: Default value = None)
 
         """
-        file_path: Optional[str] = None
+        file_path = None
         # First we check if the was an explicit file path specified.
         if not self.file_path:
-            # Type narrowing: we know self.file_path is None here, work with local file_path
             # If not, we first try with backups.
             # We construct the path to the file according to the iTunes backup
             # folder structure, if we have a valid ID.
@@ -209,9 +197,8 @@ class IOSExtraction(MVTModule):
 
         # If we do not find any, we fail.
         if file_path:
-            self.file_path = file_path  # type: str
+            self.file_path = file_path
         else:
             raise DatabaseNotFoundError("unable to find the module's database file")
 
-        assert self.file_path is not None
         self._recover_sqlite_db_if_needed(self.file_path)

src/mvt/ios/modules/fs/analytics.py

@@ -7,13 +7,8 @@ import copy
 import logging
 import plistlib
 import sqlite3
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_mactime_to_iso
 
 from ..base import IOSExtraction
@@ -34,7 +29,7 @@ class Analytics(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -44,9 +39,8 @@ class Analytics(IOSExtraction):
             log=log,
             results=results,
         )
-        self.results: list = []
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["isodate"],
             "module": self.__class__.__name__,
@@ -63,27 +57,24 @@ class Analytics(IOSExtraction):
                 if not isinstance(value, str):
                     continue
 
-                ioc_match = self.indicators.check_process(value)
-                if ioc_match:
-                    warning_message = f'Found mention of a malicious process "{value}" in {result["artifact"]} file at {result["isodate"]}'
-                    new_result = copy.copy(result)
-                    new_result["matched_indicator"] = ioc_match.ioc
-                    self.alertstore.critical(
-                        warning_message, "", new_result, matched_indicator=ioc_match.ioc
+                ioc = self.indicators.check_process(value)
+                if ioc:
+                    self.log.warning(
+                        'Found mention of a malicious process "%s" in %s file at %s',
+                        value,
+                        result["artifact"],
+                        result["isodate"],
                     )
-                    self.alertstore.log_latest()
+                    new_result = copy.copy(result)
+                    new_result["matched_indicator"] = ioc
+                    self.detected.append(new_result)
                     continue
 
-                ioc_match = self.indicators.check_url(value)
-                if ioc_match:
+                ioc = self.indicators.check_url(value)
+                if ioc:
                     new_result = copy.copy(result)
-                    result["matched_indicator"] = ioc_match.ioc
-                    self.alertstore.critical(
-                        ioc_match.message,
-                        "",
-                        new_result,
-                        matched_indicator=ioc_match.ioc,
-                    )
+                    new_result["matched_indicator"] = ioc
+                    self.detected.append(new_result)
 
     def _extract_analytics_data(self):
         artifact = self.file_path.split("/")[-1]

src/mvt/ios/modules/fs/analytics_ios_versions.py

@@ -5,14 +5,9 @@
 
 import logging
 from datetime import datetime
-from typing import Optional
+from typing import Optional, Union
 
 from mvt.ios.versions import find_version_by_build
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleSerializedResult,
-    ModuleResults,
-)
 
 from ..base import IOSExtraction
 from .analytics import Analytics
@@ -30,7 +25,7 @@ class AnalyticsIOSVersions(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -41,7 +36,7 @@ class AnalyticsIOSVersions(IOSExtraction):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["isodate"],
             "module": self.__class__.__name__,

src/mvt/ios/modules/fs/cache_files.py

@@ -6,13 +6,7 @@
 import logging
 import os
 import sqlite3
-from typing import Optional
-
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
+from typing import Optional, Union
 
 from ..base import IOSExtraction
 
@@ -25,7 +19,7 @@ class CacheFiles(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -36,7 +30,7 @@ class CacheFiles(IOSExtraction):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         records = []
         for item in self.results[record]:
             records.append(
@@ -54,19 +48,18 @@ class CacheFiles(IOSExtraction):
         if not self.indicators:
             return
 
-        self.alertstore.alerts = {}
+        self.detected = {}
         for key, values in self.results.items():
             for value in values:
-                ioc_match = self.indicators.check_url(value["url"])
-                if ioc_match:
-                    value["matched_indicator"] = ioc_match.ioc
-                    # XXX: Finish converting this method
-                    if key not in self.alertstore.alerts:
-                        self.alertstore.alerts[key] = [
+                ioc = self.indicators.check_url(value["url"])
+                if ioc:
+                    value["matched_indicator"] = ioc
+                    if key not in self.detected:
+                        self.detected[key] = [
                             value,
                         ]
                     else:
-                        self.alertstore.alerts[key].append(value)
+                        self.detected[key].append(value)
 
     def _process_cache_file(self, file_path):
         self.log.info("Processing cache file at path: %s", file_path)
@@ -96,7 +89,7 @@ class CacheFiles(IOSExtraction):
             )
 
     def run(self) -> None:
-        self.results: dict = {}
+        self.results = {}
         for root, _, files in os.walk(self.target_path):
             for file_name in files:
                 if file_name != "Cache.db":

src/mvt/ios/modules/fs/filesystem.py

@@ -5,14 +5,9 @@
 
 import logging
 import os
-from typing import Optional
+from typing import Optional, Union
 
 from mvt.common.utils import convert_unix_to_iso
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleSerializedResult,
-    ModuleResults,
-)
 
 from ..base import IOSExtraction
 
@@ -29,7 +24,7 @@ class Filesystem(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -40,7 +35,7 @@ class Filesystem(IOSExtraction):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["modified"],
             "module": self.__class__.__name__,
@@ -56,19 +51,19 @@ class Filesystem(IOSExtraction):
             if "path" not in result:
                 continue
 
-            ioc_match = self.indicators.check_file_path(result["path"])
-            if ioc_match:
-                self.alertstore.high(self.get_slug(), ioc_match.message, "", result)
-                self.alertstore.log_latest()
+            ioc = self.indicators.check_file_path(result["path"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
 
             # If we are instructed to run fast, we skip the rest.
             if self.module_options.get("fast_mode", None):
                 continue
 
-            ioc_match = self.indicators.check_file_path_process(result["path"])
-            if ioc_match:
-                self.alertstore.high(self.get_slug(), ioc_match.message, "", result)
-                self.alertstore.log_latest()
+            ioc = self.indicators.check_file_path_process(result["path"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
 
     def run(self) -> None:
         for root, dirs, files in os.walk(self.target_path):

src/mvt/ios/modules/fs/net_netusage.py

@@ -7,7 +7,6 @@ import logging
 import sqlite3
 from typing import Optional
 
-from mvt.common.module_types import ModuleResults
 from ..net_base import NetBase
 
 NETUSAGE_ROOT_PATHS = [
@@ -30,7 +29,7 @@ class Netusage(NetBase):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/ios/modules/fs/safari_favicon.py

@@ -4,13 +4,8 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_mactime_to_iso
 
 from ..base import IOSExtraction
@@ -31,7 +26,7 @@ class SafariFavicon(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -41,9 +36,8 @@ class SafariFavicon(IOSExtraction):
             log=log,
             results=results,
         )
-        self.results: list = []
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["isodate"],
             "module": self.__class__.__name__,
@@ -57,15 +51,13 @@ class SafariFavicon(IOSExtraction):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_url(result["url"])
-            if not ioc_match:
-                ioc_match = self.indicators.check_url(result["icon_url"])
+            ioc = self.indicators.check_url(result["url"])
+            if not ioc:
+                ioc = self.indicators.check_url(result["icon_url"])
 
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
-                self.alertstore.log_latest()
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
 
     def _process_favicon_db(self, file_path):
         conn = self._open_sqlite_db(file_path)

src/mvt/ios/modules/fs/shutdownlog.py

@@ -4,13 +4,8 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_mactime_to_iso
 
 from ..base import IOSExtraction
@@ -30,7 +25,7 @@ class ShutdownLog(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -41,7 +36,7 @@ class ShutdownLog(IOSExtraction):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["isodate"],
             "module": self.__class__.__name__,
@@ -55,25 +50,22 @@ class ShutdownLog(IOSExtraction):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_file_path(result["client"])
-            if ioc_match:
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
-                self.alertstore.log_latest()
+            ioc = self.indicators.check_file_path(result["client"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
                 continue
 
             for ioc in self.indicators.get_iocs("processes"):
                 parts = result["client"].split("/")
-                if ioc.value in parts:
-                    result["matched_indicator"] = ioc
-                    self.alertstore.critical(
-                        f'Found mention of a known malicious process "{ioc.value}" in shutdown.log',
-                        "",
-                        result,
-                        matched_indicator=ioc,
+                if ioc in parts:
+                    self.log.warning(
+                        'Found mention of a known malicious process "%s" in '
+                        "shutdown.log",
+                        ioc,
                     )
-                    self.alertstore.log_latest()
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
                     continue
 
     def process_shutdownlog(self, content):
@@ -137,8 +129,5 @@ class ShutdownLog(IOSExtraction):
     def run(self) -> None:
         self._find_ios_database(root_paths=SHUTDOWN_LOG_PATH)
         self.log.info("Found shutdown log at path: %s", self.file_path)
-
-        if not self.file_path:
-            return
         with open(self.file_path, "r", encoding="utf-8") as handle:
             self.process_shutdownlog(handle.read())

src/mvt/ios/modules/fs/version_history.py

@@ -6,13 +6,8 @@
 import datetime
 import json
 import logging
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_datetime_to_iso
 
 from ..base import IOSExtraction
@@ -32,7 +27,7 @@ class IOSVersionHistory(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -42,9 +37,8 @@ class IOSVersionHistory(IOSExtraction):
             log=log,
             results=results,
         )
-        self.results: list = []
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["isodate"],
             "module": self.__class__.__name__,

src/mvt/ios/modules/fs/webkit_base.py

@@ -18,13 +18,10 @@ class WebkitBase(IOSExtraction):
             return
 
         for result in self.results:
-            ioc_match = self.indicators.check_url(result["url"])
-            if ioc_match:
-                result["matched_indicator"] = ioc_match.ioc
-                self.alertstore.critical(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
-                continue
+            ioc = self.indicators.check_url(result["url"])
+            if ioc:
+                result["matched_indicator"] = ioc
+                self.detected.append(result)
 
     def _process_webkit_folder(self, root_paths):
         for found_path in self._get_fs_files_from_patterns(root_paths):

src/mvt/ios/modules/fs/webkit_indexeddb.py

@@ -4,13 +4,8 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from .webkit_base import WebkitBase
 
 WEBKIT_INDEXEDDB_ROOT_PATHS = [
@@ -34,7 +29,7 @@ class WebkitIndexedDB(WebkitBase):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -45,7 +40,7 @@ class WebkitIndexedDB(WebkitBase):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["isodate"],
             "module": self.__class__.__name__,

src/mvt/ios/modules/fs/webkit_localstorage.py

@@ -4,13 +4,8 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-from typing import Optional
+from typing import Optional, Union
 
-from mvt.common.module_types import (
-    ModuleResults,
-    ModuleSerializedResult,
-    ModuleAtomicResult,
-)
 from .webkit_base import WebkitBase
 
 WEBKIT_LOCALSTORAGE_ROOT_PATHS = [
@@ -32,7 +27,7 @@ class WebkitLocalStorage(WebkitBase):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -43,7 +38,7 @@ class WebkitLocalStorage(WebkitBase):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         return {
             "timestamp": record["isodate"],
             "module": self.__class__.__name__,

src/mvt/ios/modules/fs/webkit_safariviewservice.py

@@ -6,7 +6,6 @@
 import logging
 from typing import Optional
 
-from mvt.common.module_types import ModuleResults
 from .webkit_base import WebkitBase
 
 WEBKIT_SAFARIVIEWSERVICE_ROOT_PATHS = [
@@ -28,7 +27,7 @@ class WebkitSafariViewService(WebkitBase):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,

src/mvt/ios/modules/mixed/applications.py

@@ -8,17 +8,11 @@ import logging
 import os
 import plistlib
 from datetime import datetime, timezone
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Union
 
 from mvt.common.module import DatabaseNotFoundError
-from mvt.common.module_types import (
-    ModuleAtomicResult,
-    ModuleResults,
-    ModuleSerializedResult,
-)
 from mvt.common.utils import convert_datetime_to_iso
-
-from ..base import IOSExtraction
+from mvt.ios.modules.base import IOSExtraction
 
 APPLICATIONS_DB_PATH = [
     "private/var/containers/Bundle/Application/*/iTunesMetadata.plist"
@@ -41,7 +35,7 @@ class Applications(IOSExtraction):
         results_path: Optional[str] = None,
         module_options: Optional[dict] = None,
         log: logging.Logger = logging.getLogger(__name__),
-        results: ModuleResults = [],
+        results: Optional[list] = None,
     ) -> None:
         super().__init__(
             file_path=file_path,
@@ -52,7 +46,7 @@ class Applications(IOSExtraction):
             results=results,
         )
 
-    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+    def serialize(self, record: dict) -> Union[dict, list]:
         if "isodate" in record:
             return {
                 "timestamp": record["isodate"],
@@ -66,49 +60,41 @@ class Applications(IOSExtraction):
         for result in self.results:
             if self.indicators:
                 if "softwareVersionBundleId" not in result:
-                    self.alertstore.high(
-                        "Suspicious application identified without softwareVersionBundleId",
-                        "",
-                        result,
+                    self.log.warning(
+                        "Suspicious application identified without softwareVersionBundleId"
                     )
+                    self.detected.append(result)
                     continue
 
-                ioc_match = self.indicators.check_process(
-                    result["softwareVersionBundleId"]
-                )
-                if ioc_match:
-                    result["matched_indicator"] = ioc_match.ioc
-                    self.alertstore.critical(
-                        f"Malicious application {result['softwareVersionBundleId']} identified",
-                        "",
-                        result,
-                        matched_indicator=ioc_match.ioc,
+                ioc = self.indicators.check_process(result["softwareVersionBundleId"])
+                if ioc:
+                    self.log.warning(
+                        "Malicious application %s identified",
+                        result["softwareVersionBundleId"],
                     )
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
                     continue
 
-                ioc_match = self.indicators.check_app_id(
-                    result["softwareVersionBundleId"]
-                )
-                if ioc_match:
-                    result["matched_indicator"] = ioc_match.ioc
-                    self.alertstore.critical(
-                        f"Malicious application {result['softwareVersionBundleId']} identified",
-                        "",
-                        result,
-                        matched_indicator=ioc_match.ioc,
+                ioc = self.indicators.check_app_id(result["softwareVersionBundleId"])
+                if ioc:
+                    self.log.warning(
+                        "Malicious application %s identified",
+                        result["softwareVersionBundleId"],
                     )
+                    result["matched_indicator"] = ioc
+                    self.detected.append(result)
                     continue
-
             # Some apps installed from apple store with sourceApp "com.apple.AppStore.ProductPageExtension"
             if (
                 result.get("sourceApp", "com.apple.AppStore")
                 not in KNOWN_APP_INSTALLERS
             ):
-                self.alertstore.medium(
-                    f"Suspicious app not installed from the App Store or MDM: {result['softwareVersionBundleId']}",
-                    "",
-                    result,
+                self.log.warning(
+                    "Suspicious app not installed from the App Store or MDM: %s",
+                    result["softwareVersionBundleId"],
                 )
+                self.detected.append(result)
 
     def _parse_itunes_timestamp(self, entry: Dict[str, Any]) -> None:
         """
@@ -159,8 +145,6 @@ class Applications(IOSExtraction):
 
     def run(self) -> None:
         if self.is_backup:
-            if not self.target_path:
-                return
             plist_path = os.path.join(self.target_path, "Info.plist")
             if not os.path.isfile(plist_path):
                 raise DatabaseNotFoundError("Impossible to find Info.plist file")