p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BB: Rename raw_config -> serialized_config everywhere

This commit is contained in:
Shreya Malviya 2022-07-21 12:52:39 +05:30 committed by Mike Salvatore
parent 690fb71e10
commit f0993d94cf
7 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
envs/monkey_zoo/blackbox/island_client/island_config_parser.py
View File

@ -11,7 +11,7 @@ class IslandConfigParser:
return agent_configuration.to_json()
@staticmethod
def get_target_ips_from_serialized_config(raw_config: Mapping) -> Iterable:
def get_target_ips_from_serialized_config(serialized_config: Mapping) -> Iterable:
return dpath.util.get(
raw_config, "agent_configuration.propagation.network_scan.targets.subnets", "."
serialized_config, "agent_configuration.propagation.network_scan.targets.subnets", "."
)

14
envs/monkey_zoo/blackbox/test_blackbox.py
View File

@ -89,9 +89,10 @@ class TestMonkeyBlackbox:
test_name: str,
timeout_in_seconds=DEFAULT_TIMEOUT_SECONDS,
):
raw_config = IslandConfigParser.get_serialized_config(agent_configuration)
serialized_config = IslandConfigParser.get_serialized_config(agent_configuration)
analyzer = CommunicationAnalyzer(
island_client, IslandConfigParser.get_target_ips_from_serialized_config(raw_config)
island_client,
IslandConfigParser.get_target_ips_from_serialized_config(serialized_config),
)
log_handler = TestLogsHandler(
test_name, island_client, TestMonkeyBlackbox.get_log_dir_path()
@ -99,7 +100,7 @@ class TestMonkeyBlackbox:
ExploitationTest(
name=test_name,
island_client=island_client,
raw_config=raw_config,
serialized_config=serialized_config,
analyzers=[analyzer],
timeout=timeout_in_seconds,
log_handler=log_handler,
@ -143,10 +144,11 @@ class TestMonkeyBlackbox:
"aad3b435b51404eeaad3b435b51404ee",
"2864b62ea4496934a5d6e86f50b834a5",
]
raw_config = IslandConfigParser.get_serialized_config(zerologon_test_configuration)
serialized_config = IslandConfigParser.get_serialized_config(zerologon_test_configuration)
zero_logon_analyzer = ZerologonAnalyzer(island_client, expected_creds)
communication_analyzer = CommunicationAnalyzer(
island_client, IslandConfigParser.get_target_ips_from_serialized_config(raw_config)
island_client,
IslandConfigParser.get_target_ips_from_serialized_config(serialized_config),
)
log_handler = TestLogsHandler(
test_name, island_client, TestMonkeyBlackbox.get_log_dir_path()
@ -154,7 +156,7 @@ class TestMonkeyBlackbox:
ExploitationTest(
name=test_name,
island_client=island_client,
raw_config=raw_config,
serialized_config=serialized_config,
analyzers=[zero_logon_analyzer, communication_analyzer],
timeout=DEFAULT_TIMEOUT_SECONDS + 30,
log_handler=log_handler,

8
envs/monkey_zoo/blackbox/tests/exploitation.py
View File

@ -13,16 +13,16 @@ LOGGER = logging.getLogger(__name__)
class ExploitationTest(BasicTest):
def __init__(self, name, island_client, raw_config, analyzers, timeout, log_handler):
def __init__(self, name, island_client, serialized_config, analyzers, timeout, log_handler):
self.name = name
self.island_client = island_client
self.raw_config = raw_config
self.serialized_config = serialized_config
self.analyzers = analyzers
self.timeout = timeout
self.log_handler = log_handler
def run(self):
self.island_client.import_config(self.raw_config)
self.island_client.import_config(self.serialized_config)
self.print_test_starting_info()
try:
self.island_client.run_monkey_local()
@ -37,7 +37,7 @@ class ExploitationTest(BasicTest):
def print_test_starting_info(self):
LOGGER.info("Started {} test".format(self.name))
machine_list = ", ".join(
IslandConfigParser.get_target_ips_from_serialized_config(self.raw_config)
IslandConfigParser.get_target_ips_from_serialized_config(self.serialized_config)
)
LOGGER.info(f"Machines participating in test: {machine_list}")
print("")

9
envs/monkey_zoo/blackbox/tests/performance/map_generation.py
View File

@ -20,11 +20,16 @@ class MapGenerationTest(PerformanceTest):
TEST_NAME = "Map generation performance test"
def __init__(
self, island_client, raw_config, analyzers, timeout, log_handler, break_on_timeout
self, island_client, serialized_config, analyzers, timeout, log_handler, break_on_timeout
):
self.island_client = island_client
exploitation_test = ExploitationTest(
MapGenerationTest.TEST_NAME, island_client, raw_config, analyzers, timeout, log_handler
MapGenerationTest.TEST_NAME,
island_client,
serialized_config,
analyzers,
timeout,
log_handler,
)
performance_config = PerformanceTestConfig(
max_allowed_single_page_time=MAX_ALLOWED_SINGLE_PAGE_TIME,

2
envs/monkey_zoo/blackbox/tests/performance/performance_test.py
View File

@ -6,7 +6,7 @@ from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
class PerformanceTest(BasicTest, metaclass=ABCMeta):
@abstractmethod
def __init__(
self, island_client, raw_config, analyzers, timeout, log_handler, break_on_timeout
self, island_client, serialized_config, analyzers, timeout, log_handler, break_on_timeout
):
pass

4
envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
View File

@ -13,11 +13,11 @@ class PerformanceTestWorkflow(BasicTest):
self.name = name
self.exploitation_test = exploitation_test
self.island_client = exploitation_test.island_client
self.raw_config = exploitation_test.raw_config
self.serialized_config = exploitation_test.serialized_config
self.performance_config = performance_config
def run(self):
self.island_client.import_config(self.raw_config)
self.island_client.import_config(self.serialized_config)
self.exploitation_test.print_test_starting_info()
try:
self.island_client.run_monkey_local()

4
envs/monkey_zoo/blackbox/tests/performance/report_generation.py
View File

@ -23,13 +23,13 @@ class ReportGenerationTest(PerformanceTest):
TEST_NAME = "Report generation performance test"
def __init__(
self, island_client, raw_config, analyzers, timeout, log_handler, break_on_timeout
self, island_client, serialized_config, analyzers, timeout, log_handler, break_on_timeout
):
self.island_client = island_client
exploitation_test = ExploitationTest(
ReportGenerationTest.TEST_NAME,
island_client,
raw_config,
serialized_config,
analyzers,
timeout,
log_handler,