2.0.0.499 - Security Update

.github/workflows/codeql.yml

@@ -13,17 +13,17 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "dev" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "master", "dev" ]
   schedule:
     - cron: '45 5 * * 3'
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     permissions:
       actions: read
       contents: read

.github/workflows/virus-scan.yml

@@ -4,23 +4,37 @@ on:
   push:
     branches:
       - master
+      - dev
   pull_request:
     branches:
       - master
+      - dev
 
 jobs:
   virus-scan:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-    - name: Install ClamAV
-      run: sudo apt-get update && sudo apt-get install -y clamav clamav-daemon
+      - name: Install ClamAV
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clamav clamav-daemon
 
-    - name: Update ClamAV database
-      run: sudo freshclam
+      - name: Disable freshclam logging
+        run: |
+          sudo cp /etc/clamav/freshclam.conf /etc/clamav/freshclam.conf.bak
+          sudo sed -i 's/^UpdateLogFile/#UpdateLogFile/' /etc/clamav/freshclam.conf
+          # Ensure there is no logging defined
+          grep -q "^LogFile" /etc/clamav/freshclam.conf || echo "LogFile /dev/null" | sudo tee -a /etc/clamav/freshclam.conf
 
-    - name: Scan repository for viruses
-      run: sudo clamscan -r --bell -i .
+      - name: Update ClamAV database
+        run: sudo freshclam
+
+      - name: Restore freshclam logging (if needed)
+        run: sudo mv /etc/clamav/freshclam.conf.bak /etc/clamav/freshclam.conf
+
+      - name: Scan repository for viruses
+        run: sudo clamscan -r --bell -i .

vHC/HC_Reporting/Functions/Collection/CCollections.cs

@@ -8,7 +8,6 @@
 using VeeamHealthCheck.Shared;
 using Microsoft.Management.Infrastructure;
 using VeeamHealthCheck.Functions.Collection.PSCollections;
-using System.Web.Services.Description;
 using System.Windows;
 
 namespace VeeamHealthCheck.Functions.Collection

vHC/HC_Reporting/Functions/Collection/PSCollections/CScripts.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
 using System.Management.Automation;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace VeeamHealthCheck.Functions.Collection.PSCollections
 {

vHC/HC_Reporting/Functions/Reporting/Html/VBR/VbrTables/Job Session Summary/CJobSessSummary.cs

@@ -161,13 +161,6 @@ private List<CJobSummaryTypes> JobSessionSummaryToXml(CJobSessSummaryHelper help
                     maxBackupSize.Add(info.MaxBackupSize);
 
 
-#if DEBUG
-                    if(info.JobName == "win10trash")
-                    {
-
-                    }
-
-#endif
                     if (info.AvgBackupSize != 0 && info.AvgDataSize != 0)
                     {
                         if(info.AvgDataSize > info.UsedVmSizeTB)

vHC/HC_Reporting/VeeamHealthCheck.csproj

@@ -2,27 +2,28 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
 	  <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU;x64</Platforms>
     <PackageIcon></PackageIcon>
     <PackageIconUrl />
     <Company>Veeam</Company>
     <Authors>AdamC</Authors>
-    <ApplicationIcon>output.ico</ApplicationIcon>
-    <AssemblyVersion>2.0.0.487</AssemblyVersion>
+    <ApplicationIcon>Health_Check_Icon.ico</ApplicationIcon>
+    <AssemblyVersion>2.0.0.499</AssemblyVersion>
     <SignAssembly>False</SignAssembly>
-    <AssemblyOriginatorKeyFile>vhc_keyfile2.pfx</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
-    <FileVersion>2.0.0.487</FileVersion>
+    <FileVersion>2.0.0.499</FileVersion>
     <DebugType>full</DebugType>
 	  <SelfContained>true</SelfContained>
 	  <!--These 2 lines are what produce the single file utility. Possibly doesn't work...-->
 	  <!--<PublishSingleFile>true</PublishSingleFile>-->
 	  <!--<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>-->
 	  <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	  <NeutralLanguage>en-US</NeutralLanguage>
+	  <AnalysisLevel>none</AnalysisLevel>
+	  <AssemblyOriginatorKeyFile>vhc_keyfile2.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -94,7 +95,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="output.ico" />
+    <Content Include="Health_Check_Icon.ico" />
     <Content Include="Tools\Scripts\HealthCheck\VBR\Get-NasInfo.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -110,15 +111,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
     <PackageReference Include="DinkToPdf.Standard" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.3.3" />
     <PackageReference Include="Node.js" Version="5.3.0" />
     <PackageReference Include="Npm" Version="3.5.2" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageReference Include="System.Management.Automation" Version="7.3.3" />
+    <PackageReference Include="System.Management.Automation" Version="7.4.5" />
     <PackageReference Include="Tailwind.Extensions.AspNetCore" Version="1.0.0" />
   </ItemGroup>
 
@@ -177,7 +176,7 @@
 		  <LocalPostBuildBat Include="$(ProjectDir)Tools\build\BuildCopy.bat" Condition="Exists('$(ProjectDir)Tools\build\BuildCopy.bat')" />
 	  </ItemGroup>
 	  <!-- Calls the bat file, if the variable exists, if not this does nothing and silently continues -->
-	  <Exec Command="call @(LocalPostBuildBat)" />
+	  <Exec Command="call @(LocalPostBuildBat)&#xD;&#xA;" />
   </Target>
 
   <ItemGroup>

vHC/HC_Reporting/VhcGui.xaml.cs

@@ -28,9 +28,7 @@ private void SetUi()
         {
             SetImportRelease();
 
-#if DEBUG
-            SetImportDebug();
-#endif
+
             this.Title = _functions.ModeCheck();
             _functions.PreRunCheck();
 

vHC/VhcXTests/CArgsParserTEST.cs

@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VeeamHealthCheck.Startup;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+//using VeeamHealthCheck.Startup;
 
-namespace VhcXTests
-{
-    public class CArgsParserTEST
-    {
-        [Fact]
-        public void ParseArgs_Default_Success()
-        {
-        }
-    }
-}
+//namespace VhcXTests
+//{
+//    public class CArgsParserTEST
+//    {
+//        [Fact]
+//        public void ParseArgs_Default_Success()
+//        {
+//        }
+//    }
+//}