diff --git a/envs/monkey_zoo/blackbox/config_templates/grouped/depth_4_a.py b/envs/monkey_zoo/blackbox/config_templates/grouped/depth_3_a.py similarity index 79% rename from envs/monkey_zoo/blackbox/config_templates/grouped/depth_4_a.py rename to envs/monkey_zoo/blackbox/config_templates/grouped/depth_3_a.py index 36e06853c..3f131694a 100644 --- a/envs/monkey_zoo/blackbox/config_templates/grouped/depth_4_a.py +++ b/envs/monkey_zoo/blackbox/config_templates/grouped/depth_3_a.py @@ -4,7 +4,7 @@ from envs.monkey_zoo.blackbox.config_templates.base_template import BaseTemplate from envs.monkey_zoo.blackbox.config_templates.config_template import ConfigTemplate -class Depth4A(ConfigTemplate): +class Depth3A(ConfigTemplate): config_values = copy(BaseTemplate.config_values) # Tests: @@ -33,16 +33,13 @@ class Depth4A(ConfigTemplate): "Passw0rd!", "3Q=(Ge(+&w]*", "`))jU7L(w}", - "t67TC5ZDmz" "Ivrrw5zEzs", + "t67TC5ZDmz", + "Ivrrw5zEzs", ], "basic_network.scope.depth": 3, "internal.general.keep_tunnel_open_time": 20, "basic.credentials.exploit_user_list": ["m0nk3y", "m0nk3y-user"], "internal.network.tcp_scanner.HTTP_PORTS": [], - "internal.exploits.exploit_ntlm_hash_list": [ - "5da0889ea2081aa79f6852294cba4a5e", - "50c9987a6bf1ac59398df9f911122c9b", - ], - "internal.network.tcp_scanner.tcp_target_ports": [5985, 5986, 22, 135], + "internal.exploits.exploit_ntlm_hash_list": ["d0f0132b308a0c4e5d1029cc06f48692"], } ) diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py index 452a7ef81..806db4efb 100644 --- a/envs/monkey_zoo/blackbox/test_blackbox.py +++ b/envs/monkey_zoo/blackbox/test_blackbox.py @@ -10,7 +10,7 @@ from envs.monkey_zoo.blackbox.analyzers.zerologon_analyzer import ZerologonAnaly from envs.monkey_zoo.blackbox.config_templates.config_template import ConfigTemplate from envs.monkey_zoo.blackbox.config_templates.grouped.depth_1_a import Depth1A from envs.monkey_zoo.blackbox.config_templates.grouped.depth_1_b import Depth1B -from envs.monkey_zoo.blackbox.config_templates.grouped.depth_4_a import Depth4A +from envs.monkey_zoo.blackbox.config_templates.grouped.depth_3_a import Depth3A from envs.monkey_zoo.blackbox.gcp_test_machine_list import GCP_TEST_MACHINE_LIST from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient @@ -155,5 +155,5 @@ class TestMonkeyBlackbox: log_handler=log_handler, ).run() - def test_depth_4_a(self, island_client): - TestMonkeyBlackbox.run_exploitation_test(island_client, Depth4A, "Depth4A test suite") + def test_depth_3_a(self, island_client): + TestMonkeyBlackbox.run_exploitation_test(island_client, Depth3A, "Depth4A test suite") diff --git a/envs/monkey_zoo/blackbox/utils/config_generation_script.py b/envs/monkey_zoo/blackbox/utils/config_generation_script.py index 178f92a95..320ae8c57 100644 --- a/envs/monkey_zoo/blackbox/utils/config_generation_script.py +++ b/envs/monkey_zoo/blackbox/utils/config_generation_script.py @@ -5,7 +5,7 @@ from typing import Type from envs.monkey_zoo.blackbox.config_templates.config_template import ConfigTemplate from envs.monkey_zoo.blackbox.config_templates.grouped.depth_1_a import Depth1A from envs.monkey_zoo.blackbox.config_templates.grouped.depth_1_b import Depth1B -from envs.monkey_zoo.blackbox.config_templates.grouped.depth_4_a import Depth4A +from envs.monkey_zoo.blackbox.config_templates.grouped.depth_3_a import Depth3A from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient @@ -23,7 +23,7 @@ args = parser.parse_args() island_client = MonkeyIslandClient(args.island_ip) -CONFIG_TEMPLATES = [Depth1A, Depth1B, Depth4A] +CONFIG_TEMPLATES = [Depth1A, Depth1B, Depth3A] def generate_templates():