Skip to content

Commit

Permalink
improved resiliency
Browse files Browse the repository at this point in the history 
improved resiliency
  • Loading branch information
@HotCakeX
HotCakeX committed Dec 13, 2024
1 parent 465bc30 commit 06aa338
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 55 deletions.
9 changes: 3 additions & 6 deletions Harden-Windows-Security Module/Main files/C#/GUI/BitLocker/Variables.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Linq;
using static HardenWindowsSecurity.BitLocker;

namespace HardenWindowsSecurity
Expand Down Expand Up @@ -105,11 +105,8 @@ public static void CreateBitLockerVolumeViewModel(bool ExportToFile)
// Using the Application dispatcher to update UI elements
GUIMain.app.Dispatcher.Invoke(() =>
{
if (viewModelList.Count > 0)
{
// Place them in the DataGrid
RecoveryKeysDataGrid!.ItemsSource = viewModelList;
}
// Place them in the DataGrid
RecoveryKeysDataGrid!.ItemsSource = viewModelList;
});


Expand Down
2 changes: 1 addition & 1 deletion Harden-Windows-Security Module/Main files/C#/GUI/BitLocker/View.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ await Task.Run(() =>
ToastNotification.Show(ToastNotification.Type.EndOfBitLocker, null, null, null, "Operation System Drive");
}

}); // End of Async Thread
}); // End of Async Thread

}
finally
Expand Down
2 changes: 1 addition & 1 deletion Harden-Windows-Security Module/Main files/C#/GUI/Main/GUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices;
using System.Windows;
Expand All @@ -11,7 +12,6 @@
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Threading;
using System.Diagnostics;

#nullable disable

Expand Down
34 changes: 1 addition & 33 deletions Harden-Windows-Security Module/Main files/C#/Others/ConfirmSystemComplianceMethods.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,7 @@ private static Task VerifyWindowsUpdateConfigurations()
ComplianceCategories CatName = ComplianceCategories.WindowsUpdateConfigurations;

// Get the control from MDM CIM
Hashtable mdmPolicy = GlobalVars.MDM_Policy_Result01_Update02
?? throw new InvalidOperationException("MDM_Policy_Result01_Update02 is null");

HashTableCheckerResult MDM_Policy_Result01_Update02_AllowAutoWindowsUpdateDownloadOverMeteredNetwork =
HashTableChecker.CheckValue(mdmPolicy, "AllowAutoWindowsUpdateDownloadOverMeteredNetwork", "1");
HashTableCheckerResult MDM_Policy_Result01_Update02_AllowAutoWindowsUpdateDownloadOverMeteredNetwork = HashTableChecker.CheckValue(GlobalVars.MDM_Policy_Result01_Update02, "AllowAutoWindowsUpdateDownloadOverMeteredNetwork", "1");

nestedObjectArray.Add(new IndividualResult
{
Expand Down Expand Up @@ -543,9 +539,6 @@ private static Task VerifyBitLockerSettings()
IEnumerable<BitLocker.KeyProtectorType?> KeyProtectors = volumeInfo.KeyProtector!
.Select(kp => kp.KeyProtectorType);

// Display the key protectors
// Logger.LogMessage(string.Join(", ", KeyProtectors));

// Check if TPM+PIN and recovery password are being used - Normal Security level
if (KeyProtectors.Contains(BitLocker.KeyProtectorType.TpmPin) && KeyProtectors.Contains(BitLocker.KeyProtectorType.RecoveryPassword))
{
Expand Down Expand Up @@ -737,11 +730,6 @@ private static Task VerifyMiscellaneousConfigurations()


// Get the control from MDM CIM
if (GlobalVars.MDM_Policy_Result01_System02 is null)
{
// Handle the case where the global variable is null
throw new InvalidOperationException("MDM_Policy_Result01_System02 is null.");
}
HashTableCheckerResult MDM_Policy_Result01_System02_AllowLocation = HashTableChecker.CheckValue(GlobalVars.MDM_Policy_Result01_System02, "AllowLocation", "0");

nestedObjectArray.Add(new IndividualResult
Expand Down Expand Up @@ -1170,11 +1158,6 @@ private static Task VerifyWindowsFirewall()


// Get the control from MDM CIM
if (GlobalVars.MDM_Firewall_PublicProfile02 is null)
{
// Handle the case where the global variable is null
throw new InvalidOperationException("MDM_Firewall_PublicProfile02 is null.");
}
HashTableCheckerResult MDM_Firewall_PublicProfile02_EnableFirewall = HashTableChecker.CheckValue(GlobalVars.MDM_Firewall_PublicProfile02, "EnableFirewall", "true");

nestedObjectArray.Add(new IndividualResult
Expand Down Expand Up @@ -1245,11 +1228,6 @@ private static Task VerifyWindowsFirewall()


// Get the control from MDM CIM
if (GlobalVars.MDM_Firewall_PrivateProfile02 is null)
{
// Handle the case where the global variable is null
throw new InvalidOperationException("MDM_Firewall_PrivateProfile02 is null.");
}
HashTableCheckerResult MDM_Firewall_PrivateProfile02_EnableFirewall = HashTableChecker.CheckValue(GlobalVars.MDM_Firewall_PrivateProfile02, "EnableFirewall", "true");

nestedObjectArray.Add(new IndividualResult
Expand Down Expand Up @@ -1320,11 +1298,6 @@ private static Task VerifyWindowsFirewall()


// Get the control from MDM CIM
if (GlobalVars.MDM_Firewall_DomainProfile02 is null)
{
// Handle the case where the global variable is null
throw new InvalidOperationException("MDM_Firewall_DomainProfile02 is null.");
}
HashTableCheckerResult MDM_Firewall_DomainProfile02_EnableFirewall = HashTableChecker.CheckValue(GlobalVars.MDM_Firewall_DomainProfile02, "EnableFirewall", "true");

nestedObjectArray.Add(new IndividualResult
Expand Down Expand Up @@ -2351,11 +2324,6 @@ private static Task VerifyMicrosoftDefender()


// Get the control from MDM CIM
if (GlobalVars.MDM_Policy_Result01_System02 is null)
{
// Handle the case where the global variable is null
throw new InvalidOperationException("MDM_Policy_Result01_System02 is null.");
}
HashTableCheckerResult MDM_Policy_Result01_System02_AllowTelemetry = HashTableChecker.CheckValue(GlobalVars.MDM_Policy_Result01_System02, "AllowTelemetry", "3");

nestedObjectArray.Add(new IndividualResult
Expand Down
4 changes: 2 additions & 2 deletions Harden-Windows-Security Module/Main files/C#/Others/HashtableChecker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ internal static class HashTableChecker
/// <param name="key">The key to be used against the HashTable in order to get the value</param>
/// <param name="compareValue">Our desired value which will be compared against the value found in the HashTable after finding it based on the key we supply</param>
/// <returns></returns>
internal static HashTableCheckerResult CheckValue<T>(Hashtable hashTable, string key, T compareValue)
internal static HashTableCheckerResult CheckValue<T>(Hashtable? hashTable, string key, T compareValue)
{
// Initialize the result object
HashTableCheckerResult result = new();

// Check if the HashTable contains the specified key
if (hashTable.ContainsKey(key))
if (hashTable is not null && hashTable.ContainsKey(key))
{
// Retrieve the value associated with the key
var value = hashTable[key];
Expand Down
41 changes: 29 additions & 12 deletions Harden-Windows-Security Module/Main files/C#/Others/JsonToHashtable.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,40 @@ internal static class JsonToHashTable
{
// Using HashTable since they don't throw error for non-existing keys
// This method acts like ConvertFrom-Json -AsHashTable in PowerShell
internal static Hashtable ProcessJsonFile(string filePath)
internal static Hashtable? ProcessJsonFile(string filePath)
{
// Check if the file exists at the specified path
if (!File.Exists(filePath))

try
{
// Throw an exception if the file does not exist
throw new FileNotFoundException($"The specified file at '{filePath}' does not exist.");
}

// Read the JSON file content as a string
string jsonContent = File.ReadAllText(filePath);
// Check if the file exists at the specified path
if (!File.Exists(filePath))
{
// Throw an exception if the file does not exist
throw new FileNotFoundException($"The specified file at '{filePath}' does not exist.");
}

// Parse the JSON content into a JsonDocument
JsonDocument jsonDocument = JsonDocument.Parse(jsonContent);
// Read the JSON file content as a string
string jsonContent = File.ReadAllText(filePath);

if (string.IsNullOrWhiteSpace(jsonContent))
{
Logger.LogMessage($"The contents of '{filePath}' is empty.", LogTypeIntel.Error);
}

// Convert the root element of the JsonDocument to a HashTable and return it
return ConvertJsonElementToHashTable(jsonDocument.RootElement);
// Parse the JSON content into a JsonDocument
JsonDocument jsonDocument = JsonDocument.Parse(jsonContent);

// Convert the root element of the JsonDocument to a HashTable and return it
return ConvertJsonElementToHashTable(jsonDocument.RootElement);

}

catch
{
Logger.LogMessage($"Could not process the JSON file '{filePath}'. Compliance checks that rely on it will not show correct values.", LogTypeIntel.Error);
return null;
}
}

// Private method to convert a JsonElement representing a JSON object into a HashTable
Expand Down

0 comments on commit 06aa338

Please sign in to comment.