admin/Pennyw0rth-NetExec
1
0
Fork 0
mirror of https://github.com/Pennyw0rth/NetExec synced 2026-06-06 16:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert #26 and fix #28

Browse Source
This commit is contained in:
Alex
2023-07-04 13:25:42 +02:00
parent 912cb801ea
commit f39738fc2c
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cme/connection.py
+10 -12
View File
@@ -262,24 +262,18 @@ class connection(object):
else:
domain_single = self.args.domain if hasattr(self.args, "domain") and self.args.domain else self.domain
username_single = line
if "." not in domain_single:
self.logger.error(f"Domain {domain_single} for user {username_single.rstrip()} need to be FQDN ex:domain.local, not domain")
else:
domain.append(domain_single)
username.append(username_single.strip())
owned.append(False)
domain.append(domain_single)
username.append(username_single.strip())
owned.append(False)
else:
if "\\" in user:
domain_single, username_single = user.split("\\")
else:
domain_single = self.args.domain if hasattr(self.args, "domain") and self.args.domain else self.domain
username_single = user
if "." not in domain_single:
self.logger.error(f"Domain {domain_single} for user {username_single} need to be FQDN ex:domain.local, not domain")
else:
domain.append(domain_single)
username.append(username_single)
owned.append(False)
domain.append(domain_single)
username.append(username_single)
owned.append(False)
# Parse passwords
for password in self.args.password:
@@ -330,6 +324,10 @@ class connection(object):
return False
if self.args.continue_on_success and owned:
return False
# Enforcing FQDN for SMB if not using local authentication. Related issues/PRs: #26, #28, #24
if self.args.protocol == 'smb' and not self.args.local_auth and "." not in domain:
self.logger.error(f"Domain {domain} for user {username.rstrip()} need to be FQDN ex:domain.local, not domain")
return False
with sem:
if cred_type == 'plaintext':