Update dump-computers.py

Signed-off-by: crosscutsaw <73831924+crosscutsaw@users.noreply.github.com>

Author: crosscutsaw

nxc/modules/dump-computers.py

@@ -1,11 +1,7 @@
-import socket
-from nxc.logger import nxc_logger
-from impacket.ldap.ldap import LDAPSearchError
+from nxc.parsers.ldap_results import parse_result_attributes
 from impacket.ldap.ldapasn1 import SearchResultEntry
-import sys
 
 class NXCModule:
-
     name = "dump-computers"
     description = "Dumps all computers in the domain"
     supported_protocols = ["ldap"]
@@ -16,61 +12,56 @@ def options(self, context, module_options):
         """
         dump-computers: Specify dump-computers to call the module
         Usage:        
-        >prints fqdn and version
+        > prints fqdn and machine version
         netexec ldap $DC-IP -u $username -p $password -M dump-computers
-        
-        >prints only netbios name
+
+        > prints only netbios name (no machine version)
         netexec ldap $DC-IP -u $username -p $password -M dump-computers -o TYPE=netbios
-        
-        >prints only fqdn
+
+        > prints only fqdn (no machine version)
         netexec ldap $DC-IP -u $username -p $password -M dump-computers -o TYPE=fqdn
-        
-        >prints fqdn and version, output to file
+
+        > prints fqdn and machine version, output to file
         netexec ldap $DC-IP -u $username -p $password -M dump-computers -o OUTPUT=<location>
-        
-        >prints only netbios name, output to file
+
+        > prints netbios or fqdn (no machine version), output to file
         netexec ldap $DC-IP -u $username -p $password -M dump-computers -o TYPE=netbios OUTPUT=<location>
         netexec ldap $DC-IP -u $username -p $password -M dump-computers -o TYPE=fqdn OUTPUT=<location>
-        
         """
         self.output_file = None
         self.netbios_only = False
         self.fqdn_only = False
-        
+
         if "OUTPUT" in module_options:
             self.output_file = module_options["OUTPUT"]
-        if "TYPE" in module_options and module_options["TYPE"].lower() == "netbios":
-            self.netbios_only = True
-        if "TYPE" in module_options and module_options["TYPE"].lower() == "fqdn":
-            self.fqdn_only = True
+        if "TYPE" in module_options:
+            t = module_options["TYPE"].lower()
+            if t == "netbios":
+                self.netbios_only = True
+            elif t == "fqdn":
+                self.fqdn_only = True
 
     def on_login(self, context, connection):
         search_filter = "(objectCategory=computer)"
-        
-        try:
-            context.log.debug(f"Search Filter={search_filter}")
-            resp = connection.ldap_connection.search(searchFilter=search_filter, attributes=["dNSHostName", "operatingSystem"], sizeLimit=0)
-        except LDAPSearchError as e:
-            if e.getErrorString().find("sizeLimitExceeded") >= 0:
-                context.log.debug("sizeLimitExceeded exception caught, giving up and processing the data received")
-                resp = e.getAnswers()
-            else:
-                nxc_logger.debug(e)
-                return False
+        context.log.debug(f"Search Filter = {search_filter}")
+
+        entries = connection.search(
+            searchFilter=search_filter,
+            attributes=["dNSHostName", "operatingSystem"]
+        )
 
         answers = []
-        context.log.debug(f"Total no. of records returned: {len(resp)}")
-        for item in resp:
-            if isinstance(item, SearchResultEntry) is not True:
+        context.log.debug(f"Total number of records returned: {len(entries)}")
+
+        for item in entries:
+            if not isinstance(item, SearchResultEntry):
                 continue
-            dns_host_name = ""
-            operating_system = ""
+
             try:
-                for attribute in item["attributes"]:
-                    if str(attribute["type"]) == "dNSHostName":
-                        dns_host_name = str(attribute["vals"][0])
-                    elif str(attribute["type"]) == "operatingSystem":
-                        operating_system = attribute["vals"][0]
+                parsed = parse_result_attributes([item])[0]
+                dns_host_name = parsed.get("dNSHostName", "")
+                operating_system = parsed.get("operatingSystem", "")
+
                 if dns_host_name:
                     netbios_name = dns_host_name.split(".")[0]
                     if self.netbios_only:
@@ -80,15 +71,14 @@ def on_login(self, context, connection):
                     else:
                         answer = f"{dns_host_name} ({operating_system})"
                     answers.append(answer)
-            except Exception as e:
-                context.log.debug("Exception:", exc_info=True)
-                context.log.debug(f"Skipping item, cannot process due to error {e}")
-        
-        if len(answers) > 0:
-            context.log.success("Found the following computers: ")
+            except Exception:
+                context.log.debug("Failed to parse entry", exc_info=True)
+
+        if answers:
+            context.log.success("Found the following computers:")
             for answer in answers:
                 context.log.highlight(answer)
-            
+
             if self.output_file:
                 try:
                     with open(self.output_file, "w") as f: