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

Mimikatz collector fix #1512

Merged
merged 2 commits into from
Oct 5, 2021
Merged

Mimikatz collector fix #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbda934
Monkey: include credential key into info dict of InfoCollector class
VakarisZ Oct 5, 2021
bc42212
Monkey: add CHANGELOG.md entry about fixed Mimikatz credential collec…
VakarisZ Oct 5, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
- Some of the gathered credentials no longer appear in database plaintext. #1454
- Encryptor breaking with UTF-8 characters. (Passwords in different languages can be submitted in
the config successfully now.) #1490
- Mimikatz collector no longer fails if Azure credential collector is disabled. #1512 #1493


### Security
Expand Down
4 changes: 1 addition & 3 deletions monkey/infection_monkey/system_info/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class InfoCollector(object):
"""

def __init__(self):
self.info = {}
self.info = {"credentials": {}}

def get_info(self):
# Collect all hardcoded
Expand Down Expand Up @@ -96,8 +96,6 @@ def get_azure_info(self):
return
logger.debug("Harvesting creds if on an Azure machine")
azure_collector = AzureCollector()
if "credentials" not in self.info:
self.info["credentials"] = {}
azure_creds = azure_collector.extract_stored_credentials()
for cred in azure_creds:
username = cred[0]
Expand Down
3 changes: 1 addition & 2 deletions monkey/infection_monkey/system_info/windows_info_collector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ def get_mimikatz_info(self):
try:
credentials = MimikatzCredentialCollector.get_creds()
if credentials:
if "credentials" in self.info:
self.info["credentials"].update(credentials)
self.info["credentials"].update(credentials)
logger.info("Mimikatz info gathered successfully")
else:
logger.info("No mimikatz info was gathered")
Expand Down