diff --git a/mvt/android/cli.py b/mvt/android/cli.py index d262a19..33649da 100644 --- a/mvt/android/cli.py +++ b/mvt/android/cli.py @@ -199,6 +199,7 @@ def check_backup(ctx, iocs, output, backup_path, serial): run_module(m) + #============================================================================== # Command: download-iocs #============================================================================== diff --git a/mvt/android/modules/adb/files.py b/mvt/android/modules/adb/files.py index 926a0a0..bbdd2a1 100644 --- a/mvt/android/modules/adb/files.py +++ b/mvt/android/modules/adb/files.py @@ -4,11 +4,10 @@ # https://license.mvt.re/1.1/ import logging -import os import stat import datetime -from mvt.common.utils import check_for_links, convert_timestamp_to_iso +from mvt.common.utils import convert_timestamp_to_iso from .base import AndroidExtraction @@ -31,8 +30,8 @@ class Files(AndroidExtraction): # Run find command with correct args and parse results. # Check that full file printf options are suppported on first run. - if self.full_find == None: - output = self._adb_command(f"find '/' -maxdepth 1 -printf '%T@ %m %s %u %g %p\n' 2> /dev/null") + if self.full_find is None: + output = self._adb_command("find '/' -maxdepth 1 -printf '%T@ %m %s %u %g %p\n' 2> /dev/null") if not (output or output.strip().splitlines()): # Full find command failed to generate output, fallback to basic file arguments self.full_find = False @@ -40,7 +39,7 @@ class Files(AndroidExtraction): self.full_find = True found_files = [] - if self.full_find == True: + if self.full_find is True: # Run full file command and collect additonal file information. output = self._adb_command(f"find '{file_path}' -printf '%T@ %m %s %u %g %p\n' 2> /dev/null") for file_line in output.splitlines(): diff --git a/mvt/ios/cli.py b/mvt/ios/cli.py index 045d7d1..2bf6474 100644 --- a/mvt/ios/cli.py +++ b/mvt/ios/cli.py @@ -5,7 +5,6 @@ import logging import os -import io import click from rich.logging import RichHandler @@ -295,6 +294,7 @@ def check_iocs(ctx, iocs, list_modules, module, folder): except NotImplementedError: continue + #============================================================================== # Command: download-iocs #============================================================================== diff --git a/mvt/ios/modules/backup/configuration_profiles.py b/mvt/ios/modules/backup/configuration_profiles.py index 85f8d83..97936b0 100644 --- a/mvt/ios/modules/backup/configuration_profiles.py +++ b/mvt/ios/modules/backup/configuration_profiles.py @@ -70,7 +70,7 @@ class ConfigurationProfiles(IOSExtraction): with open(conf_file_path, "rb") as handle: try: conf_plist = plistlib.load(handle) - except: + except Exception: conf_plist = {} if "SignerCerts" in conf_plist: