Merge branch 'main' into neff-drop-py-support

Author: NeffIsBack

nxc/modules/runasppl.py

@@ -17,7 +17,7 @@ def on_admin_login(self, context, connection):
         command = r"reg query HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa\ /v RunAsPPL"
         context.log.debug(f"Executing command: {command}")
         p = connection.execute(command, True)
-        if "The system was unable to find the specified registry key or value" in p:
+        if not p or "The system was unable to find the specified registry key or value" in p:
             context.log.debug("Unable to find RunAsPPL Registry Key")
         else:
             context.log.highlight(p)

nxc/netexec.py

@@ -173,6 +173,9 @@ def main():
         for module in args.module:
             nxc_logger.display(f"{module} module options:\n{modules[module]['options']}")
         exit(0)
+    elif args.show_module_options:
+        nxc_logger.error(f"--options requires -M/--module")
+        exit(1)
     elif args.module:
         # Check the modules for sanity before loading the protocol
         nxc_logger.debug(f"Modules to be Loaded for sanity check: {args.module}, {type(args.module)}")

nxc/protocols/smb.py

@@ -258,6 +258,10 @@ def enum_host_info(self):
         except KeyError:
             self.logger.debug("Error getting server information...")
 
+        # Handle cases where server_os is returned as bytes, such as when accidentally scanning a machine running Responder
+        if isinstance(self.server_os.lower(), bytes):
+            self.server_os = self.server_os.decode("utf-8")
+
         if "Windows 6.1" in self.server_os and self.server_os_build == 0 and self.os_arch == 0:
             self.server_os = "Unix - Samba"
         elif self.server_os_build == 0 and self.os_arch == 0:
@@ -266,9 +270,6 @@ def enum_host_info(self):
 
         self.logger.extra["hostname"] = self.hostname
 
-        if isinstance(self.server_os.lower(), bytes):
-            self.server_os = self.server_os.decode("utf-8")
-
         try:
             self.signing = self.conn.isSigningRequired() if self.smbv1 else self.conn._SMBConnection._Connection["RequireSigning"]
         except Exception as e: