8000 1742 add wmi exploiter to puppet by VakarisZ · Pull Request #1766 · guardicore/monkey · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

1742 add wmi exploiter to puppet #1766

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

Jump to bottom
Merged
merged 26 commits into from
Mar 9, 2022
Merged

1742 add wmi exploiter to puppet #1766

merged 26 commits into from
Mar 9, 2022

Conversation

VakarisZ
Copy link
Contributor
@VakarisZ VakarisZ commented Mar 8, 2022 •
edited
Loading

What does this PR do?

Fixes #1742

Testing Checklist

  • Have you successfully tested your changes locally? Elaborate:

    Tested by running 6 wmi threads/machines at a time

mssalvatore
mssalvatore reviewed Mar 8, 2022
View reviewed changes
monkey/infection_monkey/exploit/smbexec.py Outdated
Comment on lines 55 to 56
# TODO extract the method in wmiexec.py
creds = self._config.get_exploit_user_password_or_hash_product()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use infectionmonkey.utils.brute_force

mssalvatore
mssalvatore reviewed Mar 8, 2022
View reviewed changes
mssalvatore
mssalvatore reviewed Mar 8, 2022
View reviewed changes
mssalvatore
mssalvatore reviewed Mar 8, 2022
View reviewed changes
mssalvatore
mssalvatore reviewed Mar 8, 2022
View reviewed changes
Copy link
Collaborator
@mssalvatore mssalvatore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From wmi_tools.py

Is this thread-safe?
image

@mssalvatore
Copy link
Collaborator

From wmi_tools.py

Is this thread-safe? image

image

mssalvatore
mssalvatore reviewed Mar 8, 2022
View reviewed changes
@VakarisZ
Copy link
Contributor Author
VakarisZ commented Mar 9, 2022 •
edited
Loading

image

@VakarisZ VakarisZ force-pushed the 1742-wmi-exploiter branch from 0d70d8e to e779feb Compare March 9, 2022 13:37
@VakarisZ VakarisZ marked this pull request as ready for review March 9, 2022 13:39
VakarisZ and others added 19 commits March 9, 2022 16:38
@VakarisZ
Agent: fix a bug in wmi_tools
afc43ae 
Fix a bug in wmi connection cleanup where incorrect keys were being used on a dictionary
@VakarisZ
Agent: added a todo to assess smb connection timeout
af9736a
@VakarisZ
Agent: improve logging in wmiexec.py
d7e222c
@VakarisZ
Agent: decouple wmiexec.py from WormConfig object
c932a19
@VakarisZ
Agent: modify wmiexec.py to return ExploitResultData
aa5220b
@mssalvatore @VakarisZ
Agent: Load WMIExploiter into puppet
6862ef3
@mssalvatore @VakarisZ
Island: Add smb_download_timeout to SMB and WMI exploiter options
e76b46c
@mssalvatore @VakarisZ
Agent: Fix malformed WMI query in WMIExploiter
98f8a5b
@mssalvatore @VakarisZ
Agent: Add missing return to WmiExploiter
f57977d
@mssalvatore @VakarisZ
Agent: Remove monkeyfs references in smb_tools.py
77f58b9
@VakarisZ
Agent: move brute-force input generation from wmiexec to brute_force
dc1a2ab
@VakarisZ
Agent: replace get_monkey_depth with self.current_depth
4e7e4a9
@VakarisZ
Agent: generate brute force credentials from exploiter options
4ce731c 
All brute force exploiters will have the same structure of options, so instead of calling the generate_username_password_or_ntlm_hash_combinations() and manually unpacking the required arguments from options, we simplify the call and remove duplication
@VakarisZ
Agent: fix a bug in WMI exploiter related to depth
16535e0
@VakarisZ
Agent: add lock to wmi tools
3dc8ef6 
impacket libraries used for WMI are not designed for multithreading
@mssalvatore @VakarisZ
Agent: Log thread name instead of thread ID
b34c287
@mssalvatore @VakarisZ
Agent: Add optional name to create_daemon_thread and run_worker_threads
f9a7672
@mssalvatore @VakarisZ
Agent: Add human-readable thread name to MonkeyTunnel
87dbe20
@mssalvatore @VakarisZ
Agent: Add human-readable thread name to aws_environment_check
847c7fb
@VakarisZ VakarisZ force-pushed the 1742-wmi-exploiter branch from 71ffbcf to 130c62a Compare March 9, 2022 14:39
@mssalvatore mssalvatore merged commit cbaa325 into agent-refactor Mar 9, 2022
@mssalvatore mssalvatore deleted the 1742-wmi-exploiter branch March 9, 2022 15:17
@mssalvatore mssalvatore restored the 1742-wmi-exploiter branch March 9, 2022 15:18
@VakarisZ VakarisZ deleted the 1742-wmi-exploiter branch March 14, 2022 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mssalvatore mssalvatore mssalvatore approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@VakarisZ @mssalvatore
0