Merge pull request #129 from f3rn0s/main

ly4k · Mar 21, 2023 · 5dba0a3 · 5dba0a3
2 parents dcb873e + be9e1c3
commit 5dba0a3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/certipy/commands/find.py b/certipy/commands/find.py
@@ -778,7 +778,10 @@ def security_to_bloodhound_aces(self, security: ActiveDirectorySecurity) -> List
             is_inherited = rights["inherited"]
             principal = self.connection.lookup_sid(sid)
 
-            standard_rights = rights["rights"].to_list()
+            try:
+                standard_rights = list(rights["rights"])
+            except:
+                standard_rights = rights["rights"].to_list()
 
             for right in standard_rights:
                 aces.append(
@@ -1076,7 +1079,10 @@ def get_ca_permissions(self, ca: LDAPEntry):
             for sid, rights in security.aces.items():
                 if self.hide_admins and is_admin_sid(sid):
                     continue
-                ca_rights = rights["rights"].to_list()
+                try:
+                    ca_rights = list(rights["rights"])
+                except:
+                    ca_rights = rights["rights"].to_list()
                 for ca_right in ca_rights:
                     if ca_right not in access_rights:
                         access_rights[ca_right] = [

diff --git a/certipy/lib/structs.py b/certipy/lib/structs.py
@@ -13,7 +13,10 @@ def to_list(self):
         return members
 
     def to_str_list(self):
-        return list(map(lambda x: str(x), self.to_list()))
+        try:
+            return list(map(lambda x: str(x), list(self)))
+        except:
+            return list(map(lambda x: str(x), self.to_list()))
 
     def __str__(self):
         cls = self.__class__