Merge 4b89887f4b into 2c5ae696b1

Co-authored-by: DonnchaC <DonnchaC@users.noreply.github.com>

Dockerfile

@@ -13,7 +13,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 # ----------------------------
 RUN apt update \
   && apt install -y python3 python3-pip libusb-1.0-0-dev wget unzip default-jre-headless adb \
-
 # Install build tools for libimobiledevice
 # ----------------------------------------
   build-essential \
@@ -27,7 +26,6 @@ RUN apt update \
   libssl-dev \
   sqlite3 \
   pkg-config \
-
 # Clean up
 # --------
   && apt-get clean \
@@ -41,17 +39,11 @@ RUN git clone https://github.com/libimobiledevice/libplist \
   && git clone https://github.com/libimobiledevice/libusbmuxd \
   && git clone https://github.com/libimobiledevice/libimobiledevice \
   && git clone https://github.com/libimobiledevice/usbmuxd \
-
   && cd libplist && ./autogen.sh && make && make install && ldconfig \
-
   && cd ../libimobiledevice-glue && PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./autogen.sh --prefix=/usr && make && make install && ldconfig \
-
   && cd ../libusbmuxd && PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./autogen.sh && make && make install && ldconfig \
-
   && cd ../libimobiledevice && PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./autogen.sh --enable-debug && make && make install && ldconfig \
-
   && cd ../usbmuxd && PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --runstatedir=/run && make && make install \
-
   # Clean up.
   && cd .. && rm -rf libplist libimobiledevice-glue libusbmuxd libimobiledevice usbmuxd
 

mvt/android/modules/androidqf/dumpsys_accessibility.py

@@ -12,7 +12,7 @@ from .base import AndroidQFModule
 
 
 class DumpsysAccessibility(DumpsysAccessibilityArtifact, AndroidQFModule):
-    """This module analyse dumpsys accessbility"""
+    """This module analyses dumpsys accessibility"""
 
     def __init__(
         self,

mvt/common/logo.py

@@ -10,7 +10,7 @@ from .version import MVT_VERSION
 
 
 def check_updates() -> None:
-    # First we check for MVT version udpates.
+    # First we check for MVT version updates.
     mvt_updates = MVTUpdates()
     try:
         latest_version = mvt_updates.check()

mvt/ios/data/ios_versions.json

@@ -964,6 +964,10 @@
         "version": "16.7.3",
         "build": "20H232"
     },
+    {
+        "version": "16.7.4",
+        "build": "20H240"
+    },
     {
         "version": "17.0",
         "build": "21A327"
@@ -1007,5 +1011,9 @@
     {
         "version": "17.2",
         "build": "21C62"
+    },
+    {
+        "version": "17.2.1",
+        "build": "21C66"
     }
 ]

mvt/ios/modules/mixed/sms.py

@@ -44,7 +44,7 @@ class SMS(IOSExtraction):
     def serialize(self, record: dict) -> Union[dict, list]:
         text = record["text"].replace("\n", "\\n")
         sms_data = f"{record['service']}: {record['guid']} \"{text}\" from {record['phone_number']} ({record['account']})"
-        sms_data = [
+        records = [
             {
                 "timestamp": record["isodate"],
                 "module": self.__class__.__name__,
@@ -54,7 +54,7 @@ class SMS(IOSExtraction):
         ]
         # If the message was read, we add an extra event.
         if record["isodate_read"]:
-            sms_data.append(
+            records.append(
                 {
                     "timestamp": record["isodate_read"],
                     "module": self.__class__.__name__,
@@ -62,7 +62,7 @@ class SMS(IOSExtraction):
                     "data": sms_data,
                 }
             )
-        return sms_data
+        return records
 
     def check_indicators(self) -> None:
         for message in self.results:

tests/ios_backup/test_sms.py

@@ -17,7 +17,7 @@ class TestSMSModule:
         m = SMS(target_path=get_ios_backup_folder())
         run_module(m)
         assert len(m.results) == 1
-        assert len(m.timeline) == 1
+        assert len(m.timeline) == 2
         assert len(m.detected) == 0
 
     def test_detection(self, indicator_file):