Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor improvements before AppControl Manager v.0.1.8.4 release #536

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Minor improvements before AppControl Manager v.0.1.8.4 release #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AppControl Manager/AppControl Manager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
</PropertyGroup>

<ItemGroup>
<DotNetCliToolReference Include="Microsoft.XmlSerializer.Generator" Version="9.0.0" />
<DotNetCliToolReference Include="Microsoft.XmlSerializer.Generator" Version="9.0.1" />
</ItemGroup>

<!--
Expand Down
10 changes: 0 additions & 10 deletions AppControl Manager/Pages/CreatePolicy.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,16 +811,6 @@ await Task.Run(() =>
// Set policy name and reset the policy ID
string policyID = SetCiPolicyInfo.Set(policyPath, true, null, null, null);

// Save the policyID and time of deployment of the audit mode policy in user configs
if (useNoFlightRoots)
{
_ = UserConfiguration.Set(StrictKernelNoFlightRootsPolicyGUID: Guid.Parse(policyID), StrictKernelModePolicyTimeOfDeployment: DateTime.UtcNow);
}
else
{
_ = UserConfiguration.Set(StrictKernelPolicyGUID: Guid.Parse(policyID), StrictKernelModePolicyTimeOfDeployment: DateTime.UtcNow);
}

// Copy the policy to the user configurations directory
File.Copy(policyPath, finalPolicyPath, true);

Expand Down
9 changes: 6 additions & 3 deletions AppControl Manager/Pages/CreateSupplementalPolicy.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ await Task.Run(() =>
StrictKernelModeInfoBar.Message = "Successfully scanned the system for events";
}


StrictKernelModeInfoBar.IsClosable = true;

}
}
Expand Down Expand Up @@ -1494,6 +1494,7 @@ await Task.Run(() =>
StrictKernelModeScanButton.IsEnabled = true;
StrictKernelModeScanSinceLastRebootButton.IsEnabled = true;
StrictKernelModeBrowseForBasePolicyButton.IsEnabled = true;
StrictKernelModeInfoBar.IsClosable = true;

}

Expand Down Expand Up @@ -1531,7 +1532,6 @@ private async void DriverAutoDetector()
StrictKernelModeInfoBar.Message = "Scanning the system for drivers";
StrictKernelModeSection.IsExpanded = true;


List<FileInfo> kernelModeDriversList = [];

ScanResults.Clear();
Expand Down Expand Up @@ -1591,7 +1591,8 @@ await Task.Run(() =>
HashSet<FileIdentity> LocalFilesResults = LocalFilesScan.Scan(kernelModeDriversList, 2, null, null);

// Add the results to the DataGrid
foreach (FileIdentity item in LocalFilesResults.Where(fileIdentity => fileIdentity.SISigningScenario is 0)) // && fileIdentity.SignatureStatus is SignatureStatus.IsSigned
// Only signed kernel-mode files
foreach (FileIdentity item in LocalFilesResults.Where(fileIdentity => fileIdentity.SISigningScenario is 0 && fileIdentity.SignatureStatus is SignatureStatus.IsSigned))
{
_ = DispatcherQueue.TryEnqueue(() =>
{
Expand Down Expand Up @@ -1629,6 +1630,8 @@ await Task.Run(() =>
StrictKernelModeScanSinceLastRebootButton.IsEnabled = true;
StrictKernelModeAutoDetectAllDriversSettingsCard.IsClickEnabled = true;
StrictKernelModeCreateButton.IsEnabled = true;

StrictKernelModeInfoBar.IsClosable = true;
}
}

Expand Down
8 changes: 0 additions & 8 deletions AppControl Manager/Pages/Settings.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,6 @@ Style="{StaticResource BodyTextBlockStyle}">
<AppBarButton Icon="Folder" Label="Browse" Click="BrowseButton_Click" Tag="CertificatePath"/>
</CommandBar>
</controls:WrapPanel>
<!-- Strict Kernel Mode Policy Time of Deployment -->
<controls:WrapPanel Orientation="Horizontal" Margin="0,0,0,10">
<TextBox Header="Strict Kernel Mode Policy Time of Deployment (YYYY-MM-DD):" x:Name="StrictKernelModePolicyTimeTextBox" MinWidth="300" Margin="0,0,10,0" VerticalAlignment="Center"/>
<CommandBar Background="Transparent" IsOpen="False" DefaultLabelPosition="Right" VerticalAlignment="Center" Margin="0,25,0,0">
<AppBarButton Icon="Save" Label="Save" Click="EditButton_Click" Tag="StrictKernelModePolicyTime"/>
<AppBarButton Icon="Clear" Label="Clear" Click="ClearButton_Click" Tag="StrictKernelModePolicyTime"/>
</CommandBar>
</controls:WrapPanel>
</StackPanel>
</controls:SettingsCard>
</controls:SettingsExpander.Items>
Expand Down
23 changes: 6 additions & 17 deletions AppControl Manager/Pages/Settings.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ private void GetConfigurationButton_Click(object sender, RoutedEventArgs e)
SignToolCustomPathTextBox.Text = userConfig.SignToolCustomPath ?? string.Empty;
CertificateCommonNameAutoSuggestBox.Text = userConfig.CertificateCommonName ?? string.Empty;
CertificatePathTextBox.Text = userConfig.CertificatePath ?? string.Empty;
StrictKernelModePolicyTimeTextBox.Text = userConfig.StrictKernelModePolicyTimeOfDeployment?.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture) ?? string.Empty;
}

// When the edit button of any field is pressed
Expand Down Expand Up @@ -329,9 +328,6 @@ private void EditButton_Click(object sender, RoutedEventArgs e)
case "CertificatePath":
newValue = CertificatePathTextBox.Text;
break;
case "StrictKernelModePolicyTime":
newValue = StrictKernelModePolicyTimeTextBox.Text;
break;
default:
break;
}
Expand All @@ -341,8 +337,7 @@ private void EditButton_Click(object sender, RoutedEventArgs e)
UnsignedPolicyPath: string.Equals(fieldName, "UnsignedPolicyPath", StringComparison.OrdinalIgnoreCase) ? newValue : null,
SignToolCustomPath: string.Equals(fieldName, "SignToolCustomPath", StringComparison.OrdinalIgnoreCase) ? newValue : null,
CertificateCommonName: string.Equals(fieldName, "CertificateCommonName", StringComparison.OrdinalIgnoreCase) ? newValue : null,
CertificatePath: string.Equals(fieldName, "CertificatePath", StringComparison.OrdinalIgnoreCase) ? newValue : null,
StrictKernelModePolicyTimeOfDeployment: string.Equals(fieldName, "StrictKernelModePolicyTime", StringComparison.OrdinalIgnoreCase) ? TryParseDateTime(newValue) : null
CertificatePath: string.Equals(fieldName, "CertificatePath", StringComparison.OrdinalIgnoreCase) ? newValue : null
);

Logger.Write($"Edited {fieldName} to {newValue}");
Expand All @@ -355,14 +350,11 @@ private void ClearButton_Click(object sender, RoutedEventArgs e)
string? fieldName = button!.Tag.ToString();

UserConfiguration.Remove(
string.Equals(fieldName, "SignedPolicyPath", StringComparison.OrdinalIgnoreCase),
string.Equals(fieldName, "UnsignedPolicyPath", StringComparison.OrdinalIgnoreCase),
string.Equals(fieldName, "SignToolCustomPath", StringComparison.OrdinalIgnoreCase),
string.Equals(fieldName, "CertificateCommonName", StringComparison.OrdinalIgnoreCase),
string.Equals(fieldName, "CertificatePath", StringComparison.OrdinalIgnoreCase),
string.Equals(fieldName, "StrictKernelPolicyGUID", StringComparison.OrdinalIgnoreCase),
string.Equals(fieldName, "StrictKernelNoFlightRootsPolicyGUID", StringComparison.OrdinalIgnoreCase),
string.Equals(fieldName, "StrictKernelModePolicyTime", StringComparison.OrdinalIgnoreCase)
SignedPolicyPath: string.Equals(fieldName, "SignedPolicyPath", StringComparison.OrdinalIgnoreCase),
UnsignedPolicyPath: string.Equals(fieldName, "UnsignedPolicyPath", StringComparison.OrdinalIgnoreCase),
SignToolCustomPath: string.Equals(fieldName, "SignToolCustomPath", StringComparison.OrdinalIgnoreCase),
CertificateCommonName: string.Equals(fieldName, "CertificateCommonName", StringComparison.OrdinalIgnoreCase),
CertificatePath: string.Equals(fieldName, "CertificatePath", StringComparison.OrdinalIgnoreCase)
);

switch (fieldName)
Expand All @@ -382,9 +374,6 @@ private void ClearButton_Click(object sender, RoutedEventArgs e)
case "CertificatePath":
CertificatePathTextBox.Text = string.Empty;
break;
case "StrictKernelModePolicyTime":
StrictKernelModePolicyTimeTextBox.Text = string.Empty;
break;
default:
break;
}
Expand Down
2 changes: 1 addition & 1 deletion AppControl Manager/Pages/StrictKernelPolicyScanResults.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<TextBlock
TextWrapping="WrapWholeWords"
Style="{StaticResource BodyTextBlockStyle}">

<Span>
View the detected Kernel-mode files that will be used to create the <Run Foreground="{ThemeResource SystemAccentColor}">enforced mode</Run> policy. Remove items you don't want to be included in the final Strict Kernel-mode policy from the list.
</Span>
Expand Down
Loading