Sort member output by sid for better alignment

Author: NeffIsBack

nxc/protocols/smb.py

@@ -1265,17 +1265,21 @@ def local_groups(self):
         except DCERPCException as e:
             self.logger.fail(f"Error enumerating local groups: {e}")
             return
-        if groups:
+
+        if groups and not self.args.local_groups:
             self.logger.success("Enumerated local groups")
             self.logger.debug(f"Local groups: {groups}")
 
-        for group_name, group_rid in groups.items():
-            self.logger.highlight(f"{group_rid} - {group_name}")
-            group_id = self.db.add_group(self.hostname, group_name, rid=group_rid)[0]
-            self.logger.debug(f"Added group, returned id: {group_id}")
+            for group_name, group_rid in groups.items():
+                self.logger.highlight(f"{group_rid} - {group_name}")
+                group_id = self.db.add_group(self.hostname, group_name, rid=group_rid)[0]
+                self.logger.debug(f"Added group, returned id: {group_id}")
+        elif groups and members:
+            self.logger.success(f"Enumerated users of local groups: {groups.popitem()[0]}")
 
-        for member in members:
-            self.logger.highlight(member)
+            members = dict(sorted(members.items(), key=lambda item: int(item[0].split("-")[-1])))
+            for member in members:
+                self.logger.highlight(f"{member} - {members[member]}")
 
     def groups(self):
         self.logger.fail("[DEPRECATED] Arg moved to the ldap protocol")

nxc/protocols/smb/samrfunc.py

@@ -41,7 +41,7 @@ def __init__(self, connection):
 
     def get_builtin_groups(self, group):
         domains = self.samr_query.get_domains()
-        members = []
+        members = {}
         if "Builtin" not in domains:
             logging.error("No Builtin group to query locally on")
             return None
@@ -55,7 +55,7 @@ def get_builtin_groups(self, group):
     def get_custom_groups(self, group=None):
         domains = self.samr_query.get_domains()
         custom_groups = {}
-        members = []
+        members = {}
         for domain in domains:
             if domain == "Builtin":
                 continue
@@ -70,19 +70,18 @@ def get_local_groups(self, group=None):
             self.logger.display(f"Querying group: {group}")
         builtin_groups, builtin_groups_members = self.get_builtin_groups(group)
         custom_groups, custom_groups_members = self.get_custom_groups(group)
-        return {**builtin_groups, **custom_groups}, builtin_groups_members + custom_groups_members
+        return {**builtin_groups, **custom_groups}, builtin_groups_members | custom_groups_members
 
     def get_local_users(self, group, domain_handle):
-        users = []
+        users = {}
         try:
             for alias_id in group.values():
                 member_sids = self.samr_query.get_alias_members(domain_handle, alias_id)
                 member_names = self.lsa_query.lookup_sids(member_sids)
-                for sid, name in zip(member_sids, member_names, strict=True):
-                    users.append(f"{name} - {sid}")
+                users = dict(zip(member_sids, member_names, strict=True))
         except Exception as e:
             self.logger.debug(f"Error enumerating users in {group}: {e}")
-            return []
+            return {}
         return users