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

Agent: Remove smb_service_name configuration option 

This option is never changed and can be more easily stored as a
constant.
This commit is contained in:
Mike Salvatore 2022-03-18 08:40:12 -04:00
parent 6c1a4faf3a
commit 415f3e6468
6 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -53,6 +53,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
- T1082 attack technique report. #1754 - T1082 attack technique report. #1754
- 32-bit agents. #1675 - 32-bit agents. #1675
- Log path config options. #1761 - Log path config options. #1761
- "smb_service_name" option. #1741
### Fixed ### Fixed
- A bug in network map page that caused delay of telemetry log loading. #1545 - A bug in network map page that caused delay of telemetry log loading. #1545

1
monkey/infection_monkey/config.py
View File

@ -120,7 +120,6 @@ class Configuration(object):
# smb/wmi exploiter # smb/wmi exploiter
smb_download_timeout = 30 # timeout in seconds smb_download_timeout = 30 # timeout in seconds
smb_service_name = "InfectionMonkey"
########################### ###########################
# post breach actions # post breach actions

1
monkey/infection_monkey/example.conf
View File

@ -38,7 +38,6 @@
], ],
"ping_scan_timeout": 10000, "ping_scan_timeout": 10000,
"smb_download_timeout": 300, "smb_download_timeout": 300,
"smb_service_name": "InfectionMonkey",
"self_delete_in_cleanup": true, "self_delete_in_cleanup": true,
"exploit_user_list": [], "exploit_user_list": [],
"exploit_password_list": [], "exploit_password_list": [],

5
monkey/infection_monkey/exploit/smbexec.py
View File

@ -23,6 +23,7 @@ class SmbExploiter(HostExploiter):
"445/SMB": (r"ncacn_np:%s[\pipe\svcctl]", 445), "445/SMB": (r"ncacn_np:%s[\pipe\svcctl]", 445),
} }
USE_KERBEROS = False USE_KERBEROS = False
SMB_SERVICE_NAME = "InfectionMonkey"
def __init__(self, host): def __init__(self, host):
super(SmbExploiter, self).__init__(host) super(SmbExploiter, self).__init__(host)
@ -162,8 +163,8 @@ class SmbExploiter(HostExploiter):
resp = scmr.hRCreateServiceW( resp = scmr.hRCreateServiceW(
scmr_rpc, scmr_rpc,
sc_handle, sc_handle,
self._config.smb_service_name, SmbExploiter.SMB_SERVICE_NAME,
self._config.smb_service_name, SmbExploiter.SMB_SERVICE_NAME,
lpBinaryPathName=cmdline, lpBinaryPathName=cmdline,
) )
service = resp["lpServiceHandle"] service = resp["lpServiceHandle"]

7
monkey/monkey_island/cc/services/config_schema/internal.py
View File

@ -225,13 +225,6 @@ INTERNAL = {
"description": "Timeout (in seconds) for SMB download operation (used in " "description": "Timeout (in seconds) for SMB download operation (used in "
"various exploits using SMB)", "various exploits using SMB)",
}, },
"smb_service_name": {
"title": "SMB service name",
"type": "string",
"default": "InfectionMonkey",
"description": "Name of the SMB service that will be set up to download "
"monkey",
},
}, },
}, },
}, },

1
monkey/tests/data_for_tests/monkey_configs/flat_config.json
View File

@ -90,7 +90,6 @@
} }
}, },
"smb_download_timeout": 300, "smb_download_timeout": 300,
"smb_service_name": "InfectionMonkey",
"subnet_scan_list": ["192.168.1.50", "192.168.56.0/24", "10.0.33.0/30"], "subnet_scan_list": ["192.168.1.50", "192.168.56.0/24", "10.0.33.0/30"],
"system_info_collector_classes": [ "system_info_collector_classes": [
"MimikatzCollector" "MimikatzCollector"