From 9e237effe6f14a8edfd601816406f1d45f4e6686 Mon Sep 17 00:00:00 2001 From: Vincent LE TOUX Date: Sun, 23 Feb 2020 16:00:57 +0100 Subject: [PATCH] PingCastle 2.8.1.0 --- Data/CompromiseGraphData.cs | 8 +++++--- Healthcheck/HealthcheckAnalyzer.cs | 8 ++++---- Healthcheck/Rules/HeatlcheckRulePrivilegedSchemaAdmins.cs | 2 +- Properties/AssemblyInfo.cs | 4 ++-- Report/ReportHealthCheckSingle.cs | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Data/CompromiseGraphData.cs b/Data/CompromiseGraphData.cs index 367afa7..a03d2de 100644 --- a/Data/CompromiseGraphData.cs +++ b/Data/CompromiseGraphData.cs @@ -308,8 +308,9 @@ public class SingleCompromiseGraphNodeData public string Name { get; set; } [XmlAttribute] public string Type { get; set; } - - [XmlIgnore] + + [IgnoreDataMember] + [XmlIgnore] public bool IsTypeAUser { get @@ -330,7 +331,8 @@ public bool IsTypeAUser public bool Critical { get; set; } // used when building the structure [XmlIgnore] - public ADItem ADItem { get; set; } + [IgnoreDataMember] + internal ADItem ADItem { get; set; } } [XmlType("link")] diff --git a/Healthcheck/HealthcheckAnalyzer.cs b/Healthcheck/HealthcheckAnalyzer.cs index 00f816d..e50dbe2 100644 --- a/Healthcheck/HealthcheckAnalyzer.cs +++ b/Healthcheck/HealthcheckAnalyzer.cs @@ -3334,10 +3334,10 @@ private void ExtractGPOAudit(string path, GPO GPO, ADDomainInfo domainInfo) { using (TextReader tr = new StreamReader(path)) { - string line = tr.ReadLine(); - // skip first line - if (line != null) - line = tr.ReadLine(); + // skip first line + string line = tr.ReadLine(); + if (line == null) + return; while ((line = tr.ReadLine()) != null) { var b = line.Split(','); diff --git a/Healthcheck/Rules/HeatlcheckRulePrivilegedSchemaAdmins.cs b/Healthcheck/Rules/HeatlcheckRulePrivilegedSchemaAdmins.cs index 5058436..f559664 100644 --- a/Healthcheck/Rules/HeatlcheckRulePrivilegedSchemaAdmins.cs +++ b/Healthcheck/Rules/HeatlcheckRulePrivilegedSchemaAdmins.cs @@ -21,7 +21,7 @@ public class HeatlcheckRulePrivilegedSchemaAdmins : RuleBase { foreach (HealthCheckGroupData group in healthcheckData.PrivilegedGroups) { - if (group.GroupName == "Schema Admins") + if (group.GroupName == "Schema Administrators") { if (group.NumberOfMember > 0) { diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 3415302..bce9702 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // Numéro de build // Révision // -[assembly: AssemblyVersion("2.8.0.0")] -[assembly: AssemblyFileVersion("2.8.0.0")] +[assembly: AssemblyVersion("2.8.1.0")] +[assembly: AssemblyFileVersion("2.8.1.0")] diff --git a/Report/ReportHealthCheckSingle.cs b/Report/ReportHealthCheckSingle.cs index a79c080..a421349 100644 --- a/Report/ReportHealthCheckSingle.cs +++ b/Report/ReportHealthCheckSingle.cs @@ -1097,9 +1097,9 @@ private void GenerateSummary(int index, SingleCompromiseGraphData data) if (data.Dependancies.Count != 0) { + Add(""); for (int i = 0; i < data.Dependancies.Count; i++) { - Add(""); var d = data.Dependancies[i]; if (i > 0) Add("
");