diff --git a/envs/monkey_zoo/blackbox/analyzers/performance_analyzer.py b/envs/monkey_zoo/blackbox/analyzers/performance_analyzer.py index 23bb5b0ae..21938eb62 100644 --- a/envs/monkey_zoo/blackbox/analyzers/performance_analyzer.py +++ b/envs/monkey_zoo/blackbox/analyzers/performance_analyzer.py @@ -23,7 +23,7 @@ class PerformanceAnalyzer(Analyzer): single_page_time_less_then_max = True - for page, elapsed in timings: + for page, elapsed in timings.items(): self.log.add_entry(f"page {page} took {str(elapsed)}") total_time += elapsed if elapsed > MAX_ALLOWED_SINGLE_PAGE_TIME: diff --git a/envs/monkey_zoo/blackbox/island_configs/STRUTS2.conf b/envs/monkey_zoo/blackbox/island_configs/STRUTS2.conf index 2f9e765a9..4e487fee9 100644 --- a/envs/monkey_zoo/blackbox/island_configs/STRUTS2.conf +++ b/envs/monkey_zoo/blackbox/island_configs/STRUTS2.conf @@ -1,17 +1,8 @@ { "basic": { "credentials": { - "exploit_password_list": [ - "Password1!", - "1234", - "password", - "12345678" - ], - "exploit_user_list": [ - "Administrator", - "root", - "user" - ] + "exploit_password_list": [], + "exploit_user_list": [] }, "general": { "should_exploit": true @@ -48,7 +39,7 @@ "exploiter_classes": [ "Struts2Exploiter" ], - "skip_exploit_if_file_exist": false + "skip_exploit_if_file_exist": true }, "ms08_067": { "ms08_067_exploit_attempts": 5, @@ -140,19 +131,19 @@ "life_cycle": { "max_iterations": 1, "retry_failed_explotation": true, - "timeout_between_iterations": 100, + "timeout_between_iterations": 30, "victims_max_exploit": 7, "victims_max_find": 30 }, "system_info": { - "collect_system_info": true, - "extract_azure_creds": true, - "should_use_mimikatz": true + "collect_system_info": false, + "extract_azure_creds": false, + "should_use_mimikatz": false } }, "network": { "ping_scanner": { - "ping_scan_timeout": 1000 + "ping_scan_timeout": 100 }, "tcp_scanner": { "HTTP_PORTS": [ @@ -164,7 +155,7 @@ ], "tcp_scan_get_banner": true, "tcp_scan_interval": 0, - "tcp_scan_timeout": 3000, + "tcp_scan_timeout": 300, "tcp_target_ports": [ 22, 2222, diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py index 2d8a96dae..71da9381b 100644 --- a/envs/monkey_zoo/blackbox/test_blackbox.py +++ b/envs/monkey_zoo/blackbox/test_blackbox.py @@ -70,7 +70,7 @@ class TestMonkeyBlackbox(object): def run_performance_test(island_client, conf_filename, test_name, timeout_in_seconds=DEFAULT_TIMEOUT_SECONDS): config_parser = IslandConfigParser(conf_filename) analyzers = [ - CommunicationAnalyzer(island_client, config_parser.get_ips_of_targets()), + # TODO CommunicationAnalyzer(island_client, config_parser.get_ips_of_targets()), PerformanceAnalyzer(island_client), ] log_handler = TestLogsHandler(test_name, island_client, TestMonkeyBlackbox.get_log_dir_path())