Merge branch '3170-ete' into develop

Issue #3170 PR #3464
guardicore · Jul 6, 2023 · bc4b489 · bc4b489
2 parents 351da9f + f705712
commit bc4b489
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/envs/monkey_zoo/blackbox/test_configurations/credentials_reuse_ssh_key.py b/envs/monkey_zoo/blackbox/test_configurations/credentials_reuse_ssh_key.py
@@ -22,7 +22,7 @@
 #     then B(10.2.4.15) exploits C(10.2.5.16) with that key
 def _add_exploiters(agent_configuration: AgentConfiguration) -> AgentConfiguration:
     exploiters: Dict[str, Mapping] = {
-        "SSHExploiter": {},
+        "SSH": {},
     }
 
     return add_exploiters(agent_configuration, exploiters=exploiters)

diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py
@@ -33,7 +33,7 @@ def _add_exploiters(agent_configuration: AgentConfiguration) -> AgentConfigurati
             "try_all_discovered_http_ports": True,
             "target_ports": [],
         },
-        "SSHExploiter": {},
+        "SSH": {},
         "PowerShell": {},
     }
 

diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py
@@ -25,7 +25,7 @@
 def _add_exploiters(agent_configuration: AgentConfiguration) -> AgentConfiguration:
     exploiters: Dict[str, Mapping] = {
         "PowerShell": {},
-        "SSHExploiter": {},
+        "SSH": {},
         "WMI": {"agent_binary_upload_timeout": 30},
     }
 

diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py
@@ -21,7 +21,7 @@
 
 def _add_exploiters(agent_configuration: AgentConfiguration) -> AgentConfiguration:
     exploiters: Dict[str, Mapping] = {
-        "SSHExploiter": {},
+        "SSH": {},
         "WMI": {"agent_binary_upload_timeout": 30},
     }
 

diff --git a/monkey/agent_plugins/exploiters/ssh/config-schema.json b/monkey/agent_plugins/exploiters/ssh/config-schema.json
@@ -1,7 +1,4 @@
 {
-    "required": [
-        "connect_timeout"
-    ],
     "properties": {
         "connect_timeout": {
             "title": "SSH connection timeout",