From e0b51dcd889266da232a5f16b9fc3573946c19d3 Mon Sep 17 00:00:00 2001 From: Adam Congdon Date: Wed, 16 Oct 2024 14:02:27 -0400 Subject: [PATCH 1/3] refactor - removing unused code --- .../Reporting/Html/Shared/CHtmlFormatting.cs | 27 +---------- .../Reporting/Html/VBR/CVbrSummaries.cs | 48 ++++++------------- .../Job Session Summary/CJobSessSummary.cs | 3 -- 3 files changed, 16 insertions(+), 62 deletions(-) diff --git a/vHC/HC_Reporting/Functions/Reporting/Html/Shared/CHtmlFormatting.cs b/vHC/HC_Reporting/Functions/Reporting/Html/Shared/CHtmlFormatting.cs index 933bb33..a552cca 100644 --- a/vHC/HC_Reporting/Functions/Reporting/Html/Shared/CHtmlFormatting.cs +++ b/vHC/HC_Reporting/Functions/Reporting/Html/Shared/CHtmlFormatting.cs @@ -30,26 +30,6 @@ public CHtmlFormatting() { } - public string DivId(string id) - { - return string.Format("
", id); - } - public string h2UnderLine(string text) - { - return string.Format("

{0}

", text); - } - - public string Button(string displayText) - { - return string.Format("", displayText); - } - - - public string HyperLink(string link, string displayText) - { - string s = string.Format("{1}", link, displayText); - return s; - } public string LineBreak() { @@ -68,12 +48,7 @@ public string AddA(string classInfo, string displaytext) return string.Format("
{1}
", classInfo, displaytext); } - public string BackToTop() - { - //return string.Format(""); - //return string.Format("Back To Top"); - return ""; - } + public string CollapsibleButton(string buttonText) { return SectionButton(_collapsible, buttonText); diff --git a/vHC/HC_Reporting/Functions/Reporting/Html/VBR/CVbrSummaries.cs b/vHC/HC_Reporting/Functions/Reporting/Html/VBR/CVbrSummaries.cs index 732549f..da4e7ee 100644 --- a/vHC/HC_Reporting/Functions/Reporting/Html/VBR/CVbrSummaries.cs +++ b/vHC/HC_Reporting/Functions/Reporting/Html/VBR/CVbrSummaries.cs @@ -77,8 +77,7 @@ public string SetVbrSummary() _form.AddA("i2", VbrLocalizationHelper.BkpSrvNotes5) + _form.AddA("i2", VbrLocalizationHelper.BkpSrvNotes6) ; - s += _form.LineBreak() + - _form.BackToTop(); + s += _form.LineBreak(); s += "
"; s += ""; @@ -107,7 +106,6 @@ public string SecSum() _form.AddA("i2", VbrLocalizationHelper.SSNote4) + _form.LineBreak(); ; - s += _form.BackToTop(); s += ""; s += ""; @@ -120,9 +118,7 @@ public string SrvSum() s += "
"; s += _form.AddA("hdr", VbrLocalizationHelper.GeneralSummaryHeader) + _form.LineBreak() + _form.AddA("i2", VbrLocalizationHelper.MssSum1) + - _form.LineBreak() + - _form.BackToTop(); - + _form.LineBreak(); s += "
"; s += ""; @@ -139,9 +135,7 @@ public string JobSummary() _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() + _form.AddA("i2", VbrLocalizationHelper.JobSumNote0) + _form.AddA("i2", VbrLocalizationHelper.JobSumNote1) + - _form.LineBreak() + - _form.BackToTop() - ; + _form.LineBreak(); s += ""; s += ""; @@ -151,8 +145,7 @@ public string MissingJobsSUmmary() { string s = _form.AddA("hdr", VbrLocalizationHelper.GeneralSummaryHeader) + _form.LineBreak() + _form.AddA("i2", VbrLocalizationHelper.NpSum1) + - _form.LineBreak() + - _form.BackToTop(); + _form.LineBreak() ; s += ""; s += ""; @@ -168,8 +161,7 @@ public string ProtectedWorkloads() _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() + _form.AddA("i2", VbrLocalizationHelper.PlNote1) + _form.LineBreak(); - _form.BackToTop(); - ; + s += ""; s += ""; @@ -183,8 +175,7 @@ public string ManagedServers() _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() + _form.AddA("i2", VbrLocalizationHelper.ManSrvNote0) + _form.AddA("i2", VbrLocalizationHelper.ManSrvNote1) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -199,8 +190,7 @@ public string RegKeys() _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() + _form.AddA("i2", VbrLocalizationHelper.RegNote0) + _form.AddA("i2", VbrLocalizationHelper.RegNote1) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -232,8 +222,7 @@ public string Proxies() _form.AddA("i2", VbrLocalizationHelper.PrxNote10) + _form.AddA("i2", VbrLocalizationHelper.PrxNote11) + _form.AddA("i2", VbrLocalizationHelper.PrxNote12) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -254,8 +243,7 @@ public string Sobr() _form.AddA("i2", VbrLocalizationHelper.SbrNote4) + _form.AddA("i2", VbrLocalizationHelper.SbrNote5) + _form.AddA("i2", VbrLocalizationHelper.SbrNote6) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -286,8 +274,7 @@ public string Extents() _form.AddA("i2", VbrLocalizationHelper.SbrExtNote14) + _form.AddA("i2", VbrLocalizationHelper.SbrExtNote15) + _form.AddA("i2", VbrLocalizationHelper.SbrExtNote16) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -318,8 +305,7 @@ public string Repos() _form.AddA("i2", VbrLocalizationHelper.SbrExtNote14) + _form.AddA("i2", VbrLocalizationHelper.SbrExtNote15) + _form.AddA("i2", VbrLocalizationHelper.SbrExtNote16) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -363,8 +349,7 @@ public string JobCon() _form.AddA("i3", VbrLocalizationHelper.JobConNoteSqlTableNote2) + _form.AddA("i3", VbrLocalizationHelper.JobConNoteSqlTableNote3) + _form.AddA("i3", VbrLocalizationHelper.JobConNoteSqlTableNote4) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -378,8 +363,7 @@ public string TaskCon() // _form.DoubleLineBreak() + _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() + _form.AddA("i2", VbrLocalizationHelper.TaskConNote0) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -403,8 +387,7 @@ public string JobSessSummary() _form.AddA("i2", VbrLocalizationHelper.JssNote8) + _form.AddA("i2", VbrLocalizationHelper.JssNote9) + _form.AddA("i2", VbrLocalizationHelper.JssNote10) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; @@ -418,8 +401,7 @@ public string JobInfo() // _form.DoubleLineBreak() + _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() + _form.AddA("i2", VbrLocalizationHelper.JobInfoNote0) + - _form.LineBreak() + - _form.BackToTop() + _form.LineBreak() ; s += ""; s += ""; diff --git a/vHC/HC_Reporting/Functions/Reporting/Html/VBR/VbrTables/Job Session Summary/CJobSessSummary.cs b/vHC/HC_Reporting/Functions/Reporting/Html/VBR/VbrTables/Job Session Summary/CJobSessSummary.cs index 61f063e..3bbb7ff 100644 --- a/vHC/HC_Reporting/Functions/Reporting/Html/VBR/VbrTables/Job Session Summary/CJobSessSummary.cs +++ b/vHC/HC_Reporting/Functions/Reporting/Html/VBR/VbrTables/Job Session Summary/CJobSessSummary.cs @@ -16,11 +16,8 @@ class CJobSessSummary { private Dictionary> _waits = new(); private CLogger log = CGlobals.Logger; - private bool _checkLogs; - private string _xmlFile; private CLogger _log; - private bool _scrub; private Scrubber.CScrubHandler _scrubber; private CDataTypesParser _parsers; From a636e5fcaa6116e123a8975d54c970fdaafe55d4 Mon Sep 17 00:00:00 2001 From: Adam Congdon Date: Fri, 18 Oct 2024 12:08:08 -0400 Subject: [PATCH 2/3] Refactor to fix CVE --- vHC/HC_Reporting/Functions/Collection/CImpersonation.cs | 4 ++-- vHC/HC_Reporting/VeeamHealthCheck.csproj | 4 ++-- vHC/VhcXTests/VhcXTests.csproj | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vHC/HC_Reporting/Functions/Collection/CImpersonation.cs b/vHC/HC_Reporting/Functions/Collection/CImpersonation.cs index 084d6b6..8b7a6fe 100644 --- a/vHC/HC_Reporting/Functions/Collection/CImpersonation.cs +++ b/vHC/HC_Reporting/Functions/Collection/CImpersonation.cs @@ -51,10 +51,10 @@ private SafeAccessTokenHandle SafeAccessTokenHandle() string domainName = CGlobals.REMOTEHOST; VBRSERVER = domainName; - _logger.Info(String.Format("Enter the login of a user on {0} that you wish to impersonate: ", domainName),false); + Console.WriteLine(String.Format("Enter the login of a user on {0} that you wish to impersonate: ", domainName),false); string userName = Console.ReadLine(); - _logger.Info(String.Format("Enter the password for {0}: ", userName), false); + Console.WriteLine(String.Format("Enter the password for {0}: ", userName), false); const int LOGON32_PROVIDER_DEFAULT = 0; //This parameter causes LogonUser to create a primary token. diff --git a/vHC/HC_Reporting/VeeamHealthCheck.csproj b/vHC/HC_Reporting/VeeamHealthCheck.csproj index 9b86b8e..6d287e9 100644 --- a/vHC/HC_Reporting/VeeamHealthCheck.csproj +++ b/vHC/HC_Reporting/VeeamHealthCheck.csproj @@ -11,10 +11,10 @@ Veeam AdamC Health_Check_Icon.ico - 2.0.0.526 + 2.0.0.527 False false - 2.0.0.526 + 2.0.0.527 full true diff --git a/vHC/VhcXTests/VhcXTests.csproj b/vHC/VhcXTests/VhcXTests.csproj index 91193dc..1371c2e 100644 --- a/vHC/VhcXTests/VhcXTests.csproj +++ b/vHC/VhcXTests/VhcXTests.csproj @@ -7,8 +7,8 @@ false true - 1.0.0.265 - 1.0.0.265 + 1.0.0.266 + 1.0.0.266 From e5283a6e4814e690c62d52be8fc25632595f9fd9 Mon Sep 17 00:00:00 2001 From: Adam Congdon Date: Fri, 18 Oct 2024 12:20:42 -0400 Subject: [PATCH 3/3] 2.0.0.528 --- vHC/HC_Reporting/VeeamHealthCheck.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vHC/HC_Reporting/VeeamHealthCheck.csproj b/vHC/HC_Reporting/VeeamHealthCheck.csproj index 6d287e9..3c71fd8 100644 --- a/vHC/HC_Reporting/VeeamHealthCheck.csproj +++ b/vHC/HC_Reporting/VeeamHealthCheck.csproj @@ -11,10 +11,10 @@ Veeam AdamC Health_Check_Icon.ico - 2.0.0.527 + 2.0.0.528 False false - 2.0.0.527 + 2.0.0.528 full true