From 3848dbeb324d129949713c615adbe36b179b884b Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Fri, 5 Mar 2021 10:46:07 +0200 Subject: [PATCH] Fixed a bug in configuration generation for BB tests. Bug was related to incorrect references --- envs/monkey_zoo/blackbox/island_configs/ssh.py | 4 +++- envs/monkey_zoo/blackbox/island_configs/struts2.py | 4 +++- envs/monkey_zoo/blackbox/island_configs/tunneling.py | 4 +++- envs/monkey_zoo/blackbox/island_configs/weblogic.py | 4 +++- envs/monkey_zoo/blackbox/island_configs/wmi_mimikatz.py | 4 +++- envs/monkey_zoo/blackbox/island_configs/wmi_pth.py | 4 +++- envs/monkey_zoo/blackbox/test_blackbox.py | 1 + 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/envs/monkey_zoo/blackbox/island_configs/ssh.py b/envs/monkey_zoo/blackbox/island_configs/ssh.py index f6a5b1762..a0c3a285e 100644 --- a/envs/monkey_zoo/blackbox/island_configs/ssh.py +++ b/envs/monkey_zoo/blackbox/island_configs/ssh.py @@ -1,8 +1,10 @@ +from copy import copy + from envs.monkey_zoo.blackbox.island_configs.base_template import BaseTemplate class Ssh(BaseTemplate): - config_values = BaseTemplate.config_values + config_values = copy(BaseTemplate.config_values) config_values.update({ "basic.exploiters.exploiter_classes": ["SSHExploiter"], diff --git a/envs/monkey_zoo/blackbox/island_configs/struts2.py b/envs/monkey_zoo/blackbox/island_configs/struts2.py index e88c0899f..a94ae714a 100644 --- a/envs/monkey_zoo/blackbox/island_configs/struts2.py +++ b/envs/monkey_zoo/blackbox/island_configs/struts2.py @@ -1,9 +1,11 @@ +from copy import copy + from envs.monkey_zoo.blackbox.island_configs.base_template import BaseTemplate class Struts2(BaseTemplate): - config_values = BaseTemplate.config_values + config_values = copy(BaseTemplate.config_values) config_values.update({ "basic.exploiters.exploiter_classes": ["Struts2Exploiter"], diff --git a/envs/monkey_zoo/blackbox/island_configs/tunneling.py b/envs/monkey_zoo/blackbox/island_configs/tunneling.py index 458b89794..9badf1a17 100644 --- a/envs/monkey_zoo/blackbox/island_configs/tunneling.py +++ b/envs/monkey_zoo/blackbox/island_configs/tunneling.py @@ -1,8 +1,10 @@ +from copy import copy + from envs.monkey_zoo.blackbox.island_configs.base_template import BaseTemplate class Tunneling(BaseTemplate): - config_values = BaseTemplate.config_values + config_values = copy(BaseTemplate.config_values) config_values.update({ "basic.exploiters.exploiter_classes": ["SmbExploiter", diff --git a/envs/monkey_zoo/blackbox/island_configs/weblogic.py b/envs/monkey_zoo/blackbox/island_configs/weblogic.py index 433067cb9..8632f0efa 100644 --- a/envs/monkey_zoo/blackbox/island_configs/weblogic.py +++ b/envs/monkey_zoo/blackbox/island_configs/weblogic.py @@ -1,9 +1,11 @@ +from copy import copy + from envs.monkey_zoo.blackbox.island_configs.base_template import BaseTemplate class Weblogic(BaseTemplate): - config_values = BaseTemplate.config_values + config_values = copy(BaseTemplate.config_values) config_values.update({ "basic.exploiters.exploiter_classes": ["WebLogicExploiter"], diff --git a/envs/monkey_zoo/blackbox/island_configs/wmi_mimikatz.py b/envs/monkey_zoo/blackbox/island_configs/wmi_mimikatz.py index 73bd913cd..11b0fc026 100644 --- a/envs/monkey_zoo/blackbox/island_configs/wmi_mimikatz.py +++ b/envs/monkey_zoo/blackbox/island_configs/wmi_mimikatz.py @@ -1,8 +1,10 @@ +from copy import copy + from envs.monkey_zoo.blackbox.island_configs.base_template import BaseTemplate class WmiMimikatz(BaseTemplate): - config_values = BaseTemplate.config_values + config_values = copy(BaseTemplate.config_values) config_values.update({ "basic.exploiters.exploiter_classes": ["WmiExploiter"], diff --git a/envs/monkey_zoo/blackbox/island_configs/wmi_pth.py b/envs/monkey_zoo/blackbox/island_configs/wmi_pth.py index dcb735c78..a435f25e4 100644 --- a/envs/monkey_zoo/blackbox/island_configs/wmi_pth.py +++ b/envs/monkey_zoo/blackbox/island_configs/wmi_pth.py @@ -1,8 +1,10 @@ +from copy import copy + from envs.monkey_zoo.blackbox.island_configs.base_template import BaseTemplate class WmiPth(BaseTemplate): - config_values = BaseTemplate.config_values + config_values = copy(BaseTemplate.config_values) config_values.update({ "basic.exploiters.exploiter_classes": ["WmiExploiter"], diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py index e5a77ef45..d895f7cfe 100644 --- a/envs/monkey_zoo/blackbox/test_blackbox.py +++ b/envs/monkey_zoo/blackbox/test_blackbox.py @@ -46,6 +46,7 @@ GCP_TEST_MACHINE_LIST = ['sshkeys-11', 'sshkeys-12', 'elastic-4', 'elastic-5', ' 'mimikatz-14', 'mimikatz-15', 'struts2-23', 'struts2-24', 'tunneling-9', 'tunneling-10', 'tunneling-11', 'tunneling-12', 'weblogic-18', 'weblogic-19', 'shellshock-8', 'zerologon-25'] LOG_DIR_PATH = "./logs" +logging.basicConfig(level=logging.INFO) LOGGER = logging.getLogger(__name__)