fix: report module for 4.17

autopsy.py

@@ -14,6 +14,7 @@
 from psy.report import ReportOutput
 from psy.processor import DataSourcesPanelSettings
 from psy.settings import ProjectIngestSettingsPanel, ProjectReportSettingsPanel
+from psy.psyutils import PsyUtils
 
 #3 Modules - Ingest, Report, DatasourceProcessor
 class ProjectIngestModuleFactory(IngestModuleFactoryAdapter):
@@ -66,9 +67,14 @@ def getName(self):
     def getDescription(self):
         return "Forensic Analysis for Mobile Apps Framework Report Generator"
 
-    def generateReport(self, baseReportDir, progressBar):
+    def generateReport(self, settings, progressBar):
+        autopsy_version = PsyUtils.get_autopsy_version()
+        baseReportDir = settings
+        if (autopsy_version["major"] == 4 and autopsy_version["minor"] >= 16):
+            baseReportDir = settings.getReportDirectoryPath()
+
         self.report.generateReport(baseReportDir, progressBar)
-    
+
     def getConfigurationPanel(self):
         self.configPanel = ProjectReportSettingsPanel()
         return self.configPanel

modules/autopsy/tiktok.py

@@ -23,7 +23,7 @@ def process_report(self, datasource_name, file, report_number, path):
 
         data = Utils.read_json(path)
 
-        self.uid = data.get("profile").get("uid")
+        self.uid = data.get("profile").get("uid") if data.get("profile").get("uid") else ""
 
         self.process_messages(data.get("messages"), file)
         self.process_user_profile(data.get("profile"), file)

psy/settings.py

@@ -52,7 +52,7 @@ def initComponents(self):
 
         autopsy_version = PsyUtils.get_autopsy_version()
 
-        if ((autopsy_version["major"] == 4 and autopsy_version["minor"] <= 16) or autopsy_version["major"] < 4):
+        if ((autopsy_version["major"] == 4 and autopsy_version["minor"] <= 17) or autopsy_version["major"] < 4):
             self.p_info.add(self.lb_info)
             self.p_info.add(self.lb_info2, BorderLayout.SOUTH)