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

Renamed values in config: Network->General to Network->Scope, Exploits->General to Exploits->Exploiters

This commit is contained in:
VakarisZ 2020-07-22 12:33:21 +03:00
parent eba779cd2d
commit 3fec6ac753
3 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
monkey/monkey_island/cc/services/config_schema.py
View File

@ -327,10 +327,31 @@ SCHEMA = {
"type": "object",
"primary": True,
"properties": {
"general": {
"title": "General",
"exploiters": {
"title": "Exploiters",
"type": "object",
"properties": {
"exploiter_classes": {
"title": "Exploiters",
"type": "array",
"uniqueItems": True,
"items": {
"$ref": "#/definitions/exploiter_classes"
},
"default": [
"SmbExploiter",
"WmiExploiter",
"SSHExploiter",
"ShellShockExploiter",
"SambaCryExploiter",
"ElasticGroovyExploiter",
"Struts2Exploiter",
"WebLogicExploiter",
"HadoopExploiter",
"VSFTPDExploiter",
"MSSQLExploiter"
]
}
}
},
"credentials": {
@ -374,8 +395,8 @@ SCHEMA = {
"title": "Network",
"type": "object",
"properties": {
"general": {
"title": "General",
"scope": {
"title": "Scope",
"type": "object",
"properties": {
"blocked_ips": {
@ -906,27 +927,6 @@ SCHEMA = {
"title": "General",
"type": "object",
"properties": {
"exploiter_classes": {
"title": "Exploits",
"type": "array",
"uniqueItems": True,
"items": {
"$ref": "#/definitions/exploiter_classes"
},
"default": [
"SmbExploiter",
"WmiExploiter",
"SSHExploiter",
"ShellShockExploiter",
"SambaCryExploiter",
"ElasticGroovyExploiter",
"Struts2Exploiter",
"WebLogicExploiter",
"HadoopExploiter",
"VSFTPDExploiter",
"MSSQLExploiter"
]
},
"skip_exploit_if_file_exist": {
"title": "Skip exploit if file exists",
"type": "boolean",

6
monkey/monkey_island/cc/services/reporting/report.py
View File

@ -618,7 +618,7 @@ class ReportService:
@staticmethod
def get_config_exploits():
exploits_config_value = ['exploits', 'general', 'exploiter_classes']
exploits_config_value = ['basic', 'exploiters', 'exploiter_classes']
default_exploits = ConfigService.get_default_config(False)
for namespace in exploits_config_value:
default_exploits = default_exploits[namespace]
@ -632,11 +632,11 @@ class ReportService:
@staticmethod
def get_config_ips():
return ConfigService.get_config_value(['basic_network', 'general', 'subnet_scan_list'], True, True)
return ConfigService.get_config_value(['basic_network', 'scope', 'subnet_scan_list'], True, True)
@staticmethod
def get_config_scan():
return ConfigService.get_config_value(['basic_network', 'general', 'local_network_scan'], True, True)
return ConfigService.get_config_value(['basic_network', 'scope', 'local_network_scan'], True, True)
@staticmethod
def get_issues_overview(issues, config_users, config_passwords):

16
monkey/monkey_island/cc/ui/src/components/configuration-components/UiSchema.js
View File

@ -5,7 +5,13 @@ import {API_PBA_LINUX, API_PBA_WINDOWS} from '../pages/ConfigurePage';
export default function UiSchema(props) {
const UiSchema = {
basic: {
'ui:order': ['general', 'credentials'],
'ui:order': ['exploiters', 'credentials'],
exploiters: {
exploiter_classes: {
classNames: 'config-template-no-header',
'ui:widget': AdvancedMultiSelect
}
}
},
basic_network: {},
monkey: {
@ -61,14 +67,6 @@ export default function UiSchema(props) {
},
cnc: {},
network: {},
exploits: {
general: {
exploiter_classes: {
classNames: 'config-template-no-header',
'ui:widget': AdvancedMultiSelect
}
}
},
internal: {
general: {
started_on_island: {'ui:widget': 'hidden'}