Merge branch 'main' into fix/tcc

catch sqlite exception in safari_browserstate.py

pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "iOSbackup==0.9.925",
     "adb-shell[usb]==0.4.4",
     "libusb1==3.3.1",
-    "cryptography==45.0.4",
+    "cryptography==45.0.5",
     "PyYAML>=6.0.2",
     "pyahocorasick==2.2.0",
     "betterproto==1.2.5",

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

@@ -95,14 +95,17 @@ class SafariBrowserState(IOSExtraction):
             )
         except sqlite3.OperationalError:
             # Old version iOS <12 likely
-            cur.execute(
+            try:
+                cur.execute(
+                    """
+                    SELECT
+                        title, url, user_visible_url, last_viewed_time, session_data
+                    FROM tabs
+                    ORDER BY last_viewed_time;
                 """
-                SELECT
+                )
-                    title, url, user_visible_url, last_viewed_time, session_data
+            except sqlite3.OperationalError as e:
-                FROM tabs
+                self.log.error(f"Error executing query: {e}")
-                ORDER BY last_viewed_time;
-            """
-            )
 
         for row in cur:
             session_entries = []

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

@@ -116,13 +116,16 @@ class TCC(IOSExtraction):
                 )
                 db_version = "v2"
             except sqlite3.OperationalError:
-                cur.execute(
+                try:
-                    """SELECT
+                    cur.execute(
-                    service, client, client_type, allowed,
+                        """SELECT
-                    prompt_count
+                        service, client, client_type, allowed,
-                    FROM access;"""
+                        prompt_count
-                )
+                        FROM access;"""
-                db_version = "v1"
+                    )
+                    db_version = "v1"
+                except sqlite3.OperationalError as e:
+                    self.log.error(f"Error parsing TCC database: {e}")
 
         for row in cur:
             service = row[0]