From abc0f2768ba63fb7d03a3932f698598edd235b2a Mon Sep 17 00:00:00 2001 From: Nex Date: Thu, 16 Jun 2022 15:24:43 +0200 Subject: [PATCH] Fixed tests --- mvt/ios/cmd_check_fs.py | 2 +- tests/android/test_backup_module.py | 8 ++++---- tests/android/test_bugreport_appops.py | 2 +- tests/ios/test_backup_info.py | 2 +- tests/ios/test_datausage.py | 4 ++-- tests/ios/test_manifest.py | 4 ++-- tests/ios/test_safari_browserstate.py | 4 ++-- tests/ios/test_sms.py | 4 ++-- tests/ios/test_tcc.py | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mvt/ios/cmd_check_fs.py b/mvt/ios/cmd_check_fs.py index b823184..46a2961 100644 --- a/mvt/ios/cmd_check_fs.py +++ b/mvt/ios/cmd_check_fs.py @@ -13,7 +13,7 @@ from .modules.mixed import MIXED_MODULES log = logging.getLogger(__name__) -class CmdIOSChecKFS(Command): +class CmdIOSCheckFS(Command): name = "check-fs" modules = FS_MODULES + MIXED_MODULES diff --git a/tests/android/test_backup_module.py b/tests/android/test_backup_module.py index 02ca425..eebc6ed 100644 --- a/tests/android/test_backup_module.py +++ b/tests/android/test_backup_module.py @@ -18,7 +18,7 @@ from ..utils import get_android_backup_folder class TestBackupModule: def test_module_folder(self): backup_path = get_android_backup_folder() - mod = SMS(base_folder=backup_path, log=logging) + mod = SMS(target_path=backup_path, log=logging) files = [] for root, subdirs, subfiles in os.walk(os.path.abspath(backup_path)): for fname in subfiles: @@ -31,7 +31,7 @@ class TestBackupModule: def test_module_file(self): fpath = os.path.join(get_android_backup_folder(), "backup.ab") - mod = SMS(base_folder=fpath, log=logging) + mod = SMS(target_path=fpath, log=logging) with open(fpath, "rb") as f: data = f.read() tardata = parse_backup_file(data) @@ -47,7 +47,7 @@ class TestBackupModule: def test_module_file2(self): fpath = os.path.join(get_android_backup_folder(), "backup2.ab") - mod = SMS(base_folder=fpath, log=logging) + mod = SMS(target_path=fpath, log=logging) with open(fpath, "rb") as f: data = f.read() tardata = parse_backup_file(data, password="123456") @@ -63,7 +63,7 @@ class TestBackupModule: def test_module_file3(self): fpath = os.path.join(get_android_backup_folder(), "backup3.ab") - mod = SMS(base_folder=fpath, log=logging) + mod = SMS(target_path=fpath, log=logging) with open(fpath, "rb") as f: data = f.read() tardata = parse_backup_file(data) diff --git a/tests/android/test_bugreport_appops.py b/tests/android/test_bugreport_appops.py index abccdb5..4b0e748 100644 --- a/tests/android/test_bugreport_appops.py +++ b/tests/android/test_bugreport_appops.py @@ -16,7 +16,7 @@ from ..utils import get_artifact_folder class TestAppopsModule: def test_appops_parsing(self): fpath = os.path.join(get_artifact_folder(), "android_data/bugreport/") - m = Appops(base_folder=fpath, log=logging, results=[]) + m = Appops(target_path=fpath, log=logging, results=[]) folder_files = [] parent_path = Path(fpath).absolute().as_posix() for root, subdirs, subfiles in os.walk(os.path.abspath(fpath)): diff --git a/tests/ios/test_backup_info.py b/tests/ios/test_backup_info.py index 56cafed..01c308b 100644 --- a/tests/ios/test_backup_info.py +++ b/tests/ios/test_backup_info.py @@ -13,7 +13,7 @@ from ..utils import get_ios_backup_folder class TestBackupInfoModule: def test_manifest(self): - m = BackupInfo(base_folder=get_ios_backup_folder(), log=logging) + m = BackupInfo(target_path=get_ios_backup_folder(), log=logging) run_module(m) assert m.results["Build Version"] == "18C66" assert m.results["IMEI"] == "42" diff --git a/tests/ios/test_datausage.py b/tests/ios/test_datausage.py index 1508633..633dcaf 100644 --- a/tests/ios/test_datausage.py +++ b/tests/ios/test_datausage.py @@ -14,14 +14,14 @@ from ..utils import get_ios_backup_folder class TestDatausageModule: def test_datausage(self): - m = Datausage(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = Datausage(target_path=get_ios_backup_folder(), log=logging, results=[]) run_module(m) assert len(m.results) == 42 assert len(m.timeline) == 60 assert len(m.detected) == 0 def test_detection(self, indicator_file): - m = Datausage(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = Datausage(target_path=get_ios_backup_folder(), log=logging, results=[]) ind = Indicators(log=logging) ind.parse_stix2(indicator_file) # Adds a file that exists in the manifest. diff --git a/tests/ios/test_manifest.py b/tests/ios/test_manifest.py index 06e1ec3..c3de353 100644 --- a/tests/ios/test_manifest.py +++ b/tests/ios/test_manifest.py @@ -14,14 +14,14 @@ from ..utils import get_ios_backup_folder class TestManifestModule: def test_manifest(self): - m = Manifest(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = Manifest(target_path=get_ios_backup_folder(), log=logging, results=[]) run_module(m) assert len(m.results) == 3721 assert len(m.timeline) == 5881 assert len(m.detected) == 0 def test_detection(self, indicator_file): - m = Manifest(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = Manifest(target_path=get_ios_backup_folder(), log=logging, results=[]) ind = Indicators(log=logging) ind.parse_stix2(indicator_file) ind.ioc_collections[0]["file_names"].append("com.apple.CoreBrightness.plist") diff --git a/tests/ios/test_safari_browserstate.py b/tests/ios/test_safari_browserstate.py index 6ef5e8e..e44cee0 100644 --- a/tests/ios/test_safari_browserstate.py +++ b/tests/ios/test_safari_browserstate.py @@ -14,7 +14,7 @@ from ..utils import get_ios_backup_folder class TestSafariBrowserStateModule: def test_parsing(self): - m = SafariBrowserState(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = SafariBrowserState(target_path=get_ios_backup_folder(), log=logging, results=[]) m.is_backup = True run_module(m) assert m.file_path is not None @@ -23,7 +23,7 @@ class TestSafariBrowserStateModule: assert len(m.detected) == 0 def test_detection(self, indicator_file): - m = SafariBrowserState(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = SafariBrowserState(target_path=get_ios_backup_folder(), log=logging, results=[]) m.is_backup = True ind = Indicators(log=logging) ind.parse_stix2(indicator_file) diff --git a/tests/ios/test_sms.py b/tests/ios/test_sms.py index 275b2c3..c3774db 100644 --- a/tests/ios/test_sms.py +++ b/tests/ios/test_sms.py @@ -14,14 +14,14 @@ from ..utils import get_ios_backup_folder class TestSMSModule: def test_sms(self): - m = SMS(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = SMS(target_path=get_ios_backup_folder(), log=logging, results=[]) run_module(m) assert len(m.results) == 1 assert len(m.timeline) == 1 assert len(m.detected) == 0 def test_detection(self, indicator_file): - m = SMS(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = SMS(target_path=get_ios_backup_folder(), log=logging, results=[]) ind = Indicators(log=logging) ind.parse_stix2(indicator_file) # Adds a file that exists in the manifest. diff --git a/tests/ios/test_tcc.py b/tests/ios/test_tcc.py index 71d3218..730e2f4 100644 --- a/tests/ios/test_tcc.py +++ b/tests/ios/test_tcc.py @@ -14,7 +14,7 @@ from ..utils import get_ios_backup_folder class TestTCCtModule: def test_tcc(self): - m = TCC(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = TCC(target_path=get_ios_backup_folder(), log=logging, results=[]) run_module(m) assert len(m.results) == 11 assert len(m.timeline) == 11 @@ -24,7 +24,7 @@ class TestTCCtModule: assert m.results[0]["auth_value"] == "allowed" def test_tcc_detection(self, indicator_file): - m = TCC(base_folder=get_ios_backup_folder(), log=logging, results=[]) + m = TCC(target_path=get_ios_backup_folder(), log=logging, results=[]) ind = Indicators(log=logging) ind.parse_stix2(indicator_file) m.indicators = ind