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

Removed the mechanism of adding exploited machines to blocked machine list. This mechanism was good way to assess performance improvement, but it sacrificed coverage

This commit is contained in:
VakarisZ 2020-05-20 12:28:14 +03:00
parent c817415ef3
commit 52767897bf
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/monkey_island/cc/services/config.py
View File

@ -318,10 +318,6 @@ class ConfigService:
def is_test_telem_export_enabled(): def is_test_telem_export_enabled():
return ConfigService.get_config_value(['internal', 'testing', 'export_monkey_telems']) return ConfigService.get_config_value(['internal', 'testing', 'export_monkey_telems'])
@staticmethod
def add_blocked_ip(ip_):
ConfigService.append_to_config_array(['basic_network', 'general', 'blocked_ips'], ip_)
@staticmethod @staticmethod
def set_started_on_island(value: bool): def set_started_on_island(value: bool):
ConfigService.set_config_value(['internal', 'general', 'started_on_island'], value) ConfigService.set_config_value(['internal', 'general', 'started_on_island'], value)

17
monkey/monkey_island/cc/services/telemetry/processing/system_info.py
View File

@ -18,7 +18,6 @@ def process_system_info_telemetry(telemetry_json):
process_ssh_info, process_ssh_info,
process_credential_info, process_credential_info,
process_mimikatz_and_wmi_info, process_mimikatz_and_wmi_info,
try_process_network_info,
dispatcher.dispatch_collector_results_to_relevant_processors dispatcher.dispatch_collector_results_to_relevant_processors
] ]
@ -103,19 +102,3 @@ def process_mimikatz_and_wmi_info(telemetry_json):
monkey_id = NodeService.get_monkey_by_guid(telemetry_json['monkey_guid']).get('_id') monkey_id = NodeService.get_monkey_by_guid(telemetry_json['monkey_guid']).get('_id')
wmi_handler = WMIHandler(monkey_id, telemetry_json['data']['wmi'], users_secrets) wmi_handler = WMIHandler(monkey_id, telemetry_json['data']['wmi'], users_secrets)
wmi_handler.process_and_handle_wmi_info() wmi_handler.process_and_handle_wmi_info()
def try_process_network_info(telemetry_json):
try:
process_network_info(telemetry_json)
except KeyError:
pass
def process_network_info(telemetry_json):
interfaces = telemetry_json['data']['network_info']['networks']
for interface in interfaces:
ip_ = ip_address(interface['addr'])
if not ip_.is_loopback:
ConfigService.add_blocked_ip(ip_.exploded)