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

Island: Fix 'propagation' field of config flattening

This commit is contained in:
Shreya Malviya 2022-06-19 22:07:47 -07:00
parent 83dd4334b2
commit f9a7989f5e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,24 +418,24 @@ class ConfigService:
@staticmethod @staticmethod
def _format_propagation_from_flat_config(config: Dict): def _format_propagation_from_flat_config(config: Dict):
formatted_propagation_config = {"network_scan": {}, "targets": {}} formatted_propagation_config = {"network_scan": {}, "maximum_depth": {}, "exploiters": {}}
formatted_propagation_config[ formatted_propagation_config[
"network_scan" "network_scan"
] = ConfigService._format_network_scan_from_flat_config(config) ] = ConfigService._format_network_scan_from_flat_config(config)
formatted_propagation_config["targets"] = ConfigService._format_targets_from_flat_config(
config
)
formatted_propagation_config[ formatted_propagation_config[
"exploiters" "exploiters"
] = ConfigService._format_exploiters_from_flat_config(config) ] = ConfigService._format_exploiters_from_flat_config(config)
formatted_propagation_config["maximum_depth"] = config["depth"]
del config["depth"]
config["propagation"] = formatted_propagation_config config["propagation"] = formatted_propagation_config
@staticmethod @staticmethod
def _format_network_scan_from_flat_config(config: Dict) -> Dict[str, Any]: def _format_network_scan_from_flat_config(config: Dict) -> Dict[str, Any]:
formatted_network_scan_config = {"tcp": {}, "icmp": {}, "fingerprinters": []} formatted_network_scan_config = {"tcp": {}, "icmp": {}, "fingerprinters": [], "targets": {}}
formatted_network_scan_config["tcp"] = ConfigService._format_tcp_scan_from_flat_config( formatted_network_scan_config["tcp"] = ConfigService._format_tcp_scan_from_flat_config(
config config
@ -447,6 +447,10 @@ class ConfigService:
"fingerprinters" "fingerprinters"
] = ConfigService._format_fingerprinters_from_flat_config(config) ] = ConfigService._format_fingerprinters_from_flat_config(config)
formatted_network_scan_config["targets"] = ConfigService._format_targets_from_flat_config(
config
)
return formatted_network_scan_config return formatted_network_scan_config
@staticmethod @staticmethod
@ -457,7 +461,7 @@ class ConfigService:
formatted_tcp_scan_config = {} formatted_tcp_scan_config = {}
formatted_tcp_scan_config["timeout_ms"] = config[flat_tcp_timeout_field] formatted_tcp_scan_config["timeout"] = config[flat_tcp_timeout_field]
ports = ConfigService._union_tcp_and_http_ports( ports = ConfigService._union_tcp_and_http_ports(
config[flat_tcp_ports_field], config[flat_http_ports_field] config[flat_tcp_ports_field], config[flat_http_ports_field]
@ -481,7 +485,7 @@ class ConfigService:
flat_ping_timeout_field = "ping_scan_timeout" flat_ping_timeout_field = "ping_scan_timeout"
formatted_icmp_scan_config = {} formatted_icmp_scan_config = {}
formatted_icmp_scan_config["timeout_ms"] = config[flat_ping_timeout_field] formatted_icmp_scan_config["timeout"] = config[flat_ping_timeout_field]
config.pop(flat_ping_timeout_field, None) config.pop(flat_ping_timeout_field, None)
@ -529,7 +533,7 @@ class ConfigService:
formatted_scan_targets_config[flat_local_network_scan_field] = config[ formatted_scan_targets_config[flat_local_network_scan_field] = config[
flat_local_network_scan_field flat_local_network_scan_field
] ]
formatted_scan_targets_config[flat_subnet_scan_list_field] = config[ formatted_scan_targets_config["subnets"] = config[
flat_subnet_scan_list_field flat_subnet_scan_list_field
] ]