p41275903
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Island: Add TODO to return default config in reporting 

Notes in services for not fixing the failing tests until we remove
the ConfigService
This commit is contained in:
Ilija Lazoroski 2022-07-06 15:45:13 +02:00
parent 9b23cc0bef
commit 16e8443134
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monkey/monkey_island/cc/services/reporting/report.py
View File

@ -392,6 +392,7 @@ class ReportService:
@staticmethod @staticmethod
def get_config_exploits(): def get_config_exploits():
exploits_config_value = EXPLOITER_CLASSES_PATH exploits_config_value = EXPLOITER_CLASSES_PATH
# TODO: Return default config here
default_exploits = ConfigService.get_default_config(False) default_exploits = ConfigService.get_default_config(False)
for namespace in exploits_config_value: for namespace in exploits_config_value:
default_exploits = default_exploits[namespace] default_exploits = default_exploits[namespace]

4
monkey/tests/unit_tests/monkey_island/cc/services/conftest.py
View File

@ -15,7 +15,9 @@ def PORT():
@pytest.fixture @pytest.fixture
def config(monkeypatch): def config(monkeypatch):
config = ConfigService.get_default_config(True) # Note: ConfigService is going away, don't try to fix the UT using
# this fixture
config = ConfigService.get_config(True)
return config return config

4
monkey/tests/unit_tests/monkey_island/cc/services/telemetry/processing/credentials/conftest.py
View File

@ -14,7 +14,9 @@ fake_ip_address = "192.168.56.1"
def fake_mongo(monkeypatch, uses_encryptor): def fake_mongo(monkeypatch, uses_encryptor):
mongo = mongoengine.connection.get_connection() mongo = mongoengine.connection.get_connection()
monkeypatch.setattr("monkey_island.cc.services.config.mongo", mongo) monkeypatch.setattr("monkey_island.cc.services.config.mongo", mongo)
config = ConfigService.get_default_config() # Note: ConfigService is going away, don't try to fix UT using
# this fixture
config = ConfigService.get_config()
ConfigService.update_config(config, should_encrypt=True) ConfigService.update_config(config, should_encrypt=True)