diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_1_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_1_a.py index 3f60f3492..abcf02b08 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/depth_1_a.py +++ b/envs/monkey_zoo/blackbox/test_configurations/depth_1_a.py @@ -76,16 +76,16 @@ def _add_http_ports(agent_configuration: AgentConfiguration) -> AgentConfigurati return add_http_ports(agent_configuration, HTTP_PORTS) -agent_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 1) -agent_configuration = _add_exploiters(agent_configuration) -agent_configuration = _add_fingerprinters(agent_configuration) -agent_configuration = _add_subnets(agent_configuration) -agent_configuration = _add_tcp_ports(agent_configuration) -agent_configuration = _add_credential_collectors(agent_configuration) -agent_configuration = _add_http_ports(agent_configuration) +test_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 1) +test_configuration = _add_exploiters(test_configuration) +test_configuration = _add_fingerprinters(test_configuration) +test_configuration = _add_subnets(test_configuration) +test_configuration = _add_tcp_ports(test_configuration) +test_configuration = _add_credential_collectors(test_configuration) +test_configuration = _add_http_ports(test_configuration) depth_1_a_test_configuration = replace_agent_configuration( - noop_test_configuration, agent_configuration + noop_test_configuration, test_configuration ) CREDENTIALS = ( Credentials(Username("m0nk3y"), None), diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py index 9166f51b5..5159a6ace 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py +++ b/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py @@ -34,13 +34,13 @@ def _add_tcp_ports(agent_configuration: AgentConfiguration) -> AgentConfiguratio return add_tcp_ports(agent_configuration, ports) -agent_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 2) -agent_configuration = _add_exploiters(agent_configuration) -agent_configuration = _add_subnets(agent_configuration) -agent_configuration = _add_tcp_ports(agent_configuration) +test_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 2) +test_configuration = _add_exploiters(test_configuration) +test_configuration = _add_subnets(test_configuration) +test_configuration = _add_tcp_ports(test_configuration) depth_2_a_test_configuration = replace_agent_configuration( - noop_test_configuration, agent_configuration + noop_test_configuration, test_configuration ) diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py index 920e325e4..df1cf1978 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py +++ b/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py @@ -48,14 +48,14 @@ def _add_tcp_ports(agent_configuration: AgentConfiguration) -> AgentConfiguratio return add_tcp_ports(agent_configuration, ports) -agent_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 3) -agent_configuration = set_keep_tunnel_open_time(agent_configuration, 20) -agent_configuration = _add_exploiters(agent_configuration) -agent_configuration = _add_subnets(agent_configuration) -agent_configuration = _add_tcp_ports(agent_configuration) +test_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 3) +test_configuration = set_keep_tunnel_open_time(test_configuration, 20) +test_configuration = _add_exploiters(test_configuration) +test_configuration = _add_subnets(test_configuration) +test_configuration = _add_tcp_ports(test_configuration) depth_3_a_test_configuration = replace_agent_configuration( - noop_test_configuration, agent_configuration + noop_test_configuration, test_configuration ) diff --git a/envs/monkey_zoo/blackbox/test_configurations/powershell_credentials_reuse.py b/envs/monkey_zoo/blackbox/test_configurations/powershell_credentials_reuse.py index 9913e2aec..0073590b3 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/powershell_credentials_reuse.py +++ b/envs/monkey_zoo/blackbox/test_configurations/powershell_credentials_reuse.py @@ -30,11 +30,11 @@ def _add_tcp_ports(agent_configuration: AgentConfiguration) -> AgentConfiguratio return add_tcp_ports(agent_configuration, ports) -agent_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 1) -agent_configuration = _add_exploiters(agent_configuration) -agent_configuration = _add_subnets(agent_configuration) -agent_configuration = _add_tcp_ports(agent_configuration) +test_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 1) +test_configuration = _add_exploiters(test_configuration) +test_configuration = _add_subnets(test_configuration) +test_configuration = _add_tcp_ports(test_configuration) powershell_credentials_reuse_test_configuration = replace_agent_configuration( - noop_test_configuration, agent_configuration + noop_test_configuration, test_configuration ) diff --git a/envs/monkey_zoo/blackbox/test_configurations/smb_pth.py b/envs/monkey_zoo/blackbox/test_configurations/smb_pth.py index 84b386d21..ec36bb4c7 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/smb_pth.py +++ b/envs/monkey_zoo/blackbox/test_configurations/smb_pth.py @@ -33,14 +33,14 @@ def _add_tcp_ports(agent_configuration: AgentConfiguration) -> AgentConfiguratio return add_tcp_ports(agent_configuration, ports) -agent_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 3) -agent_configuration = set_keep_tunnel_open_time(agent_configuration, 20) -agent_configuration = _add_exploiters(agent_configuration) -agent_configuration = _add_subnets(agent_configuration) -agent_configuration = _add_tcp_ports(agent_configuration) +test_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 3) +test_configuration = set_keep_tunnel_open_time(test_configuration, 20) +test_configuration = _add_exploiters(test_configuration) +test_configuration = _add_subnets(test_configuration) +test_configuration = _add_tcp_ports(test_configuration) smb_pth_test_configuration = replace_agent_configuration( - noop_test_configuration, agent_configuration + noop_test_configuration, test_configuration ) diff --git a/envs/monkey_zoo/blackbox/test_configurations/wmi_mimikatz.py b/envs/monkey_zoo/blackbox/test_configurations/wmi_mimikatz.py index 52d93a137..018b83075 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/wmi_mimikatz.py +++ b/envs/monkey_zoo/blackbox/test_configurations/wmi_mimikatz.py @@ -40,15 +40,15 @@ def _add_tcp_ports(agent_configuration: AgentConfiguration) -> AgentConfiguratio return add_tcp_ports(agent_configuration, ports) -agent_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 1) -agent_configuration = _add_exploiters(agent_configuration) -agent_configuration = _add_subnets(agent_configuration) -agent_configuration = _add_credential_collectors(agent_configuration) -agent_configuration = _add_tcp_ports(agent_configuration) -agent_configuration = _add_credential_collectors(agent_configuration) +test_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 1) +test_configuration = _add_exploiters(test_configuration) +test_configuration = _add_subnets(test_configuration) +test_configuration = _add_credential_collectors(test_configuration) +test_configuration = _add_tcp_ports(test_configuration) +test_configuration = _add_credential_collectors(test_configuration) wmi_mimikatz_test_configuration = replace_agent_configuration( - noop_test_configuration, agent_configuration + noop_test_configuration, test_configuration ) diff --git a/envs/monkey_zoo/blackbox/test_configurations/zerologon.py b/envs/monkey_zoo/blackbox/test_configurations/zerologon.py index 089377e54..3a956c6f3 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/zerologon.py +++ b/envs/monkey_zoo/blackbox/test_configurations/zerologon.py @@ -27,11 +27,11 @@ def _add_subnets(agent_configuration: AgentConfiguration) -> AgentConfiguration: return add_subnets(agent_configuration, subnets) -agent_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 1) -agent_configuration = _add_exploiters(agent_configuration) -agent_configuration = _add_tcp_ports(agent_configuration) -agent_configuration = _add_subnets(agent_configuration) +test_configuration = set_maximum_depth(noop_test_configuration.agent_configuration, 1) +test_configuration = _add_exploiters(test_configuration) +test_configuration = _add_tcp_ports(test_configuration) +test_configuration = _add_subnets(test_configuration) zerologon_test_configuration = replace_agent_configuration( - noop_test_configuration, agent_configuration + noop_test_configuration, test_configuration )