diff --git a/monkey/monkey_island/cc/services/config.py b/monkey/monkey_island/cc/services/config.py index ac7844ca2..ea40c52a1 100644 --- a/monkey/monkey_island/cc/services/config.py +++ b/monkey/monkey_island/cc/services/config.py @@ -1,7 +1,6 @@ import collections import functools import logging -from typing import Dict, List from common.config_value_paths import ( LM_HASH_LIST_PATH, @@ -98,25 +97,6 @@ class ConfigService: mongo_key = ".".join(config_key_as_arr) mongo.db.config.update({}, {"$set": {mongo_key: value}}) - @staticmethod - def get_flat_config(should_decrypt=True): - config_json = ConfigService.get_config(should_decrypt) - flat_config_json = {} - for i in config_json: - if i == "ransomware": - # Don't flatten the ransomware because ransomware payload expects a dictionary #1260 - flat_config_json[i] = config_json[i] - continue - for j in config_json[i]: - for k in config_json[i][j]: - if isinstance(config_json[i][j][k], dict): - for key, value in config_json[i][j][k].items(): - flat_config_json[key] = value - else: - flat_config_json[k] = config_json[i][j][k] - - return flat_config_json - # Not added to interface because it's doable by get_config_field + set_config_field @staticmethod def add_item_to_config_set_if_dont_exist(item_path_array, item_value, should_encrypt): @@ -251,13 +231,3 @@ class ConfigService: if is_decrypt else get_datastore_encryptor().encrypt(config_arr) ) - - @staticmethod - def get_config_propagation_credentials_from_flat_config(config) -> Dict[str, List[str]]: - return { - "exploit_user_list": config.get("exploit_user_list", []), - "exploit_password_list": config.get("exploit_password_list", []), - "exploit_lm_hash_list": config.get("exploit_lm_hash_list", []), - "exploit_ntlm_hash_list": config.get("exploit_ntlm_hash_list", []), - "exploit_ssh_keys": config.get("exploit_ssh_keys", []), - } diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py b/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py deleted file mode 100644 index 37249c2bc..000000000 --- a/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py +++ /dev/null @@ -1,17 +0,0 @@ -from monkey_island.cc.services.config import ConfigService - -# If tests fail because config path is changed, sync with -# monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/RunOptions.js - - -def test_get_config_propagation_credentials_from_flat_config(flat_monkey_config): - expected_creds = { - "exploit_lm_hash_list": ["lm_hash_1", "lm_hash_2"], - "exploit_ntlm_hash_list": ["nt_hash_1", "nt_hash_2", "nt_hash_3"], - "exploit_password_list": ["test", "iloveyou", "12345"], - "exploit_ssh_keys": [{"private_key": "my_private_key", "public_key": "my_public_key"}], - "exploit_user_list": ["Administrator", "root", "user", "ubuntu"], - } - - creds = ConfigService.get_config_propagation_credentials_from_flat_config(flat_monkey_config) - assert creds == expected_creds