From f5c8db979fced77f839f5c229b0935a8784b29dc Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Wed, 10 Nov 2021 15:36:57 +0200 Subject: [PATCH] Project: remove remaining sambacry exploiter references in performance.py config template, vulture_allowlist.py and monkey_config_standard.json unit test data file --- .../blackbox/config_templates/performance.py | 1 - .../monkey_config_standard.json | 54 +++++++------------ vulture_allowlist.py | 1 - 3 files changed, 18 insertions(+), 38 deletions(-) diff --git a/envs/monkey_zoo/blackbox/config_templates/performance.py b/envs/monkey_zoo/blackbox/config_templates/performance.py index ccc073197..07c7cd79f 100644 --- a/envs/monkey_zoo/blackbox/config_templates/performance.py +++ b/envs/monkey_zoo/blackbox/config_templates/performance.py @@ -17,7 +17,6 @@ class Performance(ConfigTemplate): "WmiExploiter", "SSHExploiter", "ShellShockExploiter", - "SambaCryExploiter", "ElasticGroovyExploiter", "Struts2Exploiter", "WebLogicExploiter", 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 709c8e2c8..26715875c 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 @@ -6,7 +6,6 @@ "WmiExploiter", "SSHExploiter", "ShellShockExploiter", - "SambaCryExploiter", "ElasticGroovyExploiter", "Struts2Exploiter", "WebLogicExploiter", @@ -140,23 +139,6 @@ "ms08_067": { "ms08_067_exploit_attempts": 5, "user_to_add": "Monkey_IUSER_SUPPORT" - }, - "sambacry": { - "sambacry_trigger_timeout": 5, - "sambacry_folder_paths_to_guess": [ - "/", - "/mnt", - "/tmp", - "/storage", - "/export", - "/share", - "/shares", - "/home" - ], - "sambacry_shares_not_to_check": [ - "IPC$", - "print$" - ] } }, "testing": { @@ -165,29 +147,29 @@ }, "monkey": { "post_breach": { - "custom_PBA_linux_cmd": "", - "custom_PBA_windows_cmd": "", - "PBA_windows_filename": "", - "PBA_linux_filename": "", + "custom_pba_linux_cmd": "", + "custom_pba_windows_cmd": "", + "pba_windows_filename": "", + "pba_linux_filename": "", "post_breach_actions": [ - "CommunicateAsBackdoorUser", - "ModifyShellStartupFiles", - "HiddenFiles", - "TrapCommand", - "ChangeSetuidSetgid", - "ScheduleJobs", - "Timestomping", - "AccountDiscovery" + "communicateasbackdooruser", + "modifyshellstartupfiles", + "hiddenfiles", + "trapcommand", + "changesetuidsetgid", + "schedulejobs", + "timestomping", + "accountdiscovery" ] }, "system_info": { "system_info_collector_classes": [ - "EnvironmentCollector", - "AwsCollector", - "HostnameCollector", - "ProcessListCollector", - "MimikatzCollector", - "AzureCollector" + "environmentcollector", + "awscollector", + "hostnamecollector", + "processlistcollector", + "mimikatzcollector", + "azurecollector" ] }, "persistent_scanning": { diff --git a/vulture_allowlist.py b/vulture_allowlist.py index 68e28d4be..114178ea7 100644 --- a/vulture_allowlist.py +++ b/vulture_allowlist.py @@ -55,7 +55,6 @@ _.password_restored # unused attribute (monkey/monkey_island/cc/services/report credential_type # unused variable (monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_report_info.py:18) password_restored # unused variable (monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_report_info.py:23) SSH # unused variable (monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_descriptor_enum.py:30) -SAMBACRY # unused variable (monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_descriptor_enum.py:31) ELASTIC # unused variable (monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_descriptor_enum.py:32) MS08_067 # unused variable (monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_descriptor_enum.py:35) SHELLSHOCK # unused variable (monkey/monkey_island/cc/services/reporting/issue_processing/exploit_processing/exploiter_descriptor_enum.py:36)