Merge pull request #119 from franc-pentest/improve-adcs

Improve adcs
franc-pentest · Nov 25, 2024 · 8d82e99 · 8d82e99
2 parents 9238d16 + c74e58f
commit 8d82e99
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.75
+1.0.76
diff --git a/ldeep/__main__.py b/ldeep/__main__.py
@@ -141,8 +141,6 @@ def default(o):
                         print(f"{field}: {value}")
                 elif "domain" in record["objectClass"]:
                     print(record["dn"])
-                elif "pKIEnrollmentService" in record["objectClass"]:
-                    print(record["dNSHostName"])
                 elif (
                     "msDS-AuthNPolicy" in record["objectClass"]
                     or "msDS-AuthNPolicySilo" in record["objectClass"]
@@ -735,23 +733,39 @@ def list_pkis(self, kwargs):
         if verbose:
             attributes = self.engine.all_attributes()
         else:
-            attributes = ["dNSHostName", "objectClass"]
+            attributes = [
+                "cACertificateDN",
+                "certificateTemplates",
+                "dNSHostName",
+                "name",
+            ]
 
-        self.display(
-            self.engine.query(
-                self.engine.PKI_FILTER(),
-                attributes,
-                base=",".join(
-                    [
-                        "CN=Enrollment Services,CN=Public Key Services,CN=Services",
-                        self.engine.ldap.server.info.other[
-                            "configurationNamingContext"
-                        ][0],
-                    ]
-                ),
+        ca_info = self.engine.query(
+            self.engine.PKI_FILTER(),
+            attributes,
+            base=",".join(
+                [
+                    "CN=Enrollment Services,CN=Public Key Services,CN=Services",
+                    self.engine.ldap.server.info.other["configurationNamingContext"][0],
+                ]
             ),
-            verbose,
         )
+        if verbose:
+            self.display(ca_info, verbose)
+            return
+        else:
+            ca_number = 1
+            print("Certificate Authorities")
+            for ca in ca_info:
+                print(ca_number)
+                print(f"{'CA Name':<30}: {ca.get('name')}")
+                print(f"{'DNS Name':<30}: {ca.get('dNSHostName')}")
+                print(f"{'Certificate Subject':<30}: {ca.get('cACertificateDN')}")
+                if ca.get("certificateTemplates"):
+                    print(f"{'Associated Templates':<30}")
+                    for template in ca.get("certificateTemplates"):
+                        print(f"{' ' * 32}{template}")
+                ca_number += 1
 
     def list_templates(self, kwargs):
         """