From 3f8dade610e0424eb5d5b75eeb119d125e0a1c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donncha=20=C3=93=20Cearbhaill?= Date: Fri, 7 Jan 2022 17:08:46 +0100 Subject: [PATCH] Move backup binary artifact to seperate folder --- .../0d/0d609c54856a9bb2d56729df1d68f2958a88426b | Bin .../64/64d0019cb3d46bfc8cce545a8ba54b93e7ea9347 | Bin tests/artifacts/{ => ios_backup}/Info.plist | Bin tests/artifacts/{ => ios_backup}/Manifest.db | Bin tests/ios/test_backup_info.py | 4 ++-- tests/ios/test_datausage.py | 6 +++--- tests/ios/test_manifest.py | 6 +++--- tests/ios/test_tcc.py | 5 ++--- tests/utils.py | 6 ++++-- 9 files changed, 14 insertions(+), 13 deletions(-) rename tests/artifacts/{ => ios_backup}/0d/0d609c54856a9bb2d56729df1d68f2958a88426b (100%) rename tests/artifacts/{ => ios_backup}/64/64d0019cb3d46bfc8cce545a8ba54b93e7ea9347 (100%) rename tests/artifacts/{ => ios_backup}/Info.plist (100%) rename tests/artifacts/{ => ios_backup}/Manifest.db (100%) diff --git a/tests/artifacts/0d/0d609c54856a9bb2d56729df1d68f2958a88426b b/tests/artifacts/ios_backup/0d/0d609c54856a9bb2d56729df1d68f2958a88426b similarity index 100% rename from tests/artifacts/0d/0d609c54856a9bb2d56729df1d68f2958a88426b rename to tests/artifacts/ios_backup/0d/0d609c54856a9bb2d56729df1d68f2958a88426b diff --git a/tests/artifacts/64/64d0019cb3d46bfc8cce545a8ba54b93e7ea9347 b/tests/artifacts/ios_backup/64/64d0019cb3d46bfc8cce545a8ba54b93e7ea9347 similarity index 100% rename from tests/artifacts/64/64d0019cb3d46bfc8cce545a8ba54b93e7ea9347 rename to tests/artifacts/ios_backup/64/64d0019cb3d46bfc8cce545a8ba54b93e7ea9347 diff --git a/tests/artifacts/Info.plist b/tests/artifacts/ios_backup/Info.plist similarity index 100% rename from tests/artifacts/Info.plist rename to tests/artifacts/ios_backup/Info.plist diff --git a/tests/artifacts/Manifest.db b/tests/artifacts/ios_backup/Manifest.db similarity index 100% rename from tests/artifacts/Manifest.db rename to tests/artifacts/ios_backup/Manifest.db diff --git a/tests/ios/test_backup_info.py b/tests/ios/test_backup_info.py index 4f83a87..0492550 100644 --- a/tests/ios/test_backup_info.py +++ b/tests/ios/test_backup_info.py @@ -4,7 +4,7 @@ import logging from mvt.ios.modules.backup.backup_info import BackupInfo from mvt.common.module import run_module -from ..utils import get_artifact_folder, init_setup +from ..utils import get_backup_folder, init_setup class TestBackupInfoModule: @@ -13,7 +13,7 @@ class TestBackupInfoModule: init_setup() def test_manifest(self): - m = BackupInfo(base_folder=get_artifact_folder(), log=logging) + m = BackupInfo(base_folder=get_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 b773564..71ad36a 100644 --- a/tests/ios/test_datausage.py +++ b/tests/ios/test_datausage.py @@ -5,7 +5,7 @@ from mvt.common.indicators import Indicators from mvt.ios.modules.mixed.net_datausage import Datausage from mvt.common.module import run_module -from ..utils import get_artifact, get_artifact_folder, init_setup +from ..utils import get_artifact, get_backup_folder, init_setup class TestDatausageModule: @pytest.fixture(scope="session", autouse=True) @@ -13,14 +13,14 @@ class TestDatausageModule: init_setup() def test_datausage(self): - m = Datausage(base_folder=get_artifact_folder(), log=logging) + m = Datausage(base_folder=get_backup_folder(), log=logging) run_module(m) assert len(m.results) == 42 assert len(m.timeline) == 60 assert len(m.detected) == 0 def test_detection(self): - m = Datausage(base_folder=get_artifact_folder(), log=logging) + m = Datausage(base_folder=get_backup_folder(), log=logging) ind = Indicators(log=logging) ind.parse_stix2(get_artifact("test.stix2")) # Adds a file that exists in the manifest diff --git a/tests/ios/test_manifest.py b/tests/ios/test_manifest.py index c1ae811..385d828 100644 --- a/tests/ios/test_manifest.py +++ b/tests/ios/test_manifest.py @@ -5,7 +5,7 @@ from mvt.common.indicators import Indicators from mvt.ios.modules.backup.manifest import Manifest from mvt.common.module import run_module -from ..utils import get_artifact, get_artifact_folder, init_setup +from ..utils import get_artifact, get_backup_folder, init_setup class TestManifestModule: @pytest.fixture(scope="session", autouse=True) @@ -13,14 +13,14 @@ class TestManifestModule: init_setup() def test_manifest(self): - m = Manifest(base_folder=get_artifact_folder(), log=logging) + m = Manifest(base_folder=get_backup_folder(), log=logging) run_module(m) assert len(m.results) == 3721 assert len(m.timeline) == 5881 assert len(m.detected) == 0 def test_detection(self): - m = Manifest(base_folder=get_artifact_folder(), log=logging) + m = Manifest(base_folder=get_backup_folder(), log=logging) ind = Indicators(log=logging) ind.parse_stix2(get_artifact("test.stix2")) # Adds a file that exists in the manifest diff --git a/tests/ios/test_tcc.py b/tests/ios/test_tcc.py index 600acc5..a140aff 100644 --- a/tests/ios/test_tcc.py +++ b/tests/ios/test_tcc.py @@ -4,7 +4,7 @@ import logging from mvt.ios.modules.mixed.tcc import TCC from mvt.common.module import run_module -from ..utils import get_artifact_folder, init_setup +from ..utils import get_backup_folder, init_setup class TestManifestModule: @pytest.fixture(scope="session", autouse=True) @@ -12,10 +12,9 @@ class TestManifestModule: init_setup() def test_manifest(self): - m = TCC(base_folder=get_artifact_folder(), log=logging) + m = TCC(base_folder=get_backup_folder(), log=logging) run_module(m) assert len(m.results) == 11 - # FIXME: TCC should suport timeline assert len(m.timeline) == 11 assert len(m.detected) == 0 assert m.results[0]["service"] == "kTCCServiceUbiquity" diff --git a/tests/utils.py b/tests/utils.py index c1c13b6..8020ca2 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -5,8 +5,7 @@ def get_artifact(fname): """ Return the artifact path in the artifact folder """ - DATA_FOLDER = os.path.join(os.path.dirname(__file__), "artifacts") - fpath = os.path.join(DATA_FOLDER, fname) + fpath = os.path.join(get_artifact_folder(), fname) if os.path.isfile(fpath): return fpath return @@ -16,6 +15,9 @@ def get_artifact_folder(): return os.path.join(os.path.dirname(__file__), "artifacts") +def get_backup_folder(): + return os.path.join(os.path.dirname(__file__), "artifacts", "ios_backup") + def init_setup(): """ init data to have a clean state before testing