Merge pull request #68 from spyr0-sec/update-laps-schema

Update LAPS schema
SpecterOps · Aug 16, 2023 · 4ddf1b2 · 4ddf1b2
2 parents 3fe17d5 + 1f2089b
commit 4ddf1b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/CommonLib/LDAPProperties.cs b/src/CommonLib/LDAPProperties.cs
@@ -34,7 +34,8 @@ public class LDAPProperties
         public const string OperatingSystem = "operatingsystem";
         public const string ServicePack = "operatingsystemservicepack";
         public const string DNSHostName = "dnshostname";
-        public const string LAPSExpirationTime = "ms-mcs-admpwdexpirationtime";
+        public const string LAPSExpirationTime = "mslaps-passwordexpirationtime";
+        public const string LegacyLAPSExpirationTime = "ms-mcs-admpwdexpirationtime";
         public const string Members = "member";
         public const string SecurityDescriptor = "ntsecuritydescriptor";
         public const string SecurityIdentifier = "securityidentifier";
@@ -48,4 +49,4 @@ public class LDAPProperties
         public const string ScriptPath = "scriptpath";
         public const string HostServiceAccount = "msds-hostserviceaccount";
     }
-}
+}
diff --git a/src/CommonLib/SearchResultEntryWrapper.cs b/src/CommonLib/SearchResultEntryWrapper.cs
@@ -247,12 +247,12 @@ public bool IsGMSA()
 
         public bool HasLAPS()
         {
-            return GetProperty(LDAPProperties.LAPSExpirationTime) != null;
+            return GetProperty(LDAPProperties.LAPSExpirationTime) != null || GetProperty(LDAPProperties.LegacyLAPSExpirationTime) != null;
         }
 
         public SearchResultEntry GetEntry()
         {
             return _entry;
         }
     }
-}
+}