From b5bd0532b7da284365026d1ff9fab990930291d9 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Tue, 6 Sep 2022 15:41:54 +0200 Subject: [PATCH 1/3] BB: Fix type annotation in noop_test_configuration --- envs/monkey_zoo/blackbox/test_configurations/noop.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/envs/monkey_zoo/blackbox/test_configurations/noop.py b/envs/monkey_zoo/blackbox/test_configurations/noop.py index 095bd3a12..f224eead3 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/noop.py +++ b/envs/monkey_zoo/blackbox/test_configurations/noop.py @@ -1,3 +1,5 @@ +from typing import Tuple + from common.agent_configuration import ( AgentConfiguration, CustomPBAConfiguration, @@ -47,9 +49,9 @@ _agent_configuration = AgentConfiguration( payloads=[], propagation=_propagation_configuration, ) -_propagation_credentials = tuple() +_propagation_credentials: Tuple = tuple() # This is an empty, NOOP configuration from which other configurations can be built -noop_test_configuration = TestConfiguration( +noop_test_configuration: TestConfiguration = TestConfiguration( agent_configuration=_agent_configuration, propagation_credentials=_propagation_credentials ) From eee6291a3eb6a01494e8bb8b11d4315b3eab6a13 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Tue, 6 Sep 2022 15:49:02 +0200 Subject: [PATCH 2/3] BB: Set deep copy when copying agent_configuration --- .../blackbox/test_configurations/utils.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/envs/monkey_zoo/blackbox/test_configurations/utils.py b/envs/monkey_zoo/blackbox/test_configurations/utils.py index 3872230c0..972f7cd01 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/utils.py +++ b/envs/monkey_zoo/blackbox/test_configurations/utils.py @@ -11,7 +11,7 @@ def add_exploiters( vulnerability: Sequence[PluginConfiguration] = [], ) -> AgentConfiguration: - agent_configuration_copy = agent_configuration.copy() + agent_configuration_copy = agent_configuration.copy(deep=True) agent_configuration_copy.propagation.exploitation.brute_force = brute_force agent_configuration_copy.propagation.exploitation.vulnerability = vulnerability @@ -22,7 +22,7 @@ def add_fingerprinters( agent_configuration: AgentConfiguration, fingerprinters: Sequence[PluginConfiguration] ) -> AgentConfiguration: - agent_configuration_copy = agent_configuration.copy() + agent_configuration_copy = agent_configuration.copy(deep=True) agent_configuration_copy.propagation.network_scan.fingerprinters = fingerprinters return agent_configuration_copy @@ -32,7 +32,7 @@ def add_tcp_ports( agent_configuration: AgentConfiguration, tcp_ports: Sequence[int] ) -> AgentConfiguration: - agent_configuration_copy = agent_configuration.copy() + agent_configuration_copy = agent_configuration.copy(deep=True) agent_configuration_copy.propagation.network_scan.tcp.ports = tuple(tcp_ports) return agent_configuration_copy @@ -42,7 +42,7 @@ def add_subnets( agent_configuration: AgentConfiguration, subnets: Sequence[str] ) -> AgentConfiguration: - agent_configuration_copy = agent_configuration.copy() + agent_configuration_copy = agent_configuration.copy(deep=True) agent_configuration_copy.propagation.network_scan.targets.subnets = subnets return agent_configuration_copy @@ -52,7 +52,7 @@ def add_credential_collectors( agent_configuration: AgentConfiguration, credential_collectors: Sequence[PluginConfiguration] ) -> AgentConfiguration: - agent_configuration_copy = agent_configuration.copy() + agent_configuration_copy = agent_configuration.copy(deep=True) agent_configuration_copy.credential_collectors = tuple(credential_collectors) return agent_configuration_copy @@ -62,7 +62,7 @@ def add_http_ports( agent_configuration: AgentConfiguration, http_ports: Sequence[int] ) -> AgentConfiguration: - agent_configuration_copy = agent_configuration.copy() + agent_configuration_copy = agent_configuration.copy(deep=True) agent_configuration_copy.propagation.exploitation.options.http_ports = http_ports return agent_configuration_copy @@ -72,7 +72,7 @@ def set_keep_tunnel_open_time( agent_configuration: AgentConfiguration, keep_tunnel_open_time: int ) -> AgentConfiguration: - agent_configuration_copy = agent_configuration.copy() + agent_configuration_copy = agent_configuration.copy(deep=True) agent_configuration_copy.keep_tunnel_open_time = keep_tunnel_open_time return agent_configuration_copy @@ -82,7 +82,7 @@ def set_maximum_depth( agent_configuration: AgentConfiguration, maximum_depth: int ) -> AgentConfiguration: - agent_configuration_copy = agent_configuration.copy() + agent_configuration_copy = agent_configuration.copy(deep=True) agent_configuration_copy.propagation.maximum_depth = maximum_depth return agent_configuration_copy From ce6d5cc705b16c71bd5a6f20bfa233f98a682c51 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Tue, 6 Sep 2022 10:10:08 -0400 Subject: [PATCH 3/3] BB: Add contained type to _propagation_credentials type hint --- envs/monkey_zoo/blackbox/test_configurations/noop.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/envs/monkey_zoo/blackbox/test_configurations/noop.py b/envs/monkey_zoo/blackbox/test_configurations/noop.py index f224eead3..337bdfffa 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/noop.py +++ b/envs/monkey_zoo/blackbox/test_configurations/noop.py @@ -11,6 +11,7 @@ from common.agent_configuration import ( ScanTargetConfiguration, TCPScanConfiguration, ) +from common.credentials import Credentials from . import TestConfiguration @@ -49,7 +50,7 @@ _agent_configuration = AgentConfiguration( payloads=[], propagation=_propagation_configuration, ) -_propagation_credentials: Tuple = tuple() +_propagation_credentials: Tuple[Credentials, ...] = tuple() # This is an empty, NOOP configuration from which other configurations can be built noop_test_configuration: TestConfiguration = TestConfiguration(