From b50725b9395a102aeb3ae09c84a0406f44a95af4 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Fri, 16 Sep 2022 15:36:11 +0200 Subject: [PATCH 1/5] BB: Change zone of Depth4 machines --- envs/monkey_zoo/blackbox/gcp_test_machine_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/monkey_zoo/blackbox/gcp_test_machine_list.py b/envs/monkey_zoo/blackbox/gcp_test_machine_list.py index ffbd21c90..ac25a4f4b 100644 --- a/envs/monkey_zoo/blackbox/gcp_test_machine_list.py +++ b/envs/monkey_zoo/blackbox/gcp_test_machine_list.py @@ -64,7 +64,7 @@ DEPTH_3_A = { } DEPTH_4_A = { - "europe-west1-b": [ + "europe-west3-a": [ "tunneling-9", "tunneling-10", "tunneling-12", From 8df35e010731269eb1cd775d96f8fed34d4a378b Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Fri, 16 Sep 2022 16:35:54 +0200 Subject: [PATCH 2/5] BB: Export depth_4_a_test_configuration from __init__ --- envs/monkey_zoo/blackbox/test_configurations/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/envs/monkey_zoo/blackbox/test_configurations/__init__.py b/envs/monkey_zoo/blackbox/test_configurations/__init__.py index 6a1634727..3cf03ef63 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/__init__.py +++ b/envs/monkey_zoo/blackbox/test_configurations/__init__.py @@ -2,6 +2,7 @@ from .test_configuration import TestConfiguration from .depth_1_a import depth_1_a_test_configuration from .depth_2_a import depth_2_a_test_configuration from .depth_3_a import depth_3_a_test_configuration +from .depth_4_a import depth_4_a_test_configuration from .powershell_credentials_reuse import powershell_credentials_reuse_test_configuration from .smb_pth import smb_pth_test_configuration from .wmi_mimikatz import wmi_mimikatz_test_configuration From ecbee6a3cba533dcac26b3148191a6c3760aec8f Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Fri, 16 Sep 2022 16:36:26 +0200 Subject: [PATCH 3/5] BB: Fix tunneling-13 ip address in the test_configuration --- envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py index d4ab4e512..ebd534480 100644 --- a/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py +++ b/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py @@ -32,7 +32,7 @@ def _add_subnets(agent_configuration: AgentConfiguration) -> AgentConfiguration: "10.2.2.9", "10.2.1.10", "10.2.0.12", - "10.2.2.13", + "10.2.0.13", ] return add_subnets(agent_configuration, subnets) From 95741acdf48d5dbc026c68b12e49d0afcccd8b9f Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Fri, 16 Sep 2022 16:37:00 +0200 Subject: [PATCH 4/5] BB: Shorten import of depth_4_a_test_configuration --- envs/monkey_zoo/blackbox/test_blackbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py index be8f4fe2c..4e937cf24 100644 --- a/envs/monkey_zoo/blackbox/test_blackbox.py +++ b/envs/monkey_zoo/blackbox/test_blackbox.py @@ -13,12 +13,12 @@ from envs.monkey_zoo.blackbox.test_configurations import ( depth_1_a_test_configuration, depth_2_a_test_configuration, depth_3_a_test_configuration, + depth_4_a_test_configuration, powershell_credentials_reuse_test_configuration, smb_pth_test_configuration, wmi_mimikatz_test_configuration, zerologon_test_configuration, ) -from envs.monkey_zoo.blackbox.test_configurations.depth_4_a import depth_4_a_test_configuration from envs.monkey_zoo.blackbox.test_configurations.test_configuration import TestConfiguration from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest from envs.monkey_zoo.blackbox.utils.gcp_machine_handlers import ( From 547c9f702867b71c908315feb4bd7128480ffba9 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Fri, 16 Sep 2022 16:41:26 +0200 Subject: [PATCH 5/5] BB: Fix tunneling ToC in documentation --- envs/monkey_zoo/docs/fullDocs.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/envs/monkey_zoo/docs/fullDocs.md b/envs/monkey_zoo/docs/fullDocs.md index b08a89bfc..73efb2801 100644 --- a/envs/monkey_zoo/docs/fullDocs.md +++ b/envs/monkey_zoo/docs/fullDocs.md @@ -11,6 +11,9 @@ This document describes Infection Monkey’s test network, how to deploy and use [Nr. 3 Hadoop](#_Toc526517183)
[Nr. 9 Tunneling M1](#_Toc536021462)
[Nr. 10 Tunneling M2](#_Toc536021463)
+[Nr. 11 Tunneling M1](#_Toc536021464)
+[Nr. 12 Tunneling M2](#_Toc536021465)
+[Nr. 13 Tunneling M2](#_Toc536021466)
[Nr. 11 SSH key steal](#_Toc526517190)
[Nr. 12 SSH key steal](#_Toc526517191)
[Nr. 13 RDP grinder](#_Toc526517192)
@@ -319,7 +322,7 @@ Update all requirements using deployment script:
- @@ -358,7 +361,7 @@ This prevents ssh exploitation, but allows tunneling.

Nr. 11 Tunneling M3

+

Nr. 11 Tunneling M3

(10.2.0.11)

(Exploitable)
- @@ -390,7 +393,7 @@ This prevents ssh exploitation, but allows tunneling.

Nr. 12 Tunneling M4

+

Nr. 12 Tunneling M4

(10.2.0.12)

(Exploitable)
-

Nr. 13 Tunneling M5

+

Nr. 13 Tunneling M5

(10.2.0.13)

(Exploitable)