From 6a723e533fa25f8625c3f19346170040209b0c6f Mon Sep 17 00:00:00 2001 From: Nex Date: Thu, 3 Feb 2022 20:19:07 +0100 Subject: [PATCH] Fixed logging in adb modules --- mvt/android/modules/adb/chrome_history.py | 7 +++++-- mvt/android/modules/adb/dumpsys_accessibility.py | 4 ++-- mvt/android/modules/adb/dumpsys_activities.py | 5 +++-- mvt/android/modules/adb/dumpsys_battery_daily.py | 5 ++--- mvt/android/modules/adb/dumpsys_battery_history.py | 5 ++--- mvt/android/modules/adb/dumpsys_dbinfo.py | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/mvt/android/modules/adb/chrome_history.py b/mvt/android/modules/adb/chrome_history.py index 6ffa655..c6b40a1 100644 --- a/mvt/android/modules/adb/chrome_history.py +++ b/mvt/android/modules/adb/chrome_history.py @@ -78,5 +78,8 @@ class ChromeHistory(AndroidExtraction): log.info("Extracted a total of %d history items", len(self.results)) def run(self): - self._adb_process_file(os.path.join("/", CHROME_HISTORY_PATH), - self._parse_db) + try: + self._adb_process_file(os.path.join("/", CHROME_HISTORY_PATH), + self._parse_db) + except Exception as e: + self.log.error(e) diff --git a/mvt/android/modules/adb/dumpsys_accessibility.py b/mvt/android/modules/adb/dumpsys_accessibility.py index 53c7f8e..c51e2a8 100644 --- a/mvt/android/modules/adb/dumpsys_accessibility.py +++ b/mvt/android/modules/adb/dumpsys_accessibility.py @@ -34,8 +34,9 @@ class DumpsysAccessibility(AndroidExtraction): def run(self): self._adb_connect() - output = self._adb_command("dumpsys accessibility") + self._adb_disconnect() + self.results = parse_dumpsys_accessibility(output) for result in self.results: @@ -43,4 +44,3 @@ class DumpsysAccessibility(AndroidExtraction): self.log.info("Identified a total of %d accessibility services", len(self.results)) - self._adb_disconnect() diff --git a/mvt/android/modules/adb/dumpsys_activities.py b/mvt/android/modules/adb/dumpsys_activities.py index e938254..73aa3ed 100644 --- a/mvt/android/modules/adb/dumpsys_activities.py +++ b/mvt/android/modules/adb/dumpsys_activities.py @@ -37,8 +37,9 @@ class DumpsysActivities(AndroidExtraction): def run(self): self._adb_connect() - output = self._adb_command("dumpsys package") + self._adb_disconnect() + self.results = parse_dumpsys_activity_resolver_table(output) - self._adb_disconnect() + self.log.info("Extracted activities for %d intents", len(self.results)) diff --git a/mvt/android/modules/adb/dumpsys_battery_daily.py b/mvt/android/modules/adb/dumpsys_battery_daily.py index f73b8ff..e6b8b95 100644 --- a/mvt/android/modules/adb/dumpsys_battery_daily.py +++ b/mvt/android/modules/adb/dumpsys_battery_daily.py @@ -42,10 +42,9 @@ class DumpsysBatteryDaily(AndroidExtraction): def run(self): self._adb_connect() - output = self._adb_command("dumpsys batterystats --daily") + self._adb_disconnect() + self.results = parse_dumpsys_battery_daily(output) self.log.info("Extracted %d records from battery daily stats", len(self.results)) - - self._adb_disconnect() diff --git a/mvt/android/modules/adb/dumpsys_battery_history.py b/mvt/android/modules/adb/dumpsys_battery_history.py index ac4e45b..e4b82a0 100644 --- a/mvt/android/modules/adb/dumpsys_battery_history.py +++ b/mvt/android/modules/adb/dumpsys_battery_history.py @@ -34,10 +34,9 @@ class DumpsysBatteryHistory(AndroidExtraction): def run(self): self._adb_connect() - output = self._adb_command("dumpsys batterystats --history") + self._adb_disconnect() + self.results = parse_dumpsys_battery_history(output) self.log.info("Extracted %d records from battery history", len(self.results)) - - self._adb_disconnect() diff --git a/mvt/android/modules/adb/dumpsys_dbinfo.py b/mvt/android/modules/adb/dumpsys_dbinfo.py index 548bd19..d5dcae5 100644 --- a/mvt/android/modules/adb/dumpsys_dbinfo.py +++ b/mvt/android/modules/adb/dumpsys_dbinfo.py @@ -39,11 +39,11 @@ class DumpsysDBInfo(AndroidExtraction): def run(self): self._adb_connect() - output = self._adb_command("dumpsys dbinfo") + self._adb_disconnect() + self.results = parse_dumpsys_dbinfo(output) self.log.info("Extracted a total of %d records from database information", len(self.results)) - self._adb_disconnect()