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

Ms17 010 error handling #121

Merged
merged 4 commits into from
Nov 26, 2023
Merged

Ms17 010 error handling #121

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1784d55
fix(smb errors): getErrorString only returns one item, not a tuple; f…
Marshall-Hallenbeck Nov 13, 2023
761cf71
fix(ms17-010): better error handling to catch invalid SMB responses w…
Marshall-Hallenbeck Nov 13, 2023
9b619b8
Revert "fix(smb errors): getErrorString only returns one item, not a …
Marshall-Hallenbeck Nov 13, 2023
29b22b5
Merge branch 'main' into ms17-010-error-handling
Marshall-Hallenbeck Nov 14, 2023
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
19 changes: 12 additions & 7 deletions nxc/modules/ms17-010.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,15 @@ def options(self, context, module_options):
self.logger = context.log

def on_login(self, context, connection):
if self.check(connection.host):
context.log.highlight("VULNERABLE")
context.log.highlight("Next step: https://www.rapid7.com/db/modules/exploit/windows/smb/ms17_010_eternalblue/")

try:
if self.check(connection.host):
context.log.highlight("VULNERABLE")
context.log.highlight("Next step: https://www.rapid7.com/db/modules/exploit/windows/smb/ms17_010_eternalblue/")
except ConnectionResetError as e:
context.log.debug(f"Error connecting to host when checking for MS17-010: {e!s}")
except ValueError as e:
if str(e) == "Buffer size too small (0 instead of at least 32 bytes)":
context.log.debug("Buffer size too small, which means the response was not the expected size")


def generate_smb_proto_payload(self, *protos):
Expand Down Expand Up @@ -476,7 +481,7 @@ def check(self, ip, port=445):
# 0xC0000022 - STATUS_ACCESS_DENIED

if nt_status == b"\x05\x02\x00\xc0":
self.logger.highlight(f"[+] [{ip}] is likely VULNERABLE to MS17-010! ({native_os.decode()})")
self.logger.highlight(f"[+] {ip} is likely VULNERABLE to MS17-010! ({native_os.decode()})")

# vulnerable to MS17-010, check for DoublePulsar infection
raw_proto = self.trans2_request(tree_id, process_id, user_id, multiplex_id)
Expand All @@ -491,8 +496,8 @@ def check(self, ip, port=445):
key = self.calculate_doublepulsar_xor_key(smb.signature)
self.logger.highlight(f"Host is likely INFECTED with DoublePulsar! - XOR Key: {key.decode()}")
elif nt_status in (b"\x08\x00\x00\xc0", b"\x22\x00\x00\xc0"):
self.logger.fail(f"[-] [{ip}] does NOT appear vulnerable")
self.logger.fail(f"{ip} does NOT appear vulnerable")
else:
self.logger.fail(f"[-] [{ip}] Unable to detect if this host is vulnerable")
self.logger.fail(f"{ip} Unable to detect if this host is vulnerable")

client.close()