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

Merge pull request #2009 from guardicore/1997-rename-credential_collector_classes 

Rename `credential_collector_classes`
This commit is contained in:
VakarisZ 2022-06-10 10:38:06 +03:00 committed by GitHub
parent 1f4f573aaa 1cef7874d4
commit eb7e74cd82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/infection_monkey/master/automated_master.py
View File

@ -149,7 +149,7 @@ class AutomatedMaster(IMaster):
target=self._run_plugins, target=self._run_plugins,
name="CredentialCollectorThread", name="CredentialCollectorThread",
args=( args=(
config["credential_collector_classes"], config["credential_collectors"],
"credential collector", "credential collector",
self._collect_credentials, self._collect_credentials,
), ),

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

@ -1,7 +1,7 @@
from monkey_island.cc.services.config_schema.basic import BASIC from monkey_island.cc.services.config_schema.basic import BASIC
from monkey_island.cc.services.config_schema.basic_network import BASIC_NETWORK from monkey_island.cc.services.config_schema.basic_network import BASIC_NETWORK
from monkey_island.cc.services.config_schema.definitions.credential_collector_classes import ( from monkey_island.cc.services.config_schema.definitions.credential_collector_classes import (
CREDENTIAL_COLLECTOR_CLASSES, CREDENTIAL_COLLECTORS,
) )
from monkey_island.cc.services.config_schema.definitions.exploiter_classes import EXPLOITER_CLASSES from monkey_island.cc.services.config_schema.definitions.exploiter_classes import EXPLOITER_CLASSES
from monkey_island.cc.services.config_schema.definitions.finger_classes import FINGER_CLASSES from monkey_island.cc.services.config_schema.definitions.finger_classes import FINGER_CLASSES
@ -20,7 +20,7 @@ SCHEMA = {
# users will not accidentally chose unsafe options # users will not accidentally chose unsafe options
"definitions": { "definitions": {
"exploiter_classes": EXPLOITER_CLASSES, "exploiter_classes": EXPLOITER_CLASSES,
"credential_collector_classes": CREDENTIAL_COLLECTOR_CLASSES, "credential_collectors": CREDENTIAL_COLLECTORS,
"post_breach_actions": POST_BREACH_ACTIONS, "post_breach_actions": POST_BREACH_ACTIONS,
"finger_classes": FINGER_CLASSES, "finger_classes": FINGER_CLASSES,
}, },

2
monkey/monkey_island/cc/services/config_schema/definitions/credential_collector_classes.py
View File

@ -1,6 +1,6 @@
from common.common_consts.credential_collector_names import MIMIKATZ_COLLECTOR, SSH_COLLECTOR from common.common_consts.credential_collector_names import MIMIKATZ_COLLECTOR, SSH_COLLECTOR
CREDENTIAL_COLLECTOR_CLASSES = { CREDENTIAL_COLLECTORS = {
"title": "Credential Collectors", "title": "Credential Collectors",
"description": "Click on a credential collector to find out what it collects.", "description": "Click on a credential collector to find out what it collects.",
"type": "string", "type": "string",

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

@ -77,11 +77,11 @@ MONKEY = {
"title": "Credential collection", "title": "Credential collection",
"type": "object", "type": "object",
"properties": { "properties": {
"credential_collector_classes": { "credential_collectors": {
"title": "Credential collectors", "title": "Credential collectors",
"type": "array", "type": "array",
"uniqueItems": True, "uniqueItems": True,
"items": {"$ref": "#/definitions/credential_collector_classes"}, "items": {"$ref": "#/definitions/credential_collectors"},
"default": [ "default": [
MIMIKATZ_COLLECTOR, MIMIKATZ_COLLECTOR,
SSH_COLLECTOR, SSH_COLLECTOR,

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

@ -95,7 +95,7 @@ export default function UiSchema(props) {
} }
}, },
credential_collectors: { credential_collectors: {
credential_collector_classes: { credential_collectors: {
classNames: 'config-template-no-header', classNames: 'config-template-no-header',
'ui:widget': AdvancedMultiSelect 'ui:widget': AdvancedMultiSelect
} }

4
monkey/monkey_island/cc/ui/src/components/utils/SafeOptionValidator.js
View File

@ -17,8 +17,8 @@ function getPluginDescriptors(schema, config) {
}, },
{ {
name: 'CredentialCollectors', name: 'CredentialCollectors',
allPlugins: schema.definitions.credential_collector_classes.anyOf, allPlugins: schema.definitions.credential_collectors.anyOf,
selectedPlugins: config.monkey.credential_collectors.credential_collector_classes selectedPlugins: config.monkey.credential_collectors.credential_collectors
} }
]); ]);
} }

2
monkey/tests/data_for_tests/monkey_configs/automated_master_config.json
View File

@ -101,7 +101,7 @@
"other_behaviors": {"readme": true} "other_behaviors": {"readme": true}
} }
}, },
"credential_collector_classes": [ "credential_collectors": [
"MimikatzCollector", "MimikatzCollector",
"SSHCollector" "SSHCollector"
] ]