Bump requests to 2.33.0 and cryptography to 46.0.6 to fix security vulnerabilities

- requests 2.33.0: fixes insecure temp file reuse in extract_zipped_paths() (moderate)
- cryptography 46.0.6: fixes incomplete DNS name constraint enforcement (low)

.github/dependabot.yml

@@ -5,9 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "uv" # See documentation for possible values
+  - package-ecosystem: "pip" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
-    cooldown:
-      default-days: 7

.github/workflows/mypy.yml

@@ -7,19 +7,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-        with:
-          enable-cache: true
+          python-version: 3.9
+          cache: 'pip'
+      - name: Checkout
+        uses: actions/checkout@master
       - name: Install Dependencies
         run: |
-          uv sync --locked --group dev
+          pip install mypy
       - name: mypy
         run: |
           make mypy

.github/workflows/publish-release-docker.yml

@@ -4,8 +4,6 @@ name: Create and publish a Docker image
 # Configures this workflow to run every time a release is published.
 on:
   workflow_dispatch:
-  push:
-    branches: [main]
   release:
     types: [published]
 
@@ -25,18 +23,9 @@ jobs:
       attestations: write
       id-token: write
       #
-    strategy:
-      matrix:
-        platform:
-          - dockerfile: "Dockerfile"
-            tag-suffix: ""
-          - dockerfile: "Dockerfile.ios"
-            tag-suffix: "-ios"
-          - dockerfile: "Dockerfile.android"
-            tag-suffix: "-android"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
@@ -47,33 +36,26 @@ jobs:
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=false
-          tags: |
-            type=raw,value=latest,enable={{ is_default_branch }},suffix=${{ matrix.platform.tag-suffix }}
-            type=raw,enable=${{ github.event_name == 'release' || github.ref_type == 'tag' }},value=stable,suffix=${{ matrix.platform.tag-suffix }}
-            type=raw,enable=${{ github.event_name == 'release' }},value=${{ github.event.release.tag_name }},suffix=${{ matrix.platform.tag-suffix }}
-            type=raw,enable=${{ github.ref_type == 'tag' }},value=${{ github.ref_name }},suffix=${{ matrix.platform.tag-suffix }}
-            type=sha,suffix=${{ matrix.platform.tag-suffix }}
-            type=sha,format=long,suffix=${{ matrix.platform.tag-suffix }}
-      # This step sets up some additional capabilities to generate the provenance and sbom attestations
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
       - name: Build and push Docker image
         id: push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
-          file: ${{ matrix.platform.dockerfile }}
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          provenance: mode=max
-          sbom: true
+
+      # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)."
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true
 

.github/workflows/ruff.yml

@@ -11,19 +11,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-        with:
-          enable-cache: true
+          python-version: 3.9
+          cache: 'pip'
+      - name: Checkout
+        uses: actions/checkout@master
       - name: Install Dependencies
         run: |
-          uv sync --locked --group dev
+          pip install ruff
       - name: ruff
         run: |
           make ruff

.github/workflows/tests.yml

@@ -15,18 +15,15 @@ jobs:
         python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
-      - uses: actions/checkout@v6
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-        with:
-          enable-cache: true
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Python dependencies
         run: |
-          uv sync --locked --group dev --python ${{ matrix.python-version }}
+          make install
+          make test-requirements
       - name: Test with pytest
         run: |
           set -o pipefail

.github/workflows/update-ios-data.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Run script to fetch latest iOS releases from Apple RSS feed.
         run: python3 .github/workflows/scripts/update-ios-releases.py
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v5
         with:
           title: '[auto] Update iOS releases and versions'
           commit-message: Add new iOS versions and build numbers
@@ -27,4 +27,4 @@ jobs:
           add-paths: |
             *.json
           labels: |
-            automated pr
+            automated pr

.gitignore

@@ -86,9 +86,6 @@ ipython_config.py
 # pyenv
 .python-version
 
-# uv project Python version
-!.python-version
-
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
 #   However, in case of collaboration, if having platform-specific dependencies or dependencies
@@ -141,4 +138,4 @@ dmypy.json
 .idea
 
 # Sublime Text project files
-*.sublime*
+*.sublime*

.python-version

@@ -1 +0,0 @@
-3.10

.readthedocs.yaml

@@ -6,16 +6,14 @@
 version: 2
 
 build:
-  os: "ubuntu-24.04"
+  os: "ubuntu-22.04"
   tools:
     python: "3.11"
 
 mkdocs:
   configuration: mkdocs.yml
 
+# Optionally set the version of Python and requirements required to build your docs
 python:
-  install:
-    - method: uv
-      command: sync
-      groups:
-        - docs
+   install:
+   - requirements: docs/requirements.txt

Dockerfile

@@ -1,6 +1,6 @@
 # Base image for building libraries
 # ---------------------------------
-FROM ubuntu:22.04 AS build-base
+FROM ubuntu:22.04 as build-base
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -22,7 +22,7 @@ RUN apt-get update \
 
 # libplist
 # --------
-FROM build-base AS build-libplist
+FROM build-base as build-libplist
 
 # Build
 RUN git clone https://github.com/libimobiledevice/libplist && cd libplist \
@@ -32,7 +32,7 @@ RUN git clone https://github.com/libimobiledevice/libplist && cd libplist \
 
 # libimobiledevice-glue
 # ---------------------
-FROM build-base AS build-libimobiledevice-glue
+FROM build-base as build-libimobiledevice-glue
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -45,7 +45,7 @@ RUN git clone https://github.com/libimobiledevice/libimobiledevice-glue && cd li
 
 # libtatsu
 # --------
-FROM build-base AS build-libtatsu
+FROM build-base as build-libtatsu
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -58,7 +58,7 @@ RUN git clone https://github.com/libimobiledevice/libtatsu && cd libtatsu \
 
 # libusbmuxd
 # ----------
-FROM build-base AS build-libusbmuxd
+FROM build-base as build-libusbmuxd
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -72,7 +72,7 @@ RUN git clone https://github.com/libimobiledevice/libusbmuxd && cd libusbmuxd \
 
 # libimobiledevice
 # ----------------
-FROM build-base AS build-libimobiledevice
+FROM build-base as build-libimobiledevice
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -88,7 +88,7 @@ RUN git clone https://github.com/libimobiledevice/libimobiledevice && cd libimob
 
 # usbmuxd
 # -------
-FROM build-base AS build-usbmuxd
+FROM build-base as build-usbmuxd
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -103,8 +103,7 @@ RUN git clone https://github.com/libimobiledevice/usbmuxd && cd usbmuxd \
 
 
 # Create main image
-FROM ubuntu:24.04 AS main
-COPY --from=ghcr.io/astral-sh/uv:0.11.8 /uv /uvx /usr/local/bin/
+FROM ubuntu:24.04 as main
 
 LABEL org.opencontainers.image.url="https://mvt.re"
 LABEL org.opencontainers.image.documentation="https://docs.mvt.re"
@@ -134,8 +133,12 @@ COPY --from=build-usbmuxd /build /
 
 # Install mvt using the locally checked out source
 COPY . mvt/
-RUN uv pip install --system --break-system-packages --no-cache ./mvt \
-  && rm -rf mvt
+RUN apt-get update \
+   && apt-get install -y git python3-pip \
+   && PIP_NO_CACHE_DIR=1 pip3 install --break-system-packages ./mvt \
+   && apt-get remove -y python3-pip git && apt-get autoremove -y \
+   && rm -rf /var/lib/apt/lists/* \
+   && rm -rf mvt
 
 # Installing ABE
 ADD --checksum=sha256:a20e07f8b2ea47620aff0267f230c3f1f495f097081fd709eec51cf2a2e11632 \

Dockerfile.android

@@ -1,6 +1,5 @@
 # Create main image
-FROM python:3.10.14-alpine3.20 AS main
-COPY --from=ghcr.io/astral-sh/uv:0.11.8 /uv /uvx /usr/local/bin/
+FROM python:3.10.14-alpine3.20 as main
 
 LABEL org.opencontainers.image.url="https://mvt.re"
 LABEL org.opencontainers.image.documentation="https://docs.mvt.re"
@@ -21,7 +20,7 @@ RUN apk add --no-cache \
 # Install mvt
 COPY ./ mvt
 RUN apk add --no-cache --virtual .build-deps gcc musl-dev \
-  && uv pip install --system --no-cache ./mvt \
+  && PIP_NO_CACHE_DIR=1 pip3 install ./mvt \
   && apk del .build-deps gcc musl-dev && rm -rf ./mvt
 
 # Installing ABE

Dockerfile.ios

@@ -1,6 +1,6 @@
 # Base image for building libraries
 # ---------------------------------
-FROM ubuntu:22.04 AS build-base
+FROM ubuntu:22.04 as build-base
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -22,7 +22,7 @@ RUN apt-get update \
 
 # libplist
 # --------
-FROM build-base AS build-libplist
+FROM build-base as build-libplist
 
 # Build
 RUN git clone https://github.com/libimobiledevice/libplist && cd libplist \
@@ -32,7 +32,7 @@ RUN git clone https://github.com/libimobiledevice/libplist && cd libplist \
 
 # libimobiledevice-glue
 # ---------------------
-FROM build-base AS build-libimobiledevice-glue
+FROM build-base as build-libimobiledevice-glue
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -45,7 +45,7 @@ RUN git clone https://github.com/libimobiledevice/libimobiledevice-glue && cd li
 
 # libtatsu
 # --------
-FROM build-base AS build-libtatsu
+FROM build-base as build-libtatsu
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -58,7 +58,7 @@ RUN git clone https://github.com/libimobiledevice/libtatsu && cd libtatsu \
 
 # libusbmuxd
 # ----------
-FROM build-base AS build-libusbmuxd
+FROM build-base as build-libusbmuxd
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -72,7 +72,7 @@ RUN git clone https://github.com/libimobiledevice/libusbmuxd && cd libusbmuxd \
 
 # libimobiledevice
 # ----------------
-FROM build-base AS build-libimobiledevice
+FROM build-base as build-libimobiledevice
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -88,7 +88,7 @@ RUN git clone https://github.com/libimobiledevice/libimobiledevice && cd libimob
 
 # usbmuxd
 # -------
-FROM build-base AS build-usbmuxd
+FROM build-base as build-usbmuxd
 
 # Install dependencies
 COPY --from=build-libplist /build /
@@ -104,8 +104,7 @@ RUN git clone https://github.com/libimobiledevice/usbmuxd && cd usbmuxd \
 
 # Main image
 # ----------
-FROM python:3.10.14-alpine3.20 AS main
-COPY --from=ghcr.io/astral-sh/uv:0.11.8 /uv /uvx /usr/local/bin/
+FROM python:3.10.14-alpine3.20 as main
 
 LABEL org.opencontainers.image.url="https://mvt.re"
 LABEL org.opencontainers.image.documentation="https://docs.mvt.re"
@@ -132,7 +131,7 @@ COPY --from=build-usbmuxd /build /
 # Install mvt using the locally checked out source
 COPY ./ mvt
 RUN apk add --no-cache --virtual .build-deps git gcc musl-dev \
-  && uv pip install --system --no-cache ./mvt \
+  && PIP_NO_CACHE_DIR=1 pip3 install ./mvt \
   && apk del .build-deps git gcc musl-dev && rm -rf ./mvt
 
 ENTRYPOINT [ "/usr/local/bin/mvt-ios" ]

Makefile

@@ -1,39 +1,39 @@
 PWD = $(shell pwd)
-UV ?= uv
 
 check: ruff mypy
 
 ruff:
-	$(UV) run ruff check .
+	ruff check .
 
 mypy:
-	$(UV) run mypy
+	mypy
 
 test:
-	$(UV) run pytest
+	python3 -m pytest
 
 test-ci:
-	$(UV) run pytest -v
+	python3 -m pytest -v
 
 install:
-	$(UV) sync
+	python3 -m pip install --upgrade -e .
 
 test-requirements:
-	$(UV) sync --group dev
+	python3 -m pip install --upgrade --group dev
 
 generate-proto-parsers:
 	# Generate python parsers for protobuf files
 	PROTO_FILES=$$(find src/mvt/android/parsers/proto/ -iname "*.proto"); \
-	$(UV) run protoc -Isrc/mvt/android/parsers/proto/ --python_betterproto2_out=src/mvt/android/parsers/proto/ $$PROTO_FILES
+	protoc -Isrc/mvt/android/parsers/proto/ --python_betterproto_out=src/mvt/android/parsers/proto/ $$PROTO_FILES
 
 clean:
 	rm -rf $(PWD)/build $(PWD)/dist $(PWD)/src/mvt.egg-info
 
 dist:
-	$(UV) build
+	python3 -m pip install --upgrade build
+	python3 -m build
 
 upload:
-	$(UV) tool run twine upload dist/*
+	python3 -m twine upload dist/*
 
 test-upload:
-	$(UV) tool run twine upload --repository testpypi dist/*
+	python3 -m twine upload --repository testpypi dist/*

README.md

@@ -4,9 +4,6 @@
 
 # Mobile Verification Toolkit
 
-> [!IMPORTANT]
-> We recently merged the "v3" branch. This introduced breaking changes. If you relied on mvt output in other scripts They might have broken. More details: https://github.com/mvt-project/mvt/issues/757
-
 [![](https://img.shields.io/pypi/v/mvt)](https://pypi.org/project/mvt/)
 [![Documentation Status](https://readthedocs.org/projects/mvt/badge/?version=latest)](https://docs.mvt.re/en/latest/?badge=latest)
 [![CI](https://github.com/mvt-project/mvt/actions/workflows/tests.yml/badge.svg)](https://github.com/mvt-project/mvt/actions/workflows/tests.yml)
@@ -41,18 +38,6 @@ MVT can be installed from sources or from [PyPI](https://pypi.org/project/mvt/)
 pip3 install mvt
 ```
 
-You can also install MVT from PyPI with [uv](https://docs.astral.sh/uv/). First, install uv:
-
-```bash
-curl -LsSf https://astral.sh/uv/install.sh | sh
-```
-
-Then install MVT as a command-line tool:
-
-```bash
-uv tool install mvt
-```
-
 For alternative installation options and known issues, please refer to the [documentation](https://docs.mvt.re/en/latest/install/) as well as [GitHub Issues](https://github.com/mvt-project/mvt/issues).
 
 

docs/android/adb.md

@@ -1,29 +1,50 @@
-# ADB Analysis Removed
+# Check over ADB
 
-The ability to analyze Android devices directly over the [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb) has been removed from MVT.
+In order to check an Android device over the [Android Debug Bridge (adb)](https://developer.android.com/studio/command-line/adb) you will first need to install [Android SDK Platform Tools](https://developer.android.com/studio/releases/platform-tools). If you have installed [Android Studio](https://developer.android.com/studio/) you should already have access to `adb` and other utilities.
 
-Use [AndroidQF](https://github.com/mvt-project/androidqf) to collect forensic artifacts from an Android device, then analyze the collected output with:
+While many Linux distributions already package Android Platform Tools (for example `android-platform-tools-base` on Debian), it is preferable to install the most recent version from the official website. Packaged versions might be outdated and incompatible with most recent Android handsets.
+
+Next you will need to enable debugging on the Android device you are testing. [Please follow the official instructions on how to do so.](https://developer.android.com/studio/command-line/adb)
+
+## Connecting over USB
+
+The easiest way to check the device is over a USB transport. You will need to have USB debugging enabled and the device plugged into your computer. If everything is configured appropriately you should see your device when launching the command `adb devices`.
+
+Now you can try launching MVT with:
 
 ```bash
-mvt-android check-androidqf /path/to/androidqf-output
+mvt-android check-adb --output /path/to/results
 ```
 
-For a standalone Android bug report, use:
+!!! warning
+    The `check-adb` command is deprecated and will be removed in a future release.
+    Whenever possible, prefer acquiring device data using the AndroidQF project (https://github.com/mvt-project/androidqf/) and then analyze those acquisitions with MVT.
 
-```bash
-mvt-android check-bugreport /path/to/bugreport.zip
-```
+    Running `mvt-android check-adb` will also emit a runtime deprecation warning advising you to migrate to AndroidQF.
 
-## Reasons for Removal
+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
+
+    The `mvt-android check-adb` command has been deprecated and removed from MVT.
+
+The ability to analyze Android devices over ADB (`mvt-android check-adb`) has been removed from MVT due to several technical and forensic limitations.
+
+## Reasons for Deprecation
 
 1. **Inconsistent Data Collection Across Devices**
-   Android devices vary significantly in system architecture, security policy, and diagnostic log availability. This made it difficult to collect reliable forensic data 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.
 
 2. **Incomplete Forensic Data Acquisition**
-   Direct ADB analysis did not retrieve a complete forensic snapshot. Critical artifacts such as full bug reports could be missing.
+   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.
 
-3. **Duplicated Analysis Paths**
-   Similar artifacts were parsed through separate ADB, AndroidQF, and bugreport modules, which made behavior harder to keep consistent.
+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.
 
-4. **Workflow Consistency**
-   MVT now focuses on analyzing acquired artifacts rather than interacting with live devices directly.
+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.
+
+## Alternative: Using AndroidQF for Forensic Data Collection
+
+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)

docs/android/download_apks.md

@@ -0,0 +1,28 @@
+# Downloading APKs from an Android phone
+
+MVT allows you to attempt to download all available installed packages (APKs) from a device in order to further inspect them and potentially identify any which might be malicious in nature.
+
+You can do so by launching the following command:
+
+```bash
+mvt-android download-apks --output /path/to/folder
+```
+
+It might take several minutes to complete.
+
+!!! info
+    MVT will likely warn you it was unable to download certain installed packages. There is no reason to be alarmed: this is typically expected behavior when MVT attempts to download a system package it has no privileges to access.
+
+Optionally, you can decide to enable lookups of the SHA256 hash of all the extracted APKs on [VirusTotal](https://www.virustotal.com). While these lookups do not provide any conclusive assessment on all of the extracted APKs, they might highlight any known malicious ones:
+
+```bash
+MVT_VT_API_KEY=<key> mvt-android download-apks --output /path/to/folder --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.
+
+In case you have a previous extraction of APKs you want to later check against VirusTotal, you can do so with the following arguments:
+
+```bash
+MVT_VT_API_KEY=<key> mvt-android download-apks --from-file /path/to/folder/apks.json --virustotal
+```

docs/android/intrusion_logs.md

@@ -1,82 +0,0 @@
-# Check Android Intrusion Logs
-
-Recent versions of Android can produce structured *Intrusion Logs* — newline-delimited JSON records derived from the platform's [SecurityLog API](https://developer.android.com/reference/android/app/admin/SecurityLog). Intrusion Logging is offered as a new option under Android's **Advanced Protection Mode**, which users can opt into on their device; no MDM or device-policy configuration is required. When enabled, these logs provide a high-fidelity record of process starts, DNS queries, outbound network connections, ADB activity, keyguard events, and other security-relevant operations. The initial Intrusion Logging feature was released for Android 16 in May 2026. The feature and supported events is likely to be expanded over time.
-
-For background on how this data source was introduced and why it is forensically valuable, see the Amnesty International Security Lab announcement: [Android Intrusion Logging as a new source of data for consensual forensic analysis](https://securitylab.amnesty.org/latest/2026/05/android-intrusion-logging-as-a-new-source-of-data-for-consensual-forensic-analysis/).
-
-## Recommended workflow: collect with AndroidQF
-
-[AndroidQF](https://github.com/mvt-project/androidqf) is the recommended way to acquire data from an Android device for analysis with MVT. During acquisition AndroidQF will prompt the user to also collect intrusion logs from the device, and writes them into an `intrusion-logs/` subdirectory of the acquisition output.
-
-When you analyse such an acquisition with `mvt-android check-androidqf`, MVT automatically detects the `intrusion-logs/` directory and runs the same intrusion-log checks described below — there is no need to invoke a separate command:
-
-```bash
-mvt-android check-androidqf --output /path/to/results/ /path/to/androidqf-output/
-```
-
-The device timezone is read from the AndroidQF acquisition (`getprop.txt`) and applied to event timestamps automatically.
-
-## Standalone command: `check-intrusion-logs`
-
-The `mvt-android check-intrusion-logs` command runs the intrusion-log analysis directly against a set of log files. Prefer the AndroidQF workflow above; use the standalone command when the intrusion logs were collected outside of an AndroidQF acquisition, or when re-analysing only a set of intrusion logs.
-
-## Expected input
-
-`check-intrusion-logs` accepts either:
-
-- a **directory** containing one or more `.txt` files (recursively), or
-- a **`.zip` archive** containing such `.txt` files (nested `.zip` archives are also walked).
-
-Each `.txt` file is expected to contain newline-delimited JSON, with one JSON object per line. Each object wraps a single event under a top-level key indicating its type, for example:
-
-```json
-{"dns_event": {"event_time": 1746979200000, "hostname": "example.com", "ip_addresses": ["93.184.216.34"], "package_name": "com.example.app"}}
-{"connect_event": {"event_time": 1746979201000, "ip_address": "93.184.216.34", "port": 443, "package_name": "com.example.app"}}
-{"security_event": {"event_time": 1746979202000, "tag": 210005, "data": ["..."]}}
-```
-
-Identical events that appear across multiple overlapping log files (e.g. daily rotations) are de-duplicated on a first-seen basis.
-
-## Running the analysis
-
-```bash
-mvt-android check-intrusion-logs --output /path/to/results/ /path/to/intrusion-logs/
-```
-
-A `.zip` archive can be passed directly in place of the directory:
-
-```bash
-mvt-android check-intrusion-logs --output /path/to/results/ /path/to/intrusion-logs.zip
-```
-
-### Options
-
-| Option | Description |
-| --- | --- |
-| `-i, --iocs PATH` | Path to a STIX2 indicator file. May be passed multiple times. |
-| `-o, --output PATH` | Directory where JSON results and the timeline CSV will be written. |
-| `-l, --list-modules` | List the available intrusion-log modules and exit. |
-| `-m, --module NAME` | Run a single module (e.g. `DnsEvent`) instead of all of them. |
-| `-t, --timezone TZ` | IANA timezone name for the device (e.g. `Europe/Paris`). When set, event timestamps are converted to the device's local time instead of UTC. |
-| `-v, --verbose` | Verbose logging. |
-
-## Modules
-
-The command runs the following modules over the parsed events:
-
-- **`DnsEvent`** — DNS resolution events. Hostnames and resolved IP addresses are checked against domain indicators, and the requesting `package_name` is checked against app-identifier indicators.
-- **`ConnectEvent`** — Outbound network connection events. Destination IPs (with localhost addresses skipped) are checked against domain indicators, and `package_name` is checked against app-identifier indicators.
-- **`SecurityEvent`** — Security log events keyed by Android `SecurityLog` tag IDs (e.g. `app_process_start`, `adb_shell_cmd`, `keyguard_dismissed`, `os_startup`, `cert_*` events). These are surfaced in the timeline to help reconstruct device activity around suspected events.
-
-All three modules share a single pre-parsing pass over the input, so adding more modules in the future does not multiply I/O cost. Additional modules will be added in the future to support new event types which are generated by the Intrusion Logging feature.
-
-## Interpreting results
-
-A successful IOC match raises a `CRITICAL` alert that includes the matched indicator, the offending event, and the event timestamp. Alerts are summarised at the end of the run and persisted alongside the per-module JSON results.
-
-When `--timezone` is provided, timestamps in the timeline and JSON output reflect the device's local wall-clock time. Otherwise timestamps are in UTC, consistent with the rest of MVT.
-
-## Limitations
-
-- This page assumes the intrusion logs have already been collected from the device. The recommended collection path is via AndroidQF (see above); intrusion logging itself must have been enabled on the device beforehand by opting into Android's Advanced Protection mode and also enabling the optional Intrusion Logging feature (see the [Amnesty blog post](https://securitylab.amnesty.org/latest/2026/05/android-intrusion-logging-as-a-new-source-of-data-for-consensual-forensic-analysis/) for details).
-- As with all IOC-based analysis, public indicators alone are not sufficient to conclude that a device is uncompromised. See the [Indicators of Compromise](../iocs.md) page for context.

docs/android/methodology.md

@@ -38,17 +38,11 @@ By separating artifact collection from forensic analysis, this approach ensures
 
 For more information, refer to the [AndroidQF project documentation](https://github.com/mvt-project/androidqf).
 
-## Android Intrusion Logs
+## Check the device over Android Debug Bridge
 
-On devices where the user has opted into Android's [**Advanced Protection Mode**](https://support.google.com/android/answer/16339980) and turned on the optional Intrusion Logging featrue, Android can create and archive structured *Intrusion Logs* in an encrypted format. These logs record DNS queries, outbound network connections, process starts, ADB activity and other security-relevant events, and are a high-fidelity complement to the rest of an AndroidQF acquisition. The logs are generated on-device and encrypted before being stored in the Google account associated with the device. The encryption key is protected by the user device PIN. The intrusion log data is not accessible to Google.
+The ability to analyze Android devices over ADB (`mvt-android check-adb`) has been removed from MVT.
 
-AndroidQF will prompt the user to download, decrypt and collect device intrusion logs as part of an acquisition. When they are present, `mvt-android check-androidqf` will automatically run the intrusion-log checks alongside the other AndroidQF modules — no extra command is required. This is the recommended workflow for Android forensic analysis with MVT.
-
-For cases where intrusion logs were collected outside of an AndroidQF acquisition, the standalone `mvt-android check-intrusion-logs` command can analyse them directly. See [Check Android Intrusion Logs](intrusion_logs.md) for details, and the [feature announcment from Amnesty International's Security Lab](https://securitylab.amnesty.org/latest/2026/05/android-intrusion-logging-as-a-new-source-of-data-for-consensual-forensic-analysis/) for background on the data source.
-
-## Android Debug Bridge analysis removed
-
-The ability to analyze Android devices directly over ADB has been removed from MVT. Direct extraction of data from ADB was error-prone and frequently resulted in inconsistent data collection between ADB and AndroidQF acquisitions. Use AndroidQF for device acquisition and `mvt-android check-androidqf` for analysis.
+See the [Android ADB documentation](./adb.md) for more information.
 
 ## Check an Android Backup (SMS messages)
 

docs/development.md

@@ -2,17 +2,9 @@
 
 The Mobile Verification Toolkit team welcomes contributions of new forensic modules or other contributions which help improve the software.
 
-## Local environment
-
-MVT uses `uv` for dependency management. To install the project and development dependencies from the locked environment, run:
-
-```bash
-make install
-```
-
 ## Testing
 
-MVT uses `pytest` for unit and integration tests. Code style consistency is maintained with `ruff` and `mypy`. All can
+MVT uses `pytest` for unit and integration tests. Code style consistency is maintained with `flake8`, `ruff` and `black`. All can
 be run automatically with:
 
 ```bash
@@ -32,4 +24,4 @@ MVT modules can be profiled with Python built-in `cProfile` by setting the `MVT_
 MVT_PROFILE=1 dev/mvt-ios check-backup test_backup
 ```
 
-Open an issue or PR if you are encountering significant performance issues when analyzing a device with MVT.
+Open an issue or PR if you are encountering significant performance issues when analyzing a device with MVT.

docs/requirements.txt

@@ -0,0 +1,5 @@
+mkdocs==1.6.1
+mkdocs-autorefs==1.4.3
+mkdocs-material==9.6.20
+mkdocs-material-extensions==1.3.1
+mkdocstrings==1.0.0

mkdocs.yml

@@ -42,8 +42,9 @@ nav:
         - Records extracted by mvt-ios: "ios/records.md"
     - MVT for Android:
         - Android Forensic Methodology: "android/methodology.md"
+        - Check over ADB: "android/adb.md"
         - Check an Android Backup (SMS messages): "android/backup.md"
-        - Check Android Intrusion Logs: "android/intrusion_logs.md"
+        - Download APKs: "android/download_apks.md"
     - Indicators of Compromise: "iocs.md"
     - Development: "development.md"
     - License: "license.md"

pyproject.toml

@@ -17,25 +17,25 @@ classifiers = [
     "Programming Language :: Python",
 ]
 dependencies = [
-    "click==8.3.2",
-    "rich==14.3.3",
+    "click==8.3.1",
+    "rich==14.1.0",
     "tld==0.13.1",
-    "requests==2.33.1",
+    "requests==2.33.0",
     "simplejson==3.20.2",
-    "packaging==26.0",
+    "packaging==25.0",
     "appdirs==1.4.4",
     "iOSbackup==0.9.925",
     "adb-shell[usb]==0.4.4",
     "libusb1==3.3.1",
-    "cryptography==47.0.0",
+    "cryptography==46.0.6",
     "PyYAML>=6.0.2",
     "pyahocorasick==2.2.0",
-    "betterproto2==0.9.1",
-    "pydantic==2.13.3",
-    "pydantic-settings==2.13.1",
+    "betterproto==1.2.5",
+    "pydantic==2.12.5",
+    "pydantic-settings==2.10.1",
     "NSKeyedUnArchiver==1.5.2",
     "python-dateutil==2.9.0.post0",
-    "tzdata==2026.2",
+    "tzdata==2025.2",
 ]
 requires-python = ">= 3.10"
 
@@ -57,17 +57,7 @@ dev = [
     "stix2>=3.0.1",
     "ruff>=0.1.6",
     "mypy>=1.7.1",
-    "betterproto2-compiler",
-    "types-PyYAML>=6.0.12.20250516",
-    "types-python-dateutil>=2.9.0.20250822",
-    "types-requests>=2.32.4.20250913",
-]
-docs = [
-    "mkdocs==1.6.1",
-    "mkdocs-autorefs==1.4.4",
-    "mkdocs-material==9.7.6",
-    "mkdocs-material-extensions==1.3.1",
-    "mkdocstrings==1.0.4",
+    "betterproto[compiler]",
 ]
 
 [build-system]
@@ -81,7 +71,8 @@ omit = ["tests/*"]
 directory = "htmlcov"
 
 [tool.mypy]
-install_types = false
+install_types = true
+non_interactive = true
 ignore_missing_imports = true
 packages = "src"
 

src/mvt/android/artifacts/dumpsys_battery_daily.py

@@ -91,10 +91,10 @@ class DumpsysBatteryDailyArtifact(AndroidArtifact):
 
                 # Check for uninstall (version 0)
                 if vers_nr == "0":
-                    self.alertstore.medium(
-                        f"Detected uninstall of package {package_name} (vers 0)",
+                    self.log.warning(
+                        "Detected uninstall of package %s (vers 0) on %s",
+                        package_name,
                         daily["from"],
-                        update_record,
                     )
                 # Check for downgrade
                 elif package_name in package_versions:
@@ -104,11 +104,12 @@ class DumpsysBatteryDailyArtifact(AndroidArtifact):
                         if current_vers < previous_vers:
                             update_record["action"] = "downgrade"
                             update_record["previous_vers"] = str(previous_vers)
-                            self.alertstore.medium(
-                                f"Detected downgrade of package {package_name} "
-                                f"from vers {previous_vers} to vers {current_vers}",
+                            self.log.warning(
+                                "Detected downgrade of package %s from vers %d to vers %d on %s",
+                                package_name,
+                                previous_vers,
+                                current_vers,
                                 daily["from"],
-                                update_record,
                             )
                     except ValueError:
                         # If version numbers aren't integers, skip comparison

src/mvt/android/artifacts/dumpsys_packages.py

@@ -22,6 +22,7 @@ class DumpsysPackagesArtifact(AndroidArtifact):
                     "",
                     result,
                 )
+                self.alertstore.log_latest()
                 continue
 
             if not self.indicators:
@@ -32,6 +33,7 @@ class DumpsysPackagesArtifact(AndroidArtifact):
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )
+                self.alertstore.log_latest()
 
     def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
         records = []

src/mvt/android/artifacts/mounts.py

@@ -154,7 +154,7 @@ class Mounts(AndroidArtifact):
                 ):
                     continue
                 suspicious_mounts.append(mount)
-                self.alertstore.medium(
+                self.alertstore.high(
                     f"Suspicious mount options found for {mount_point}: {', '.join(suspicious_opts)}",
                     "",
                     mount,
@@ -180,18 +180,18 @@ class Mounts(AndroidArtifact):
             ioc = self.indicators.check_file_path(mount.get("mount_point", ""))
             if ioc:
                 self.alertstore.critical(
-                    ioc.message,
+                    f"Mount point matches indicator: {mount.get('mount_point', '')}",
                     "",
                     mount,
-                    matched_indicator=ioc.ioc,
+                    matched_indicator=ioc,
                 )
 
             # Check device paths for indicators
             ioc = self.indicators.check_file_path(mount.get("device", ""))
             if ioc:
                 self.alertstore.critical(
-                    ioc.message,
+                    f"Device path matches indicator: {mount.get('device', '')}",
                     "",
                     mount,
-                    matched_indicator=ioc.ioc,
+                    matched_indicator=ioc,
                 )

src/mvt/android/artifacts/tombstone_crashes.py

@@ -6,8 +6,8 @@
 import datetime
 from typing import List, Optional
 
+import betterproto
 import pydantic
-import betterproto2
 from dateutil import parser
 
 from mvt.android.parsers.proto.tombstone import Tombstone
@@ -131,7 +131,7 @@ class TombstoneCrashArtifact(AndroidArtifact):
         """Parse Android tombstone crash files from a protobuf object."""
         tombstone_pb = Tombstone().parse(data)
         tombstone_dict = tombstone_pb.to_dict(
-            casing=betterproto2.Casing.SNAKE, include_default_values=True
+            betterproto.Casing.SNAKE, include_default_values=True
         )
 
         # Add some extra metadata

src/mvt/android/cli.py

@@ -16,7 +16,6 @@ from mvt.common.help import (
     HELP_MSG_CHECK_ANDROIDQF,
     HELP_MSG_CHECK_BUGREPORT,
     HELP_MSG_CHECK_IOCS,
-    HELP_MSG_CHECK_INTRUSION_LOGS,
     HELP_MSG_DISABLE_INDICATOR_UPDATE_CHECK,
     HELP_MSG_DISABLE_UPDATE_CHECK,
     HELP_MSG_HASHES,
@@ -36,8 +35,6 @@ from mvt.common.utils import init_logging, set_verbose_logging
 from .cmd_check_androidqf import CmdAndroidCheckAndroidQF
 from .cmd_check_backup import CmdAndroidCheckBackup
 from .cmd_check_bugreport import CmdAndroidCheckBugreport
-from .cmd_check_intrusion_logs import CmdAndroidCheckIntrusionLogs
-from .modules.intrusion_logs import INTRUSION_LOGS_MODULES
 from .modules.androidqf import ANDROIDQF_MODULES
 from .modules.backup import BACKUP_MODULES
 from .modules.backup.helpers import cli_load_android_backup_password
@@ -99,7 +96,6 @@ def version():
 @click.pass_context
 def check_adb(ctx):
     log.error(HELP_MSG_CHECK_ADB_REMOVED_DESCRIPTION)
-    ctx.exit(1)
 
 
 # ==============================================================================
@@ -269,75 +265,6 @@ def check_androidqf(
     cmd.show_support_message()
 
 
-# ==============================================================================
-# Command: check-intrusion-logs
-# ==============================================================================
-@cli.command(
-    "check-intrusion-logs",
-    context_settings=CONTEXT_SETTINGS,
-    help=HELP_MSG_CHECK_INTRUSION_LOGS,
-)
-@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("--list-modules", "-l", is_flag=True, help=HELP_MSG_LIST_MODULES)
-@click.option("--module", "-m", help=HELP_MSG_MODULE)
-@click.option(
-    "--timezone",
-    "-t",
-    default=None,
-    help=(
-        "IANA timezone name for the device, for example 'Europe/Paris'. "
-        "When provided, event timestamps are expressed in the device's local "
-        "time instead of UTC."
-    ),
-)
-@click.option("--verbose", "-v", is_flag=True, help=HELP_MSG_VERBOSE)
-@click.argument("LOGS_PATH", type=click.Path(exists=True))
-@click.pass_context
-def check_intrusion_logs(
-    ctx,
-    iocs,
-    output,
-    list_modules,
-    module,
-    timezone,
-    verbose,
-    logs_path,
-):
-    set_verbose_logging(verbose)
-
-    module_options = {}
-    if timezone:
-        module_options["device_timezone"] = timezone
-
-    cmd = CmdAndroidCheckIntrusionLogs(
-        target_path=logs_path,
-        results_path=output,
-        ioc_files=iocs,
-        module_name=module,
-        module_options=module_options if module_options else None,
-        disable_version_check=_get_disable_flags(ctx)[0],
-        disable_indicator_check=_get_disable_flags(ctx)[1],
-    )
-
-    if list_modules:
-        cmd.list_modules()
-        return
-
-    log.info("Checking intrusion logs at path: %s", logs_path)
-
-    cmd.run()
-    cmd.show_alerts_brief()
-    cmd.show_support_message()
-
-
 # ==============================================================================
 # Command: check-iocs
 # ==============================================================================
@@ -356,9 +283,7 @@ def check_intrusion_logs(
 @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 + INTRUSION_LOGS_MODULES
-    )
+    cmd.modules = BACKUP_MODULES + BUGREPORT_MODULES + ANDROIDQF_MODULES
 
     if list_modules:
         cmd.list_modules()

src/mvt/android/cmd_check_androidqf.py

@@ -5,14 +5,10 @@
 
 import logging
 import os
-import shutil
-import tempfile
 import zipfile
 from pathlib import Path
 from typing import List, Optional
 
-from mvt.android.artifacts.getprop import GetProp
-from mvt.android.cmd_check_intrusion_logs import CmdAndroidCheckIntrusionLogs
 from mvt.android.cmd_check_backup import CmdAndroidCheckBackup
 from mvt.android.cmd_check_bugreport import CmdAndroidCheckBugreport
 from mvt.common.command import Command
@@ -143,55 +139,6 @@ class CmdAndroidCheckAndroidQF(Command):
 
         raise NoAndroidQFBackup
 
-    def _read_device_timezone(self) -> Optional[str]:
-        getprop_files = [
-            f for f in self.__files if f.replace("\\", "/").endswith("getprop.txt")
-        ]
-        if not getprop_files:
-            self.log.warning(
-                "Could not find getprop.txt; intrusion log timestamps will use UTC."
-            )
-            return None
-
-        try:
-            content = self._get_file_content(getprop_files[0]).decode(
-                "utf-8", errors="ignore"
-            )
-        except Exception as exc:
-            self.log.warning("Could not read getprop.txt: %s", exc)
-            return None
-
-        props = GetProp()
-        props.parse(content)
-        timezone = props.get_device_timezone()
-        if timezone:
-            self.log.info(
-                "Device timezone identified from getprop.txt: %s",
-                timezone,
-            )
-        else:
-            self.log.warning(
-                "persist.sys.timezone not found in getprop.txt; "
-                "intrusion log timestamps will use UTC."
-            )
-
-        return timezone
-
-    def _get_file_content(self, file_path: str) -> bytes:
-        if self.__format == "zip" and self.__zip:
-            handle = self.__zip.open(file_path)
-            try:
-                return handle.read()
-            finally:
-                handle.close()
-
-        if self.__format == "dir" and self.target_path:
-            parent_path = Path(self.target_path).absolute().parent.as_posix()
-            with open(os.path.join(parent_path, file_path), "rb") as handle:
-                return handle.read()
-
-        raise FileNotFoundError(file_path)
-
     def run_bugreport_cmd(self) -> bool:
         bugreport = None
         try:
@@ -247,85 +194,9 @@ class CmdAndroidCheckAndroidQF(Command):
         self.alertstore.extend(cmd.alertstore.alerts)
         return True
 
-    def run_intrusion_logs_cmd(self) -> bool:
-        intrusion_log_files = [
-            f
-            for f in self.__files
-            if "/intrusion_logs/" in f.replace("\\", "/")
-            or f.replace("\\", "/").startswith("intrusion_logs/")
-        ]
-
-        if not intrusion_log_files:
-            self.log.info(
-                "No intrusion_logs folder found in AndroidQF data, "
-                "skipping intrusion logs analysis."
-            )
-            return False
-
-        self.log.info(
-            "Found intrusion_logs folder in AndroidQF data, running intrusion logs analysis."
-        )
-
-        intrusion_logs_path = None
-        temp_dir = None
-
-        try:
-            if self.__format == "dir" and self.target_path:
-                intrusion_logs_path = os.path.join(
-                    os.path.abspath(self.target_path), "intrusion_logs"
-                )
-                if not os.path.isdir(intrusion_logs_path):
-                    self.log.warning(
-                        "intrusion_logs directory not found at %s",
-                        intrusion_logs_path,
-                    )
-                    return False
-
-            elif self.__format == "zip" and self.__zip:
-                temp_dir = tempfile.mkdtemp(prefix="mvt_intrusion_logs_")
-                for entry in intrusion_log_files:
-                    normalized = entry.replace("\\", "/")
-                    idx = normalized.find("intrusion_logs/")
-                    relative = normalized[idx + len("intrusion_logs/") :]
-                    if not relative or relative.endswith("/"):
-                        continue
-
-                    target = os.path.join(temp_dir, relative)
-                    os.makedirs(os.path.dirname(target), exist_ok=True)
-                    with self.__zip.open(entry) as src, open(target, "wb") as dst:
-                        dst.write(src.read())
-
-                intrusion_logs_path = temp_dir
-            else:
-                return False
-
-            adv_module_options = dict(self.module_options or {})
-            if device_timezone := self._read_device_timezone():
-                adv_module_options["device_timezone"] = device_timezone
-
-            cmd = CmdAndroidCheckIntrusionLogs(
-                target_path=intrusion_logs_path,
-                results_path=self.results_path,
-                ioc_files=self.ioc_files,
-                iocs=self.iocs,
-                module_options=adv_module_options,
-                hashes=self.hashes,
-                sub_command=True,
-            )
-            cmd.run()
-
-            self.timeline.extend(cmd.timeline)
-            self.alertstore.extend(cmd.alertstore.alerts)
-            return True
-
-        finally:
-            if temp_dir:
-                shutil.rmtree(temp_dir, ignore_errors=True)
-
     def finish(self) -> None:
         """
-        Run nested modules if their respective files are found in AndroidQF data.
+        Run the bugreport and backup modules if the respective files are found in the AndroidQF data.
         """
         self.run_bugreport_cmd()
         self.run_backup_cmd()
-        self.run_intrusion_logs_cmd()

src/mvt/android/cmd_check_intrusion_logs.py

@@ -1,113 +0,0 @@
-# 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
-from typing import Optional
-
-from mvt.common.command import Command
-from mvt.common.indicators import Indicators
-
-from .modules.intrusion_logs import (
-    INTRUSION_LOGS_MODULES,
-    KNOWN_INTRUSION_LOG_EVENT_TYPES,
-)
-from .modules.intrusion_logs.base import IntrusionLogsModule
-
-log = logging.getLogger(__name__)
-
-
-class CmdAndroidCheckIntrusionLogs(Command):
-    """Command to check Android Intrusion Logging files."""
-
-    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-intrusion-logs"
-        self.modules = INTRUSION_LOGS_MODULES
-        self._all_events: dict[str, list[dict]] = {}
-
-    def init(self) -> None:
-        if not self.target_path:
-            raise ValueError("No target path specified")
-
-        if not os.path.isdir(self.target_path) and not (
-            os.path.isfile(self.target_path)
-            and self.target_path.lower().endswith(".zip")
-        ):
-            raise ValueError(
-                f"Target path must be a directory or a .zip file: {self.target_path}"
-            )
-
-        self.log.info("Checking intrusion logs at path: %s", self.target_path)
-        self._all_events = self._pre_load_events()
-
-    def module_init(self, module: IntrusionLogsModule) -> None:  # type: ignore[override]
-        module.il_events_by_type = self._all_events
-
-    def finish(self) -> None:
-        return
-
-    def _pre_load_events(self) -> dict[str, list[dict]]:
-        """Load and parse all advanced-log files once for reuse by all modules."""
-        self.log.info("Pre-loading intrusion log files from: %s", self.target_path)
-
-        loader = IntrusionLogsModule(
-            target_path=self.target_path,
-            log=self.log,
-        )
-
-        try:
-            all_events = loader.load_all_events(self.target_path)
-        except Exception as exc:
-            self.log.error("Failed to pre-load events: %s", exc)
-            return {}
-
-        total_events = sum(len(events) for events in all_events.values())
-        self.log.info(
-            "Pre-loaded %d events across %d type(s); modules will reuse this data",
-            total_events,
-            len(all_events),
-        )
-
-        unknown_event_types = sorted(
-            event_type
-            for event_type in all_events
-            if event_type not in KNOWN_INTRUSION_LOG_EVENT_TYPES
-        )
-        if unknown_event_types:
-            self.log.warning(
-                "Found unknown intrusion logging event type(s): %s. "
-                "Please open an issue on GitHub so MVT can add support for them.",
-                ", ".join(unknown_event_types),
-            )
-
-        return all_events

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

@@ -0,0 +1,32 @@
+# 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/
+
+from .chrome_history import ChromeHistory
+from .dumpsys_full import DumpsysFull
+from .files import Files
+from .getprop import Getprop
+from .logcat import Logcat
+from .packages import Packages
+from .processes import Processes
+from .root_binaries import RootBinaries
+from .selinux_status import SELinuxStatus
+from .settings import Settings
+from .sms import SMS
+from .whatsapp import Whatsapp
+
+ADB_MODULES = [
+    ChromeHistory,
+    SMS,
+    Whatsapp,
+    Processes,
+    Getprop,
+    Settings,
+    SELinuxStatus,
+    DumpsysFull,
+    Packages,
+    Logcat,
+    RootBinaries,
+    Files,
+]

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

@@ -0,0 +1,117 @@
+# 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 sqlite3
+from typing import Optional
+
+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
+
+CHROME_HISTORY_PATH = "data/data/com.android.chrome/app_chrome/Default/History"
+
+
+class ChromeHistory(AndroidExtraction):
+    """This module extracts records from Android's Chrome browsing history."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+        self.results: list = []
+
+    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+        return {
+            "timestamp": record["isodate"],
+            "module": self.__class__.__name__,
+            "event": "visit",
+            "data": f"{record['id']} - {record['url']} (visit ID: {record['visit_id']}, "
+            f"redirect source: {record['redirect_source']})",
+        }
+
+    def check_indicators(self) -> None:
+        if not self.indicators:
+            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
+                )
+
+    def _parse_db(self, db_path: str) -> None:
+        """Parse a Chrome History database file.
+
+        :param db_path: Path to the History database to process.
+
+        """
+        assert isinstance(self.results, list)  # assert results type for mypy
+        conn = sqlite3.connect(db_path)
+        cur = conn.cursor()
+        cur.execute(
+            """
+            SELECT
+                urls.id,
+                urls.url,
+                visits.id,
+                visits.visit_time,
+                visits.from_visit
+            FROM urls
+            JOIN visits ON visits.url = urls.id
+            ORDER BY visits.visit_time;
+        """
+        )
+
+        for item in cur:
+            self.results.append(
+                {
+                    "id": item[0],
+                    "url": item[1],
+                    "visit_id": item[2],
+                    "timestamp": item[3],
+                    "isodate": convert_datetime_to_iso(
+                        convert_chrometime_to_datetime(item[3])
+                    ),
+                    "redirect_source": item[4],
+                }
+            )
+
+        cur.close()
+        conn.close()
+
+        self.log.info("Extracted a total of %d history items", len(self.results))
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        try:
+            self._adb_process_file(
+                os.path.join("/", CHROME_HISTORY_PATH), self._parse_db
+            )
+        except Exception as exc:
+            self.log.error(exc)
+
+        self._adb_disconnect()

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

@@ -0,0 +1,46 @@
+# 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
+from typing import Optional
+
+from .base import AndroidExtraction
+from mvt.common.module_types import ModuleResults
+
+
+class DumpsysFull(AndroidExtraction):
+    """This module extracts stats on battery consumption by processes."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        output = self._adb_command("dumpsys")
+        if self.results_path:
+            output_path = os.path.join(self.results_path, "dumpsys.txt")
+            with open(output_path, "w", encoding="utf-8") as handle:
+                handle.write(output)
+
+            self.log.info("Full dumpsys output stored at %s", output_path)
+
+        self._adb_disconnect()

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

@@ -0,0 +1,160 @@
+# 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 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
+
+ANDROID_TMP_FOLDERS = [
+    "/tmp/",
+    "/data/local/tmp/",
+]
+ANDROID_MEDIA_FOLDERS = [
+    "/data/media/0",
+    "/sdcard/",
+]
+
+
+class Files(AndroidExtraction):
+    """This module extracts the list of files on the device."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+        self.full_find = False
+
+    def serialize(self, record: dict) -> Union[dict, list, None]:
+        if "modified_time" in record:
+            return {
+                "timestamp": record["modified_time"],
+                "module": self.__class__.__name__,
+                "event": "file_modified",
+                "data": record["path"],
+            }
+
+        return None
+
+    def check_indicators(self) -> None:
+        for result in self.results:
+            if result.get("is_suid"):
+                self.log.warning(
+                    'Found an SUID file in a non-standard directory "%s".',
+                    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,
+                    )
+
+    def backup_file(self, file_path: str) -> None:
+        if not self.results_path:
+            return
+
+        local_file_name = file_path.replace("/", "_").replace(" ", "-")
+        local_files_folder = os.path.join(self.results_path, "files")
+        if not os.path.exists(local_files_folder):
+            os.mkdir(local_files_folder)
+
+        local_file_path = os.path.join(local_files_folder, local_file_name)
+
+        try:
+            self._adb_download(remote_path=file_path, local_path=local_file_path)
+        except Exception:
+            pass
+        else:
+            self.log.info(
+                "Downloaded file %s to local copy at %s", file_path, local_file_path
+            )
+
+    def find_files(self, folder: str) -> None:
+        assert isinstance(self.results, list)
+        if self.full_find:
+            cmd = f"find '{folder}' -type f -printf '%T@ %m %s %u %g %p\n' 2> /dev/null"
+            output = self._adb_command(cmd)
+
+            for file_line in output.splitlines():
+                file_info = file_line.rstrip().split(" ", 5)
+                if len(file_line) < 6:
+                    self.log.info("Skipping invalid file info - %s", file_line.rstrip())
+                    continue
+                [unix_timestamp, mode, size, owner, group, full_path] = file_info
+                mod_time = convert_unix_to_iso(unix_timestamp)
+
+                self.results.append(
+                    {
+                        "path": full_path,
+                        "modified_time": mod_time,
+                        "mode": mode,
+                        "is_suid": (int(mode, 8) & stat.S_ISUID) == 2048,
+                        "is_sgid": (int(mode, 8) & stat.S_ISGID) == 1024,
+                        "size": size,
+                        "owner": owner,
+                        "group": group,
+                    }
+                )
+        else:
+            output = self._adb_command(f"find '{folder}' -type f 2> /dev/null")
+            for file_line in output.splitlines():
+                self.results.append({"path": file_line.rstrip()})
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        cmd = "find '/' -maxdepth 1 -printf '%T@ %m %s %u %g %p\n' 2> /dev/null"
+        output = self._adb_command(cmd)
+        if output or output.strip().splitlines():
+            self.full_find = True
+
+        for tmp_folder in ANDROID_TMP_FOLDERS:
+            self.find_files(tmp_folder)
+
+        for entry in self.results:
+            self.log.info("Found file in tmp folder at path %s", entry.get("path"))
+            self.backup_file(entry.get("path"))
+
+        for media_folder in ANDROID_MEDIA_FOLDERS:
+            self.find_files(media_folder)
+
+        self.log.info(
+            "Found %s files in primary Android tmp and media folders", len(self.results)
+        )
+
+        if self.module_options.get("fast_mode", None):
+            self.log.info(
+                "The `fast_mode` option was enabled: skipping full file listing"
+            )
+        else:
+            self.log.info("Processing full file listing. This may take a while...")
+            self.find_files("/")
+
+            self.log.info("Found %s total files", len(self.results))
+
+        self._adb_disconnect()

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

@@ -0,0 +1,44 @@
+# 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.android.artifacts.getprop import GetProp as GetPropArtifact
+
+from .base import AndroidExtraction
+from mvt.common.module_types import ModuleResults
+
+
+class Getprop(GetPropArtifact, AndroidExtraction):
+    """This module extracts device properties from getprop command."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+        self.results = {} if not results else results
+
+    def run(self) -> None:
+        self._adb_connect()
+        output = self._adb_command("getprop")
+        self._adb_disconnect()
+
+        self.parse(output)
+        self.log.info("Extracted %d Android system properties", len(self.results))

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

@@ -0,0 +1,58 @@
+# 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
+from typing import Optional
+
+from .base import AndroidExtraction
+from mvt.common.module_types import ModuleResults
+
+
+class Logcat(AndroidExtraction):
+    """This module extracts details on installed packages."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        # Get the current logcat.
+        output = self._adb_command('logcat -d -b all "*:V"')
+        # Get the locat prior to last reboot.
+        last_output = self._adb_command('logcat -L -b all "*:V"')
+
+        if self.results_path:
+            logcat_path = os.path.join(self.results_path, "logcat.txt")
+            with open(logcat_path, "w", encoding="utf-8") as handle:
+                handle.write(output)
+
+            self.log.info("Current logcat logs stored at %s", logcat_path)
+
+            logcat_last_path = os.path.join(self.results_path, "logcat_last.txt")
+            with open(logcat_last_path, "w", encoding="utf-8") as handle:
+                handle.write(last_output)
+
+            self.log.info(
+                "Logcat logs prior to last reboot stored at %s", logcat_last_path
+            )
+
+        self._adb_disconnect()

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

@@ -0,0 +1,311 @@
+# 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.android.artifacts.dumpsys_packages import DumpsysPackagesArtifact
+from mvt.android.utils import (
+    DANGEROUS_PERMISSIONS,
+    DANGEROUS_PERMISSIONS_THRESHOLD,
+    ROOT_PACKAGES,
+    SECURITY_PACKAGES,
+    SYSTEM_UPDATE_PACKAGES,
+)
+from mvt.common.module_types import (
+    ModuleAtomicResult,
+    ModuleResults,
+    ModuleSerializedResult,
+)
+
+from .base import AndroidExtraction
+
+
+class Packages(AndroidExtraction):
+    """This module extracts the list of installed packages."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+        self._user_needed = False
+
+    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+        records = []
+
+        timestamps = [
+            {"event": "package_install", "timestamp": record["timestamp"]},
+            {
+                "event": "package_first_install",
+                "timestamp": record["first_install_time"],
+            },
+            {"event": "package_last_update", "timestamp": record["last_update_time"]},
+        ]
+
+        for timestamp in timestamps:
+            records.append(
+                {
+                    "timestamp": timestamp["timestamp"],
+                    "module": self.__class__.__name__,
+                    "event": timestamp["event"],
+                    "data": f"{record['package_name']} (system: {record['system']},"
+                    f" third party: {record['third_party']})",
+                }
+            )
+
+        return records
+
+    def check_indicators(self) -> None:
+        for result in self.results:
+            if result["package_name"] in ROOT_PACKAGES:
+                self.log.warning(
+                    'Found an installed package related to rooting/jailbreaking: "%s"',
+                    result["package_name"],
+                )
+                self.detected.append(result)
+                continue
+
+            if result["package_name"] in SECURITY_PACKAGES and result["disabled"]:
+                self.log.warning(
+                    'Found a security package disabled: "%s"', result["package_name"]
+                )
+
+            if result["package_name"] in SYSTEM_UPDATE_PACKAGES and result["disabled"]:
+                self.log.warning(
+                    'System OTA update package "%s" disabled on the phone',
+                    result["package_name"],
+                )
+
+            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
+                )
+
+            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
+                    )
+
+    # @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"])
+
+    #     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)
+
+    @staticmethod
+    def parse_package_for_details(output: str) -> dict:
+        lines = []
+        in_packages = False
+        for line in output.splitlines():
+            if in_packages:
+                if line.strip() == "":
+                    break
+                lines.append(line)
+            if line.strip() == "Packages:":
+                in_packages = True
+
+        return DumpsysPackagesArtifact.parse_dumpsys_package_for_details(
+            "\n".join(lines)
+        )
+
+    def _get_files_for_package(self, package_name: str) -> list:
+        command = f"pm path {package_name}"
+        if self._user_needed:
+            command += " --user 0"
+        output = self._adb_command(command)
+        output = output.strip().replace("package:", "")
+        if not output:
+            return []
+
+        package_files = []
+        for file_path in output.splitlines():
+            file_path = file_path.strip()
+
+            md5 = self._adb_command(f"md5sum {file_path}").split(" ", maxsplit=1)[0]
+            sha1 = self._adb_command(f"sha1sum {file_path}").split(" ", maxsplit=1)[0]
+            sha256 = self._adb_command(f"sha256sum {file_path}").split(" ", maxsplit=1)[
+                0
+            ]
+            sha512 = self._adb_command(f"sha512sum {file_path}").split(" ", maxsplit=1)[
+                0
+            ]
+
+            package_files.append(
+                {
+                    "path": file_path,
+                    "md5": md5,
+                    "sha1": sha1,
+                    "sha256": sha256,
+                    "sha512": sha512,
+                }
+            )
+
+        return package_files
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        packages = self._adb_command("pm list packages -u -i -f")
+        if "java.lang.SecurityException" in packages or packages.strip() == "":
+            self._user_needed = True
+            packages = self._adb_command("pm list packages -u -i -f --user 0")
+
+        for line in packages.splitlines():
+            line = line.strip()
+            if not line.startswith("package:"):
+                continue
+
+            fields = line.split()
+            file_name, package_name = fields[0].split(":")[1].rsplit("=", 1)
+
+            try:
+                installer = fields[1].split("=")[1].strip()
+            except IndexError:
+                installer = None
+            else:
+                if installer == "null":
+                    installer = None
+
+            package_files = self._get_files_for_package(package_name)
+            new_package = {
+                "package_name": package_name,
+                "file_name": file_name,
+                "installer": installer,
+                "disabled": False,
+                "system": False,
+                "third_party": False,
+                "files": package_files,
+            }
+
+            dumpsys_package = self._adb_command(f"dumpsys package {package_name}")
+            package_details = self.parse_package_for_details(dumpsys_package)
+            new_package.update(package_details)
+
+            self.results.append(new_package)
+
+        cmds = [
+            {"field": "disabled", "arg": "-d"},
+            {"field": "system", "arg": "-s"},
+            {"field": "third_party", "arg": "-3"},
+        ]
+        for cmd in cmds:
+            command = f"pm list packages {cmd['arg']}"
+            if self._user_needed:
+                command += " --user 0"
+            output = self._adb_command(command)
+            for line in output.splitlines():
+                line = line.strip()
+                if not line.startswith("package:"):
+                    continue
+
+                package_name = line.split(":", 1)[1]
+                for i, result in enumerate(self.results):
+                    if result["package_name"] == package_name:
+                        self.results[i][cmd["field"]] = True
+
+        for result in self.results:
+            if not result["third_party"]:
+                continue
+
+            dangerous_permissions_count = 0
+            for perm in result["requested_permissions"]:
+                if perm in DANGEROUS_PERMISSIONS:
+                    dangerous_permissions_count += 1
+
+            if dangerous_permissions_count >= DANGEROUS_PERMISSIONS_THRESHOLD:
+                self.log.info(
+                    'Third-party package "%s" requested %d '
+                    "potentially dangerous permissions",
+                    result["package_name"],
+                    dangerous_permissions_count,
+                )
+
+        packages_to_lookup = []
+        for result in self.results:
+            if result["system"]:
+                continue
+
+            packages_to_lookup.append(result)
+            self.log.info(
+                'Found non-system package with name "%s" installed by "%s" on %s',
+                result["package_name"],
+                result["installer"],
+                result["timestamp"],
+            )
+
+        if not self.module_options.get("fast_mode", None):
+            self.check_virustotal(packages_to_lookup)
+
+        self.log.info(
+            "Extracted at total of %d installed package names", len(self.results)
+        )
+
+        self._adb_disconnect()

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

@@ -0,0 +1,43 @@
+# 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.android.artifacts.processes import Processes as ProcessesArtifact
+
+from .base import AndroidExtraction
+from mvt.common.module_types import ModuleResults
+
+
+class Processes(ProcessesArtifact, AndroidExtraction):
+    """This module extracts details on running processes."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        output = self._adb_command("ps -A")
+        self.parse(output)
+        self._adb_disconnect()
+
+        self.log.info("Extracted records on a total of %d processes", len(self.results))

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

@@ -0,0 +1,75 @@
+# 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.module_types import ModuleResults
+
+from .base import AndroidExtraction
+
+
+class RootBinaries(AndroidExtraction):
+    """This module extracts the list of installed packages."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+    def check_indicators(self) -> None:
+        for root_binary in self.results:
+            self.alertstore.high(
+                f'Found root binary "{root_binary}"',
+                "",
+                root_binary,
+            )
+
+    def run(self) -> None:
+        root_binaries = [
+            "su",
+            "busybox",
+            "supersu",
+            "Superuser.apk",
+            "KingoUser.apk",
+            "SuperSu.apk",
+            "magisk",
+            "magiskhide",
+            "magiskinit",
+            "magiskpolicy",
+        ]
+
+        self._adb_connect()
+
+        for root_binary in root_binaries:
+            root_binary = root_binary.strip()
+            if not root_binary:
+                continue
+
+            output = self._adb_command(f"which -a {root_binary}")
+            output = output.strip()
+
+            if not output:
+                continue
+
+            if "which: not found" in output:
+                continue
+
+            self.results.append(root_binary)
+
+        self._adb_disconnect()

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

@@ -0,0 +1,50 @@
+# 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.module_types import ModuleResults
+
+from .base import AndroidExtraction
+
+
+class SELinuxStatus(AndroidExtraction):
+    """This module checks if SELinux is being enforced."""
+
+    slug = "selinux_status"
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+        self.results: dict = {}
+
+    def run(self) -> None:
+        self._adb_connect()
+        output = self._adb_command("getenforce")
+        self._adb_disconnect()
+
+        status = output.lower().strip()
+        self.results["status"] = status
+
+        if status == "enforcing":
+            self.log.info("SELinux is being regularly enforced")
+        else:
+            self.log.warning('SELinux status is "%s"!', status)

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

@@ -0,0 +1,59 @@
+# 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.android.artifacts.settings import Settings as SettingsArtifact
+from mvt.common.module_types import ModuleResults
+
+from .base import AndroidExtraction
+
+
+class Settings(SettingsArtifact, AndroidExtraction):
+    """This module extracts Android system settings."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+        self.results = {} if not results else results
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        for namespace in ["system", "secure", "global"]:
+            out = self._adb_command(f"cmd settings list {namespace}")
+            if not out:
+                continue
+
+            self.results[namespace] = {}
+
+            for line in out.splitlines():
+                line = line.strip()
+                if line == "":
+                    continue
+
+                fields = line.split("=", 1)
+                try:
+                    self.results[namespace][fields[0]] = fields[1]
+                except IndexError:
+                    continue
+
+        self._adb_disconnect()

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

@@ -0,0 +1,186 @@
+# 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 sqlite3
+from typing import Optional
+
+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
+
+SMS_BUGLE_PATH = "data/data/com.google.android.apps.messaging/databases/bugle_db"
+SMS_BUGLE_QUERY = """
+SELECT
+    ppl.normalized_destination AS address,
+    p.timestamp AS timestamp,
+CASE WHEN m.sender_id IN
+(SELECT _id FROM participants WHERE contact_id=-1)
+THEN 2 ELSE 1 END incoming, p.text AS body
+FROM messages m, conversations c, parts p,
+        participants ppl, conversation_participants cp
+WHERE (m.conversation_id = c._id)
+    AND (m._id = p.message_id)
+    AND (cp.conversation_id = c._id)
+    AND (cp.participant_id = ppl._id);
+"""
+
+SMS_MMSSMS_PATH = "data/data/com.android.providers.telephony/databases/mmssms.db"
+SMS_MMSMS_QUERY = """
+SELECT
+    address AS address,
+    date_sent AS timestamp,
+    type as incoming,
+    body AS body
+FROM sms;
+"""
+
+
+class SMS(AndroidExtraction):
+    """This module extracts all SMS messages."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+        self.sms_db_type = 0
+
+    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+        body = record["body"].replace("\n", "\\n")
+        return {
+            "timestamp": record["isodate"],
+            "module": self.__class__.__name__,
+            "event": f"sms_{record['direction']}",
+            "data": f'{record.get("address", "unknown source")}: "{body}"',
+        }
+
+    def check_indicators(self) -> None:
+        if not self.indicators:
+            return
+
+        for message in self.results:
+            if "body" not in message:
+                continue
+
+            message_links = message.get("links", [])
+            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
+                )
+
+    def _parse_db(self, db_path: str) -> None:
+        """Parse an Android bugle_db SMS database file.
+
+        :param db_path: Path to the Android SMS database file to process
+
+        """
+        conn = sqlite3.connect(db_path)
+        cur = conn.cursor()
+
+        if self.sms_db_type == 1:
+            cur.execute(SMS_BUGLE_QUERY)
+        elif self.sms_db_type == 2:
+            cur.execute(SMS_MMSMS_QUERY)
+
+        names = [description[0] for description in cur.description]
+
+        for item in cur:
+            message = {}
+            for index, value in enumerate(item):
+                message[names[index]] = value
+
+            message["direction"] = "received" if message["incoming"] == 1 else "sent"
+            message["isodate"] = convert_unix_to_iso(message["timestamp"])
+
+            # Extract links in the message body
+            body = message.get("body", None)
+            if body:
+                links = check_for_links(message["body"])
+                message["links"] = links
+
+            self.results.append(message)
+
+        cur.close()
+        conn.close()
+
+        self.log.info("Extracted a total of %d SMS messages", len(self.results))
+
+    def _extract_sms_adb(self) -> None:
+        """Use the Android backup command to extract SMS data from the native
+        SMS app.
+
+        It is crucial to use the under-documented "-nocompress" flag to disable
+        the non-standard Java compression algorithm. This module only supports
+        an unencrypted ADB backup.
+        """
+        backup_tar = self._generate_backup("com.android.providers.telephony")
+        if not backup_tar:
+            return
+
+        try:
+            self.results = parse_tar_for_sms(backup_tar)
+        except AndroidBackupParsingError:
+            self.log.info(
+                "Impossible to read SMS from the Android Backup, "
+                "please extract the SMS and try extracting it with "
+                "Android Backup Extractor"
+            )
+            return
+
+        self.log.info("Extracted a total of %d SMS messages", len(self.results))
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        try:
+            if self._adb_check_file_exists(os.path.join("/", SMS_BUGLE_PATH)):
+                self.sms_db_type = 1
+                self._adb_process_file(
+                    os.path.join("/", SMS_BUGLE_PATH), self._parse_db
+                )
+            elif self._adb_check_file_exists(os.path.join("/", SMS_MMSSMS_PATH)):
+                self.sms_db_type = 2
+                self._adb_process_file(
+                    os.path.join("/", SMS_MMSSMS_PATH), self._parse_db
+                )
+
+            self._adb_disconnect()
+            return
+        except InsufficientPrivileges:
+            pass
+
+        self.log.info(
+            "No SMS database found. Trying extraction of SMS data "
+            "using Android backup feature."
+        )
+        self._extract_sms_adb()
+
+        self._adb_disconnect()

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

@@ -0,0 +1,121 @@
+# 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 sqlite3
+from typing import Optional
+
+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
+
+WHATSAPP_PATH = "data/data/com.whatsapp/databases/msgstore.db"
+
+
+class Whatsapp(AndroidExtraction):
+    """This module extracts all WhatsApp messages containing links."""
+
+    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: ModuleResults = [],
+    ) -> None:
+        super().__init__(
+            file_path=file_path,
+            target_path=target_path,
+            results_path=results_path,
+            module_options=module_options,
+            log=log,
+            results=results,
+        )
+
+    def serialize(self, record: ModuleAtomicResult) -> ModuleSerializedResult:
+        text = record["data"].replace("\n", "\\n")
+        return {
+            "timestamp": record["isodate"],
+            "module": self.__class__.__name__,
+            "event": f"whatsapp_msg_{record['direction']}",
+            "data": f'"{text}"',
+        }
+
+    def check_indicators(self) -> None:
+        if not self.indicators:
+            return
+
+        for message in self.results:
+            if "data" not in message:
+                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
+                )
+                continue
+
+    def _parse_db(self, db_path: str) -> None:
+        """Parse an Android msgstore.db WhatsApp database file.
+
+        :param db_path: Path to the Android WhatsApp database file to process
+
+        """
+        conn = sqlite3.connect(db_path)
+        cur = conn.cursor()
+        cur.execute(
+            """
+            SELECT * FROM messages;
+        """
+        )
+        names = [description[0] for description in cur.description]
+
+        messages = []
+        for item in cur:
+            message = {}
+            for index, value in enumerate(item):
+                message[names[index]] = value
+
+            if not message["data"]:
+                continue
+
+            message["direction"] = "send" if message["key_from_me"] == 1 else "received"
+            message["isodate"] = convert_unix_to_iso(message["timestamp"])
+
+            # If we find links in the messages or if they are empty we add them
+            # to the list.
+            if check_for_links(message["data"]) or message["data"].strip() == "":
+                if message.get("thumb_image"):
+                    message["thumb_image"] = base64.b64encode(message["thumb_image"])
+
+                messages.append(message)
+
+        cur.close()
+        conn.close()
+
+        self.log.info(
+            "Extracted a total of %d WhatsApp messages containing links", len(messages)
+        )
+        self.results = messages
+
+    def run(self) -> None:
+        self._adb_connect()
+
+        try:
+            self._adb_process_file(os.path.join("/", WHATSAPP_PATH), self._parse_db)
+        except Exception as exc:
+            self.log.error(exc)
+
+        self._adb_disconnect()

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

@@ -92,6 +92,7 @@ class AQFFiles(AndroidQFModule):
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )
+                self.alertstore.log_latest()
                 continue
 
             # NOTE: Update with final path used for Android collector.
@@ -106,6 +107,7 @@ class AQFFiles(AndroidQFModule):
 
                     msg = f'Found {file_type}file at suspicious path "{result["path"]}"'
                     self.alertstore.high(msg, "", result)
+                    self.alertstore.log_latest()
 
             if result.get("sha256", "") == "":
                 continue

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

@@ -49,6 +49,7 @@ class AQFPackages(AndroidQFModule):
                     "",
                     result,
                 )
+                self.alertstore.log_latest()
                 continue
 
             # Detections for apps installed via unusual methods.
@@ -58,36 +59,41 @@ class AQFPackages(AndroidQFModule):
                     "",
                     result,
                 )
+                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.alertstore.log_latest()
             elif result["installer"] == "null" and result["system"] is False:
-                self.alertstore.medium(
+                self.alertstore.high(
                     f'Found a non-system package installed via adb or another method: "{result["name"]}"',
                     "",
                     result,
                 )
+                self.alertstore.log_latest()
             elif result["installer"] in PLAY_STORE_INSTALLERS:
                 pass
 
             # 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.medium(
+                self.alertstore.high(
                     f'Security package "{result["name"]}" disabled on the phone',
                     "",
                     result,
                 )
+                self.alertstore.log_latest()
 
             if result["name"] in SYSTEM_UPDATE_PACKAGES and package_disabled:
-                self.alertstore.medium(
+                self.alertstore.high(
                     f'System OTA update package "{result["name"]}" disabled on the phone',
                     "",
                     result,
                 )
+                self.alertstore.log_latest()
 
             if not self.indicators:
                 continue
@@ -97,6 +103,7 @@ class AQFPackages(AndroidQFModule):
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )
+                self.alertstore.log_latest()
 
             for package_file in result.get("files", []):
                 ioc_match = self.indicators.check_file_hash(
@@ -106,6 +113,7 @@ class AQFPackages(AndroidQFModule):
                     self.alertstore.critical(
                         ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                     )
+                    self.alertstore.log_latest()
 
                 if "certificate" not in package_file:
                     continue
@@ -123,6 +131,7 @@ class AQFPackages(AndroidQFModule):
                             result,
                             matched_indicator=ioc_match.ioc,
                         )
+                        self.alertstore.log_latest()
                         break
 
     def run(self) -> None:

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

@@ -51,6 +51,7 @@ class RootBinaries(AndroidQFModule):
                 "",
                 result,
             )
+            self.alertstore.log_latest()
 
         if self.results:
             self.log.warning(

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

@@ -6,7 +6,6 @@ import datetime
 import fnmatch
 import logging
 import os
-from pathlib import Path
 from typing import List, Optional
 from zipfile import ZipFile
 
@@ -71,10 +70,7 @@ class BugReportModule(MVTModule):
         else:
             if not self.extract_path:
                 raise ValueError("extract_path is not set")
-            joined = os.path.join(self.extract_path, file_path)
-            if not Path(joined).resolve().is_relative_to(Path(self.extract_path).resolve()):
-                raise ValueError("unsafe file_path")
-            handle = open(joined, "rb")
+            handle = open(os.path.join(self.extract_path, file_path), "rb")
 
         data = handle.read()
         handle.close()

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

@@ -41,14 +41,10 @@ class DumpsysReceivers(DumpsysReceiversArtifact, BugReportModule):
                 receiver_name = self.results[result][0]["receiver"]
 
                 # return IoC if the stix2 process name a substring of the receiver name
-                ioc_match = self.indicators.check_receiver_prefix(receiver_name)
-                if ioc_match:
-                    self.alertstore.critical(
-                        ioc_match.message,
-                        "",
-                        self.results[result][0],
-                        matched_indicator=ioc_match.ioc,
-                    )
+                ioc = self.indicators.check_receiver_prefix(receiver_name)
+                if ioc:
+                    self.results[result][0]["matched_indicator"] = ioc
+                    self.detected.append(result)
                     continue
 
 

src/mvt/android/modules/intrusion_logs/__init__.py

@@ -1,20 +0,0 @@
-# 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/
-
-from .connect_event import ConnectEvent
-from .dns_event import DnsEvent
-from .security_event import SecurityEvent
-
-INTRUSION_LOGS_MODULES = [
-    DnsEvent,
-    ConnectEvent,
-    SecurityEvent,
-]
-
-KNOWN_INTRUSION_LOG_EVENT_TYPES = {
-    "connect_event",
-    "dns_event",
-    "security_event",
-}

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

@@ -1,395 +0,0 @@
-# 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 datetime
-import io
-import json
-import logging
-import zipfile
-from pathlib import Path
-from typing import Optional, Union
-
-try:
-    import zoneinfo
-except ImportError:
-    from backports import zoneinfo  # type: ignore[no-redef]
-
-from mvt.common.module import MVTModule
-from mvt.common.utils import convert_datetime_to_iso, convert_unix_to_iso
-
-
-class IntrusionLogsModule(MVTModule):
-    """Base class for modules analyzing intrusion logs (newline-delimited JSON).
-
-    Performance note
-    ----------------
-    Log files can be large and are shared by every module in this package.
-    To avoid re-reading and re-parsing the same files N times (once per
-    module), the command layer should call :meth:`load_all_events` exactly
-    once and then assign the returned dict to the ``il_events_by_type``
-    attribute of every module instance **before** calling ``run_module``.
-
-    When ``il_events_by_type`` is populated:
-    * :meth:`collect_txt` becomes a no-op (no disk I/O).
-    * :meth:`parse_collected_txt` iterates the in-memory list for the
-      requested event type instead of re-parsing raw text.
-
-    Modules that are used standalone (e.g. in tests) still work as before
-    because ``il_events_by_type`` defaults to ``None``, which preserves the
-    original file-loading code path.
-    """
-
-    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,
-        )
-        # Raw file content collected by collect_txt (fallback path only).
-        self.il_files: list[tuple[str, str]] = []
-
-        # Pre-parsed events injected by the command layer.
-        # Keys are event-type strings (e.g. "dns_event"), values are lists of
-        # raw event-data dicts exactly as they appear in the JSON lines.
-        # When this is not None, collect_txt and parse_collected_txt use it
-        # instead of touching the file system.
-        self.il_events_by_type: Optional[dict[str, list[dict]]] = None
-
-    # ------------------------------------------------------------------
-    # Serialization helper
-    # ------------------------------------------------------------------
-
-    def serialize(self, record: dict) -> Union[dict, list]:
-        """Serialize a record for timeline output."""
-        return {
-            "timestamp": record.get("timestamp", record.get("isodate")),
-            "module": self.__class__.__name__,
-            "event": record.get("event_type", ""),
-            "data": str(record),
-        }
-
-    # ------------------------------------------------------------------
-    # File collection
-    # ------------------------------------------------------------------
-
-    def collect_txt(self, source) -> None:
-        """Collect text log files from *source* into ``self.il_files``.
-
-        Entry points:
-        * directory → walk recursively
-        * zip file  → walk zip entries
-        * anything else → silently skip
-
-        If ``self.il_events_by_type`` has already been populated (i.e. the
-        command layer pre-loaded the events), this method returns immediately
-        without any disk I/O.
-        """
-        if self.il_events_by_type is not None:
-            self.log.debug(
-                "Pre-loaded events available — skipping file collection for %s",
-                self.__class__.__name__,
-            )
-            return
-
-        path = Path(source)
-
-        if path.is_dir():
-            self._walk_directory(path)
-            return
-
-        if path.is_file() and path.suffix.lower() == ".zip":
-            try:
-                with zipfile.ZipFile(path) as z:
-                    self._walk_zip(z)
-            except zipfile.BadZipFile:
-                self.log.debug("Skipping invalid zip: %s", path)
-            return
-
-        self.log.debug("Skipping unsupported source: %s", source)
-
-    def _walk_directory(self, root: Path, prefix: str = "") -> None:
-        for item in root.iterdir():
-            if item.is_dir():
-                self._walk_directory(item, prefix=f"{prefix}{item.name}/")
-                continue
-
-            if item.suffix.lower() == ".txt":
-                self.il_files.append(
-                    (f"{prefix}{item.name}", item.read_text(errors="ignore"))
-                )
-
-            elif item.suffix.lower() == ".zip":
-                try:
-                    with zipfile.ZipFile(item) as z:
-                        self._walk_zip(z, prefix=f"{prefix}{item.name}::")
-                except zipfile.BadZipFile:
-                    self.log.warning("Skipping invalid zip: %s", item)
-
-    def _walk_zip(self, zf: zipfile.ZipFile, prefix: str = "") -> None:
-        for info in zf.infolist():
-            if info.is_dir():
-                continue
-
-            name = info.filename
-            with zf.open(info) as f:
-                data = f.read()
-
-            if name.lower().endswith(".txt"):
-                self.il_files.append((f"{prefix}{name}", data.decode(errors="ignore")))
-
-            elif name.lower().endswith(".zip"):
-                with zipfile.ZipFile(io.BytesIO(data)) as inner:
-                    self._walk_zip(inner, prefix=f"{prefix}{name}::")
-
-    # ------------------------------------------------------------------
-    # Single-pass loader (used by the command layer)
-    # ------------------------------------------------------------------
-
-    def load_all_events(self, source) -> dict[str, list[dict]]:
-        """Read every log file under *source* **once** and parse all JSON
-        lines in a single pass, routing events into per-type buckets.
-
-        Returns a ``dict`` mapping *event_type* strings to lists of raw
-        event-data dicts.  The result is also stored in
-        ``self.il_events_by_type`` so that subsequent calls to
-        :meth:`collect_txt` and :meth:`parse_collected_txt` on *this*
-        instance are no-ops.
-
-        Intended usage in the command layer::
-
-            loader = IntrusionLogsModule(target_path=target, log=log)
-            all_events = loader.load_all_events(target)
-
-            for module_cls in INTRUSION_LOGS_MODULES:
-                m = module_cls(target_path=target, ...)
-                m.il_events_by_type = all_events   # inject — no re-reading
-                run_module(m)
-        """
-        # Reset so that _collect_txt actually runs (il_events_by_type is None).
-        self.il_events_by_type = None
-        self.il_files = []
-        self.collect_txt(source)
-
-        events_by_type: dict[str, list[dict]] = {}
-        # JSON fingerprints used to drop events that appear in more than one
-        # log file (overlapping daily files are the most common source of
-        # cross-file duplicates).
-        seen_fingerprints: set[str] = set()
-        total_lines = 0
-        skipped_lines = 0
-        duplicate_lines = 0
-
-        for file_name, text in self.il_files:
-            for line_num, line in enumerate(text.splitlines(), start=1):
-                line = line.strip()
-                if not line:
-                    continue
-
-                total_lines += 1
-                try:
-                    entry = json.loads(line)
-                    for event_type, event_data in entry.items():
-                        if isinstance(event_data, dict):
-                            fingerprint = json.dumps(event_data, sort_keys=True)
-                            if fingerprint in seen_fingerprints:
-                                duplicate_lines += 1
-                                continue
-                            seen_fingerprints.add(fingerprint)
-                            events_by_type.setdefault(event_type, []).append(event_data)
-                except json.JSONDecodeError as e:
-                    skipped_lines += 1
-                    self.log.warning(
-                        "Failed to parse JSON on line %d in %s: %s",
-                        line_num,
-                        file_name,
-                        e,
-                    )
-                except Exception as e:
-                    skipped_lines += 1
-                    self.log.warning(
-                        "Error processing line %d in %s: %s",
-                        line_num,
-                        file_name,
-                        e,
-                    )
-
-        if duplicate_lines:
-            self.log.info(
-                "Removed %d duplicate event(s) seen across multiple log files",
-                duplicate_lines,
-            )
-
-        self.log.info(
-            "Loaded %d log files, parsed %d lines (%d skipped), found event types: %s",
-            len(self.il_files),
-            total_lines,
-            skipped_lines,
-            {k: len(v) for k, v in events_by_type.items()},
-        )
-
-        # Cache so this instance also benefits from the fast path.
-        self.il_events_by_type = events_by_type
-        return events_by_type
-
-    # ------------------------------------------------------------------
-    # Parsing
-    # ------------------------------------------------------------------
-
-    def parse_collected_txt(self, event_type: str) -> None:
-        """Parse collected log text and dispatch events of *event_type*.
-
-        Fast path
-        ~~~~~~~~~
-        When ``self.il_events_by_type`` is populated (injected by the command
-        layer after a single shared :meth:`load_all_events` call), the method
-        iterates the already-parsed in-memory list for *event_type* — no
-        re-reading, no re-parsing of JSON.
-
-        Fallback path
-        ~~~~~~~~~~~~~
-        When ``self.il_events_by_type`` is ``None``, the method falls back to
-        iterating ``self.il_files`` and parsing each JSON line, which is the
-        original behaviour.
-        """
-        if self.il_events_by_type is not None:
-            events = self.il_events_by_type.get(event_type, [])
-            self.log.debug(
-                "Using pre-loaded events: dispatching %d '%s' events",
-                len(events),
-                event_type,
-            )
-            for event_data in events:
-                try:
-                    # Work on a shallow copy so that mutations in one module
-                    # (e.g. adding "timestamp") do not affect other modules
-                    # that share the same dict reference.
-                    self.process_event(dict(event_data))
-                except Exception as e:
-                    self.log.warning(
-                        "Error processing pre-parsed '%s' event: %s",
-                        event_type,
-                        e,
-                    )
-            return
-
-        # Fallback: parse raw text collected by collect_txt().
-        # Use the same JSON-fingerprint approach as MVTModule._deduplicate_timeline
-        # to drop events that appear verbatim in more than one log file.
-        seen_fingerprints: set[str] = set()
-        duplicate_count = 0
-        for file_name, text in self.il_files:
-            for line_num, line in enumerate(text.splitlines(), start=1):
-                line = line.strip()
-                if not line:
-                    continue
-                try:
-                    entry = json.loads(line)
-                    if event_type in entry:
-                        event_data = entry[event_type]
-                        fingerprint = json.dumps(event_data, sort_keys=True)
-                        if fingerprint in seen_fingerprints:
-                            duplicate_count += 1
-                            continue
-                        seen_fingerprints.add(fingerprint)
-                        event_data["event_type"] = event_type
-                        self.process_event(event_data)
-                except json.JSONDecodeError as e:
-                    self.log.warning(
-                        "Failed to parse JSON on line %d in %s: %s",
-                        line_num,
-                        file_name,
-                        str(e),
-                    )
-                except Exception as e:
-                    self.log.warning(
-                        "Error processing line %d in %s: %s",
-                        line_num,
-                        file_name,
-                        str(e),
-                    )
-        if duplicate_count:
-            self.log.info(
-                "Removed %d duplicate '%s' event(s) seen across multiple log files",
-                duplicate_count,
-                event_type,
-            )
-
-    # ------------------------------------------------------------------
-    # Event processing
-    # ------------------------------------------------------------------
-
-    def process_event(self, event_data: dict) -> None:
-        """Process an individual event.  Override this in subclasses.
-
-        Args:
-            event_data: Dictionary containing the event data.
-        """
-        self.results.append(event_data)
-
-    # ------------------------------------------------------------------
-    # Timestamp localisation
-    # ------------------------------------------------------------------
-
-    def _localize_timestamp(self, event_time_seconds: float) -> str:
-        """Convert a Unix timestamp (in seconds) to an ISO string.
-
-        When the device timezone is available via ``module_options["device_timezone"]``
-        (a IANA timezone name such as ``"Europe/Paris"`` read from
-        ``persist.sys.timezone`` in ``getprop.txt``), the UTC instant is
-        converted to the device's local time before formatting — mirroring the
-        approach used by ``AQFFiles``.
-
-        When no timezone is configured the method falls back to UTC, which is
-        consistent with all other MVT modules that call ``convert_unix_to_iso``.
-
-        Args:
-            event_time_seconds: Unix epoch timestamp expressed in **seconds**
-                (callers are responsible for dividing ms/ns values first).
-
-        Returns:
-            ISO-formatted datetime string (``YYYY-mm-dd HH:MM:SS.ffffff``).
-            The string always represents the device-local time (or UTC when no
-            timezone is known); no UTC offset suffix is appended, matching the
-            format produced by :func:`mvt.common.utils.convert_unix_to_iso`.
-        """
-        tz_name: Optional[str] = self.module_options.get("device_timezone")
-        if tz_name:
-            try:
-                device_tz = zoneinfo.ZoneInfo(tz_name)
-                utc_dt = datetime.datetime.fromtimestamp(
-                    event_time_seconds, tz=datetime.timezone.utc
-                )
-                local_dt = utc_dt.astimezone(device_tz)
-                # Strip tzinfo so that convert_datetime_to_iso outputs the
-                # local wall-clock time without a timezone suffix.  This is
-                # the same pattern used by AQFFiles.
-                return convert_datetime_to_iso(local_dt.replace(tzinfo=None))
-            except Exception as e:
-                self.log.warning(
-                    "Could not apply device timezone '%s', falling back to UTC: %s",
-                    tz_name,
-                    e,
-                )
-
-        return convert_unix_to_iso(event_time_seconds)
-
-    # ------------------------------------------------------------------
-    # Abstract interface
-    # ------------------------------------------------------------------
-
-    def run(self) -> None:
-        """Main execution method.  Must be implemented by subclasses."""
-        raise NotImplementedError("Subclasses must implement the run() method")

src/mvt/android/modules/intrusion_logs/connect_event.py

@@ -1,121 +0,0 @@
-# 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, Union
-
-from .base import IntrusionLogsModule
-
-
-class ConnectEvent(IntrusionLogsModule):
-    """This module analyzes network connection events from intrusion logs."""
-
-    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,
-        )
-
-    def check_indicators(self) -> None:
-        """Check connection events against indicators of compromise."""
-        if not self.indicators:
-            return
-
-        for result in self.results:
-            # Check IP address against indicators
-            ip_address = result.get("ip_address", "")
-            if ip_address:
-                # Clean IP address (remove leading slash and extract IP from format like "ip6-localhost/::1")
-                if "/" in ip_address:
-                    parts = ip_address.split("/")
-                    clean_ip = parts[-1] if len(parts) > 1 else parts[0]
-                else:
-                    clean_ip = ip_address.lstrip("/")
-
-                # Skip localhost addresses
-                if clean_ip and clean_ip not in ["::1", "127.0.0.1", "0.0.0.0"]:
-                    ioc = self.indicators.check_domain(clean_ip)
-                    if ioc:
-                        result["matched_ip"] = clean_ip
-                        self.alertstore.critical(
-                            ioc.message,
-                            result.get("timestamp") or "",
-                            result,
-                            matched_indicator=ioc.ioc,
-                        )
-
-            # Check package name against app identifiers
-            package_name = result.get("package_name", "")
-            if package_name:
-                ioc = self.indicators.check_app_id(package_name)
-                if ioc:
-                    self.alertstore.critical(
-                        ioc.message,
-                        result.get("timestamp") or "",
-                        result,
-                        matched_indicator=ioc.ioc,
-                    )
-
-    def serialize(self, record: dict) -> Union[dict, list]:
-        """Serialize a connection event record for timeline output."""
-        ip_address = record.get("ip_address", "")
-        port = record.get("port", 0)
-        package_name = record.get("package_name", "")
-        matched_ip = record.get("matched_ip", "")
-
-        # Clean IP address for display
-        if "/" in ip_address:
-            parts = ip_address.split("/")
-            clean_ip = parts[-1] if len(parts) > 1 else parts[0]
-        else:
-            clean_ip = ip_address.lstrip("/")
-
-        # Indicate when IP matched an IoC
-        if matched_ip:
-            data = f"Connection to {clean_ip}:{port} by {package_name} [Matched IP: {matched_ip}]"
-        else:
-            data = f"Connection to {clean_ip}:{port} by {package_name}"
-
-        return {
-            "timestamp": record.get("timestamp"),
-            "module": self.__class__.__name__,
-            "event": "network_connection",
-            "data": data,
-        }
-
-    def process_event(self, event_data: dict) -> None:
-        """Process a connection event and add it to results."""
-        # Convert event_time from milliseconds to ISO format
-        event_time = event_data.get("event_time")
-        if event_time:
-            # Android event times are in milliseconds since epoch
-            event_data["timestamp"] = self._localize_timestamp(event_time / 1000.0)
-        else:
-            event_data["timestamp"] = None
-
-        self.results.append(event_data)
-
-    def run(self) -> None:
-        """Extract and analyze connection events from intrusion logs."""
-        if not self.target_path:
-            self.log.error("No target path specified")
-            return
-
-        self.collect_txt(self.target_path)
-        self.parse_collected_txt("connect_event")
-
-        self.log.info("Identified %d connection events", len(self.results))

src/mvt/android/modules/intrusion_logs/dns_event.py

@@ -1,141 +0,0 @@
-# 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, Union
-
-from .base import IntrusionLogsModule
-
-
-class DnsEvent(IntrusionLogsModule):
-    """This module analyzes DNS events from intrusion logs."""
-
-    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,
-        )
-
-    def check_indicators(self) -> None:
-        """Check DNS events against indicators of compromise."""
-        if not self.indicators:
-            return
-
-        for result in self.results:
-            # Check hostname against domain indicators
-            hostname = result.get("hostname", "")
-            if hostname:
-                ioc = self.indicators.check_domain(hostname)
-                if ioc:
-                    self.alertstore.critical(
-                        ioc.message,
-                        result.get("timestamp") or "",
-                        result,
-                        matched_indicator=ioc.ioc,
-                    )
-
-            # Check IP addresses against indicators
-            ip_addresses = result.get("ip_addresses", [])
-            matched_ips = []
-            for ip_addr in ip_addresses:
-                # Remove leading slash if present
-                clean_ip = (
-                    ip_addr.lstrip("/") if isinstance(ip_addr, str) else str(ip_addr)
-                )
-                if clean_ip and clean_ip != "0.0.0.0":
-                    ioc = self.indicators.check_domain(clean_ip)
-                    if ioc:
-                        matched_ips.append(clean_ip)
-                        self.alertstore.critical(
-                            ioc.message,
-                            result.get("timestamp") or "",
-                            result,
-                            matched_indicator=ioc.ioc,
-                        )
-
-            # Store matched IPs for timeline display
-            if matched_ips:
-                result["matched_ips"] = matched_ips
-
-            # Check package name against app identifiers
-            package_name = result.get("package_name", "")
-            if package_name:
-                ioc = self.indicators.check_app_id(package_name)
-                if ioc:
-                    self.alertstore.critical(
-                        ioc.message,
-                        result.get("timestamp") or "",
-                        result,
-                        matched_indicator=ioc.ioc,
-                    )
-
-    def serialize(self, record: dict) -> Union[dict, list]:
-        """Serialize a DNS event record for timeline output."""
-        hostname = record.get("hostname", "")
-        package_name = record.get("package_name", "")
-
-        # Get IP addresses for display
-        ip_addresses = record.get("ip_addresses", [])
-        matched_ips = record.get("matched_ips", [])
-
-        # Clean up IP addresses (remove leading slashes)
-        clean_ips = []
-        for ip_addr in ip_addresses:
-            clean_ip = ip_addr.lstrip("/") if isinstance(ip_addr, str) else str(ip_addr)
-            if clean_ip and clean_ip != "0.0.0.0":
-                clean_ips.append(clean_ip)
-
-        # Build the data string with actual IPs
-        if matched_ips:
-            # Highlight matched IPs in the output
-            ip_display = ", ".join(matched_ips)
-            data = f"DNS query for {hostname} by {package_name} [Matched IPs: {ip_display}]"
-        elif clean_ips:
-            ip_display = ", ".join(clean_ips)
-            data = f"DNS query for {hostname} by {package_name} [IPs: {ip_display}]"
-        else:
-            data = f"DNS query for {hostname} by {package_name}"
-
-        return {
-            "timestamp": record.get("timestamp"),
-            "module": self.__class__.__name__,
-            "event": "dns_query",
-            "data": data,
-        }
-
-    def process_event(self, event_data: dict) -> None:
-        """Process a DNS event and add it to results."""
-        # Convert event_time from milliseconds to ISO format
-        event_time = event_data.get("event_time")
-        if event_time:
-            # Android event times are in milliseconds since epoch
-            event_data["timestamp"] = self._localize_timestamp(event_time / 1000.0)
-        else:
-            event_data["timestamp"] = None
-
-        self.results.append(event_data)
-
-    def run(self) -> None:
-        """Extract and analyze DNS events from intrusion logs."""
-        if not self.target_path:
-            self.log.error("No target path specified")
-            return
-
-        self.collect_txt(self.target_path)
-        self.parse_collected_txt("dns_event")
-
-        self.log.info("Identified %d DNS events", len(self.results))

src/mvt/android/modules/intrusion_logs/security_event.py

@@ -1,758 +0,0 @@
-# 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, Union
-
-from .base import IntrusionLogsModule
-
-# Security event tags based on Android SecurityLog API
-# Reference: https://developer.android.com/reference/android/app/admin/SecurityLog
-SECURITY_EVENT_TAGS = {
-    # ADB events (API level 24)
-    "adb_shell_interactive": {
-        "tag_id": 210001,
-        "name": "ADB Shell Interactive",
-        "description": "An ADB interactive shell was opened via 'adb shell'",
-    },
-    "adb_shell_cmd": {
-        "tag_id": 210002,
-        "name": "ADB Shell Command",
-        "description": "A shell command was issued over ADB via 'adb shell <command>'",
-    },
-    "adb_sync_recv_file": {
-        "tag_id": 210003,
-        "name": "ADB Sync Recv File",
-        "description": "A file was pulled from the device via adb daemon (adb pull)",
-    },
-    "adb_sync_send_file": {
-        "tag_id": 210004,
-        "name": "ADB Sync Send File",
-        "description": "A file was pushed to the device via adb daemon (adb push)",
-    },
-    # App process events (API level 24)
-    "app_process_start": {
-        "tag_id": 210005,
-        "name": "App Process Start",
-        "description": "An app process was started",
-    },
-    # Keyguard events (API level 24)
-    "keyguard_dismissed": {
-        "tag_id": 210006,
-        "name": "Keyguard Dismissed",
-        "description": "Keyguard has been dismissed",
-    },
-    "keyguard_dismiss_auth_attempt": {
-        "tag_id": 210007,
-        "name": "Keyguard Dismiss Auth Attempt",
-        "description": "Authentication attempt to dismiss keyguard",
-    },
-    "keyguard_secured": {
-        "tag_id": 210008,
-        "name": "Keyguard Secured",
-        "description": "Device has been locked",
-    },
-    # OS events (API level 28)
-    "os_startup": {
-        "tag_id": 210009,
-        "name": "OS Startup",
-        "description": "Android OS has started",
-    },
-    "os_shutdown": {
-        "tag_id": 210010,
-        "name": "OS Shutdown",
-        "description": "Android OS has shutdown",
-    },
-    # Logging events (API level 28)
-    "logging_started": {
-        "tag_id": 210011,
-        "name": "Logging Started",
-        "description": "Audit logging has started",
-    },
-    "logging_stopped": {
-        "tag_id": 210012,
-        "name": "Logging Stopped",
-        "description": "Audit logging has stopped",
-    },
-    # Media events (API level 28)
-    "media_mount": {
-        "tag_id": 210013,
-        "name": "Media Mount",
-        "description": "Removable media has been mounted",
-    },
-    "media_unmount": {
-        "tag_id": 210014,
-        "name": "Media Unmount",
-        "description": "Removable media was unmounted",
-    },
-    # Log buffer event (API level 28)
-    "log_buffer_size_critical": {
-        "tag_id": 210015,
-        "name": "Log Buffer Size Critical",
-        "description": "Audit log buffer has reached 90% capacity",
-    },
-    # Password policy events (API level 28)
-    "password_expiration_set": {
-        "tag_id": 210016,
-        "name": "Password Expiration Set",
-        "description": "Admin set password expiration timeout",
-    },
-    "password_complexity_set": {
-        "tag_id": 210017,
-        "name": "Password Complexity Set",
-        "description": "Admin set password complexity requirement",
-    },
-    "password_history_length_set": {
-        "tag_id": 210018,
-        "name": "Password History Length Set",
-        "description": "Admin set password history length",
-    },
-    "max_screen_lock_timeout_set": {
-        "tag_id": 210019,
-        "name": "Max Screen Lock Timeout Set",
-        "description": "Admin set maximum screen lock timeout",
-    },
-    "max_password_attempts_set": {
-        "tag_id": 210020,
-        "name": "Max Password Attempts Set",
-        "description": "Admin set maximum failed password attempts before wipe",
-    },
-    "keyguard_disabled_features_set": {
-        "tag_id": 210021,
-        "name": "Keyguard Disabled Features Set",
-        "description": "Admin set disabled keyguard features",
-    },
-    # Remote lock event (API level 28)
-    "remote_lock": {
-        "tag_id": 210022,
-        "name": "Remote Lock",
-        "description": "Admin remotely locked the device or profile",
-    },
-    # Wipe failure event (API level 28)
-    "wipe_failure": {
-        "tag_id": 210023,
-        "name": "Wipe Failure",
-        "description": "Failed to wipe device or user data",
-    },
-    # Cryptographic key events (API level 28)
-    "key_generated": {
-        "tag_id": 210024,
-        "name": "Key Generated",
-        "description": "Cryptographic key was generated",
-    },
-    "key_import": {
-        "tag_id": 210025,
-        "name": "Key Import",
-        "description": "Cryptographic key was imported",
-    },
-    "key_destruction": {
-        "tag_id": 210026,
-        "name": "Key Destruction",
-        "description": "Cryptographic key was destroyed",
-    },
-    # User restriction events (API level 28)
-    "user_restriction_added": {
-        "tag_id": 210027,
-        "name": "User Restriction Added",
-        "description": "Admin added a user restriction",
-    },
-    "user_restriction_removed": {
-        "tag_id": 210028,
-        "name": "User Restriction Removed",
-        "description": "Admin removed a user restriction",
-    },
-    # Certificate events (API level 28)
-    "cert_authority_installed": {
-        "tag_id": 210029,
-        "name": "Certificate Authority Installed",
-        "description": "Root certificate installed to trusted storage",
-    },
-    "cert_authority_removed": {
-        "tag_id": 210030,
-        "name": "Certificate Authority Removed",
-        "description": "Root certificate removed from trusted storage",
-    },
-    "crypto_self_test_completed": {
-        "tag_id": 210031,
-        "name": "Crypto Self Test Completed",
-        "description": "Cryptographic functionality self test completed",
-    },
-    "key_integrity_violation": {
-        "tag_id": 210032,
-        "name": "Key Integrity Violation",
-        "description": "Key integrity violation detected",
-    },
-    "cert_validation_failure": {
-        "tag_id": 210033,
-        "name": "Certificate Validation Failure",
-        "description": "X.509v3 certificate validation failed",
-    },
-    # Camera policy event (API level 30)
-    "camera_policy_set": {
-        "tag_id": 210034,
-        "name": "Camera Policy Set",
-        "description": "Admin set policy to disable camera",
-    },
-    # Password complexity events (API level 31/33)
-    "password_complexity_required": {
-        "tag_id": 210035,
-        "name": "Password Complexity Required",
-        "description": "Admin set password complexity requirement using predefined levels",
-    },
-    "password_changed": {
-        "tag_id": 210036,
-        "name": "Password Changed",
-        "description": "User changed their lockscreen password",
-    },
-    # WiFi events (API level 33)
-    "wifi_connection": {
-        "tag_id": 210037,
-        "name": "WiFi Connection",
-        "description": "Device attempted to connect to a managed WiFi network",
-    },
-    "wifi_disconnection": {
-        "tag_id": 210038,
-        "name": "WiFi Disconnection",
-        "description": "Device disconnected from a managed WiFi network",
-    },
-    # Bluetooth events (API level 33)
-    "bluetooth_connection": {
-        "tag_id": 210039,
-        "name": "Bluetooth Connection",
-        "description": "Device attempted to connect to a Bluetooth device",
-    },
-    "bluetooth_disconnection": {
-        "tag_id": 210040,
-        "name": "Bluetooth Disconnection",
-        "description": "Device disconnected from a Bluetooth device",
-    },
-    # Package events (API level 34)
-    "package_installed": {
-        "tag_id": 210041,
-        "name": "Package Installed",
-        "description": "Application package was installed",
-    },
-    "package_updated": {
-        "tag_id": 210042,
-        "name": "Package Updated",
-        "description": "Application package was updated",
-    },
-    "package_uninstalled": {
-        "tag_id": 210043,
-        "name": "Package Uninstalled",
-        "description": "Application package was uninstalled",
-    },
-    # Backup service event (API level 35)
-    "backup_service_toggled": {
-        "tag_id": 210044,
-        "name": "Backup Service Toggled",
-        "description": "Admin enabled or disabled backup service",
-    },
-    # NFC events (API level 36)
-    "nfc_enabled": {
-        "tag_id": 210045,
-        "name": "NFC Enabled",
-        "description": "NFC service is enabled",
-    },
-    "nfc_disabled": {
-        "tag_id": 210046,
-        "name": "NFC Disabled",
-        "description": "NFC service is disabled",
-    },
-}
-
-SECURITY_EVENT_METADATA_KEYS = {
-    "event_time",
-    "event_type",
-    "timestamp",
-}
-
-
-class SecurityEvent(IntrusionLogsModule):
-    """This module analyzes security events from intrusion logs."""
-
-    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.event_type_counts: dict[str, int] = {}
-
-    def _get_event_tag(self, event_data: dict) -> Optional[str]:
-        """Return the security-event tag key, including tags unknown to MVT."""
-        for key in event_data:
-            if key not in SECURITY_EVENT_METADATA_KEYS:
-                return key
-
-        return None
-
-    def check_indicators(self) -> None:
-        """Check security events against indicators of compromise."""
-        if not self.indicators:
-            return
-
-        for result in self.results:
-            # Check app process start events for suspicious package names
-            if "app_process_start" in result:
-                process_info = result["app_process_start"]
-                process_name = process_info.get("process", "")
-                if process_name:
-                    # Check the full process name
-                    ioc = self.indicators.check_app_id(process_name)
-                    if ioc:
-                        self.alertstore.critical(
-                            ioc.message,
-                            result.get("timestamp") or "",
-                            result,
-                            matched_indicator=ioc.ioc,
-                        )
-
-                    # Also check process components after the first colon
-                    # Example: "com.google.android.webview:sandboxed_process0:org.chromium.content.app.SandboxedProcessService0:0"
-                    # We want to check "sandboxed_process0" and subsequent components
-                    if ":" in process_name:
-                        components = process_name.split(":")
-                        for component in components[
-                            1:
-                        ]:  # Skip the first component (main package name)
-                            if component:
-                                ioc = self.indicators.check_app_id(component)
-                                if ioc:
-                                    self.alertstore.critical(
-                                        ioc.message,
-                                        result.get("timestamp") or "",
-                                        result,
-                                        matched_indicator=ioc.ioc,
-                                    )
-                                    break
-
-            # Check package operations for suspicious packages
-            for pkg_event in [
-                "package_installed",
-                "package_updated",
-                "package_uninstalled",
-            ]:
-                if pkg_event in result:
-                    pkg_info = result[pkg_event]
-                    pkg_name = pkg_info.get("package_name", "")
-                    if pkg_name:
-                        ioc = self.indicators.check_app_id(pkg_name)
-                        if ioc:
-                            self.alertstore.critical(
-                                ioc.message,
-                                result.get("timestamp") or "",
-                                result,
-                                matched_indicator=ioc.ioc,
-                            )
-
-            # Check ADB shell commands for suspicious patterns
-            if "adb_shell_cmd" in result:
-                cmd_info = result["adb_shell_cmd"]
-                command = cmd_info.get("command", "")
-                if command:
-                    # Check if command contains any suspicious app IDs
-                    ioc = self.indicators.check_app_id(command)
-                    if ioc:
-                        self.alertstore.critical(
-                            ioc.message,
-                            result.get("timestamp") or "",
-                            result,
-                            matched_indicator=ioc.ioc,
-                        )
-
-            # Check ADB file sync events for suspicious paths
-            for adb_event in ["adb_sync_recv_file", "adb_sync_send_file"]:
-                if adb_event in result:
-                    file_info = result[adb_event]
-                    file_path = file_info.get("path", "")
-                    if file_path:
-                        ioc = self.indicators.check_file_path(file_path)
-                        if ioc:
-                            self.alertstore.critical(
-                                ioc.message,
-                                result.get("timestamp") or "",
-                                result,
-                                matched_indicator=ioc.ioc,
-                            )
-
-            # Flag failed cryptographic operations as potentially suspicious
-            if "key_generated" in result:
-                if not result["key_generated"].get("success", True):
-                    self.log.warning(
-                        "Failed key generation detected for key_id: %s",
-                        result["key_generated"].get("key_id", "unknown"),
-                    )
-
-            # Flag certificate validation failures
-            if "cert_validation_failure" in result:
-                self.log.warning(
-                    "Certificate validation failure detected: %s",
-                    result.get("cert_validation_failure"),
-                )
-
-            # Flag key integrity violations
-            if "key_integrity_violation" in result:
-                self.alertstore.medium(
-                    f"Key integrity violation detected: {result.get('key_integrity_violation')}",
-                    result.get("timestamp") or "",
-                    result,
-                )
-
-            # Flag certificate authority installations (potential MITM)
-            if "cert_authority_installed" in result:
-                cert_info = result["cert_authority_installed"]
-                self.log.warning(
-                    "Certificate authority installed: %s (success: %s)",
-                    cert_info.get("subject", "unknown"),
-                    cert_info.get("success", "unknown"),
-                )
-
-            # Flag wipe failures
-            if "wipe_failure" in result:
-                self.alertstore.medium(
-                    "Device wipe failure detected",
-                    result.get("timestamp") or "",
-                    result,
-                )
-
-            # Flag crypto self test failures
-            if "crypto_self_test_completed" in result:
-                test_result = result["crypto_self_test_completed"]
-                if isinstance(test_result, dict):
-                    success = test_result.get("success", True)
-                else:
-                    success = test_result == 1
-                if not success:
-                    self.alertstore.medium(
-                        "Cryptographic self test failed",
-                        result.get("timestamp") or "",
-                        result,
-                    )
-
-    def serialize(self, record: dict) -> Union[dict, list]:
-        """Serialize a security event record for timeline output."""
-        # Determine the event sub-type
-        event_subtype = None
-        event_data_str = ""
-
-        event_subtype = self._get_event_tag(record)
-        if event_subtype:
-            event_info = record[event_subtype]
-
-            if event_subtype in SECURITY_EVENT_TAGS:
-                # ADB events
-                if event_subtype == "adb_shell_interactive":
-                    event_data_str = "ADB interactive shell opened"
-                elif event_subtype == "adb_shell_cmd":
-                    command = event_info.get("command", "")
-                    event_data_str = f"ADB shell command: {command}"
-                elif event_subtype == "adb_sync_recv_file":
-                    path = event_info.get("path", "")
-                    event_data_str = f"File pulled via ADB: {path}"
-                elif event_subtype == "adb_sync_send_file":
-                    path = event_info.get("path", "")
-                    event_data_str = f"File pushed via ADB: {path}"
-
-                # App process events
-                elif event_subtype == "app_process_start":
-                    process_name = event_info.get("process", "")
-                    uid = event_info.get("uid", "")
-                    pid = event_info.get("pid", "")
-                    event_data_str = (
-                        f"Process started: {process_name} (UID: {uid}, PID: {pid})"
-                    )
-
-                # Keyguard events
-                elif event_subtype == "keyguard_dismiss_auth_attempt":
-                    success = event_info.get("success", False)
-                    method = event_info.get("method_strength", 0)
-                    event_data_str = f"Auth attempt: {'Success' if success else 'Failed'} (method strength: {method})"
-                elif event_subtype == "keyguard_dismissed":
-                    event_data_str = "Keyguard dismissed"
-                elif event_subtype == "keyguard_secured":
-                    event_data_str = "Device locked"
-                elif event_subtype == "keyguard_disabled_features_set":
-                    admin = event_info.get("admin_package", "")
-                    features = event_info.get("disabled_features", "")
-                    event_data_str = (
-                        f"Keyguard features disabled by {admin}: {features}"
-                    )
-
-                # Key events
-                elif event_subtype == "key_generated":
-                    success = event_info.get("success", False)
-                    key_id = event_info.get("key_id", "unknown")
-                    uid = event_info.get("uid", "")
-                    event_data_str = f"Key {'generated' if success else 'generation failed'}: {key_id} (UID: {uid})"
-                elif event_subtype == "key_destruction":
-                    success = event_info.get("success", False)
-                    key_id = event_info.get("key_id", "unknown")
-                    uid = event_info.get("uid", "")
-                    event_data_str = f"Key {'destroyed' if success else 'destruction failed'}: {key_id} (UID: {uid})"
-                elif event_subtype == "key_import":
-                    success = event_info.get("success", False)
-                    key_id = event_info.get("key_id", "unknown")
-                    event_data_str = (
-                        f"Key {'imported' if success else 'import failed'}: {key_id}"
-                    )
-                elif event_subtype == "key_integrity_violation":
-                    key_id = event_info.get("key_id", "unknown")
-                    event_data_str = f"Key integrity violation: {key_id}"
-
-                # Certificate events
-                elif event_subtype == "cert_authority_installed":
-                    success = event_info.get("success", False)
-                    subject = event_info.get("subject", "unknown")
-                    event_data_str = f"Cert {'installed' if success else 'install failed'}: {subject}"
-                elif event_subtype == "cert_authority_removed":
-                    success = event_info.get("success", False)
-                    subject = event_info.get("subject", "unknown")
-                    event_data_str = (
-                        f"Cert {'removed' if success else 'removal failed'}: {subject}"
-                    )
-                elif event_subtype == "cert_validation_failure":
-                    reason = (
-                        event_info if isinstance(event_info, str) else str(event_info)
-                    )
-                    event_data_str = f"Certificate validation failure: {reason}"
-                elif event_subtype == "crypto_self_test_completed":
-                    if isinstance(event_info, dict):
-                        success = event_info.get("success", False)
-                    else:
-                        success = event_info == 1
-                    event_data_str = (
-                        f"Crypto self test: {'passed' if success else 'FAILED'}"
-                    )
-
-                # Package events
-                elif event_subtype in [
-                    "package_installed",
-                    "package_updated",
-                    "package_uninstalled",
-                ]:
-                    pkg_name = event_info.get("package_name", "")
-                    version = event_info.get("version_code", "")
-                    user_id = event_info.get("user_id", "")
-                    action = event_subtype.replace("package_", "").title()
-                    event_data_str = (
-                        f"Package {action}: {pkg_name} (v{version}, user: {user_id})"
-                    )
-
-                # OS events
-                elif event_subtype == "os_startup":
-                    verified_boot = event_info.get("verified_boot_state", "")
-                    dm_verity = event_info.get("dm_verity_mode", "")
-                    event_data_str = f"OS startup (verified boot: {verified_boot}, dm-verity: {dm_verity})"
-                elif event_subtype == "os_shutdown":
-                    event_data_str = "OS shutdown"
-
-                # Logging events
-                elif event_subtype == "logging_started":
-                    event_data_str = "Audit logging started"
-                elif event_subtype == "logging_stopped":
-                    event_data_str = "Audit logging stopped"
-                elif event_subtype == "log_buffer_size_critical":
-                    event_data_str = "Log buffer at 90% capacity"
-
-                # Media events
-                elif event_subtype == "media_mount":
-                    mount_point = event_info.get("mount_point", "")
-                    label = event_info.get("volume_label", "")
-                    event_data_str = f"Media mounted: {mount_point} ({label})"
-                elif event_subtype == "media_unmount":
-                    mount_point = event_info.get("mount_point", "")
-                    label = event_info.get("volume_label", "")
-                    event_data_str = f"Media unmounted: {mount_point} ({label})"
-
-                # Password policy events
-                elif event_subtype == "password_expiration_set":
-                    admin = event_info.get("admin_package", "")
-                    timeout = event_info.get("timeout_ms", "")
-                    event_data_str = f"Password expiration set by {admin}: {timeout}ms"
-                elif event_subtype == "password_complexity_set":
-                    admin = event_info.get("admin_package", "")
-                    event_data_str = f"Password complexity set by {admin}"
-                elif event_subtype == "password_complexity_required":
-                    admin = event_info.get("admin_package", "")
-                    complexity = event_info.get("complexity", "")
-                    event_data_str = (
-                        f"Password complexity required by {admin}: {complexity}"
-                    )
-                elif event_subtype == "password_history_length_set":
-                    admin = event_info.get("admin_package", "")
-                    length = event_info.get("length", "")
-                    event_data_str = f"Password history length set by {admin}: {length}"
-                elif event_subtype == "password_changed":
-                    complexity = event_info.get("complexity", "")
-                    user_id = event_info.get("user_id", "")
-                    event_data_str = (
-                        f"Password changed (complexity: {complexity}, user: {user_id})"
-                    )
-                elif event_subtype == "max_screen_lock_timeout_set":
-                    admin = event_info.get("admin_package", "")
-                    timeout = event_info.get("timeout_ms", "")
-                    event_data_str = (
-                        f"Max screen lock timeout set by {admin}: {timeout}ms"
-                    )
-                elif event_subtype == "max_password_attempts_set":
-                    admin = event_info.get("admin_package", "")
-                    attempts = event_info.get("max_attempts", "")
-                    event_data_str = f"Max password attempts set by {admin}: {attempts}"
-
-                # Remote lock and wipe events
-                elif event_subtype == "remote_lock":
-                    admin = event_info.get("admin_package", "")
-                    event_data_str = f"Device remotely locked by {admin}"
-                elif event_subtype == "wipe_failure":
-                    event_data_str = "Device wipe failed"
-
-                # User restriction events
-                elif event_subtype == "user_restriction_added":
-                    admin = event_info.get("admin_package", "")
-                    restriction = event_info.get("restriction", "")
-                    event_data_str = f"User restriction added by {admin}: {restriction}"
-                elif event_subtype == "user_restriction_removed":
-                    admin = event_info.get("admin_package", "")
-                    restriction = event_info.get("restriction", "")
-                    event_data_str = (
-                        f"User restriction removed by {admin}: {restriction}"
-                    )
-
-                # WiFi events
-                elif event_subtype == "wifi_connection":
-                    bssid = event_info.get("bssid", "")
-                    event_type = event_info.get("event_type", "")
-                    reason = event_info.get("reason", "")
-                    event_data_str = f"WiFi connection: {event_type} (BSSID: {bssid})"
-                    if reason:
-                        event_data_str += f" - {reason}"
-                elif event_subtype == "wifi_disconnection":
-                    bssid = event_info.get("bssid", "")
-                    reason = event_info.get("reason", "")
-                    event_data_str = f"WiFi disconnection (BSSID: {bssid})"
-                    if reason:
-                        event_data_str += f" - {reason}"
-
-                # Bluetooth events
-                elif event_subtype == "bluetooth_connection":
-                    mac = event_info.get("mac_address", "")
-                    success = event_info.get("success", False)
-                    reason = event_info.get("reason", "")
-                    event_data_str = f"Bluetooth {'connected' if success else 'connection failed'}: {mac}"
-                    if reason:
-                        event_data_str += f" - {reason}"
-                elif event_subtype == "bluetooth_disconnection":
-                    mac = event_info.get("mac_address", "")
-                    reason = event_info.get("reason", "")
-                    event_data_str = f"Bluetooth disconnected: {mac}"
-                    if reason:
-                        event_data_str += f" - {reason}"
-
-                # Camera policy event
-                elif event_subtype == "camera_policy_set":
-                    admin = event_info.get("admin_package", "")
-                    disabled = event_info.get("disabled", False)
-                    event_data_str = (
-                        f"Camera {'disabled' if disabled else 'enabled'} by {admin}"
-                    )
-
-                # Backup service event
-                elif event_subtype == "backup_service_toggled":
-                    admin = event_info.get("admin_package", "")
-                    enabled = event_info.get("enabled", False)
-                    event_data_str = f"Backup service {'enabled' if enabled else 'disabled'} by {admin}"
-
-                # NFC events
-                elif event_subtype == "nfc_enabled":
-                    event_data_str = "NFC enabled"
-                elif event_subtype == "nfc_disabled":
-                    event_data_str = "NFC disabled"
-
-                else:
-                    event_data_str = (
-                        f"{SECURITY_EVENT_TAGS.get(event_subtype, {}).get('name', event_subtype)}: "
-                        f"{event_info}"
-                    )
-            else:
-                event_data_str = f"{event_subtype}: {event_info}"
-
-        if not event_subtype:
-            event_subtype = "unknown"
-            event_data_str = str(record)
-
-        return {
-            "timestamp": record.get("timestamp"),
-            "module": self.__class__.__name__,
-            "event": event_subtype,
-            "data": event_data_str,
-        }
-
-    def process_event(self, event_data: dict) -> None:
-        """Process a security event and add it to results."""
-        # Convert event_time to ISO format
-        # Security events use nanoseconds since epoch
-        event_time = event_data.get("event_time")
-        if event_time:
-            # Convert nanoseconds to seconds
-            event_data["timestamp"] = self._localize_timestamp(
-                event_time / 1_000_000_000.0
-            )
-        else:
-            event_data["timestamp"] = None
-
-        # Track event type statistics, including future tags unknown to MVT.
-        event_tag = self._get_event_tag(event_data)
-        if event_tag:
-            self.event_type_counts[event_tag] = (
-                self.event_type_counts.get(event_tag, 0) + 1
-            )
-
-        self.results.append(event_data)
-
-    def run(self) -> None:
-        """Extract and analyze security events from intrusion logs."""
-        if not self.target_path:
-            self.log.error("No target path specified")
-            return
-
-        self.collect_txt(self.target_path)
-        self.parse_collected_txt("security_event")
-
-        self.log.info("Identified %d security events", len(self.results))
-
-        # Log event type breakdown
-        if self.event_type_counts:
-            self.log.info("Security event breakdown:")
-            for event_type, count in sorted(
-                self.event_type_counts.items(), key=lambda x: x[1], reverse=True
-            ):
-                event_name = SECURITY_EVENT_TAGS.get(event_type, {}).get(
-                    "name", event_type
-                )
-                self.log.info("  - %s: %d", event_name, count)
-
-            unknown_event_types = sorted(
-                event_type
-                for event_type in self.event_type_counts
-                if event_type not in SECURITY_EVENT_TAGS
-            )
-            if unknown_event_types:
-                self.log.warning(
-                    "Found unknown intrusion logging security event type(s): %s. "
-                    "Please open an issue on GitHub so MVT can add support for them.",
-                    ", ".join(unknown_event_types),
-                )

src/mvt/android/parsers/proto/tombstone.py

@@ -1,12 +1,13 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # sources: tombstone.proto
-# plugin: python-betterproto2
+# plugin: python-betterproto
 from dataclasses import dataclass
+from typing import Dict, List
 
-import betterproto2
+import betterproto
 
 
-class Architecture(betterproto2.Enum):
+class Architecture(betterproto.Enum):
     ARM32 = 0
     ARM64 = 1
     X86 = 2
@@ -15,12 +16,12 @@ class Architecture(betterproto2.Enum):
     NONE = 5
 
 
-class MemoryErrorTool(betterproto2.Enum):
+class MemoryErrorTool(betterproto.Enum):
     GWP_ASAN = 0
     SCUDO = 1
 
 
-class MemoryErrorType(betterproto2.Enum):
+class MemoryErrorType(betterproto.Enum):
     UNKNOWN = 0
     USE_AFTER_FREE = 1
     DOUBLE_FREE = 2
@@ -29,179 +30,179 @@ class MemoryErrorType(betterproto2.Enum):
     BUFFER_UNDERFLOW = 5
 
 
-@dataclass(eq=False, repr=False)
-class CrashDetail(betterproto2.Message):
+@dataclass
+class CrashDetail(betterproto.Message):
     """
     NOTE TO OEMS: If you add custom fields to this proto, do not use numbers in
     the reserved range.
     """
 
-    name: "bytes" = betterproto2.field(1, betterproto2.TYPE_BYTES)
-    data: "bytes" = betterproto2.field(2, betterproto2.TYPE_BYTES)
+    name: bytes = betterproto.bytes_field(1)
+    data: bytes = betterproto.bytes_field(2)
 
 
-@dataclass(eq=False, repr=False)
-class StackHistoryBufferEntry(betterproto2.Message):
-    addr: "BacktraceFrame | None" = betterproto2.field(1, betterproto2.TYPE_MESSAGE, optional=True)
-    fp: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
-    tag: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
+@dataclass
+class StackHistoryBufferEntry(betterproto.Message):
+    addr: "BacktraceFrame" = betterproto.message_field(1)
+    fp: int = betterproto.uint64_field(2)
+    tag: int = betterproto.uint64_field(3)
 
 
-@dataclass(eq=False, repr=False)
-class StackHistoryBuffer(betterproto2.Message):
-    tid: "int" = betterproto2.field(1, betterproto2.TYPE_UINT64)
-    entries: "list[StackHistoryBufferEntry]" = betterproto2.field(2, betterproto2.TYPE_MESSAGE, repeated=True)
+@dataclass
+class StackHistoryBuffer(betterproto.Message):
+    tid: int = betterproto.uint64_field(1)
+    entries: List["StackHistoryBufferEntry"] = betterproto.message_field(2)
 
 
-@dataclass(eq=False, repr=False)
-class Tombstone(betterproto2.Message):
-    arch: "Architecture" = betterproto2.field(1, betterproto2.TYPE_ENUM, default_factory=lambda: Architecture(0))
-    guest_arch: "Architecture" = betterproto2.field(24, betterproto2.TYPE_ENUM, default_factory=lambda: Architecture(0))
-    build_fingerprint: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
-    revision: "str" = betterproto2.field(3, betterproto2.TYPE_STRING)
-    timestamp: "str" = betterproto2.field(4, betterproto2.TYPE_STRING)
-    pid: "int" = betterproto2.field(5, betterproto2.TYPE_UINT32)
-    tid: "int" = betterproto2.field(6, betterproto2.TYPE_UINT32)
-    uid: "int" = betterproto2.field(7, betterproto2.TYPE_UINT32)
-    selinux_label: "str" = betterproto2.field(8, betterproto2.TYPE_STRING)
-    command_line: "list[str]" = betterproto2.field(9, betterproto2.TYPE_STRING, repeated=True)
+@dataclass
+class Tombstone(betterproto.Message):
+    arch: "Architecture" = betterproto.enum_field(1)
+    guest_arch: "Architecture" = betterproto.enum_field(24)
+    build_fingerprint: str = betterproto.string_field(2)
+    revision: str = betterproto.string_field(3)
+    timestamp: str = betterproto.string_field(4)
+    pid: int = betterproto.uint32_field(5)
+    tid: int = betterproto.uint32_field(6)
+    uid: int = betterproto.uint32_field(7)
+    selinux_label: str = betterproto.string_field(8)
+    command_line: List[str] = betterproto.string_field(9)
     # Process uptime in seconds.
-    process_uptime: "int" = betterproto2.field(20, betterproto2.TYPE_UINT32)
-    signal_info: "Signal | None" = betterproto2.field(10, betterproto2.TYPE_MESSAGE, optional=True)
-    abort_message: "str" = betterproto2.field(14, betterproto2.TYPE_STRING)
-    crash_details: "list[CrashDetail]" = betterproto2.field(21, betterproto2.TYPE_MESSAGE, repeated=True)
-    causes: "list[Cause]" = betterproto2.field(15, betterproto2.TYPE_MESSAGE, repeated=True)
-    threads: "dict[int, Thread]" = betterproto2.field(
-        16, betterproto2.TYPE_MAP, map_meta=betterproto2.map_meta(betterproto2.TYPE_UINT32, betterproto2.TYPE_MESSAGE)
+    process_uptime: int = betterproto.uint32_field(20)
+    signal_info: "Signal" = betterproto.message_field(10)
+    abort_message: str = betterproto.string_field(14)
+    crash_details: List["CrashDetail"] = betterproto.message_field(21)
+    causes: List["Cause"] = betterproto.message_field(15)
+    threads: Dict[int, "Thread"] = betterproto.map_field(
+        16, betterproto.TYPE_UINT32, betterproto.TYPE_MESSAGE
     )
-    guest_threads: "dict[int, Thread]" = betterproto2.field(
-        25, betterproto2.TYPE_MAP, map_meta=betterproto2.map_meta(betterproto2.TYPE_UINT32, betterproto2.TYPE_MESSAGE)
+    guest_threads: Dict[int, "Thread"] = betterproto.map_field(
+        25, betterproto.TYPE_UINT32, betterproto.TYPE_MESSAGE
     )
-    memory_mappings: "list[MemoryMapping]" = betterproto2.field(17, betterproto2.TYPE_MESSAGE, repeated=True)
-    log_buffers: "list[LogBuffer]" = betterproto2.field(18, betterproto2.TYPE_MESSAGE, repeated=True)
-    open_fds: "list[FD]" = betterproto2.field(19, betterproto2.TYPE_MESSAGE, repeated=True)
-    page_size: "int" = betterproto2.field(22, betterproto2.TYPE_UINT32)
-    has_been_16kb_mode: "bool" = betterproto2.field(23, betterproto2.TYPE_BOOL)
-    stack_history_buffer: "StackHistoryBuffer | None" = betterproto2.field(26, betterproto2.TYPE_MESSAGE, optional=True)
+    memory_mappings: List["MemoryMapping"] = betterproto.message_field(17)
+    log_buffers: List["LogBuffer"] = betterproto.message_field(18)
+    open_fds: List["FD"] = betterproto.message_field(19)
+    page_size: int = betterproto.uint32_field(22)
+    has_been_16kb_mode: bool = betterproto.bool_field(23)
+    stack_history_buffer: "StackHistoryBuffer" = betterproto.message_field(26)
 
 
-@dataclass(eq=False, repr=False)
-class Signal(betterproto2.Message):
-    number: "int" = betterproto2.field(1, betterproto2.TYPE_INT32)
-    name: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
-    code: "int" = betterproto2.field(3, betterproto2.TYPE_INT32)
-    code_name: "str" = betterproto2.field(4, betterproto2.TYPE_STRING)
-    has_sender: "bool" = betterproto2.field(5, betterproto2.TYPE_BOOL)
-    sender_uid: "int" = betterproto2.field(6, betterproto2.TYPE_INT32)
-    sender_pid: "int" = betterproto2.field(7, betterproto2.TYPE_INT32)
-    has_fault_address: "bool" = betterproto2.field(8, betterproto2.TYPE_BOOL)
-    fault_address: "int" = betterproto2.field(9, betterproto2.TYPE_UINT64)
+@dataclass
+class Signal(betterproto.Message):
+    number: int = betterproto.int32_field(1)
+    name: str = betterproto.string_field(2)
+    code: int = betterproto.int32_field(3)
+    code_name: str = betterproto.string_field(4)
+    has_sender: bool = betterproto.bool_field(5)
+    sender_uid: int = betterproto.int32_field(6)
+    sender_pid: int = betterproto.int32_field(7)
+    has_fault_address: bool = betterproto.bool_field(8)
+    fault_address: int = betterproto.uint64_field(9)
     # Note, may or may not contain the dump of the actual memory contents.
     # Currently, on arm64, we only include metadata, and not the contents.
-    fault_adjacent_metadata: "MemoryDump | None" = betterproto2.field(10, betterproto2.TYPE_MESSAGE, optional=True)
+    fault_adjacent_metadata: "MemoryDump" = betterproto.message_field(10)
 
 
-@dataclass(eq=False, repr=False)
-class HeapObject(betterproto2.Message):
-    address: "int" = betterproto2.field(1, betterproto2.TYPE_UINT64)
-    size: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
-    allocation_tid: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
-    allocation_backtrace: "list[BacktraceFrame]" = betterproto2.field(4, betterproto2.TYPE_MESSAGE, repeated=True)
-    deallocation_tid: "int" = betterproto2.field(5, betterproto2.TYPE_UINT64)
-    deallocation_backtrace: "list[BacktraceFrame]" = betterproto2.field(6, betterproto2.TYPE_MESSAGE, repeated=True)
+@dataclass
+class HeapObject(betterproto.Message):
+    address: int = betterproto.uint64_field(1)
+    size: int = betterproto.uint64_field(2)
+    allocation_tid: int = betterproto.uint64_field(3)
+    allocation_backtrace: List["BacktraceFrame"] = betterproto.message_field(4)
+    deallocation_tid: int = betterproto.uint64_field(5)
+    deallocation_backtrace: List["BacktraceFrame"] = betterproto.message_field(6)
 
 
-@dataclass(eq=False, repr=False)
-class MemoryError(betterproto2.Message):
-    tool: "MemoryErrorTool" = betterproto2.field(1, betterproto2.TYPE_ENUM, default_factory=lambda: MemoryErrorTool(0))
-    type: "MemoryErrorType" = betterproto2.field(2, betterproto2.TYPE_ENUM, default_factory=lambda: MemoryErrorType(0))
-    heap: "HeapObject | None" = betterproto2.field(3, betterproto2.TYPE_MESSAGE, optional=True, group="location")
+@dataclass
+class MemoryError(betterproto.Message):
+    tool: "MemoryErrorTool" = betterproto.enum_field(1)
+    type: "MemoryErrorType" = betterproto.enum_field(2)
+    heap: "HeapObject" = betterproto.message_field(3, group="location")
 
 
-@dataclass(eq=False, repr=False)
-class Cause(betterproto2.Message):
-    human_readable: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
-    memory_error: "MemoryError | None" = betterproto2.field(2, betterproto2.TYPE_MESSAGE, optional=True, group="details")
+@dataclass
+class Cause(betterproto.Message):
+    human_readable: str = betterproto.string_field(1)
+    memory_error: "MemoryError" = betterproto.message_field(2, group="details")
 
 
-@dataclass(eq=False, repr=False)
-class Register(betterproto2.Message):
-    name: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
-    u64: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
+@dataclass
+class Register(betterproto.Message):
+    name: str = betterproto.string_field(1)
+    u64: int = betterproto.uint64_field(2)
 
 
-@dataclass(eq=False, repr=False)
-class Thread(betterproto2.Message):
-    id: "int" = betterproto2.field(1, betterproto2.TYPE_INT32)
-    name: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
-    registers: "list[Register]" = betterproto2.field(3, betterproto2.TYPE_MESSAGE, repeated=True)
-    backtrace_note: "list[str]" = betterproto2.field(7, betterproto2.TYPE_STRING, repeated=True)
-    unreadable_elf_files: "list[str]" = betterproto2.field(9, betterproto2.TYPE_STRING, repeated=True)
-    current_backtrace: "list[BacktraceFrame]" = betterproto2.field(4, betterproto2.TYPE_MESSAGE, repeated=True)
-    memory_dump: "list[MemoryDump]" = betterproto2.field(5, betterproto2.TYPE_MESSAGE, repeated=True)
-    tagged_addr_ctrl: "int" = betterproto2.field(6, betterproto2.TYPE_INT64)
-    pac_enabled_keys: "int" = betterproto2.field(8, betterproto2.TYPE_INT64)
+@dataclass
+class Thread(betterproto.Message):
+    id: int = betterproto.int32_field(1)
+    name: str = betterproto.string_field(2)
+    registers: List["Register"] = betterproto.message_field(3)
+    backtrace_note: List[str] = betterproto.string_field(7)
+    unreadable_elf_files: List[str] = betterproto.string_field(9)
+    current_backtrace: List["BacktraceFrame"] = betterproto.message_field(4)
+    memory_dump: List["MemoryDump"] = betterproto.message_field(5)
+    tagged_addr_ctrl: int = betterproto.int64_field(6)
+    pac_enabled_keys: int = betterproto.int64_field(8)
 
 
-@dataclass(eq=False, repr=False)
-class BacktraceFrame(betterproto2.Message):
-    rel_pc: "int" = betterproto2.field(1, betterproto2.TYPE_UINT64)
-    pc: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
-    sp: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
-    function_name: "str" = betterproto2.field(4, betterproto2.TYPE_STRING)
-    function_offset: "int" = betterproto2.field(5, betterproto2.TYPE_UINT64)
-    file_name: "str" = betterproto2.field(6, betterproto2.TYPE_STRING)
-    file_map_offset: "int" = betterproto2.field(7, betterproto2.TYPE_UINT64)
-    build_id: "str" = betterproto2.field(8, betterproto2.TYPE_STRING)
+@dataclass
+class BacktraceFrame(betterproto.Message):
+    rel_pc: int = betterproto.uint64_field(1)
+    pc: int = betterproto.uint64_field(2)
+    sp: int = betterproto.uint64_field(3)
+    function_name: str = betterproto.string_field(4)
+    function_offset: int = betterproto.uint64_field(5)
+    file_name: str = betterproto.string_field(6)
+    file_map_offset: int = betterproto.uint64_field(7)
+    build_id: str = betterproto.string_field(8)
 
 
-@dataclass(eq=False, repr=False)
-class ArmMTEMetadata(betterproto2.Message):
+@dataclass
+class ArmMTEMetadata(betterproto.Message):
     # One memory tag per granule (e.g. every 16 bytes) of regular memory.
-    memory_tags: "bytes" = betterproto2.field(1, betterproto2.TYPE_BYTES)
+    memory_tags: bytes = betterproto.bytes_field(1)
 
 
-@dataclass(eq=False, repr=False)
-class MemoryDump(betterproto2.Message):
-    register_name: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
-    mapping_name: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
-    begin_address: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
-    memory: "bytes" = betterproto2.field(4, betterproto2.TYPE_BYTES)
-    arm_mte_metadata: "ArmMTEMetadata | None" = betterproto2.field(6, betterproto2.TYPE_MESSAGE, optional=True, group="metadata")
+@dataclass
+class MemoryDump(betterproto.Message):
+    register_name: str = betterproto.string_field(1)
+    mapping_name: str = betterproto.string_field(2)
+    begin_address: int = betterproto.uint64_field(3)
+    memory: bytes = betterproto.bytes_field(4)
+    arm_mte_metadata: "ArmMTEMetadata" = betterproto.message_field(6, group="metadata")
 
 
-@dataclass(eq=False, repr=False)
-class MemoryMapping(betterproto2.Message):
-    begin_address: "int" = betterproto2.field(1, betterproto2.TYPE_UINT64)
-    end_address: "int" = betterproto2.field(2, betterproto2.TYPE_UINT64)
-    offset: "int" = betterproto2.field(3, betterproto2.TYPE_UINT64)
-    read: "bool" = betterproto2.field(4, betterproto2.TYPE_BOOL)
-    write: "bool" = betterproto2.field(5, betterproto2.TYPE_BOOL)
-    execute: "bool" = betterproto2.field(6, betterproto2.TYPE_BOOL)
-    mapping_name: "str" = betterproto2.field(7, betterproto2.TYPE_STRING)
-    build_id: "str" = betterproto2.field(8, betterproto2.TYPE_STRING)
-    load_bias: "int" = betterproto2.field(9, betterproto2.TYPE_UINT64)
+@dataclass
+class MemoryMapping(betterproto.Message):
+    begin_address: int = betterproto.uint64_field(1)
+    end_address: int = betterproto.uint64_field(2)
+    offset: int = betterproto.uint64_field(3)
+    read: bool = betterproto.bool_field(4)
+    write: bool = betterproto.bool_field(5)
+    execute: bool = betterproto.bool_field(6)
+    mapping_name: str = betterproto.string_field(7)
+    build_id: str = betterproto.string_field(8)
+    load_bias: int = betterproto.uint64_field(9)
 
 
-@dataclass(eq=False, repr=False)
-class FD(betterproto2.Message):
-    fd: "int" = betterproto2.field(1, betterproto2.TYPE_INT32)
-    path: "str" = betterproto2.field(2, betterproto2.TYPE_STRING)
-    owner: "str" = betterproto2.field(3, betterproto2.TYPE_STRING)
-    tag: "int" = betterproto2.field(4, betterproto2.TYPE_UINT64)
+@dataclass
+class FD(betterproto.Message):
+    fd: int = betterproto.int32_field(1)
+    path: str = betterproto.string_field(2)
+    owner: str = betterproto.string_field(3)
+    tag: int = betterproto.uint64_field(4)
 
 
-@dataclass(eq=False, repr=False)
-class LogBuffer(betterproto2.Message):
-    name: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
-    logs: "list[LogMessage]" = betterproto2.field(2, betterproto2.TYPE_MESSAGE, repeated=True)
+@dataclass
+class LogBuffer(betterproto.Message):
+    name: str = betterproto.string_field(1)
+    logs: List["LogMessage"] = betterproto.message_field(2)
 
 
-@dataclass(eq=False, repr=False)
-class LogMessage(betterproto2.Message):
-    timestamp: "str" = betterproto2.field(1, betterproto2.TYPE_STRING)
-    pid: "int" = betterproto2.field(2, betterproto2.TYPE_UINT32)
-    tid: "int" = betterproto2.field(3, betterproto2.TYPE_UINT32)
-    priority: "int" = betterproto2.field(4, betterproto2.TYPE_UINT32)
-    tag: "str" = betterproto2.field(5, betterproto2.TYPE_STRING)
-    message: "str" = betterproto2.field(6, betterproto2.TYPE_STRING)
+@dataclass
+class LogMessage(betterproto.Message):
+    timestamp: str = betterproto.string_field(1)
+    pid: int = betterproto.uint32_field(2)
+    tid: int = betterproto.uint32_field(3)
+    priority: int = betterproto.uint32_field(4)
+    tag: str = betterproto.string_field(5)
+    message: str = betterproto.string_field(6)

src/mvt/common/alerts.py

@@ -207,19 +207,12 @@ class AlertStore:
             alert_dict = asdict(alert)
             # This is required because an Enum is not JSON serializable.
             alert_dict["level"] = alert.level.name
-            if isinstance(alert_dict.get("event"), dict):
-                event_matched_indicator = alert_dict["event"].pop(
-                    "matched_indicator", None
-                )
-                if alert_dict["matched_indicator"] is None:
-                    alert_dict["matched_indicator"] = event_matched_indicator
-
             alerts.append(alert_dict)
 
         return alerts
 
     def save_timeline(self, timeline_path: str) -> None:
-        with open(timeline_path, "w", encoding="utf-8") as handle:
+        with open(timeline_path, "a+", encoding="utf-8") as handle:
             csvoutput = csv.writer(
                 handle,
                 delimiter=",",

src/mvt/common/command.py

@@ -17,9 +17,8 @@ from rich.text import Text
 from .alerts import AlertLevel, AlertStore
 from .config import settings
 from .indicators import Indicators
-from .module import EncryptedBackupError, MVTModule, run_module, save_timeline
+from .module import MVTModule, run_module, save_timeline
 from .utils import (
-    CustomJSONEncoder,
     convert_datetime_to_iso,
     generate_hashes_from_path,
     get_sha256_from_file_path,
@@ -142,7 +141,7 @@ class Command:
 
         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, cls=CustomJSONEncoder)
+            json.dump(alerts, handle, indent=4)
 
     def _store_alerts_timeline(self) -> None:
         if not self.results_path:
@@ -295,14 +294,7 @@ class Command:
             except NotImplementedError:
                 pass
 
-            try:
-                run_module(m)
-            except EncryptedBackupError:
-                self.log.critical(
-                    "The backup appears to be encrypted. "
-                    "Please decrypt it first using `mvt-ios decrypt-backup`."
-                )
-                return
+            run_module(m)
 
             self.executed.append(m)
             self.timeline.extend(m.timeline)

src/mvt/common/help.py

@@ -47,4 +47,3 @@ HELP_MSG_CHECK_ADB_REMOVED_DESCRIPTION = (
 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"
-HELP_MSG_CHECK_INTRUSION_LOGS = "Check Android Intrusion Logging files"

src/mvt/common/indicators.py

@@ -9,7 +9,7 @@ import logging
 import os
 from dataclasses import dataclass
 from functools import lru_cache
-from typing import Any, Dict, Iterator, List, Optional
+from typing import Any, Dict, Iterator, List, Optional, Union
 
 import ahocorasick
 from appdirs import user_data_dir
@@ -115,17 +115,6 @@ class Indicators:
         key, value = indicator.get("pattern", "").strip("[]").split("=")
         key = key.strip()
 
-        # Normalize hash algorithm keys so that both the STIX2-spec-compliant
-        # form (e.g. file:hashes.'SHA-256', which requires quotes around
-        # algorithm names that contain hyphens) and the non-standard lowercase
-        # form (e.g. file:hashes.sha256) are accepted.  Strip single quotes and
-        # hyphens from the algorithm name only, then lowercase it.
-        for sep in ("hashes.", "cert."):
-            if sep in key:
-                prefix, _, algo = key.partition(sep)
-                key = prefix + sep + algo.replace("'", "").replace("-", "").lower()
-                break
-
         if key == "domain-name:value":
             # We force domain names to lower case.
             self._add_indicator(
@@ -727,32 +716,30 @@ class Indicators:
 
         return None
 
-    def check_receiver_prefix(
-        self, receiver_name: str
-    ) -> Optional[IndicatorMatch]:
+    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 receiver_name: Receiver name to check against app ID indicators
-        :type receiver_name: str
-        :returns: IndicatorMatch if matched, otherwise None
+        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():
-                return IndicatorMatch(
-                    ioc=ioc,
-                    message=f'Found a known suspicious receiver with name "{receiver_name}" matching indicators from "{ioc.name}"',
+            if ioc["value"].lower() in receiver_name.lower():
+                self.log.warning(
+                    'Found a known suspicious receiver with name "%s" '
+                    'matching indicators from "%s"',
+                    receiver_name,
+                    ioc["name"],
                 )
+                return ioc
 
         return None
 
-    def check_android_property_name(
-        self, property_name: str
-    ) -> Optional[IndicatorMatch]:
+    def check_android_property_name(self, property_name: str) -> Optional[dict]:
         """Check the android property name against the list of indicators.
 
         :param property_name: Name of the Android property

src/mvt/common/module.py

@@ -30,10 +30,6 @@ class DatabaseCorruptedError(Exception):
     pass
 
 
-class EncryptedBackupError(Exception):
-    pass
-
-
 class InsufficientPrivileges(Exception):
     pass
 
@@ -109,13 +105,10 @@ class MVTModule:
         name = self.get_slug()
 
         if self.results:
-            if isinstance(self.results, dict):
-                converted_results = self.results
-            else:
-                converted_results = [
-                    asdict(result) if is_dataclass(result) else result
-                    for result in 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:
@@ -136,7 +129,7 @@ class MVTModule:
             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.as_json(), handle, indent=4, cls=CustomJSONEncoder
+                    self.alertstore.alerts, handle, indent=4, cls=CustomJSONEncoder
                 )
 
     def serialize(self, result: ModuleAtomicResult) -> ModuleSerializedResult:
@@ -188,8 +181,6 @@ def run_module(module: MVTModule) -> None:
 
     try:
         exec_or_profile("module.run()", globals(), locals())
-    except EncryptedBackupError:
-        raise
     except NotImplementedError:
         module.log.exception(
             "The run() procedure of module %s was not implemented yet!",
@@ -259,7 +250,7 @@ def save_timeline(timeline: list, timeline_path: str, is_utc: bool = True) -> No
     :param timeline_path: Path to the csv file to store the timeline to
 
     """
-    with open(timeline_path, "w", encoding="utf-8") as handle:
+    with open(timeline_path, "a+", encoding="utf-8") as handle:
         csvoutput = csv.writer(
             handle, delimiter=",", quotechar='"', quoting=csv.QUOTE_ALL, escapechar="\\"
         )

src/mvt/common/utils.py

@@ -10,7 +10,6 @@ import json
 import logging
 import os
 import re
-from dataclasses import asdict, is_dataclass
 from typing import Any, Iterator, Union
 
 from .log import MVTLogHandler
@@ -31,9 +30,6 @@ class CustomJSONEncoder(json.JSONEncoder):
     """
 
     def default(self, o):
-        # Unwrap dataclass instances (such as Indicator) to dict. Skip class itself.
-        if is_dataclass(o) and not isinstance(o, type):
-            return asdict(o)
         if isinstance(o, bytes):
             # Decode as utf-8, replace any invalid UTF-8 bytes with escaped hex
             return o.decode("utf-8", errors="backslashreplace")
@@ -239,7 +235,7 @@ def init_logging(verbose: bool = False):
     Initialise logging for the MVT module
     """
     log = logging.getLogger("mvt")
-    log.setLevel(logging.DEBUG)
+    log.setLevel(logging.INFO)
     consoleHandler = MVTLogHandler()
     consoleHandler.setFormatter(logging.Formatter("%(message)s"))
     if verbose:

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 = "2026.5.12"
+MVT_VERSION = "3.0.0"

src/mvt/ios/data/ios_versions.json

@@ -911,10 +911,6 @@
         "version": "15.8.7",
         "build": "19H411"
     },
-    {
-        "version": "15.8.8",
-        "build": "19H422"
-    },
     {
         "build": "20A362",
         "version": "16.0"
@@ -1032,10 +1028,6 @@
         "version": "16.7.15",
         "build": "20H380"
     },
-    {
-        "version": "16.7.16",
-        "build": "20H392"
-    },
     {
         "version": "17.0",
         "build": "21A327"
@@ -1208,14 +1200,6 @@
         "version": "18.7.7",
         "build": "22H333"
     },
-    {
-        "version": "18.7.8",
-        "build": "22H352"
-    },
-    {
-        "version": "18.7.9",
-        "build": "22H355"
-    },
     {
         "version": "26",
         "build": "23A341"
@@ -1247,13 +1231,5 @@
     {
         "version": "26.4",
         "build": "23E246"
-    },
-    {
-        "version": "26.4.2",
-        "build": "23E261"
-    },
-    {
-        "version": "26.5",
-        "build": "23F77"
     }
 ]

src/mvt/ios/decrypt.py

@@ -11,7 +11,6 @@ import os
 import os.path
 import shutil
 import sqlite3
-from pathlib import Path
 from typing import Optional
 
 from iOSbackup import iOSbackup
@@ -47,16 +46,14 @@ class DecryptBackup:
 
         """
         conn = sqlite3.connect(os.path.join(backup_path, "Manifest.db"))
+        cur = conn.cursor()
         try:
-            cur = conn.cursor()
             cur.execute("SELECT fileID FROM Files LIMIT 1;")
         except sqlite3.DatabaseError:
             return True
         else:
             log.critical("The backup does not seem encrypted!")
             return False
-        finally:
-            conn.close()
 
     def _process_file(
         self, relative_path: str, domain: str, item, file_id: str, item_folder: str
@@ -97,9 +94,6 @@ class DecryptBackup:
                 # This may be a partial backup. Skip files from the manifest
                 # which do not exist locally.
                 source_file_path = os.path.join(self.backup_path, file_id[0:2], file_id)
-                if not Path(source_file_path).resolve().is_relative_to(Path(self.backup_path).resolve()):
-                    log.warning("Skipping unsafe file_id: %r", file_id)
-                    continue
                 if not os.path.exists(source_file_path):
                     log.debug(
                         "Skipping file %s. File not found in encrypted backup directory.",
@@ -108,9 +102,6 @@ class DecryptBackup:
                     continue
 
                 item_folder = os.path.join(self.dest_path, file_id[0:2])  # type: ignore[arg-type]
-                if not Path(os.path.join(item_folder, file_id)).resolve().is_relative_to(Path(self.dest_path).resolve()):
-                    log.warning("Skipping unsafe file_id: %r", file_id)
-                    continue
                 if not os.path.exists(item_folder):
                     os.makedirs(item_folder)
 

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

@@ -73,9 +73,11 @@ class ConfigurationProfiles(IOSExtraction):
                 )
                 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
                     )
+                    self.alertstore.log_latest()
                     continue
 
                 # Highlight suspicious configuration profiles which may be used
@@ -83,6 +85,7 @@ class ConfigurationProfiles(IOSExtraction):
                 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()
                     continue
 
     def run(self) -> None:

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

@@ -8,10 +8,9 @@ import io
 import logging
 import os
 import plistlib
-import sqlite3
 from typing import Optional
 
-from mvt.common.module import DatabaseNotFoundError, EncryptedBackupError
+from mvt.common.module import DatabaseNotFoundError
 from mvt.common.module_types import (
     ModuleAtomicResult,
     ModuleResults,
@@ -103,6 +102,7 @@ class Manifest(IOSExtraction):
 
             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
                 )
@@ -118,6 +118,7 @@ class Manifest(IOSExtraction):
 
                 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}',
                         "",
@@ -137,14 +138,7 @@ class Manifest(IOSExtraction):
         conn = self._open_sqlite_db(manifest_db_path)
         cur = conn.cursor()
 
-        try:
-            cur.execute("SELECT * FROM Files;")
-        except sqlite3.DatabaseError:
-            conn.close()
-            raise EncryptedBackupError(
-                "Manifest.db is not a valid SQLite database. "
-                "The backup may be encrypted."
-            )
+        cur.execute("SELECT * FROM Files;")
         names = [description[0] for description in cur.description]
 
         for file_entry in cur:

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

@@ -59,6 +59,7 @@ class ProfileEvents(IOSExtraction):
         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
@@ -66,6 +67,7 @@ class ProfileEvents(IOSExtraction):
         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
                 )
@@ -73,6 +75,7 @@ class ProfileEvents(IOSExtraction):
 
             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
                 )

src/mvt/ios/modules/base.py

@@ -9,7 +9,6 @@ import os
 import shutil
 import sqlite3
 import subprocess
-from pathlib import Path
 from typing import Iterator, Optional, Union
 
 from mvt.common.module import (
@@ -123,8 +122,6 @@ class IOSExtraction(MVTModule):
 
         base_sql = "SELECT fileID, domain, relativePath FROM Files WHERE "
 
-        conn: Optional[sqlite3.Connection] = None
-        cur: Optional[sqlite3.Cursor] = None
         try:
             conn = self._open_sqlite_db(manifest_db_path)
             cur = conn.cursor()
@@ -144,30 +141,20 @@ class IOSExtraction(MVTModule):
                         cur.execute(f"{base_sql} relativePath = ?;", (relative_path,))
                 elif domain:
                     cur.execute(f"{base_sql} domain = ?;", (domain,))
-            records = [
-                {
-                    "file_id": row[0],
-                    "domain": row[1],
-                    "relative_path": row[2],
-                }
-                for row in cur
-            ]
         except Exception as exc:
             raise DatabaseCorruptedError(f"failed to query Manifest.db: {exc}") from exc
-        finally:
-            if cur:
-                cur.close()
-            if conn:
-                conn.close()
 
-        return iter(records)
+        for row in cur:
+            yield {
+                "file_id": row[0],
+                "domain": row[1],
+                "relative_path": row[2],
+            }
 
     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 not Path(file_path).resolve().is_relative_to(Path(self.target_path).resolve()):
-            return None
         if os.path.exists(file_path):
             return file_path
 

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

@@ -67,14 +67,17 @@ class Analytics(IOSExtraction):
                 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
                     )
+                    self.alertstore.log_latest()
                     continue
 
                 ioc_match = self.indicators.check_url(value)
                 if ioc_match:
                     new_result = copy.copy(result)
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.critical(
                         ioc_match.message,
                         "",

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

@@ -54,17 +54,19 @@ class CacheFiles(IOSExtraction):
         if not self.indicators:
             return
 
+        self.alertstore.alerts = {}
         for key, values in self.results.items():
             for value in values:
                 ioc_match = self.indicators.check_url(value["url"])
                 if ioc_match:
-                    value["cache_file"] = key
-                    self.alertstore.critical(
-                        ioc_match.message,
-                        value.get("isodate", ""),
-                        value,
-                        matched_indicator=ioc_match.ioc,
-                    )
+                    value["matched_indicator"] = ioc_match.ioc
+                    # XXX: Finish converting this method
+                    if key not in self.alertstore.alerts:
+                        self.alertstore.alerts[key] = [
+                            value,
+                        ]
+                    else:
+                        self.alertstore.alerts[key].append(value)
 
     def _process_cache_file(self, file_path):
         self.log.info("Processing cache file at path: %s", file_path)
@@ -73,29 +75,25 @@ class CacheFiles(IOSExtraction):
         cur = conn.cursor()
 
         try:
-            try:
-                cur.execute("SELECT * FROM cfurl_cache_response;")
-            except sqlite3.OperationalError:
-                return
+            cur.execute("SELECT * FROM cfurl_cache_response;")
+        except sqlite3.OperationalError:
+            return
 
-            key_name = os.path.relpath(file_path, self.target_path)
-            if key_name not in self.results:
-                self.results[key_name] = []
+        key_name = os.path.relpath(file_path, self.target_path)
+        if key_name not in self.results:
+            self.results[key_name] = []
 
-            for row in cur:
-                self.results[key_name].append(
-                    {
-                        "entry_id": row[0],
-                        "version": row[1],
-                        "hash_value": row[2],
-                        "storage_policy": row[3],
-                        "url": row[4],
-                        "isodate": row[5],
-                    }
-                )
-        finally:
-            cur.close()
-            conn.close()
+        for row in cur:
+            self.results[key_name].append(
+                {
+                    "entry_id": row[0],
+                    "version": row[1],
+                    "hash_value": row[2],
+                    "storage_policy": row[3],
+                    "url": row[4],
+                    "isodate": row[5],
+                }
+            )
 
     def run(self) -> None:
         self.results: dict = {}

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

@@ -58,9 +58,8 @@ class Filesystem(IOSExtraction):
 
             ioc_match = self.indicators.check_file_path(result["path"])
             if ioc_match:
-                self.alertstore.high(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+                self.alertstore.high(self.get_slug(), ioc_match.message, "", result)
+                self.alertstore.log_latest()
 
             # If we are instructed to run fast, we skip the rest.
             if self.module_options.get("fast_mode", None):
@@ -68,9 +67,8 @@ class Filesystem(IOSExtraction):
 
             ioc_match = self.indicators.check_file_path_process(result["path"])
             if ioc_match:
-                self.alertstore.high(
-                    ioc_match.message, "", result, matched_indicator=ioc_match.ioc
-                )
+                self.alertstore.high(self.get_slug(), ioc_match.message, "", result)
+                self.alertstore.log_latest()
 
     def run(self) -> None:
         for root, dirs, files in os.walk(self.target_path):

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

@@ -65,6 +65,7 @@ class SafariFavicon(IOSExtraction):
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )
+                self.alertstore.log_latest()
 
     def _process_favicon_db(self, file_path):
         conn = self._open_sqlite_db(file_path)

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

@@ -60,17 +60,20 @@ class ShutdownLog(IOSExtraction):
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )
+                self.alertstore.log_latest()
                 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,
                     )
+                    self.alertstore.log_latest()
                     continue
 
     def process_shutdownlog(self, content):

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

@@ -20,6 +20,7 @@ class WebkitBase(IOSExtraction):
         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
                 )

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

@@ -66,7 +66,7 @@ class Applications(IOSExtraction):
         for result in self.results:
             if self.indicators:
                 if "softwareVersionBundleId" not in result:
-                    self.alertstore.medium(
+                    self.alertstore.high(
                         "Suspicious application identified without softwareVersionBundleId",
                         "",
                         result,
@@ -77,6 +77,7 @@ class Applications(IOSExtraction):
                     result["softwareVersionBundleId"]
                 )
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.critical(
                         f"Malicious application {result['softwareVersionBundleId']} identified",
                         "",
@@ -89,6 +90,7 @@ class Applications(IOSExtraction):
                     result["softwareVersionBundleId"]
                 )
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.critical(
                         f"Malicious application {result['softwareVersionBundleId']} identified",
                         "",

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

@@ -71,6 +71,7 @@ class Calendar(IOSExtraction):
             if result["participant_email"] and self.indicators:
                 ioc_match = self.indicators.check_email(result["participant_email"])
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.critical(
                         ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                     )
@@ -83,6 +84,7 @@ class Calendar(IOSExtraction):
                     "",
                     result,
                 )
+                self.alertstore.log_latest()
 
     def _parse_calendar_db(self):
         """

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

@@ -61,6 +61,7 @@ class ChromeFavicon(IOSExtraction):
                 ioc_match = self.indicators.check_url(result["icon_url"])
 
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )

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

@@ -62,6 +62,7 @@ class ChromeHistory(IOSExtraction):
         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
                 )

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

@@ -51,31 +51,30 @@ class Contacts(IOSExtraction):
         conn = self._open_sqlite_db(self.file_path)
         cur = conn.cursor()
         try:
-            try:
-                cur.execute(
-                    """
-                    SELECT
-                        multi.value, person.first, person.middle, person.last,
-                        person.organization
-                    FROM ABPerson person, ABMultiValue multi
-                    WHERE person.rowid = multi.record_id and multi.value not null
-                    ORDER by person.rowid ASC;
+            cur.execute(
                 """
-                )
-            except sqlite3.OperationalError as e:
-                self.log.info("Error while reading the contact table: %s", e)
-                return None
-            names = [description[0] for description in cur.description]
+                SELECT
+                    multi.value, person.first, person.middle, person.last,
+                    person.organization
+                FROM ABPerson person, ABMultiValue multi
+                WHERE person.rowid = multi.record_id and multi.value not null
+                ORDER by person.rowid ASC;
+            """
+            )
+        except sqlite3.OperationalError as e:
+            self.log.info("Error while reading the contact table: %s", e)
+            return None
+        names = [description[0] for description in cur.description]
 
-            for row in cur:
-                new_contact = {}
-                for index, value in enumerate(row):
-                    new_contact[names[index]] = value
+        for row in cur:
+            new_contact = {}
+            for index, value in enumerate(row):
+                new_contact[names[index]] = value
 
-                self.results.append(new_contact)
-        finally:
-            cur.close()
-            conn.close()
+            self.results.append(new_contact)
+
+        cur.close()
+        conn.close()
 
         self.log.info(
             "Extracted a total of %d contacts from the address book", len(self.results)

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

@@ -63,6 +63,7 @@ class FirefoxFavicon(IOSExtraction):
                 ioc_match = self.indicators.check_url(result.get("history_url", ""))
 
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )

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

@@ -63,6 +63,7 @@ class FirefoxHistory(IOSExtraction):
         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
                 )

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

@@ -65,6 +65,7 @@ class IDStatusCache(IOSExtraction):
                 email = result["user"][7:].strip("'")
                 ioc_match = self.indicators.check_email(email)
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.critical(
                         ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                     )

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

@@ -291,38 +291,37 @@ class InteractionC(IOSExtraction):
         cur = conn.cursor()
 
         try:
+            cur.execute(QUERIES[0])
+        except sqlite3.OperationalError:
             try:
-                cur.execute(QUERIES[0])
+                cur.execute(QUERIES[1])
             except sqlite3.OperationalError:
                 try:
-                    cur.execute(QUERIES[1])
+                    cur.execute(QUERIES[2])
                 except sqlite3.OperationalError:
                     try:
-                        cur.execute(QUERIES[2])
-                    except sqlite3.OperationalError:
-                        try:
-                            cur.execute(QUERIES[3])
-                        except sqlite3.OperationalError as e:
-                            self.log.info(
-                                "Error while reading the InteractionC table: %s", e
-                            )
-                            return None
+                        cur.execute(QUERIES[3])
+                    except sqlite3.OperationalError as e:
+                        self.log.info(
+                            "Error while reading the InteractionC table: %s", e
+                        )
+                        return None
 
-            names = [description[0] for description in cur.description]
-            for item in cur:
-                entry = {}
-                for index, value in enumerate(item):
-                    if names[index] in self.timestamps:
-                        if value is None or isinstance(value, str):
-                            entry[names[index]] = value
-                        else:
-                            entry[names[index]] = convert_mactime_to_iso(value)
-                    else:
+        names = [description[0] for description in cur.description]
+        for item in cur:
+            entry = {}
+            for index, value in enumerate(item):
+                if names[index] in self.timestamps:
+                    if value is None or isinstance(value, str):
                         entry[names[index]] = value
+                    else:
+                        entry[names[index]] = convert_mactime_to_iso(value)
+                else:
+                    entry[names[index]] = value
 
-                self.results.append(entry)
-        finally:
-            cur.close()
-            conn.close()
+            self.results.append(entry)
+
+        cur.close()
+        conn.close()
 
         self.log.info("Extracted a total of %d InteractionC events", len(self.results))

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

@@ -84,44 +84,48 @@ class LocationdClients(IOSExtraction):
 
             ioc_match = self.indicators.check_process(proc_name)
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.high(
                     f"Found a suspicious process name in LocationD entry {result['package']}",
                     "",
                     result,
-                    matched_indicator=ioc_match.ioc,
                 )
+                self.alertstore.log_latest()
                 continue
 
             if "BundleId" in result:
                 ioc_match = self.indicators.check_process(result["BundleId"])
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.high(
                         f"Found a suspicious process name in LocationD entry {result['package']}",
                         "",
                         result,
-                        matched_indicator=ioc_match.ioc,
                     )
+                    self.alertstore.log_latest()
 
             if "BundlePath" in result:
                 ioc_match = self.indicators.check_file_path(result["BundlePath"])
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.high(
                         f"Found a known malicious domain in LocationD entry {result['package']}",
                         "",
                         result,
-                        matched_indicator=ioc_match.ioc,
                     )
+                    self.alertstore.log_latest()
                     continue
 
             if "Executable" in result:
                 ioc_match = self.indicators.check_file_path(result["Executable"])
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.high(
                         f"Found a suspicious file path in LocationD entry {result['Executable']}",
                         "",
                         result,
-                        matched_indicator=ioc_match.ioc,
                     )
+                    self.alertstore.log_latest()
                     continue
 
             if "Registered" in result:
@@ -131,12 +135,13 @@ class LocationdClients(IOSExtraction):
 
                 ioc_match = self.indicators.check_file_path(result["Registered"])
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.high(
                         f"Found a suspicious file path in LocationD entry {result['Registered']}",
                         "",
                         result,
-                        matched_indicator=ioc_match.ioc,
                     )
+                    self.alertstore.log_latest()
                     continue
 
     def _extract_locationd_entries(self, file_path):

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

@@ -64,6 +64,7 @@ class OSAnalyticsADDaily(IOSExtraction):
         for result in self.results:
             ioc_match = self.indicators.check_process(result["package"])
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )

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

@@ -65,6 +65,7 @@ class SafariBrowserState(IOSExtraction):
             if "tab_url" in result:
                 ioc_match = self.indicators.check_url(result["tab_url"])
                 if ioc_match:
+                    result["matched_indicator"] = ioc_match.ioc
                     self.alertstore.critical(
                         ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                     )
@@ -77,6 +78,7 @@ class SafariBrowserState(IOSExtraction):
                 if "entry_url" in session_entry:
                     ioc_match = self.indicators.check_url(session_entry["entry_url"])
                     if ioc_match:
+                        result["matched_indicator"] = ioc_match.ioc
                         self.alertstore.critical(
                             ioc_match.message,
                             "",
@@ -90,87 +92,82 @@ class SafariBrowserState(IOSExtraction):
 
         cur = conn.cursor()
         try:
+            cur.execute(
+                """
+                SELECT
+                    tabs.title,
+                    tabs.url,
+                    tabs.user_visible_url,
+                    tabs.last_viewed_time,
+                    tab_sessions.session_data
+                FROM tabs
+                JOIN tab_sessions ON tabs.uuid = tab_sessions.tab_uuid
+                ORDER BY tabs.last_viewed_time;
+            """
+            )
+        except sqlite3.OperationalError:
+            # Old version iOS <12 likely
             try:
                 cur.execute(
                     """
                     SELECT
-                        tabs.title,
-                        tabs.url,
-                        tabs.user_visible_url,
-                        tabs.last_viewed_time,
-                        tab_sessions.session_data
-                    FROM tabs
-                    JOIN tab_sessions ON tabs.uuid = tab_sessions.tab_uuid
-                    ORDER BY tabs.last_viewed_time;
-                """
-                )
-            except sqlite3.OperationalError:
-                # Old version iOS <12 likely
-                try:
-                    cur.execute(
-                        """
-                        SELECT
-                            title, url, user_visible_url, last_viewed_time, session_data
+                        title, url, user_visible_url, last_viewed_time, session_data
                     FROM tabs
                     ORDER BY last_viewed_time;
                 """
-                    )
-                except sqlite3.OperationalError as e:
-                    self.log.error(f"Error executing query: {e}")
-                    return
+                )
+            except sqlite3.OperationalError as e:
+                self.log.error(f"Error executing query: {e}")
 
-            for row in cur:
-                session_entries = []
+        for row in cur:
+            session_entries = []
 
-                if row[4]:
-                    # Skip a 4 byte header before the plist content.
-                    session_plist = row[4][4:]
-                    session_data = {}
-                    try:
-                        session_data = plistlib.load(io.BytesIO(session_plist))
-                        session_data = keys_bytes_to_string(session_data)
-                    except plistlib.InvalidFileException:
-                        pass
+            if row[4]:
+                # Skip a 4 byte header before the plist content.
+                session_plist = row[4][4:]
+                session_data = {}
+                try:
+                    session_data = plistlib.load(io.BytesIO(session_plist))
+                    session_data = keys_bytes_to_string(session_data)
+                except plistlib.InvalidFileException:
+                    pass
 
-                    if "SessionHistoryEntries" in session_data.get("SessionHistory", {}):
-                        for session_entry in session_data["SessionHistory"].get(
-                            "SessionHistoryEntries"
-                        ):
-                            self._session_history_count += 1
+                if "SessionHistoryEntries" in session_data.get("SessionHistory", {}):
+                    for session_entry in session_data["SessionHistory"].get(
+                        "SessionHistoryEntries"
+                    ):
+                        self._session_history_count += 1
 
-                            data_length = 0
-                            if "SessionHistoryEntryData" in session_entry:
-                                data_length = len(
-                                    session_entry.get("SessionHistoryEntryData")
-                                )
-
-                            session_entries.append(
-                                {
-                                    "entry_title": session_entry.get(
-                                        "SessionHistoryEntryOriginalURL"
-                                    ),
-                                    "entry_url": session_entry.get(
-                                        "SessionHistoryEntryURL"
-                                    ),
-                                    "data_length": data_length,
-                                }
+                        data_length = 0
+                        if "SessionHistoryEntryData" in session_entry:
+                            data_length = len(
+                                session_entry.get("SessionHistoryEntryData")
                             )
 
-                self.results.append(
-                    {
-                        "tab_title": row[0],
-                        "tab_url": row[1],
-                        "tab_visible_url": row[2],
-                        "last_viewed_timestamp": convert_mactime_to_iso(row[3]),
-                        "session_data": session_entries,
-                        "safari_browser_state_db": os.path.relpath(
-                            db_path, self.target_path
-                        ),
-                    }
-                )
-        finally:
-            cur.close()
-            conn.close()
+                        session_entries.append(
+                            {
+                                "entry_title": session_entry.get(
+                                    "SessionHistoryEntryOriginalURL"
+                                ),
+                                "entry_url": session_entry.get(
+                                    "SessionHistoryEntryURL"
+                                ),
+                                "data_length": data_length,
+                            }
+                        )
+
+            self.results.append(
+                {
+                    "tab_title": row[0],
+                    "tab_url": row[1],
+                    "tab_visible_url": row[2],
+                    "last_viewed_timestamp": convert_mactime_to_iso(row[3]),
+                    "session_data": session_entries,
+                    "safari_browser_state_db": os.path.relpath(
+                        db_path, self.target_path
+                    ),
+                }
+            )
 
     def run(self) -> None:
         if self.is_backup:

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

@@ -101,8 +101,9 @@ class SafariHistory(IOSExtraction):
 
                 if elapsed_time.seconds == 0:
                     self.alertstore.medium(
+                        self.get_slug(),
                         f"Redirect took less than a second! ({elapsed_ms} milliseconds)",
-                        convert_mactime_to_iso(result["timestamp"]),
+                        result["timestamp"],
                         result,
                     )
 
@@ -115,6 +116,7 @@ class SafariHistory(IOSExtraction):
         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
                 )

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

@@ -79,6 +79,7 @@ class Shortcuts(IOSExtraction):
         for result in self.results:
             ioc_match = self.indicators.check_urls(result["action_urls"])
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )

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

@@ -77,10 +77,12 @@ class SMS(IOSExtraction):
                 "text", ""
             ).startswith(alert_new):
                 self.alertstore.high(
-                    f"Apple warning about state-sponsored attack received on {message['isodate']}",
+                    self.get_slug(),
+                    f"Apple warning about state-sponsored attack received on the {message['isodate']}",
                     message["isodate"],
                     message,
                 )
+                self.alertstore.log_latest()
 
         if not self.indicators:
             return
@@ -92,6 +94,7 @@ class SMS(IOSExtraction):
                 message_links = check_for_links(result.get("text", ""))
             ioc_match = self.indicators.check_urls(message_links)
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )
@@ -134,11 +137,6 @@ class SMS(IOSExtraction):
                 """
                 )
                 items = list(cur)
-            elif "no such table" in str(exc):
-                self.log.info(
-                    "No SMS tables found in the database, skipping: %s", exc
-                )
-                return
             else:
                 raise exc
         names = [description[0] for description in cur.description]

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

@@ -4,7 +4,6 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-import sqlite3
 from base64 import b64encode
 from typing import Optional
 
@@ -65,12 +64,8 @@ class SMSAttachments(IOSExtraction):
             if self.indicators:
                 ioc_match = self.indicators.check_file_path(attachment["filename"])
                 if ioc_match:
-                    self.alertstore.high(
-                        ioc_match.message,
-                        "",
-                        attachment,
-                        matched_indicator=ioc_match.ioc,
-                    )
+                    attachment["matched_indicator"] = ioc_match.ioc
+                    self.alertstore.high(ioc_match.message, "", attachment)
 
             if (
                 attachment["filename"].startswith("/var/tmp/")
@@ -78,6 +73,7 @@ class SMSAttachments(IOSExtraction):
                 and attachment["direction"] == "received"
             ):
                 self.alertstore.medium(
+                    self.get_slug(),
                     f"Suspicious iMessage attachment {attachment['filename']} on {attachment['isodate']}",
                     attachment["isodate"],
                     attachment,
@@ -91,29 +87,21 @@ class SMSAttachments(IOSExtraction):
             return
         conn = self._open_sqlite_db(self.file_path)
         cur = conn.cursor()
-        try:
-            cur.execute(
-                """
-                SELECT
-                    attachment.ROWID as "attachment_id",
-                    attachment.*,
-                    message.service as "service",
-                    handle.id as "phone_number"
-                FROM attachment
-                LEFT JOIN message_attachment_join ON
-                    message_attachment_join.attachment_id = attachment.ROWID
-                LEFT JOIN message ON
-                    message.ROWID = message_attachment_join.message_id
-                LEFT JOIN handle ON handle.ROWID = message.handle_id;
+        cur.execute(
             """
-            )
-        except sqlite3.OperationalError as exc:
-            self.log.info(
-                "No SMS attachment tables found in the database, skipping: %s", exc
-            )
-            cur.close()
-            conn.close()
-            return
+            SELECT
+                attachment.ROWID as "attachment_id",
+                attachment.*,
+                message.service as "service",
+                handle.id as "phone_number"
+            FROM attachment
+            LEFT JOIN message_attachment_join ON
+                message_attachment_join.attachment_id = attachment.ROWID
+            LEFT JOIN message ON
+                message.ROWID = message_attachment_join.message_id
+            LEFT JOIN handle ON handle.ROWID = message.handle_id;
+        """
+        )
         names = [description[0] for description in cur.description]
 
         for item in cur:

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

@@ -68,9 +68,11 @@ class WebkitResourceLoadStatistics(IOSExtraction):
         for result in self.results:
             ioc_match = self.indicators.check_url(result["registrable_domain"])
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )
+                self.alertstore.log_latest()
 
     def _process_observations_db(self, db_path: str, domain: str, path: str) -> None:
         self.log.info(
@@ -84,36 +86,32 @@ class WebkitResourceLoadStatistics(IOSExtraction):
         cur = conn.cursor()
 
         try:
-            try:
-                # FIXME: table contains extra fields with timestamp here
-                cur.execute(
-                    """
-                    SELECT
-                        domainID,
-                        registrableDomain,
-                        lastSeen,
-                        hadUserInteraction
-                    from ObservedDomains;
+            # FIXME: table contains extra fields with timestamp here
+            cur.execute(
                 """
-                )
-            except sqlite3.OperationalError:
-                return
+                SELECT
+                    domainID,
+                    registrableDomain,
+                    lastSeen,
+                    hadUserInteraction
+                from ObservedDomains;
+            """
+            )
+        except sqlite3.OperationalError:
+            return
 
-            for row in cur:
-                self.results.append(
-                    {
-                        "domain_id": row[0],
-                        "registrable_domain": row[1],
-                        "last_seen": row[2],
-                        "had_user_interaction": bool(row[3]),
-                        "last_seen_isodate": convert_unix_to_iso(row[2]),
-                        "domain": domain,
-                        "path": path,
-                    }
-                )
-        finally:
-            cur.close()
-            conn.close()
+        for row in cur:
+            self.results.append(
+                {
+                    "domain_id": row[0],
+                    "registrable_domain": row[1],
+                    "last_seen": row[2],
+                    "had_user_interaction": bool(row[3]),
+                    "last_seen_isodate": convert_unix_to_iso(row[2]),
+                    "domain": domain,
+                    "path": path,
+                }
+            )
 
         if len(self.results) > 0:
             self.log.info(

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

@@ -89,6 +89,7 @@ class WebkitSessionResourceLog(IOSExtraction):
 
                 ioc_match = self.indicators.check_urls(all_origins)
                 if ioc_match:
+                    entry["matched_indicator"] = ioc_match.ioc
                     self.alertstore.critical(
                         ioc_match.message, "", entry, matched_indicator=ioc_match.ioc
                     )

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

@@ -64,6 +64,7 @@ class Whatsapp(IOSExtraction):
         for result in self.results:
             ioc_match = self.indicators.check_urls(result.get("links", []))
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.critical(
                     ioc_match.message, "", result, matched_indicator=ioc_match.ioc
                 )

src/mvt/ios/modules/net_base.py

@@ -238,7 +238,7 @@ class NetBase(IOSExtraction):
                         )
 
                     self.alertstore.medium(
-                        msg, proc["live_isodate"], proc
+                        self.get_slug(), msg, proc["live_isodate"], proc
                     )
 
             if not proc["live_proc_id"]:
@@ -260,15 +260,18 @@ class NetBase(IOSExtraction):
             if result["live_proc_id"] not in missing_process_cache:
                 missing_process_cache.add(result["live_proc_id"])
                 self.alertstore.high(
+                    self.get_slug(),
                     f"Found manipulated process entry {result['live_proc_id']}. Entry on {result['live_isodate']}",
                     result["live_isodate"],
                     result,
                 )
+                self.alertstore.log_latest()
 
             # Set manipulated proc timestamp so it appears in timeline.
             result["first_isodate"] = result["isodate"] = result["live_isodate"]
             result["proc_name"] = "MANIPULATED [process record deleted]"
             self.alertstore.high(
+                self.get_slug(),
                 f"Found manipulated process entry {result['live_proc_id']}/",
                 result["first_isodate"],
                 result,
@@ -291,10 +294,12 @@ class NetBase(IOSExtraction):
             if proc_id not in all_proc_id:
                 previous_proc = results_by_proc[last_proc_id]
                 self.alertstore.low(
+                    self.get_slug(),
                     f'Missing process {proc_id}. Previous process at "{previous_proc["first_isodate"]}" ({previous_proc["proc_name"]})',
                     previous_proc["first_isodate"],
                     previous_proc,
                 )
+                self.alertstore.log_latest()
 
                 missing_procs[proc_id] = {
                     "proc_id": proc_id,
@@ -346,9 +351,7 @@ class NetBase(IOSExtraction):
 
             ioc_match = self.indicators.check_process(proc_name)
             if ioc_match:
+                result["matched_indicator"] = ioc_match.ioc
                 self.alertstore.critical(
-                    ioc_match.message,
-                    result["first_isodate"],
-                    result,
-                    matched_indicator=ioc_match.ioc,
+                    self.get_slug(), ioc_match.message, result["first_isodate"], result
                 )

src/mvt/ios/versions.py

@@ -7,7 +7,7 @@ import pkgutil
 from logging import Logger
 from typing import Dict, Optional
 
-from packaging import version as packaging_version
+import packaging
 
 IPHONE_MODELS = json.loads(pkgutil.get_data("mvt", "ios/data/ios_models.json") or b"[]")
 IPHONE_IOS_VERSIONS = json.loads(
@@ -49,8 +49,8 @@ def is_ios_version_outdated(version: str, log: Optional[Logger] = None) -> bool:
         if version == "":
             return False
 
-    latest_parsed = packaging_version.parse(latest_ios_version()["version"])
-    current_parsed = packaging_version.parse(version)
+    latest_parsed = packaging.version.parse(latest_ios_version()["version"])
+    current_parsed = packaging.version.parse(version)
     if current_parsed < latest_parsed:
         if log:
             log.warning(

tests/android/test_artifact_dumpsys_battery_daily.py

@@ -5,7 +5,6 @@
 import logging
 
 from mvt.android.artifacts.dumpsys_battery_daily import DumpsysBatteryDailyArtifact
-from mvt.common.alerts import AlertLevel
 from mvt.common.indicators import Indicators
 
 from ..utils import get_artifact
@@ -36,36 +35,3 @@ class TestDumpsysBatteryDailyArtifact:
         assert len(dba.alertstore.alerts) == 0
         dba.check_indicators()
         assert len(dba.alertstore.alerts) == 1
-
-    def test_uninstall_and_downgrade_create_medium_alerts(self):
-        dba = DumpsysBatteryDailyArtifact()
-        dba.parse(
-            """
-  Daily from 2022-08-16-15-56-39 to 2022-08-17-01-15-45:
-      Update com.example.app vers=10
-      Update com.example.removed vers=0
-  Daily from 2022-08-17-15-56-39 to 2022-08-18-01-15-45:
-      Update com.example.app vers=9
-"""
-        )
-
-        assert len(dba.results) == 3
-        assert len(dba.alertstore.alerts) == 2
-
-        uninstall_alert, downgrade_alert = dba.alertstore.alerts
-        assert uninstall_alert.level == AlertLevel.MEDIUM
-        assert uninstall_alert.message == (
-            "Detected uninstall of package com.example.removed (vers 0)"
-        )
-        assert uninstall_alert.event_time == "2022-08-16"
-        assert uninstall_alert.event["package_name"] == "com.example.removed"
-        assert uninstall_alert.event["vers"] == "0"
-
-        assert downgrade_alert.level == AlertLevel.MEDIUM
-        assert downgrade_alert.message == (
-            "Detected downgrade of package com.example.app from vers 10 to vers 9"
-        )
-        assert downgrade_alert.event_time == "2022-08-17"
-        assert downgrade_alert.event["package_name"] == "com.example.app"
-        assert downgrade_alert.event["action"] == "downgrade"
-        assert downgrade_alert.event["previous_vers"] == "10"

tests/android/test_intrusion_logs.py

@@ -1,154 +0,0 @@
-# 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
-
-from click.testing import CliRunner
-
-from mvt.android.cli import check_intrusion_logs
-from mvt.android.cmd_check_intrusion_logs import CmdAndroidCheckIntrusionLogs
-from mvt.android.modules.intrusion_logs.base import IntrusionLogsModule
-from mvt.android.modules.intrusion_logs.security_event import SecurityEvent
-
-
-def _write_ndjson(path, records):
-    path.write_text(
-        "\n".join(json.dumps(record) for record in records),
-        encoding="utf-8",
-    )
-
-
-def test_load_all_events_preserves_unknown_top_level_event(tmp_path):
-    _write_ndjson(
-        tmp_path / "intrusion.txt",
-        [
-            {
-                "future_event": {
-                    "event_time": 1_700_000_000_000,
-                    "field": "value",
-                }
-            }
-        ],
-    )
-
-    module = IntrusionLogsModule(target_path=str(tmp_path))
-    events = module.load_all_events(str(tmp_path))
-
-    assert events == {
-        "future_event": [
-            {
-                "event_time": 1_700_000_000_000,
-                "field": "value",
-            }
-        ]
-    }
-
-
-def test_check_intrusion_logs_warns_about_unknown_top_level_event_type(
-    tmp_path, caplog
-):
-    _write_ndjson(
-        tmp_path / "intrusion.txt",
-        [
-            {
-                "future_event": {
-                    "event_time": 1_700_000_000_000,
-                    "field": "value",
-                }
-            }
-        ],
-    )
-
-    with caplog.at_level(logging.WARNING):
-        cmd = CmdAndroidCheckIntrusionLogs(target_path=str(tmp_path))
-        cmd.run()
-
-    assert "Found unknown intrusion logging event type(s): future_event" in caplog.text
-    assert "Please open an issue on GitHub" in caplog.text
-
-
-def test_check_intrusion_logs_parses_core_and_unknown_security_events(
-    tmp_path, caplog
-):
-    _write_ndjson(
-        tmp_path / "intrusion.txt",
-        [
-            {
-                "dns_event": {
-                    "event_time": 1_700_000_000_000,
-                    "hostname": "example.com",
-                    "package_name": "com.example.app",
-                    "ip_addresses": ["/1.2.3.4"],
-                }
-            },
-            {
-                "connect_event": {
-                    "event_time": 1_700_000_001_000,
-                    "ip_address": "/5.6.7.8",
-                    "port": 443,
-                    "package_name": "com.example.app",
-                }
-            },
-            {
-                "security_event": {
-                    "event_time": 1_700_000_002_000_000_000,
-                    "app_process_start": {
-                        "process": "com.example.app",
-                        "uid": 10_000,
-                        "pid": 1234,
-                    },
-                }
-            },
-            {
-                "security_event": {
-                    "event_time": 1_700_000_003_000_000_000,
-                    "future_google_event": {
-                        "field": "value",
-                    },
-                }
-            },
-        ],
-    )
-
-    with caplog.at_level(logging.WARNING):
-        cmd = CmdAndroidCheckIntrusionLogs(target_path=str(tmp_path))
-        cmd.run()
-
-    assert [module.__class__.__name__ for module in cmd.executed] == [
-        "DnsEvent",
-        "ConnectEvent",
-        "SecurityEvent",
-    ]
-    assert [len(module.results) for module in cmd.executed] == [1, 1, 2]
-
-    security_module = next(
-        module for module in cmd.executed if isinstance(module, SecurityEvent)
-    )
-    assert security_module.event_type_counts["app_process_start"] == 1
-    assert security_module.event_type_counts["future_google_event"] == 1
-
-    future_timeline_events = [
-        event for event in cmd.timeline if event["event"] == "future_google_event"
-    ]
-    assert len(future_timeline_events) == 1
-    assert "future_google_event" in future_timeline_events[0]["data"]
-    assert "field" in future_timeline_events[0]["data"]
-    assert (
-        "Found unknown intrusion logging security event type(s): future_google_event"
-        in caplog.text
-    )
-    assert "Please open an issue on GitHub" in caplog.text
-
-
-def test_check_intrusion_logs_cli_lists_modules(tmp_path):
-    _write_ndjson(tmp_path / "intrusion.txt", [])
-
-    result = CliRunner().invoke(check_intrusion_logs, ["--list-modules", str(tmp_path)])
-
-    assert result.exit_code == 0
-    assert "DnsEvent" in result.output
-    assert "ConnectEvent" in result.output
-    assert "SecurityEvent" in result.output

tests/android_androidqf/test_mounts.py

@@ -6,7 +6,6 @@
 import logging
 from pathlib import Path
 
-from mvt.common.indicators import Indicator, IndicatorMatch
 from mvt.common.module import run_module
 
 from ..utils import get_android_androidqf, list_files
@@ -73,38 +72,6 @@ class TestAndroidqfMountsArtifact:
             (("by-name/data" in s or "/data" in s) and "rw" in s) for s in concatenated
         ), f"No data-like tokens (data + rw) found in parsed results: {concatenated}"
 
-    def test_mount_ioc_alert_uses_indicator(self):
-        from mvt.android.artifacts.mounts import Mounts as MountsArtifact
-
-        indicator = Indicator(
-            value="/system",
-            type="file_path",
-            name="TestMalware",
-            stix2_file_name="indicators.stix2",
-        )
-        m = MountsArtifact()
-        m.indicators = type(
-            "MountIndicators",
-            (),
-            {
-                "check_file_path": lambda self, path: IndicatorMatch(
-                    ioc=indicator, message="matched file path"
-                )
-                if path == "/system"
-                else None
-            },
-        )()
-
-        m.parse("/dev/block/by-name/system on /system type ext4 (rw,seclabel)")
-        m.check_indicators()
-
-        indicator_alerts = [
-            alert for alert in m.alertstore.alerts if alert.matched_indicator
-        ]
-        assert len(indicator_alerts) == 1
-        assert indicator_alerts[0].matched_indicator == indicator
-        assert indicator_alerts[0].message == "matched file path"
-
 
 class TestAndroidqfMountsModule:
     def test_androidqf_module_no_mounts_file(self):

tests/artifacts/generate_stix.py

@@ -82,7 +82,7 @@ def generate_test_stix_file(file_path):
     for h in sha256:
         i = Indicator(
             indicator_types=["malicious-activity"],
-            pattern="[file:hashes.'SHA-256'='{}']".format(h),
+            pattern="[file:hashes.sha256='{}']".format(h),
             pattern_type="stix",
         )
         res.append(i)
@@ -91,7 +91,7 @@ def generate_test_stix_file(file_path):
     for h in sha1:
         i = Indicator(
             indicator_types=["malicious-activity"],
-            pattern="[file:hashes.'SHA-1'='{}']".format(h),
+            pattern="[file:hashes.sha1='{}']".format(h),
             pattern_type="stix",
         )
         res.append(i)

tests/common/test_alerts.py

@@ -1,49 +0,0 @@
-# Mobile Verification Toolkit (MVT)
-# Copyright (c) 2026 The MVT Authors.
-# Use of this software is governed by the MVT License 1.1 that can be found at
-#   https://license.mvt.re/1.1/
-
-from mvt.common.alerts import Alert, AlertLevel, AlertStore
-
-
-def test_as_json_promotes_nested_matched_indicator():
-    indicator = {"value": "com.apple.weather", "type": "processes"}
-    alertstore = AlertStore()
-    alertstore.add(
-        Alert(
-            level=AlertLevel.CRITICAL,
-            module="datausage",
-            message="Matched indicator",
-            event_time="2026-01-01 00:00:00",
-            event={
-                "proc_name": "WeatherWidget/com.apple.weather",
-                "matched_indicator": indicator,
-            },
-        )
-    )
-
-    alert = alertstore.as_json()[0]
-
-    assert alert["matched_indicator"] == indicator
-    assert "matched_indicator" not in alert["event"]
-
-
-def test_as_json_removes_nested_matched_indicator_when_parent_exists():
-    event_indicator = {"value": "nested", "type": "processes"}
-    alert_indicator = {"value": "parent", "type": "processes"}
-    alertstore = AlertStore()
-    alertstore.add(
-        Alert(
-            level=AlertLevel.CRITICAL,
-            module="manifest",
-            message="Matched indicator",
-            event_time="2026-01-01 00:00:00",
-            event={"path": "/tmp/example", "matched_indicator": event_indicator},
-            matched_indicator=alert_indicator,
-        )
-    )
-
-    alert = alertstore.as_json()[0]
-
-    assert alert["matched_indicator"] == alert_indicator
-    assert "matched_indicator" not in alert["event"]

tests/common/test_command.py

@@ -1,23 +0,0 @@
-# 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
-
-from mvt.common.command import Command
-
-
-class TestCommand:
-    def test_store_alerts_handles_bytes(self, tmp_path):
-        cmd = Command(results_path=str(tmp_path))
-        cmd.alertstore.medium(
-            "bytes event",
-            "",
-            {"payload": b"\xa8\xa9"},
-        )
-
-        cmd._store_alerts()
-
-        alerts = json.loads((tmp_path / "alerts.json").read_text())
-        assert alerts[0]["event"]["payload"] == "\\xa8\\xa9"

tests/common/test_indicators.py

@@ -94,78 +94,6 @@ class TestIndicators:
         )
         assert ind.check_file_hash("da0611a300a9ce9aa7a09d1212f203fca5856794")
 
-    def test_parse_stix2_hash_key_variants(self, tmp_path):
-        """STIX2 spec requires single-quoted algorithm names that contain hyphens,
-        e.g. file:hashes.'SHA-256'. Verify MVT accepts both spec-compliant and
-        non-standard lowercase spellings for MD5, SHA-1 and SHA-256."""
-        import json
-
-        sha256_hash = "570cd76bf49cf52e0cb347a68bdcf0590b2eaece134e1b1eba7e8d66261bdbe6"
-        sha1_hash = "da0611a300a9ce9aa7a09d1212f203fca5856794"
-        md5_hash = "d41d8cd98f00b204e9800998ecf8427e"
-
-        variants = [
-            # (pattern_key, expected_bucket)
-            ("file:hashes.'SHA-256'", "files_sha256"),
-            ("file:hashes.SHA-256", "files_sha256"),
-            ("file:hashes.SHA256", "files_sha256"),
-            ("file:hashes.sha256", "files_sha256"),
-            ("file:hashes.'SHA-1'", "files_sha1"),
-            ("file:hashes.SHA-1", "files_sha1"),
-            ("file:hashes.SHA1", "files_sha1"),
-            ("file:hashes.sha1", "files_sha1"),
-            ("file:hashes.MD5", "files_md5"),
-            ("file:hashes.'MD5'", "files_md5"),
-            ("file:hashes.md5", "files_md5"),
-        ]
-
-        hash_for = {
-            "files_sha256": sha256_hash,
-            "files_sha1": sha1_hash,
-            "files_md5": md5_hash,
-        }
-
-        for pattern_key, bucket in variants:
-            h = hash_for[bucket]
-            stix = {
-                "type": "bundle",
-                "id": "bundle--test",
-                "objects": [
-                    {
-                        "type": "malware",
-                        "id": "malware--test",
-                        "name": "TestMalware",
-                        "is_family": False,
-                    },
-                    {
-                        "type": "indicator",
-                        "id": "indicator--test",
-                        "indicator_types": ["malicious-activity"],
-                        "pattern": f"[{pattern_key}='{h}']",
-                        "pattern_type": "stix",
-                        "valid_from": "2024-01-01T00:00:00Z",
-                    },
-                    {
-                        "type": "relationship",
-                        "id": "relationship--test",
-                        "relationship_type": "indicates",
-                        "source_ref": "indicator--test",
-                        "target_ref": "malware--test",
-                    },
-                ],
-            }
-            stix_file = tmp_path / "test.stix2"
-            stix_file.write_text(json.dumps(stix))
-
-            ind = Indicators(log=logging)
-            ind.load_indicators_files([str(stix_file)], load_default=False)
-            assert len(ind.ioc_collections[0][bucket]) == 1, (
-                f"Pattern key '{pattern_key}' was not parsed into '{bucket}'"
-            )
-            assert ind.check_file_hash(h) is not None, (
-                f"check_file_hash failed for pattern key '{pattern_key}'"
-            )
-
     def test_check_android_property(self, indicator_file):
         ind = Indicators(log=logging)
         ind.load_indicators_files([indicator_file], load_default=False)