p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Fixed bug created during merge, fixed typos in attack telemetries for usage.

This commit is contained in:
VakarisZ 2019-08-19 09:16:14 +03:00
parent e774fcaff6
commit 7eab8687c1
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
monkey/common/utils/attack_utils.py
View File

@ -18,12 +18,10 @@ class UsageEnum(Enum):
MIMIKATZ_WINAPI = {ScanStatus.USED.value: "WinAPI was called to load mimikatz.", MIMIKATZ_WINAPI = {ScanStatus.USED.value: "WinAPI was called to load mimikatz.",
ScanStatus.SCANNED.value: "Monkey tried to call WinAPI to load mimikatz."} ScanStatus.SCANNED.value: "Monkey tried to call WinAPI to load mimikatz."}
DROPPER = {ScanStatus.USED.value: "WinAPI was used to mark monkey files for deletion on next boot."} DROPPER = {ScanStatus.USED.value: "WinAPI was used to mark monkey files for deletion on next boot."}
MIMIKATZ_FILE_COPY = {ScanStatus.USED.value: "WinAPI was called to load mimikatz.", SINGLETON_WINAPI = {ScanStatus.USED.value: "WinAPI was called to acquire system singleton for monkey's process.",
ScanStatus.SCANNED.value: "Monkey tried to call WinAPI to load mimikatz, but failed."} ScanStatus.SCANNED.value: "WinAPI call to acquire system singleton"
SINGLETON_FILE_COPY = {ScanStatus.USED.value: "WinAPI was called to acquire system singleton for monkey's process.", " for monkey process wasn't successful."}
ScanStatus.SCANNED.value: "WinAPI call to acquire system singleton" DROPPER_WINAPI = {ScanStatus.USED.value: "WinAPI was used to mark monkey files for deletion on next boot."}
" for monkey process wasn't successful."}
DROPPER_FILE_COPY = {ScanStatus.USED.value: "WinAPI was used to mark monkey files for deletion on next boot."}
# Dict that describes what BITS job was used for # Dict that describes what BITS job was used for

2
monkey/infection_monkey/dropper.py
View File

@ -158,6 +158,6 @@ class MonkeyDrops(object):
else: else:
LOG.debug("Dropper source file '%s' is marked for deletion on next boot", LOG.debug("Dropper source file '%s' is marked for deletion on next boot",
self._config['source_path']) self._config['source_path'])
T1106Telem(ScanStatus.USED, UsageEnum.DROPPER_FILE_COPY).send() T1106Telem(ScanStatus.USED, UsageEnum.DROPPER_WINAPI).send()
except AttributeError: except AttributeError:
LOG.error("Invalid configuration options. Failing") LOG.error("Invalid configuration options. Failing")

2
monkey/infection_monkey/system_info/mimikatz_collector.py
View File

@ -55,8 +55,8 @@ class MimikatzCollector(object):
except Exception: except Exception:
LOG.exception("Error initializing mimikatz collector") LOG.exception("Error initializing mimikatz collector")
status = ScanStatus.SCANNED status = ScanStatus.SCANNED
T1106Telem(status, UsageEnum.MIMIKATZ_WINAPI).send()
T1129Telem(status, UsageEnum.MIMIKATZ).send() T1129Telem(status, UsageEnum.MIMIKATZ).send()
T1106Telem(status, UsageEnum.MIMIKATZ_FILE_COPY).send()
def get_logon_info(self): def get_logon_info(self):
""" """

2
monkey/infection_monkey/system_singleton.py
View File

@ -59,7 +59,7 @@ class WindowsSystemSingleton(_SystemSingleton):
if not status: if not status:
status = ScanStatus.USED status = ScanStatus.USED
T1106Telem(status, UsageEnum.SINGLETON_FILE_COPY).send() T1106Telem(status, UsageEnum.SINGLETON_WINAPI).send()
if status == ScanStatus.SCANNED: if status == ScanStatus.SCANNED:
return False return False

4
monkey/infection_monkey/telemetry/attack/usage_telem.py
View File

@ -7,10 +7,10 @@ class UsageTelem(AttackTelem):
""" """
:param technique: Id of technique :param technique: Id of technique
:param status: ScanStatus of technique :param status: ScanStatus of technique
:param usage: Enum of UsageEnum type :param usage: Usage string
""" """
super(UsageTelem, self).__init__(technique, status) super(UsageTelem, self).__init__(technique, status)
self.usage = usage.name self.usage = usage
def get_data(self): def get_data(self):
data = super(UsageTelem, self).get_data() data = super(UsageTelem, self).get_data()