Fix AES authentication, and no-pass issue

dirkjanm · Nov 28, 2023 · 6a8c206 · 6a8c206 · n3rada · Apr 28, 2024
1 parent 7216269
commit 6a8c206
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/bloodhound/__init__.py b/bloodhound/__init__.py
@@ -274,23 +274,19 @@ def main():
     if args.username is not None and args.password is not None:
         logging.debug('Authentication: username/password')
         auth = ADAuthentication(username=args.username, password=args.password, domain=args.domain, auth_method=args.auth_method)
-    elif args.username is not None and args.password is None and args.hashes is None:
+    elif args.username is not None and args.password is None and args.hashes is None and args.no_pass is None:
         args.password = getpass.getpass()
         auth = ADAuthentication(username=args.username, password=args.password, domain=args.domain, auth_method=args.auth_method)
     elif args.username is None and (args.password is not None or args.hashes is not None):
         logging.error('Authentication: password or hashes provided without username')
         sys.exit(1)
-    elif (args.hashes is not None or args.aesKey is not None) and args.username is not None:
-        if args.hashes:
-            logging.debug('Authentication: NT hash')
-            lm, nt = args.hashes.split(":")
-            auth = ADAuthentication(lm_hash=lm, nt_hash=nt, username=args.username, domain=args.domain, auth_method=args.auth_method)
-            if args.aesKey:
-                logging.debug('Authentication: Kerberos AES')
-                auth.set_aeskey(args.aesKey)
-        else:
-            logging.debug('Authentication: Kerberos AES')
-            auth = ADAuthentication(username=args.username, domain=args.domain, aeskey=args.aesKey, auth_method=args.auth_method)
+    elif args.hashes is not None and args.username is not None:
+        logging.debug('Authentication: NT hash')
+        lm, nt = args.hashes.split(":")
+        auth = ADAuthentication(lm_hash=lm, nt_hash=nt, username=args.username, domain=args.domain, auth_method=args.auth_method)
+    elif args.aesKey is not None and args.username is not None:
+        logging.debug('Authentication: Kerberos AES')
+        auth = ADAuthentication(username=args.username, domain=args.domain, aeskey=args.aesKey, auth_method=args.auth_method)
     else:
         if not args.kerberos:
             parser.print_help()