Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Agent, Island: Modify config to remove boolean propagator field #1722

Merged
merged 1 commit into from
Feb 18, 2022
Merged

Agent, Island: Modify config to remove boolean propagator field #1722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion monkey/infection_monkey/master/exploiter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _run_all_exploiters(
exploiter_results = self._run_exploiter(exploiter_name, victim_host, stop)
results_callback(exploiter_name, victim_host, exploiter_results)

if exploiter["propagator"] and exploiter_results.success:
if exploiter_name != "ZerologonExploiter" and exploiter_results.success:
break

def _run_exploiter(
Expand Down
4 changes: 1 addition & 3 deletions monkey/monkey_island/cc/services/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,9 +611,7 @@ def _format_exploiters_from_flat_config(config: Dict) -> Dict[str, List[Dict[str
else vulnerability_category
)

formatted_exploiters_config[category].append(
{"name": exploiter, "propagator": (exploiter != "ZerologonExploiter")}
)
formatted_exploiters_config[category].append({"name": exploiter})

config.pop(flat_config_exploiter_classes_field, None)

Expand Down
24 changes: 12 additions & 12 deletions monkey/tests/data_for_tests/monkey_configs/automated_master_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@
},
"exploiters": {
"brute_force": [
{"name": "MSSQLExploiter", "propagator": true},
{"name": "PowerShellExploiter", "propagator": true},
{"name": "SmbExploiter", "propagator": true},
{"name": "SSHExploiter", "propagator": true},
{"name": "WmiExploiter", "propagator": true}
{"name": "MSSQLExploiter"},
{"name": "PowerShellExploiter"},
{"name": "SmbExploiter"},
{"name": "SSHExploiter"},
{"name": "WmiExploiter"}
],
"vulnerability": [
{"name": "DrupalExploiter", "propagator": true},
{"name": "ElasticGroovyExploiter", "propagator": true},
{"name": "HadoopExploiter", "propagator": true},
{"name": "ShellShockExploiter", "propagator": true},
{"name": "Struts2Exploiter", "propagator": true},
{"name": "WebLogicExploiter", "propagator": true},
{"name": "ZerologonExploiter", "propagator": false}
{"name": "DrupalExploiter"},
{"name": "ElasticGroovyExploiter"},
{"name": "HadoopExploiter"},
{"name": "ShellShockExploiter"},
{"name": "Struts2Exploiter"},
{"name": "WebLogicExploiter"},
{"name": "ZerologonExploiter"}
]
}
},
Expand Down
6 changes: 3 additions & 3 deletions monkey/tests/unit_tests/infection_monkey/master/test_exploiter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ def callback():
def exploiter_config():
return {
"brute_force": [
{"name": "PowerShellExploiter", "propagator": True},
{"name": "SSHExploiter", "propagator": True},
{"name": "PowerShellExploiter"},
{"name": "SSHExploiter"},
],
"vulnerability": [
{"name": "ZerologonExploiter", "propagator": False},
{"name": "ZerologonExploiter"},
],
}

Expand Down
24 changes: 12 additions & 12 deletions monkey/tests/unit_tests/monkey_island/cc/services/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,20 +172,20 @@ def test_format_config_for_agent__network_scan(flat_monkey_config):
def test_format_config_for_agent__exploiters(flat_monkey_config):
expected_exploiters_config = {
"brute_force": [
{"name": "MSSQLExploiter", "propagator": True},
{"name": "PowerShellExploiter", "propagator": True},
{"name": "SSHExploiter", "propagator": True},
{"name": "SmbExploiter", "propagator": True},
{"name": "WmiExploiter", "propagator": True},
{"name": "MSSQLExploiter"},
{"name": "PowerShellExploiter"},
{"name": "SSHExploiter"},
{"name": "SmbExploiter"},
{"name": "WmiExploiter"},
],
"vulnerability": [
{"name": "DrupalExploiter", "propagator": True},
{"name": "ElasticGroovyExploiter", "propagator": True},
{"name": "HadoopExploiter", "propagator": True},
{"name": "ShellShockExploiter", "propagator": True},
{"name": "Struts2Exploiter", "propagator": True},
{"name": "WebLogicExploiter", "propagator": True},
{"name": "ZerologonExploiter", "propagator": False},
{"name": "DrupalExploiter"},
{"name": "ElasticGroovyExploiter"},
{"name": "HadoopExploiter"},
{"name": "ShellShockExploiter"},
{"name": "Struts2Exploiter"},
{"name": "WebLogicExploiter"},
{"name": "ZerologonExploiter"},
],
}
ConfigService.format_flat_config_for_agent(flat_monkey_config)
Expand Down