PingCastle 3.1.0.1

vletoux · vletoux · commit 02765905cdb1 · 2023-08-28T19:08:36.000+02:00
diff --git a/Exports/ExportComputers.cs b/Exports/ExportComputers.cs
@@ -100,7 +100,7 @@ public override void Export(string filename)
                                 data.Add(string.Empty);
                                 data.Add(string.Empty);
                             }
-                            if (lapsAnalyzer.LegacyLAPSIntId > 0 && x.ReplPropertyMetaData != null && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))
+                            if (lapsAnalyzer.LegacyLAPSIntId != 0 && x.ReplPropertyMetaData != null && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))
                             {
                                 var dd = x.ReplPropertyMetaData[lapsAnalyzer.LegacyLAPSIntId];
                                 data.Add(dd.LastOriginatingChange.ToString("u"));
@@ -109,7 +109,7 @@ public override void Export(string filename)
                             {
                                 data.Add(string.Empty);
                             }
-                            if (lapsAnalyzer.MsLAPSIntId > 0 && x.ReplPropertyMetaData != null && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))
+                            if (lapsAnalyzer.MsLAPSIntId != 0 && x.ReplPropertyMetaData != null && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))
                             {
                                 var dd = x.ReplPropertyMetaData[lapsAnalyzer.MsLAPSIntId];
                                 data.Add(dd.LastOriginatingChange.ToString("u"));
diff --git a/Healthcheck/HealthcheckAnalyzer.cs b/Healthcheck/HealthcheckAnalyzer.cs
@@ -925,7 +925,7 @@ private void GenerateComputerData(ADDomainInfo domainInfo, ADWebService adws)
                                     }
                                 }
                             }
-                            if (x.ReplPropertyMetaData != null && LAPSAnalyzer.LegacyLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(LAPSAnalyzer.LegacyLAPSIntId))
+                            if (x.ReplPropertyMetaData != null && LAPSAnalyzer.LegacyLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(LAPSAnalyzer.LegacyLAPSIntId))
                             {
                                 proxy.AddWithoutDetail("LAPS");
                                 var d = x.ReplPropertyMetaData[LAPSAnalyzer.LegacyLAPSIntId];
@@ -938,7 +938,7 @@ private void GenerateComputerData(ADDomainInfo domainInfo, ADWebService adws)
                                         lapsDistribution[i] = 1;
                                 }
                             }
-                            if (x.ReplPropertyMetaData != null && LAPSAnalyzer.MsLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(LAPSAnalyzer.MsLAPSIntId))
+                            if (x.ReplPropertyMetaData != null && LAPSAnalyzer.MsLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(LAPSAnalyzer.MsLAPSIntId))
                             {
                                 proxy.AddWithoutDetail("LAPSNew");
                                 var d = x.ReplPropertyMetaData[LAPSAnalyzer.MsLAPSIntId];
@@ -2607,7 +2607,7 @@ void ThreadGPOAnalysis(int ThreadId, ADWebService adws, string directoryFullName
                 if (adws.FileConnection.FileExists(path))
                 {
                     step = "extract GPP local group assignment";
-                    ExtractLocalGroupAssignment(adws, path, GPO, "Unknown [" + shortName + "]");
+                    ExtractLocalGroupAssignment(adws, path, GPO);
                 }
                 path = directoryFullName + @"\Machine\Microsoft\Windows nt\SecEdit\GptTmpl.inf";
                 if (adws.FileConnection.FileExists(path))
@@ -2680,14 +2680,14 @@ void ThreadGPOAnalysis(int ThreadId, ADWebService adws, string directoryFullName
             }
         }
 
-        private void ExtractLocalGroupAssignment(ADWebService adws, string path, GPO GPO, string p)
+        private void ExtractLocalGroupAssignment(ADWebService adws, string path, GPO GPO)
         {
             XmlDocument doc = new XmlDocument();
             doc.Load(path);
             XmlNodeList nodeList = doc.SelectNodes(@"//Group");
             foreach (XmlNode node in nodeList)
             {
-                XmlNode actionNode = node.SelectSingleNode(@"//Properties/@action");
+                XmlNode actionNode = node.SelectSingleNode(@"Properties/@action");
                 if (actionNode != null)
                 {
                     switch (actionNode.Value.ToUpperInvariant())
@@ -2703,7 +2703,7 @@ private void ExtractLocalGroupAssignment(ADWebService adws, string path, GPO GPO
                 var groupNameNode = node.SelectSingleNode("@name");
                 if (groupNameNode == null)
                     continue;
-                foreach (XmlNode userNameNode in node.SelectNodes(@"//Member[@action=""ADD""]"))
+                foreach (XmlNode userNameNode in node.SelectNodes(@"Properties/Members/Member[@action=""ADD""]"))
                 {
                     var sidnode = userNameNode.SelectSingleNode("@sid");
                     if (sidnode == null)
@@ -4552,9 +4552,9 @@ private LAPSAnalyzer CheckLAPSInstalled(ADDomainInfo domainInfo, ADWebService ad
                         var f = false;
                         // check if there is a LAPS attribute (looked into metadata because hidden if the current user has not right to read it)
                         if (
-                            (lapsAnalyzer.LegacyLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))
+                            (lapsAnalyzer.LegacyLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))
                             ||
-                            (lapsAnalyzer.MsLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))
+                            (lapsAnalyzer.MsLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))
                             )
                         {
                             if (x.NTSecurityDescriptor != null)
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Numéro de build
 //      Révision
 //
-[assembly: AssemblyVersion("3.1.0.0")]
-[assembly: AssemblyFileVersion("3.1.0.0")]
+[assembly: AssemblyVersion("3.1.0.1")]
+[assembly: AssemblyFileVersion("3.1.0.1")]
diff --git a/Scanners/LAPSBitLocker.cs b/Scanners/LAPSBitLocker.cs
@@ -65,12 +65,12 @@ public void Export(string filename)
                             LastLogonTimestamp = x.LastLogonTimestamp,
                             OperatingSystem = x.OperatingSystem,
                         };
-                        if (lapsAnalyzer.LegacyLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))
+                        if (lapsAnalyzer.LegacyLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))
                         {
                             computer.HasLegacyLAPS = true;
                             computer.LegacyLAPSLastChange = x.ReplPropertyMetaData[lapsAnalyzer.LegacyLAPSIntId].LastOriginatingChange;
                         }
-                        if (lapsAnalyzer.MsLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))
+                        if (lapsAnalyzer.MsLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))
                         {
                             computer.HasMsLAPS = true;
                             computer.MsLAPSLastChange = x.ReplPropertyMetaData[lapsAnalyzer.MsLAPSIntId].LastOriginatingChange;
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+3.1.0.1
+* fix local membership if many settings are defined
+* fix LAPS collection (signed / unsigned bug)
+
 3.1.0.0
 * fix a bug for machineaccountquote when GPO has been rewritten to remove all users
 * fix a regression introduced in previous version in P-TrustedCredManAccessPrivilege

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public override void Export(string filename)`
`100`	`100`	`data.Add(string.Empty);`
`101`	`101`	`data.Add(string.Empty);`
`102`	`102`	`}`
`103`		`- if (lapsAnalyzer.LegacyLAPSIntId > 0 && x.ReplPropertyMetaData != null && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))`
	`103`	`+ if (lapsAnalyzer.LegacyLAPSIntId != 0 && x.ReplPropertyMetaData != null && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))`
`104`	`104`	`{`
`105`	`105`	`var dd = x.ReplPropertyMetaData[lapsAnalyzer.LegacyLAPSIntId];`
`106`	`106`	`data.Add(dd.LastOriginatingChange.ToString("u"));`
`@@ -109,7 +109,7 @@ public override void Export(string filename)`
`109`	`109`	`{`
`110`	`110`	`data.Add(string.Empty);`
`111`	`111`	`}`
`112`		`- if (lapsAnalyzer.MsLAPSIntId > 0 && x.ReplPropertyMetaData != null && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))`
	`112`	`+ if (lapsAnalyzer.MsLAPSIntId != 0 && x.ReplPropertyMetaData != null && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))`
`113`	`113`	`{`
`114`	`114`	`var dd = x.ReplPropertyMetaData[lapsAnalyzer.MsLAPSIntId];`
`115`	`115`	`data.Add(dd.LastOriginatingChange.ToString("u"));`
Original file line number	Diff line number	Diff line change
`@@ -925,7 +925,7 @@ private void GenerateComputerData(ADDomainInfo domainInfo, ADWebService adws)`
`925`	`925`	`}`
`926`	`926`	`}`
`927`	`927`	`}`
`928`		`- if (x.ReplPropertyMetaData != null && LAPSAnalyzer.LegacyLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(LAPSAnalyzer.LegacyLAPSIntId))`
	`928`	`+ if (x.ReplPropertyMetaData != null && LAPSAnalyzer.LegacyLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(LAPSAnalyzer.LegacyLAPSIntId))`
`929`	`929`	`{`
`930`	`930`	`proxy.AddWithoutDetail("LAPS");`
`931`	`931`	`var d = x.ReplPropertyMetaData[LAPSAnalyzer.LegacyLAPSIntId];`
`@@ -938,7 +938,7 @@ private void GenerateComputerData(ADDomainInfo domainInfo, ADWebService adws)`
`938`	`938`	`lapsDistribution[i] = 1;`
`939`	`939`	`}`
`940`	`940`	`}`
`941`		`- if (x.ReplPropertyMetaData != null && LAPSAnalyzer.MsLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(LAPSAnalyzer.MsLAPSIntId))`
	`941`	`+ if (x.ReplPropertyMetaData != null && LAPSAnalyzer.MsLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(LAPSAnalyzer.MsLAPSIntId))`
`942`	`942`	`{`
`943`	`943`	`proxy.AddWithoutDetail("LAPSNew");`
`944`	`944`	`var d = x.ReplPropertyMetaData[LAPSAnalyzer.MsLAPSIntId];`
`@@ -2607,7 +2607,7 @@ void ThreadGPOAnalysis(int ThreadId, ADWebService adws, string directoryFullName`
`2607`	`2607`	`if (adws.FileConnection.FileExists(path))`
`2608`	`2608`	`{`
`2609`	`2609`	`step = "extract GPP local group assignment";`
`2610`		`- ExtractLocalGroupAssignment(adws, path, GPO, "Unknown [" + shortName + "]");`
	`2610`	`+ ExtractLocalGroupAssignment(adws, path, GPO);`
`2611`	`2611`	`}`
`2612`	`2612`	`path = directoryFullName + @"\Machine\Microsoft\Windows nt\SecEdit\GptTmpl.inf";`
`2613`	`2613`	`if (adws.FileConnection.FileExists(path))`
`@@ -2680,14 +2680,14 @@ void ThreadGPOAnalysis(int ThreadId, ADWebService adws, string directoryFullName`
`2680`	`2680`	`}`
`2681`	`2681`	`}`
`2682`	`2682`
`2683`		`- private void ExtractLocalGroupAssignment(ADWebService adws, string path, GPO GPO, string p)`
	`2683`	`+ private void ExtractLocalGroupAssignment(ADWebService adws, string path, GPO GPO)`
`2684`	`2684`	`{`
`2685`	`2685`	`XmlDocument doc = new XmlDocument();`
`2686`	`2686`	`doc.Load(path);`
`2687`	`2687`	`XmlNodeList nodeList = doc.SelectNodes(@"//Group");`
`2688`	`2688`	`foreach (XmlNode node in nodeList)`
`2689`	`2689`	`{`
`2690`		`- XmlNode actionNode = node.SelectSingleNode(@"//Properties/@action");`
	`2690`	`+ XmlNode actionNode = node.SelectSingleNode(@"Properties/@action");`
`2691`	`2691`	`if (actionNode != null)`
`2692`	`2692`	`{`
`2693`	`2693`	`switch (actionNode.Value.ToUpperInvariant())`
`@@ -2703,7 +2703,7 @@ private void ExtractLocalGroupAssignment(ADWebService adws, string path, GPO GPO`
`2703`	`2703`	`var groupNameNode = node.SelectSingleNode("@name");`
`2704`	`2704`	`if (groupNameNode == null)`
`2705`	`2705`	`continue;`
`2706`		`- foreach (XmlNode userNameNode in node.SelectNodes(@"//Member[@action=""ADD""]"))`
	`2706`	`+ foreach (XmlNode userNameNode in node.SelectNodes(@"Properties/Members/Member[@action=""ADD""]"))`
`2707`	`2707`	`{`
`2708`	`2708`	`var sidnode = userNameNode.SelectSingleNode("@sid");`
`2709`	`2709`	`if (sidnode == null)`
`@@ -4552,9 +4552,9 @@ private LAPSAnalyzer CheckLAPSInstalled(ADDomainInfo domainInfo, ADWebService ad`
`4552`	`4552`	`var f = false;`
`4553`	`4553`	`// check if there is a LAPS attribute (looked into metadata because hidden if the current user has not right to read it)`
`4554`	`4554`	`if (`
`4555`		`- (lapsAnalyzer.LegacyLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))`
	`4555`	`+ (lapsAnalyzer.LegacyLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))`
`4556`	`4556`	`\|\|`
`4557`		`- (lapsAnalyzer.MsLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))`
	`4557`	`+ (lapsAnalyzer.MsLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))`
`4558`	`4558`	`)`
`4559`	`4559`	`{`
`4560`	`4560`	`if (x.NTSecurityDescriptor != null)`
Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,12 @@ public void Export(string filename)`
`65`	`65`	`LastLogonTimestamp = x.LastLogonTimestamp,`
`66`	`66`	`OperatingSystem = x.OperatingSystem,`
`67`	`67`	`};`
`68`		`- if (lapsAnalyzer.LegacyLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))`
	`68`	`+ if (lapsAnalyzer.LegacyLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.LegacyLAPSIntId))`
`69`	`69`	`{`
`70`	`70`	`computer.HasLegacyLAPS = true;`
`71`	`71`	`computer.LegacyLAPSLastChange = x.ReplPropertyMetaData[lapsAnalyzer.LegacyLAPSIntId].LastOriginatingChange;`
`72`	`72`	`}`
`73`		`- if (lapsAnalyzer.MsLAPSIntId > 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))`
	`73`	`+ if (lapsAnalyzer.MsLAPSIntId != 0 && x.ReplPropertyMetaData.ContainsKey(lapsAnalyzer.MsLAPSIntId))`
`74`	`74`	`{`
`75`	`75`	`computer.HasMsLAPS = true;`
`76`	`76`	`computer.MsLAPSLastChange = x.ReplPropertyMetaData[lapsAnalyzer.MsLAPSIntId].LastOriginatingChange;`