admin/cisagov-snafflepy
1
0
Fork 0
mirror of https://github.com/cisagov/snafflepy synced 2026-09-24 18:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from robert-todora/dev

Browse Source 
fixed a bug with error handling for logins
This commit is contained in:
Robert Todora
2023-07-18 10:51:06 -05:00
committed by GitHub
parent 3f3e9b455b 3e635d1182
commit 9c26a40f5d
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
snaffcore/go_snaffle.py
+19 -22
View File
@@ -60,24 +60,21 @@ def begin_snaffle(options):
try:
smb_client = SMBClient(
target, options.username, options.password, options.domain, options.hash)
if smb_client.login():
for share in smb_client.shares:
try:
files = smb_client.ls(share, "")
for file in files:
# filelist.append(file)
# Ask do they want file sizes?
# log.info(f"{target} Found file in {share}: {file.get_longname()}")
naive_classify(share, file)
# log.info(f"{target} Found file in {share}: {file}")
except FileListError:
log.error(
"Access Denied, cannot list files in %s" % share)
continue
else:
log.error(f"Log on to {target} failed")
smb_client.login()
for share in smb_client.shares:
try:
files = smb_client.ls(share, "")
for file in files:
# filelist.append(file)
# Ask do they want file sizes?
# log.info(f"{target} Found file in {share}: {file.get_longname()}")
naive_classify(share, file)
# log.info(f"{target} Found file in {share}: {file}")
except FileListError:
log.error(
"Access Denied, cannot list files in %s" % share)
continue
except Exception as e:
log.error(f"Error creating SMBClient object, {e}")
@@ -88,24 +85,24 @@ def access_ldap_server(ip, username, password):
server = Server(ip, get_info=DSA)
try:
conn = Connection(server, username, password)
log.debug(server.schema)
# log.debug(server.schema)
if not conn.bind():
log.critical(f"Unable to bind to {server} as {username}, ")
return conn
except Exception as e:
log.critical(f'Error logging in to {ip}, {e}')
log.critical(f'Error logging in to {ip}')
log.info("Trying guest session... ")
try:
conn = Connection(server, username='Guest', password='')
if not conn.bind():
log.critical(f"Unable to bind to {server} as {username}, ")
log.critical(f"Unable to bind to {server} as {username}")
return conn
except Exception as e:
log.critical(f'Error logging in to {ip}, as {username}; {e}')
log.critical(f'Error logging in to {ip}, as {username}')
log.info("Trying null session... ")
conn = Connection(server, username='', password='')
snaffcore/smb.py
+1 -1
View File
@@ -63,7 +63,7 @@ class SMBClient:
self.server, self.server, sess_port=445, timeout=10)
except Exception as e:
# log.info(f"Timeout exceeded, unable to connect to {self.server}")
log.debug("Exception: ", impacket_error(e))
e = handle_impacket_error(e, self, display=True)
# self.conn = SMBConnection(
# self.server, self.server, sess_port=139, timeout=10)