Formating
parent
6a4852e013
commit
14e7034352
|
@ -373,7 +373,6 @@ class ldap(connection):
|
||||||
used_ccache = " from ccache" if useCache else f":{process_secret(kerb_pass)}"
|
used_ccache = " from ccache" if useCache else f":{process_secret(kerb_pass)}"
|
||||||
out = f"{domain}\\{self.username}{used_ccache} {self.mark_pwned()}"
|
out = f"{domain}\\{self.username}{used_ccache} {self.mark_pwned()}"
|
||||||
|
|
||||||
|
|
||||||
self.logger.extra["protocol"] = "LDAP"
|
self.logger.extra["protocol"] = "LDAP"
|
||||||
self.logger.extra["port"] = "636" if (self.args.gmsa or self.port == 636) else "389"
|
self.logger.extra["port"] = "636" if (self.args.gmsa or self.port == 636) else "389"
|
||||||
self.logger.success(out)
|
self.logger.success(out)
|
||||||
|
@ -799,6 +798,7 @@ class ldap(connection):
|
||||||
parsed_pw_last_set = "<never>"
|
parsed_pw_last_set = "<never>"
|
||||||
# we default attributes to blank strings if they don't exist in the dict
|
# we default attributes to blank strings if they don't exist in the dict
|
||||||
self.logger.highlight(f"{user.get('sAMAccountName', ''):<30}{parsed_pw_last_set:<20}{user.get('badPwdCount', ''):<8}{user.get('description', ''):<60}")
|
self.logger.highlight(f"{user.get('sAMAccountName', ''):<30}{parsed_pw_last_set:<20}{user.get('badPwdCount', ''):<8}{user.get('description', ''):<60}")
|
||||||
|
|
||||||
def groups(self):
|
def groups(self):
|
||||||
# Building the search filter
|
# Building the search filter
|
||||||
search_filter = "(objectCategory=group)"
|
search_filter = "(objectCategory=group)"
|
||||||
|
@ -1404,4 +1404,3 @@ class ldap(connection):
|
||||||
if each_file.startswith(self.output_filename.split("/")[-1]) and each_file.endswith("json"):
|
if each_file.startswith(self.output_filename.split("/")[-1]) and each_file.endswith("json"):
|
||||||
z.write(each_file)
|
z.write(each_file)
|
||||||
os.remove(each_file)
|
os.remove(each_file)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue