From ed8a5a3845d9dfcb255030ccfa1b7133df9ca899 Mon Sep 17 00:00:00 2001 From: Nex Date: Thu, 3 Feb 2022 19:55:18 +0100 Subject: [PATCH] Fixed dumpstate parsing for different formats and added logging --- mvt/android/modules/bugreport/accessibility.py | 2 +- mvt/android/modules/bugreport/activities.py | 4 +++- mvt/android/modules/bugreport/battery_daily.py | 3 +++ mvt/android/modules/bugreport/battery_history.py | 3 +++ mvt/android/modules/bugreport/dbinfo.py | 5 ++++- mvt/android/modules/bugreport/packages.py | 2 ++ mvt/android/modules/bugreport/receivers.py | 4 +++- 7 files changed, 19 insertions(+), 4 deletions(-) diff --git a/mvt/android/modules/bugreport/accessibility.py b/mvt/android/modules/bugreport/accessibility.py index adb91e6..8f4cb09 100644 --- a/mvt/android/modules/bugreport/accessibility.py +++ b/mvt/android/modules/bugreport/accessibility.py @@ -51,7 +51,7 @@ class Accessibility(BugReportModule): if not in_accessibility: continue - if line.strip() == "------------------------------------------------------------------------------": + if line.strip().startswith("------------------------------------------------------------------------------"): break lines.append(line) diff --git a/mvt/android/modules/bugreport/activities.py b/mvt/android/modules/bugreport/activities.py index 0db5d94..6207eef 100644 --- a/mvt/android/modules/bugreport/activities.py +++ b/mvt/android/modules/bugreport/activities.py @@ -54,9 +54,11 @@ class Activities(BugReportModule): if not in_package: continue - if line.strip() == "------------------------------------------------------------------------------": + if line.strip().startswith("------------------------------------------------------------------------------"): break lines.append(line) self.results = parse_dumpsys_activity_resolver_table("\n".join(lines)) + + self.log.info("Extracted activities for %d intents", len(self.results)) diff --git a/mvt/android/modules/bugreport/battery_daily.py b/mvt/android/modules/bugreport/battery_daily.py index ac67b5a..b4821b0 100644 --- a/mvt/android/modules/bugreport/battery_daily.py +++ b/mvt/android/modules/bugreport/battery_daily.py @@ -74,3 +74,6 @@ class BatteryDaily(BugReportModule): lines.append(line) self.results = parse_dumpsys_battery_daily("\n".join(lines)) + + self.log.info("Extracted a total of %d battery daily stats", + len(self.results)) diff --git a/mvt/android/modules/bugreport/battery_history.py b/mvt/android/modules/bugreport/battery_history.py index 7690dd9..9f86c09 100644 --- a/mvt/android/modules/bugreport/battery_history.py +++ b/mvt/android/modules/bugreport/battery_history.py @@ -66,3 +66,6 @@ class BatteryHistory(BugReportModule): lines.append(line) self.results = parse_dumpsys_battery_history("\n".join(lines)) + + self.log.info("Extracted a total of %d battery history records", + len(self.results)) diff --git a/mvt/android/modules/bugreport/dbinfo.py b/mvt/android/modules/bugreport/dbinfo.py index 1d6e1f2..37d65ea 100644 --- a/mvt/android/modules/bugreport/dbinfo.py +++ b/mvt/android/modules/bugreport/dbinfo.py @@ -55,9 +55,12 @@ class DBInfo(BugReportModule): if not in_dbinfo: continue - if line.strip() == "------------------------------------------------------------------------------": + if line.strip().startswith("------------------------------------------------------------------------------"): break lines.append(line) self.results = parse_dumpsys_dbinfo("\n".join(lines)) + + self.log.info("Extracted a total of %d database connection pool records", + len(self.results)) diff --git a/mvt/android/modules/bugreport/packages.py b/mvt/android/modules/bugreport/packages.py index da5315d..45261c5 100644 --- a/mvt/android/modules/bugreport/packages.py +++ b/mvt/android/modules/bugreport/packages.py @@ -116,3 +116,5 @@ class Packages(BugReportModule): lines.append(line) self.results = self.parse_packages_list("\n".join(lines)) + + self.log.info("Extracted details on %d packages", len(self.results)) diff --git a/mvt/android/modules/bugreport/receivers.py b/mvt/android/modules/bugreport/receivers.py index f8ab7f2..ba5b881 100644 --- a/mvt/android/modules/bugreport/receivers.py +++ b/mvt/android/modules/bugreport/receivers.py @@ -76,9 +76,11 @@ class Receivers(BugReportModule): if not in_receivers: continue - if line.strip() == "------------------------------------------------------------------------------": + if line.strip().startswith("------------------------------------------------------------------------------"): break lines.append(line) self.results = parse_dumpsys_receiver_resolver_table("\n".join(lines)) + + self.log.info("Extracted receivers for %d intents", len(self.results))