From 690fb71e1096818f8778e8c95125dc948937e56a Mon Sep 17 00:00:00 2001
From: Shreya Malviya <shreya.malviya@gmail.com>
Date: Thu, 21 Jul 2022 12:33:19 +0530
Subject: [PATCH] BB: Rename get_ips_of_targets() ->
get_target_ips_from_serialized_config() and pass correct arguments
---
.../monkey_zoo/blackbox/island_client/island_config_parser.py | 2 +-
envs/monkey_zoo/blackbox/test_blackbox.py | 4 ++--
envs/monkey_zoo/blackbox/tests/exploitation.py | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/envs/monkey_zoo/blackbox/island_client/island_config_parser.py b/envs/monkey_zoo/blackbox/island_client/island_config_parser.py
index bad886969..4ed4f60bf 100644
--- a/envs/monkey_zoo/blackbox/island_client/island_config_parser.py
+++ b/envs/monkey_zoo/blackbox/island_client/island_config_parser.py
@@ -11,7 +11,7 @@ class IslandConfigParser:
return agent_configuration.to_json()
@staticmethod
- def get_ips_of_targets(raw_config: Mapping) -> Iterable:
+ def get_target_ips_from_serialized_config(raw_config: Mapping) -> Iterable:
return dpath.util.get(
raw_config, "agent_configuration.propagation.network_scan.targets.subnets", "."
)
diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py
index a2e191818..ec84bdbce 100644
--- a/envs/monkey_zoo/blackbox/test_blackbox.py
+++ b/envs/monkey_zoo/blackbox/test_blackbox.py
@@ -91,7 +91,7 @@ class TestMonkeyBlackbox:
):
raw_config = IslandConfigParser.get_serialized_config(agent_configuration)
analyzer = CommunicationAnalyzer(
- island_client, IslandConfigParser.get_ips_of_targets(raw_config)
+ island_client, IslandConfigParser.get_target_ips_from_serialized_config(raw_config)
)
log_handler = TestLogsHandler(
test_name, island_client, TestMonkeyBlackbox.get_log_dir_path()
@@ -146,7 +146,7 @@ class TestMonkeyBlackbox:
raw_config = IslandConfigParser.get_serialized_config(zerologon_test_configuration)
zero_logon_analyzer = ZerologonAnalyzer(island_client, expected_creds)
communication_analyzer = CommunicationAnalyzer(
- island_client, IslandConfigParser.get_ips_of_targets(raw_config)
+ island_client, IslandConfigParser.get_target_ips_from_serialized_config(raw_config)
)
log_handler = TestLogsHandler(
test_name, island_client, TestMonkeyBlackbox.get_log_dir_path()
diff --git a/envs/monkey_zoo/blackbox/tests/exploitation.py b/envs/monkey_zoo/blackbox/tests/exploitation.py
index f439e11db..37a6a4b85 100644
--- a/envs/monkey_zoo/blackbox/tests/exploitation.py
+++ b/envs/monkey_zoo/blackbox/tests/exploitation.py
@@ -36,7 +36,9 @@ class ExploitationTest(BasicTest):
def print_test_starting_info(self):
LOGGER.info("Started {} test".format(self.name))
- machine_list = ", ".join(IslandConfigParser.get_ips_of_targets(self.raw_config))
+ machine_list = ", ".join(
+ IslandConfigParser.get_target_ips_from_serialized_config(self.raw_config)
+ )
LOGGER.info(f"Machines participating in test: {machine_list}")
print("")