swisskyrepo
/
NetExec
mirror of https://github.com/swisskyrepo/NetExec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed to f-string, swapped single quote to double quotes

main
Alexander Neff 2023-10-30 10:38:52 -04:00
parent 4b2535d8b4
commit 4840ea0cd3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nxc/helpers/bloodhound.py
View File

@ -43,26 +43,26 @@ def add_user_bh(user, domain, logger, config):
try: try:
with driver.session() as session, session.begin_transaction() as tx: with driver.session() as session, session.begin_transaction() as tx:
for info in users_owned: for info in users_owned:
distinguished_name = "".join(["DC=" + dc + "," for dc in info["domain"].split(".")]).rstrip(",") distinguished_name = "".join([f"DC={dc}," for dc in info["domain"].split(".")]).rstrip(",")
domain_query = tx.run(f'MATCH (d:Domain) WHERE d.distinguishedname STARTS WITH "{distinguished_name}" RETURN d').data() domain_query = tx.run(f"MATCH (d:Domain) WHERE d.distinguishedname STARTS WITH '{distinguished_name}' RETURN d").data()
if not domain_query: if not domain_query:
raise Exception("Domain not found in bloodhound") raise Exception("Domain not found in bloodhound")
else: else:
domain = domain_query[0]["d"].get("name") domain = domain_query[0]["d"].get("name")
if info["username"][-1] == "$": if info["username"][-1] == "$":
user_owned = info["username"][:-1] + "." + domain user_owned = f"{info['username'][:-1]}.{domain}"
account_type = "Computer" account_type = "Computer"
else: else:
user_owned = info["username"] + "@" + domain user_owned = f"{info['username']}@{domain}"
account_type = "User" account_type = "User"
result = tx.run(f'MATCH (c:{account_type} {{name:"{user_owned}"}}) RETURN c') result = tx.run(f"MATCH (c:{account_type} {{name:'{user_owned}''}}) RETURN c")
if result.data()[0]["c"].get("owned") in (False, None): if result.data()[0]["c"].get("owned") in (False, None):
logger.debug(f'MATCH (c:{account_type} {{name:"{user_owned}"}}) SET c.owned=True RETURN c.name AS name') logger.debug(f"MATCH (c:{account_type} {{name:'{user_owned}'}}) SET c.owned=True RETURN c.name AS name")
result = tx.run(f'MATCH (c:{account_type} {{name:"{user_owned}"}}) SET c.owned=True RETURN c.name AS name') result = tx.run(f"MATCH (c:{account_type} {{name:'{user_owned}'}}) SET c.owned=True RETURN c.name AS name")
logger.highlight(f"Node {user_owned} successfully set as owned in BloodHound") logger.highlight(f"Node {user_owned} successfully set as owned in BloodHound")
except AuthError: except AuthError:
logger.fail(f"Provided Neo4J credentials ({config.get('BloodHound', 'bh_user')}:{config.get('BloodHound', 'bh_pass')}) are not valid.") logger.fail(f"Provided Neo4J credentials ({config.get('BloodHound', 'bh_user')}:{config.get('BloodHound', 'bh_pass')}) are not valid.")