From 99d33922be36d1093efc9ad097b713e37855228c Mon Sep 17 00:00:00 2001 From: Nex Date: Thu, 11 Aug 2022 16:42:04 +0200 Subject: [PATCH] Conformed ways modules logger is initialized --- mvt/android/modules/adb/base.py | 3 ++- mvt/android/modules/adb/chrome_history.py | 11 ++++++----- mvt/android/modules/adb/dumpsys_accessibility.py | 5 ++--- mvt/android/modules/adb/dumpsys_activities.py | 5 ++--- mvt/android/modules/adb/dumpsys_appops.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 | 5 ++--- mvt/android/modules/adb/dumpsys_full.py | 7 +++---- mvt/android/modules/adb/dumpsys_receivers.py | 5 ++--- mvt/android/modules/adb/files.py | 5 ++--- mvt/android/modules/adb/getprop.py | 5 ++--- mvt/android/modules/adb/logcat.py | 13 ++++++------- mvt/android/modules/adb/packages.py | 10 ++++------ mvt/android/modules/adb/processes.py | 8 ++++---- mvt/android/modules/adb/root_binaries.py | 5 ++--- mvt/android/modules/adb/selinux_status.py | 5 ++--- mvt/android/modules/adb/settings.py | 5 ++--- mvt/android/modules/adb/sms.py | 10 +++++----- mvt/android/modules/adb/whatsapp.py | 8 ++++---- mvt/android/modules/backup/sms.py | 3 ++- mvt/android/modules/bugreport/accessibility.py | 7 +++---- mvt/android/modules/bugreport/activities.py | 5 ++--- mvt/android/modules/bugreport/appops.py | 5 ++--- mvt/android/modules/bugreport/base.py | 3 --- mvt/android/modules/bugreport/battery_daily.py | 5 ++--- mvt/android/modules/bugreport/battery_history.py | 5 ++--- mvt/android/modules/bugreport/dbinfo.py | 5 ++--- mvt/android/modules/bugreport/getprop.py | 5 ++--- mvt/android/modules/bugreport/packages.py | 5 ++--- mvt/android/modules/bugreport/receivers.py | 5 ++--- mvt/ios/modules/backup/backup_info.py | 3 ++- mvt/ios/modules/backup/configuration_profiles.py | 3 ++- mvt/ios/modules/backup/manifest.py | 3 ++- mvt/ios/modules/backup/profile_events.py | 3 ++- mvt/ios/modules/base.py | 3 ++- mvt/ios/modules/fs/analytics.py | 3 ++- mvt/ios/modules/fs/analytics_ios_versions.py | 3 ++- mvt/ios/modules/fs/cache_files.py | 3 ++- mvt/ios/modules/fs/filesystem.py | 3 ++- mvt/ios/modules/fs/net_netusage.py | 3 ++- mvt/ios/modules/fs/safari_favicon.py | 3 ++- mvt/ios/modules/fs/shutdownlog.py | 3 ++- mvt/ios/modules/fs/version_history.py | 3 ++- mvt/ios/modules/fs/webkit_indexeddb.py | 3 ++- mvt/ios/modules/fs/webkit_localstorage.py | 3 ++- mvt/ios/modules/fs/webkit_safariviewservice.py | 3 ++- mvt/ios/modules/mixed/calls.py | 3 ++- mvt/ios/modules/mixed/chrome_favicon.py | 3 ++- mvt/ios/modules/mixed/chrome_history.py | 3 ++- mvt/ios/modules/mixed/contacts.py | 3 ++- mvt/ios/modules/mixed/firefox_favicon.py | 3 ++- mvt/ios/modules/mixed/firefox_history.py | 3 ++- mvt/ios/modules/mixed/idstatuscache.py | 3 ++- mvt/ios/modules/mixed/interactionc.py | 3 ++- mvt/ios/modules/mixed/locationd.py | 3 ++- mvt/ios/modules/mixed/net_datausage.py | 3 ++- mvt/ios/modules/mixed/osanalytics_addaily.py | 3 ++- mvt/ios/modules/mixed/safari_browserstate.py | 3 ++- mvt/ios/modules/mixed/safari_history.py | 3 ++- mvt/ios/modules/mixed/shortcuts.py | 3 ++- mvt/ios/modules/mixed/sms.py | 3 ++- mvt/ios/modules/mixed/sms_attachments.py | 3 ++- mvt/ios/modules/mixed/tcc.py | 3 ++- .../mixed/webkit_resource_load_statistics.py | 3 ++- .../modules/mixed/webkit_session_resource_log.py | 3 ++- mvt/ios/modules/mixed/whatsapp.py | 5 ++--- mvt/ios/modules/net_base.py | 3 ++- 68 files changed, 153 insertions(+), 143 deletions(-) diff --git a/mvt/android/modules/adb/base.py b/mvt/android/modules/adb/base.py index b6d1475..b90bec7 100644 --- a/mvt/android/modules/adb/base.py +++ b/mvt/android/modules/adb/base.py @@ -36,7 +36,8 @@ class AndroidExtraction(MVTModule): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/chrome_history.py b/mvt/android/modules/adb/chrome_history.py index 25ce7b8..95506a3 100644 --- a/mvt/android/modules/adb/chrome_history.py +++ b/mvt/android/modules/adb/chrome_history.py @@ -12,8 +12,6 @@ from mvt.common.utils import (convert_chrometime_to_unix, from .base import AndroidExtraction -log = logging.getLogger(__name__) - CHROME_HISTORY_PATH = "data/data/com.android.chrome/app_chrome/Default/History" @@ -22,7 +20,8 @@ class ChromeHistory(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) @@ -32,7 +31,8 @@ class ChromeHistory(AndroidExtraction): "timestamp": record["isodate"], "module": self.__class__.__name__, "event": "visit", - "data": f"{record['id']} - {record['url']} (visit ID: {record['visit_id']}, redirect source: {record['redirect_source']})" + "data": f"{record['id']} - {record['url']} (visit ID: {record['visit_id']}, " + f"redirect source: {record['redirect_source']})" } def check_indicators(self) -> None: @@ -76,7 +76,8 @@ class ChromeHistory(AndroidExtraction): cur.close() conn.close() - log.info("Extracted a total of %d history items", len(self.results)) + self.log.info("Extracted a total of %d history items", + len(self.results)) def run(self) -> None: try: diff --git a/mvt/android/modules/adb/dumpsys_accessibility.py b/mvt/android/modules/adb/dumpsys_accessibility.py index 6980a10..baf128e 100644 --- a/mvt/android/modules/adb/dumpsys_accessibility.py +++ b/mvt/android/modules/adb/dumpsys_accessibility.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_accessibility from .base import AndroidExtraction -log = logging.getLogger(__name__) - class DumpsysAccessibility(AndroidExtraction): """This module extracts stats on accessibility.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/dumpsys_activities.py b/mvt/android/modules/adb/dumpsys_activities.py index 60fd815..c716899 100644 --- a/mvt/android/modules/adb/dumpsys_activities.py +++ b/mvt/android/modules/adb/dumpsys_activities.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_activity_resolver_table from .base import AndroidExtraction -log = logging.getLogger(__name__) - class DumpsysActivities(AndroidExtraction): """This module extracts details on receivers for risky activities.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/dumpsys_appops.py b/mvt/android/modules/adb/dumpsys_appops.py index 4b027de..211eabd 100644 --- a/mvt/android/modules/adb/dumpsys_appops.py +++ b/mvt/android/modules/adb/dumpsys_appops.py @@ -9,8 +9,6 @@ from mvt.android.parsers.dumpsys import parse_dumpsys_appops from .base import AndroidExtraction -log = logging.getLogger(__name__) - class DumpsysAppOps(AndroidExtraction): """This module extracts records from App-op Manager.""" @@ -19,7 +17,8 @@ class DumpsysAppOps(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/dumpsys_battery_daily.py b/mvt/android/modules/adb/dumpsys_battery_daily.py index eb889b1..8ac197b 100644 --- a/mvt/android/modules/adb/dumpsys_battery_daily.py +++ b/mvt/android/modules/adb/dumpsys_battery_daily.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_battery_daily from .base import AndroidExtraction -log = logging.getLogger(__name__) - class DumpsysBatteryDaily(AndroidExtraction): """This module extracts records from battery daily updates.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/dumpsys_battery_history.py b/mvt/android/modules/adb/dumpsys_battery_history.py index 8adc25d..459a4bf 100644 --- a/mvt/android/modules/adb/dumpsys_battery_history.py +++ b/mvt/android/modules/adb/dumpsys_battery_history.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_battery_history from .base import AndroidExtraction -log = logging.getLogger(__name__) - class DumpsysBatteryHistory(AndroidExtraction): """This module extracts records from battery history events.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/dumpsys_dbinfo.py b/mvt/android/modules/adb/dumpsys_dbinfo.py index d7e3877..9102285 100644 --- a/mvt/android/modules/adb/dumpsys_dbinfo.py +++ b/mvt/android/modules/adb/dumpsys_dbinfo.py @@ -9,8 +9,6 @@ from mvt.android.parsers import parse_dumpsys_dbinfo from .base import AndroidExtraction -log = logging.getLogger(__name__) - class DumpsysDBInfo(AndroidExtraction): """This module extracts records from battery daily updates.""" @@ -19,7 +17,8 @@ class DumpsysDBInfo(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/dumpsys_full.py b/mvt/android/modules/adb/dumpsys_full.py index 53a4964..12a27fb 100644 --- a/mvt/android/modules/adb/dumpsys_full.py +++ b/mvt/android/modules/adb/dumpsys_full.py @@ -8,15 +8,14 @@ import os from .base import AndroidExtraction -log = logging.getLogger(__name__) - class DumpsysFull(AndroidExtraction): """This module extracts stats on battery consumption by processes.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) @@ -30,6 +29,6 @@ class DumpsysFull(AndroidExtraction): with open(output_path, "w", encoding="utf-8") as handle: handle.write(output) - log.info("Full dumpsys output stored at %s", output_path) + self.log.info("Full dumpsys output stored at %s", output_path) self._adb_disconnect() diff --git a/mvt/android/modules/adb/dumpsys_receivers.py b/mvt/android/modules/adb/dumpsys_receivers.py index a3076ab..a3df117 100644 --- a/mvt/android/modules/adb/dumpsys_receivers.py +++ b/mvt/android/modules/adb/dumpsys_receivers.py @@ -9,8 +9,6 @@ from mvt.android.parsers import parse_dumpsys_receiver_resolver_table from .base import AndroidExtraction -log = logging.getLogger(__name__) - INTENT_NEW_OUTGOING_SMS = "android.provider.Telephony.NEW_OUTGOING_SMS" INTENT_SMS_RECEIVED = "android.provider.Telephony.SMS_RECEIVED" INTENT_DATA_SMS_RECEIVED = "android.intent.action.DATA_SMS_RECEIVED" @@ -23,7 +21,8 @@ class DumpsysReceivers(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/files.py b/mvt/android/modules/adb/files.py index 07120d0..27c2eec 100644 --- a/mvt/android/modules/adb/files.py +++ b/mvt/android/modules/adb/files.py @@ -12,8 +12,6 @@ from mvt.common.utils import convert_timestamp_to_iso from .base import AndroidExtraction -log = logging.getLogger(__name__) - ANDROID_TMP_FOLDERS = [ "/tmp/", "/data/local/tmp/", @@ -29,7 +27,8 @@ class Files(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/getprop.py b/mvt/android/modules/adb/getprop.py index b32134f..61a0c47 100644 --- a/mvt/android/modules/adb/getprop.py +++ b/mvt/android/modules/adb/getprop.py @@ -10,15 +10,14 @@ from mvt.android.parsers import parse_getprop from .base import AndroidExtraction -log = logging.getLogger(__name__) - class Getprop(AndroidExtraction): """This module extracts device properties from getprop command.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/logcat.py b/mvt/android/modules/adb/logcat.py index 0458c73..bee4318 100644 --- a/mvt/android/modules/adb/logcat.py +++ b/mvt/android/modules/adb/logcat.py @@ -8,15 +8,14 @@ import os from .base import AndroidExtraction -log = logging.getLogger(__name__) - class Logcat(AndroidExtraction): """This module extracts details on installed packages.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) @@ -35,15 +34,15 @@ class Logcat(AndroidExtraction): with open(logcat_path, "w", encoding="utf-8") as handle: handle.write(output) - log.info("Current logcat logs stored at %s", - logcat_path) + self.log.info("Current logcat logs stored at %s", + logcat_path) logcat_last_path = os.path.join(self.results_path, "logcat_last.txt") with open(logcat_last_path, "w", encoding="utf-8") as handle: handle.write(last_output) - log.info("Logcat logs prior to last reboot stored at %s", - logcat_last_path) + self.log.info("Logcat logs prior to last reboot stored at %s", + logcat_last_path) self._adb_disconnect() diff --git a/mvt/android/modules/adb/packages.py b/mvt/android/modules/adb/packages.py index ea7284e..0d924bf 100644 --- a/mvt/android/modules/adb/packages.py +++ b/mvt/android/modules/adb/packages.py @@ -14,8 +14,6 @@ from mvt.common.virustotal import VTNoKey, VTQuotaExceeded, virustotal_lookup from .base import AndroidExtraction -log = logging.getLogger(__name__) - DANGEROUS_PERMISSIONS_THRESHOLD = 10 DANGEROUS_PERMISSIONS = [ "android.permission.ACCESS_COARSE_LOCATION", @@ -74,7 +72,8 @@ class Packages(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) @@ -135,11 +134,10 @@ class Packages(AndroidExtraction): for i in track(range(total_hashes), description=f"Looking up {total_hashes} files..."): try: results = virustotal_lookup(hashes[i]) - except VTNoKey as e: - log.info(e) + except VTNoKey: return except VTQuotaExceeded as e: - log.error("Unable to continue: %s", e) + print("Unable to continue: %s", e) break if not results: diff --git a/mvt/android/modules/adb/processes.py b/mvt/android/modules/adb/processes.py index ac2d3f0..557fe09 100644 --- a/mvt/android/modules/adb/processes.py +++ b/mvt/android/modules/adb/processes.py @@ -7,15 +7,14 @@ import logging from .base import AndroidExtraction -log = logging.getLogger(__name__) - class Processes(AndroidExtraction): """This module extracts details on running processes.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) @@ -63,4 +62,5 @@ class Processes(AndroidExtraction): self._adb_disconnect() - log.info("Extracted records on a total of %d processes", len(self.results)) + self.log.info("Extracted records on a total of %d processes", + len(self.results)) diff --git a/mvt/android/modules/adb/root_binaries.py b/mvt/android/modules/adb/root_binaries.py index 6de7770..a1a401f 100644 --- a/mvt/android/modules/adb/root_binaries.py +++ b/mvt/android/modules/adb/root_binaries.py @@ -7,15 +7,14 @@ import logging from .base import AndroidExtraction -log = logging.getLogger(__name__) - class RootBinaries(AndroidExtraction): """This module extracts the list of installed packages.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/selinux_status.py b/mvt/android/modules/adb/selinux_status.py index 5a6a93e..d444358 100644 --- a/mvt/android/modules/adb/selinux_status.py +++ b/mvt/android/modules/adb/selinux_status.py @@ -7,8 +7,6 @@ import logging from .base import AndroidExtraction -log = logging.getLogger(__name__) - class SELinuxStatus(AndroidExtraction): """This module checks if SELinux is being enforced.""" @@ -17,7 +15,8 @@ class SELinuxStatus(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/settings.py b/mvt/android/modules/adb/settings.py index e7c9a99..53415fc 100644 --- a/mvt/android/modules/adb/settings.py +++ b/mvt/android/modules/adb/settings.py @@ -7,8 +7,6 @@ import logging from .base import AndroidExtraction -log = logging.getLogger(__name__) - ANDROID_DANGEROUS_SETTINGS = [ { @@ -64,7 +62,8 @@ class Settings(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/adb/sms.py b/mvt/android/modules/adb/sms.py index f41374e..7ce3f9a 100644 --- a/mvt/android/modules/adb/sms.py +++ b/mvt/android/modules/adb/sms.py @@ -14,8 +14,6 @@ from mvt.common.utils import check_for_links, convert_timestamp_to_iso from .base import AndroidExtraction -log = logging.getLogger(__name__) - SMS_BUGLE_PATH = "data/data/com.google.android.apps.messaging/databases/bugle_db" SMS_BUGLE_QUERY = """ SELECT @@ -48,7 +46,8 @@ class SMS(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) @@ -107,7 +106,7 @@ class SMS(AndroidExtraction): cur.close() conn.close() - log.info("Extracted a total of %d SMS messages containing links", len(self.results)) + self.log.info("Extracted a total of %d SMS messages containing links", len(self.results)) def _extract_sms_adb(self) -> None: """Use the Android backup command to extract SMS data from the native SMS @@ -128,7 +127,8 @@ class SMS(AndroidExtraction): "the SMS and try extracting it with Android Backup Extractor") return - log.info("Extracted a total of %d SMS messages containing links", len(self.results)) + self.log.info("Extracted a total of %d SMS messages containing links", + len(self.results)) def run(self) -> None: try: diff --git a/mvt/android/modules/adb/whatsapp.py b/mvt/android/modules/adb/whatsapp.py index 9dba664..ea59446 100644 --- a/mvt/android/modules/adb/whatsapp.py +++ b/mvt/android/modules/adb/whatsapp.py @@ -12,8 +12,6 @@ from mvt.common.utils import check_for_links, convert_timestamp_to_iso from .base import AndroidExtraction -log = logging.getLogger(__name__) - WHATSAPP_PATH = "data/data/com.whatsapp/databases/msgstore.db" @@ -22,7 +20,8 @@ class Whatsapp(AndroidExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) @@ -82,7 +81,8 @@ class Whatsapp(AndroidExtraction): cur.close() conn.close() - log.info("Extracted a total of %d WhatsApp messages containing links", len(messages)) + self.log.info("Extracted a total of %d WhatsApp messages containing links", + len(messages)) self.results = messages def run(self) -> None: diff --git a/mvt/android/modules/backup/sms.py b/mvt/android/modules/backup/sms.py index 4d4c5ca..a8b03f5 100644 --- a/mvt/android/modules/backup/sms.py +++ b/mvt/android/modules/backup/sms.py @@ -12,7 +12,8 @@ from mvt.android.parsers.backup import parse_sms_file class SMS(BackupExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/bugreport/accessibility.py b/mvt/android/modules/bugreport/accessibility.py index 2d004bd..5697c06 100644 --- a/mvt/android/modules/bugreport/accessibility.py +++ b/mvt/android/modules/bugreport/accessibility.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_accessibility from .base import BugReportModule -log = logging.getLogger(__name__) - class Accessibility(BugReportModule): """This module extracts stats on accessibility.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) @@ -56,6 +55,6 @@ class Accessibility(BugReportModule): self.results = parse_dumpsys_accessibility("\n".join(lines)) for result in self.results: - log.info("Found installed accessibility service \"%s\"", result.get("service")) + self.log.info("Found installed accessibility service \"%s\"", result.get("service")) self.log.info("Identified a total of %d accessibility services", len(self.results)) diff --git a/mvt/android/modules/bugreport/activities.py b/mvt/android/modules/bugreport/activities.py index 51a3fb0..3fec673 100644 --- a/mvt/android/modules/bugreport/activities.py +++ b/mvt/android/modules/bugreport/activities.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_activity_resolver_table from .base import BugReportModule -log = logging.getLogger(__name__) - class Activities(BugReportModule): """This module extracts details on receivers for risky activities.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/bugreport/appops.py b/mvt/android/modules/bugreport/appops.py index 6887328..f219d72 100644 --- a/mvt/android/modules/bugreport/appops.py +++ b/mvt/android/modules/bugreport/appops.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_appops from .base import BugReportModule -log = logging.getLogger(__name__) - class Appops(BugReportModule): """This module extracts information on package from App-Ops Manager.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/bugreport/base.py b/mvt/android/modules/bugreport/base.py index 50cec46..d7476d3 100644 --- a/mvt/android/modules/bugreport/base.py +++ b/mvt/android/modules/bugreport/base.py @@ -4,14 +4,11 @@ # https://github.com/mvt-project/mvt/blob/main/LICENSE import fnmatch -import logging import os from zipfile import ZipFile from mvt.common.module import MVTModule -log = logging.getLogger(__name__) - class BugReportModule(MVTModule): """This class provides a base for all Android Bug Report modules.""" diff --git a/mvt/android/modules/bugreport/battery_daily.py b/mvt/android/modules/bugreport/battery_daily.py index d3c8492..750ff19 100644 --- a/mvt/android/modules/bugreport/battery_daily.py +++ b/mvt/android/modules/bugreport/battery_daily.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_battery_daily from .base import BugReportModule -log = logging.getLogger(__name__) - class BatteryDaily(BugReportModule): """This module extracts records from battery daily updates.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/bugreport/battery_history.py b/mvt/android/modules/bugreport/battery_history.py index ca08d00..e431e1d 100644 --- a/mvt/android/modules/bugreport/battery_history.py +++ b/mvt/android/modules/bugreport/battery_history.py @@ -9,15 +9,14 @@ from mvt.android.parsers import parse_dumpsys_battery_history from .base import BugReportModule -log = logging.getLogger(__name__) - class BatteryHistory(BugReportModule): """This module extracts records from battery daily updates.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/bugreport/dbinfo.py b/mvt/android/modules/bugreport/dbinfo.py index 52ee858..e15a83f 100644 --- a/mvt/android/modules/bugreport/dbinfo.py +++ b/mvt/android/modules/bugreport/dbinfo.py @@ -9,8 +9,6 @@ from mvt.android.parsers import parse_dumpsys_dbinfo from .base import BugReportModule -log = logging.getLogger(__name__) - class DBInfo(BugReportModule): """This module extracts records from battery daily updates.""" @@ -19,7 +17,8 @@ class DBInfo(BugReportModule): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/bugreport/getprop.py b/mvt/android/modules/bugreport/getprop.py index bfa5d23..f08b069 100644 --- a/mvt/android/modules/bugreport/getprop.py +++ b/mvt/android/modules/bugreport/getprop.py @@ -10,15 +10,14 @@ from mvt.android.parsers import parse_getprop from .base import BugReportModule -log = logging.getLogger(__name__) - class Getprop(BugReportModule): """This module extracts device properties from getprop command.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/bugreport/packages.py b/mvt/android/modules/bugreport/packages.py index dc59d30..88b521e 100644 --- a/mvt/android/modules/bugreport/packages.py +++ b/mvt/android/modules/bugreport/packages.py @@ -12,15 +12,14 @@ from mvt.android.modules.adb.packages import (DANGEROUS_PERMISSIONS, from .base import BugReportModule -log = logging.getLogger(__name__) - class Packages(BugReportModule): """This module extracts details on receivers for risky activities.""" def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/android/modules/bugreport/receivers.py b/mvt/android/modules/bugreport/receivers.py index 97928eb..73e3469 100644 --- a/mvt/android/modules/bugreport/receivers.py +++ b/mvt/android/modules/bugreport/receivers.py @@ -9,8 +9,6 @@ from mvt.android.parsers import parse_dumpsys_receiver_resolver_table from .base import BugReportModule -log = logging.getLogger(__name__) - INTENT_NEW_OUTGOING_SMS = "android.provider.Telephony.NEW_OUTGOING_SMS" INTENT_SMS_RECEIVED = "android.provider.Telephony.SMS_RECEIVED" INTENT_DATA_SMS_RECEIVED = "android.intent.action.DATA_SMS_RECEIVED" @@ -23,7 +21,8 @@ class Receivers(BugReportModule): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/backup/backup_info.py b/mvt/ios/modules/backup/backup_info.py index 7928519..80c7aca 100644 --- a/mvt/ios/modules/backup/backup_info.py +++ b/mvt/ios/modules/backup/backup_info.py @@ -18,7 +18,8 @@ class BackupInfo(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/backup/configuration_profiles.py b/mvt/ios/modules/backup/configuration_profiles.py index 64ae169..f97457c 100644 --- a/mvt/ios/modules/backup/configuration_profiles.py +++ b/mvt/ios/modules/backup/configuration_profiles.py @@ -20,7 +20,8 @@ class ConfigurationProfiles(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/backup/manifest.py b/mvt/ios/modules/backup/manifest.py index 591fa01..3bfac33 100644 --- a/mvt/ios/modules/backup/manifest.py +++ b/mvt/ios/modules/backup/manifest.py @@ -21,7 +21,8 @@ class Manifest(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/backup/profile_events.py b/mvt/ios/modules/backup/profile_events.py index f2af9dd..358ce24 100644 --- a/mvt/ios/modules/backup/profile_events.py +++ b/mvt/ios/modules/backup/profile_events.py @@ -21,7 +21,8 @@ class ProfileEvents(IOSExtraction): """ def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/base.py b/mvt/ios/modules/base.py index fbe0451..b70c814 100644 --- a/mvt/ios/modules/base.py +++ b/mvt/ios/modules/base.py @@ -19,7 +19,8 @@ class IOSExtraction(MVTModule): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/analytics.py b/mvt/ios/modules/fs/analytics.py index 83b377c..8c946d0 100644 --- a/mvt/ios/modules/fs/analytics.py +++ b/mvt/ios/modules/fs/analytics.py @@ -21,7 +21,8 @@ class Analytics(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/analytics_ios_versions.py b/mvt/ios/modules/fs/analytics_ios_versions.py index c1951ed..a72cc53 100644 --- a/mvt/ios/modules/fs/analytics_ios_versions.py +++ b/mvt/ios/modules/fs/analytics_ios_versions.py @@ -19,7 +19,8 @@ class AnalyticsIOSVersions(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/cache_files.py b/mvt/ios/modules/fs/cache_files.py index 00d9b46..5bcf5be 100644 --- a/mvt/ios/modules/fs/cache_files.py +++ b/mvt/ios/modules/fs/cache_files.py @@ -14,7 +14,8 @@ class CacheFiles(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/filesystem.py b/mvt/ios/modules/fs/filesystem.py index e3c230d..bf04420 100644 --- a/mvt/ios/modules/fs/filesystem.py +++ b/mvt/ios/modules/fs/filesystem.py @@ -21,7 +21,8 @@ class Filesystem(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/net_netusage.py b/mvt/ios/modules/fs/net_netusage.py index c0a8bc0..9e6a016 100644 --- a/mvt/ios/modules/fs/net_netusage.py +++ b/mvt/ios/modules/fs/net_netusage.py @@ -23,7 +23,8 @@ class Netusage(NetBase): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/safari_favicon.py b/mvt/ios/modules/fs/safari_favicon.py index 8158fc0..241b3fc 100644 --- a/mvt/ios/modules/fs/safari_favicon.py +++ b/mvt/ios/modules/fs/safari_favicon.py @@ -21,7 +21,8 @@ class SafariFavicon(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/shutdownlog.py b/mvt/ios/modules/fs/shutdownlog.py index 2bd648c..cd5d2a4 100644 --- a/mvt/ios/modules/fs/shutdownlog.py +++ b/mvt/ios/modules/fs/shutdownlog.py @@ -19,7 +19,8 @@ class ShutdownLog(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/version_history.py b/mvt/ios/modules/fs/version_history.py index 9073e8d..afe1b54 100644 --- a/mvt/ios/modules/fs/version_history.py +++ b/mvt/ios/modules/fs/version_history.py @@ -21,7 +21,8 @@ class IOSVersionHistory(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/webkit_indexeddb.py b/mvt/ios/modules/fs/webkit_indexeddb.py index 877593e..1e2333c 100644 --- a/mvt/ios/modules/fs/webkit_indexeddb.py +++ b/mvt/ios/modules/fs/webkit_indexeddb.py @@ -23,7 +23,8 @@ class WebkitIndexedDB(WebkitBase): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/webkit_localstorage.py b/mvt/ios/modules/fs/webkit_localstorage.py index cbd1ca3..f921df6 100644 --- a/mvt/ios/modules/fs/webkit_localstorage.py +++ b/mvt/ios/modules/fs/webkit_localstorage.py @@ -21,7 +21,8 @@ class WebkitLocalStorage(WebkitBase): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/fs/webkit_safariviewservice.py b/mvt/ios/modules/fs/webkit_safariviewservice.py index a32e9a1..ac204ac 100644 --- a/mvt/ios/modules/fs/webkit_safariviewservice.py +++ b/mvt/ios/modules/fs/webkit_safariviewservice.py @@ -21,7 +21,8 @@ class WebkitSafariViewService(WebkitBase): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/calls.py b/mvt/ios/modules/mixed/calls.py index 03d50b4..423990d 100644 --- a/mvt/ios/modules/mixed/calls.py +++ b/mvt/ios/modules/mixed/calls.py @@ -23,7 +23,8 @@ class Calls(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/chrome_favicon.py b/mvt/ios/modules/mixed/chrome_favicon.py index 0ba2795..44be403 100644 --- a/mvt/ios/modules/mixed/chrome_favicon.py +++ b/mvt/ios/modules/mixed/chrome_favicon.py @@ -26,7 +26,8 @@ class ChromeFavicon(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/chrome_history.py b/mvt/ios/modules/mixed/chrome_history.py index 595de15..78c3f0d 100644 --- a/mvt/ios/modules/mixed/chrome_history.py +++ b/mvt/ios/modules/mixed/chrome_history.py @@ -25,7 +25,8 @@ class ChromeHistory(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/contacts.py b/mvt/ios/modules/mixed/contacts.py index 4585327..4b54451 100644 --- a/mvt/ios/modules/mixed/contacts.py +++ b/mvt/ios/modules/mixed/contacts.py @@ -21,7 +21,8 @@ class Contacts(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/firefox_favicon.py b/mvt/ios/modules/mixed/firefox_favicon.py index b8bdfa2..2ca83b0 100644 --- a/mvt/ios/modules/mixed/firefox_favicon.py +++ b/mvt/ios/modules/mixed/firefox_favicon.py @@ -24,7 +24,8 @@ class FirefoxFavicon(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/firefox_history.py b/mvt/ios/modules/mixed/firefox_history.py index 803838c..9895dd6 100644 --- a/mvt/ios/modules/mixed/firefox_history.py +++ b/mvt/ios/modules/mixed/firefox_history.py @@ -28,7 +28,8 @@ class FirefoxHistory(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/idstatuscache.py b/mvt/ios/modules/mixed/idstatuscache.py index 45d2208..10d65f4 100644 --- a/mvt/ios/modules/mixed/idstatuscache.py +++ b/mvt/ios/modules/mixed/idstatuscache.py @@ -25,7 +25,8 @@ class IDStatusCache(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/interactionc.py b/mvt/ios/modules/mixed/interactionc.py index cf25b72..2d0c4cc 100644 --- a/mvt/ios/modules/mixed/interactionc.py +++ b/mvt/ios/modules/mixed/interactionc.py @@ -23,7 +23,8 @@ class InteractionC(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/locationd.py b/mvt/ios/modules/mixed/locationd.py index 528bb6d..adb30ed 100644 --- a/mvt/ios/modules/mixed/locationd.py +++ b/mvt/ios/modules/mixed/locationd.py @@ -24,7 +24,8 @@ class LocationdClients(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/net_datausage.py b/mvt/ios/modules/mixed/net_datausage.py index 873e4a2..53ce851 100644 --- a/mvt/ios/modules/mixed/net_datausage.py +++ b/mvt/ios/modules/mixed/net_datausage.py @@ -24,7 +24,8 @@ class Datausage(NetBase): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/osanalytics_addaily.py b/mvt/ios/modules/mixed/osanalytics_addaily.py index 58d2cc4..7efeeaf 100644 --- a/mvt/ios/modules/mixed/osanalytics_addaily.py +++ b/mvt/ios/modules/mixed/osanalytics_addaily.py @@ -23,7 +23,8 @@ class OSAnalyticsADDaily(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/safari_browserstate.py b/mvt/ios/modules/mixed/safari_browserstate.py index c0db2a0..4273697 100644 --- a/mvt/ios/modules/mixed/safari_browserstate.py +++ b/mvt/ios/modules/mixed/safari_browserstate.py @@ -26,7 +26,8 @@ class SafariBrowserState(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/safari_history.py b/mvt/ios/modules/mixed/safari_history.py index 60fdae6..3bc026c 100644 --- a/mvt/ios/modules/mixed/safari_history.py +++ b/mvt/ios/modules/mixed/safari_history.py @@ -28,7 +28,8 @@ class SafariHistory(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/shortcuts.py b/mvt/ios/modules/mixed/shortcuts.py index b9558b3..dfa5bd0 100644 --- a/mvt/ios/modules/mixed/shortcuts.py +++ b/mvt/ios/modules/mixed/shortcuts.py @@ -27,7 +27,8 @@ class Shortcuts(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/sms.py b/mvt/ios/modules/mixed/sms.py index 01ebb85..fd95407 100644 --- a/mvt/ios/modules/mixed/sms.py +++ b/mvt/ios/modules/mixed/sms.py @@ -25,7 +25,8 @@ class SMS(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/sms_attachments.py b/mvt/ios/modules/mixed/sms_attachments.py index 13a64ed..a9e475c 100644 --- a/mvt/ios/modules/mixed/sms_attachments.py +++ b/mvt/ios/modules/mixed/sms_attachments.py @@ -24,7 +24,8 @@ class SMSAttachments(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/tcc.py b/mvt/ios/modules/mixed/tcc.py index de1a565..c42e505 100644 --- a/mvt/ios/modules/mixed/tcc.py +++ b/mvt/ios/modules/mixed/tcc.py @@ -50,7 +50,8 @@ class TCC(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/webkit_resource_load_statistics.py b/mvt/ios/modules/mixed/webkit_resource_load_statistics.py index 405beef..17e6962 100644 --- a/mvt/ios/modules/mixed/webkit_resource_load_statistics.py +++ b/mvt/ios/modules/mixed/webkit_resource_load_statistics.py @@ -25,7 +25,8 @@ class WebkitResourceLoadStatistics(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/webkit_session_resource_log.py b/mvt/ios/modules/mixed/webkit_session_resource_log.py index b8cbae2..9b58ad1 100644 --- a/mvt/ios/modules/mixed/webkit_session_resource_log.py +++ b/mvt/ios/modules/mixed/webkit_session_resource_log.py @@ -32,7 +32,8 @@ class WebkitSessionResourceLog(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/mixed/whatsapp.py b/mvt/ios/modules/mixed/whatsapp.py index d98c3e3..6a67e70 100644 --- a/mvt/ios/modules/mixed/whatsapp.py +++ b/mvt/ios/modules/mixed/whatsapp.py @@ -11,8 +11,6 @@ from mvt.common.utils import (check_for_links, convert_mactime_to_unix, from ..base import IOSExtraction -log = logging.getLogger(__name__) - WHATSAPP_BACKUP_IDS = [ "7c7fba66680ef796b916b067077cc246adacf01d", ] @@ -26,7 +24,8 @@ class Whatsapp(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results) diff --git a/mvt/ios/modules/net_base.py b/mvt/ios/modules/net_base.py index 38d645f..4b0f355 100644 --- a/mvt/ios/modules/net_base.py +++ b/mvt/ios/modules/net_base.py @@ -18,7 +18,8 @@ class NetBase(IOSExtraction): def __init__(self, file_path: str = None, target_path: str = None, results_path: str = None, fast_mode: bool = False, - log: logging.Logger = None, results: list = []) -> None: + log: logging.Logger = logging.getLogger(__name__), + results: list = []) -> None: super().__init__(file_path=file_path, target_path=target_path, results_path=results_path, fast_mode=fast_mode, log=log, results=results)