Improves Artifact class

mvt/android/artifacts/artifact.py

@@ -2,21 +2,8 @@
 # Copyright (c) 2021-2023 Claudio Guarnieri.
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
-from datetime import datetime, timedelta
-
 from mvt.common.artifact import Artifact
 
 
 class AndroidArtifact(Artifact):
-    def warn_patch_level(self, patch_level: str, log) -> bool:
-        """Alert if Android patch level out-of-date"""
-        patch_date = datetime.strptime(patch_level, "%Y-%m-%d")
-        if (datetime.now() - patch_date) > timedelta(days=6 * 31):
-            log.warning(
-                "This phone has not received security updates "
-                "for more than six months (last update: %s)",
-                patch_level,
-            )
-            return True
-
-        return False
+    pass

mvt/android/artifacts/getprop.py

@@ -5,6 +5,8 @@
 import re
 from typing import Dict, List
 
+from mvt.android.utils import warn_android_patch_level
+
 from .artifact import AndroidArtifact
 
 INTERESTING_PROPERTIES = [
@@ -45,7 +47,7 @@ class GetProp(AndroidArtifact):
                 self.log.info("%s: %s", entry["name"], entry["value"])
 
             if entry["name"] == "ro.build.version.security_patch":
-                self.warn_patch_level(entry["value"], self.log)
+                warn_android_patch_level(entry["value"], self.log)
 
         if not self.indicators:
             return

mvt/android/utils.py

@@ -0,0 +1,19 @@
+# Mobile Verification Toolkit (MVT)
+# Copyright (c) 2021-2023 Claudio Guarnieri.
+# Use of this software is governed by the MVT License 1.1 that can be found at
+#   https://license.mvt.re/1.1/
+from datetime import datetime, timedelta
+
+
+def warn_android_patch_level(self, patch_level: str, log) -> bool:
+    """Alert if Android patch level out-of-date"""
+    patch_date = datetime.strptime(patch_level, "%Y-%m-%d")
+    if (datetime.now() - patch_date) > timedelta(days=6 * 31):
+        log.warning(
+            "This phone has not received security updates "
+            "for more than six months (last update: %s)",
+            patch_level,
+        )
+        return True
+
+    return False

mvt/common/artifact.py

@@ -1,5 +1,28 @@
+# Mobile Verification Toolkit (MVT)
+# Copyright (c) 2021-2023 Claudio Guarnieri.
+# Use of this software is governed by the MVT License 1.1 that can be found at
+#   https://license.mvt.re/1.1/
+
+
 class Artifact:
+    """
+    Main artifact class
+    """
+
     def __init__(self, *args, **kwargs):
         self.results = []
         self.detected = []
+        self.indicators = None
         super().__init__(*args, **kwargs)
+
+    def parse(self, entry: str):
+        """
+        Parse the artifact, adds the parsed information to self.results
+        """
+        NotImplementedError
+
+    def check_indicators(self) -> None:
+        """Check the results of this module against a provided list of
+        indicators coming from self.indicators
+        """
+        raise NotImplementedError