diff --git a/monkey/tests/data_for_tests/monkey_configs/automated_master_config.json b/monkey/tests/data_for_tests/monkey_configs/automated_master_config.json index e4712defe..9aa42aa94 100644 --- a/monkey/tests/data_for_tests/monkey_configs/automated_master_config.json +++ b/monkey/tests/data_for_tests/monkey_configs/automated_master_config.json @@ -54,7 +54,6 @@ {"name": "WmiExploiter", "supported_os": ["windows"], "options": {}} ], "vulnerability": [ - {"name": "DrupalExploiter", "supported_os": ["linux", "windows"], "options": {}}, {"name": "HadoopExploiter", "supported_os": ["linux", "windows"], "options": {}}, {"name": "ShellShockExploiter", "supported_os": ["linux"], "options": {}}, {"name": "Struts2Exploiter", "supported_os": ["linux", "windows"], "options": {}}, diff --git a/monkey/tests/data_for_tests/monkey_configs/flat_config.json b/monkey/tests/data_for_tests/monkey_configs/flat_config.json index b9dae9453..f2877b271 100644 --- a/monkey/tests/data_for_tests/monkey_configs/flat_config.json +++ b/monkey/tests/data_for_tests/monkey_configs/flat_config.json @@ -54,7 +54,6 @@ "WebLogicExploiter", "HadoopExploiter", "MSSQLExploiter", - "DrupalExploiter", "PowerShellExploiter", "Log4ShellExploiter" ], diff --git a/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json b/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json index f0c95e5b3..da8e10480 100644 --- a/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json +++ b/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json @@ -8,8 +8,7 @@ "Struts2Exploiter", "WebLogicExploiter", "HadoopExploiter", - "MSSQLExploiter", - "DrupalExploiter" + "MSSQLExploiter" ] }, "credentials": { diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/reporting/exploitations/test_monkey_exploitation.py b/monkey/tests/unit_tests/monkey_island/cc/services/reporting/exploitations/test_monkey_exploitation.py index 9995ba795..84d7bb3eb 100644 --- a/monkey/tests/unit_tests/monkey_island/cc/services/reporting/exploitations/test_monkey_exploitation.py +++ b/monkey/tests/unit_tests/monkey_island/cc/services/reporting/exploitations/test_monkey_exploitation.py @@ -94,9 +94,9 @@ NODE_DICT = { "exploits": [ { "exploitation_result": True, - "exploiter": "DrupalExploiter", + "exploiter": "Log4ShellExploiter", "info": { - "display_name": "Drupal Server", + "display_name": "Log4j", "started": datetime.datetime(2021, 2, 19, 9, 0, 14, 950000), "finished": datetime.datetime(2021, 2, 19, 9, 0, 14, 950000), "vulnerable_urls": [], @@ -135,12 +135,12 @@ NODE_DICT_FAILED_EXPLOITS["exploits"][1]["exploitation_result"] = False def test_get_exploits_used_on_node__2_exploits(): exploits = get_exploits_used_on_node(NODE_DICT) - assert sorted(exploits) == sorted(["Zerologon Exploiter", "Drupal Server Exploiter"]) + assert sorted(exploits) == sorted(["Zerologon Exploiter", "Log4Shell Exploiter"]) def test_get_exploits_used_on_node__duplicate_exploits(): exploits = get_exploits_used_on_node(NODE_DICT_DUPLICATE_EXPLOITS) - assert exploits == ["Drupal Server Exploiter"] + assert exploits == ["Log4Shell Exploiter"] def test_get_exploits_used_on_node__failed(): 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 index b49007eb0..4ca4322d5 100644 --- a/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py +++ b/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py @@ -199,7 +199,6 @@ def test_format_config_for_agent__exploiters(flat_monkey_config): }, ], "vulnerability": [ - {"name": "DrupalExploiter", "supported_os": [], "options": {}}, {"name": "HadoopExploiter", "supported_os": ["linux", "windows"], "options": {}}, {"name": "Log4ShellExploiter", "supported_os": ["linux", "windows"], "options": {}}, {"name": "Struts2Exploiter", "supported_os": [], "options": {}},