Skip to content

some hardening added to the security service test steps #1759

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

Merged
StuartFerguson merged 6 commits into from
Oct 12, 2026
Merged

some hardening added to the security service test steps #1759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebf8f6f
some hardening added to the security service test steps
StuartFerguson Oct 12, 2026
0c92624
harden the security service setup flow
StuartFerguson Oct 12, 2026
e06804d
fix integration test setup and custom claim checks
StuartFerguson Oct 12, 2026
adac729
handle omitted user claims in integration tests
StuartFerguson Oct 12, 2026
b677ee7
normalize integration test expectations
StuartFerguson Oct 12, 2026
848757f
ignore bootstrap client in client scenario
StuartFerguson Oct 12, 2026
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
18 changes: 9 additions & 9 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="HealthMonitoring.Client" Version="2026.9.3.34" />
<PackageVersion Include="HealthMonitoring.Client" Version="2026.9.4.48" />
<PackageVersion Include="MediatR" Version="14.2.0" />
<PackageVersion Include="MessagingService.Client" Version="2026.9.2.151" />
<PackageVersion Include="MessagingService.Client" Version="2026.9.3.153" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
<PackageVersion Include="OpenIddict.Abstractions" Version="7.7.1" />
<PackageVersion Include="OpenIddict.Server" Version="7.7.1" />
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.7.1" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.7.1" />
<PackageVersion Include="Shared.Logger" Version="2026.9.7" />
<PackageVersion Include="Shared.Results" Version="2026.9.7" />
<PackageVersion Include="Shared.Logger" Version="2026.10.2" />
<PackageVersion Include="Shared.Results" Version="2026.10.2" />
<PackageVersion Include="SimpleResults" Version="4.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
Expand All @@ -28,7 +28,7 @@
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.12" />
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.7.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.12" />
<PackageVersion Include="ClientProxyBase" Version="2026.9.7" />
<PackageVersion Include="ClientProxyBase" Version="2026.10.2" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.12" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="10.0.12" />
<PackageVersion Include="QRCoder" Version="1.6.0" />
Expand All @@ -38,7 +38,7 @@
<PackageVersion Include="NUnit" Version="4.6.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.3.0" />
<PackageVersion Include="Reqnroll.NUnit" Version="3.3.3" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.9.7" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.10.2" />
<PackageVersion Include="System.Data.SqlClient" Version="4.9.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.12" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
Expand All @@ -48,8 +48,8 @@
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageVersion Include="OpenIddict.AspNetCore" Version="7.7.1" />
<PackageVersion Include="Shared" Version="2026.9.7" />
<PackageVersion Include="Shared.Results.Web" Version="2026.9.7" />
<PackageVersion Include="Shared" Version="2026.10.2" />
<PackageVersion Include="Shared.Results.Web" Version="2026.10.2" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.11.1" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="6.2.1" />
Expand All @@ -58,4 +58,4 @@
<PackageVersion Include="Selenium.WebDriver" Version="4.49.0" />
<PackageVersion Include="Reqnroll.NUnit" Version="3.3.4" />
</ItemGroup>
</Project>
</Project>
93 changes: 62 additions & 31 deletions SecurityService.IntegrationTesting.Helpers/IntegrationTestCertificate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,47 @@ private IntegrationTestCertificate(string certificateDirectory, X509Certificate2
public static IntegrationTestCertificate Create()
{
string certificateDirectory = Path.Combine(Path.GetTempPath(), $"securityservice-cert-{Guid.NewGuid():N}");
Directory.CreateDirectory(certificateDirectory);
IntegrationTestCertificate? result = null;

using RSA rsa = RSA.Create(2048);
CertificateRequest request = new CertificateRequest(RootSubjectName, rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
request.CertificateExtensions.Add(new X509BasicConstraintsExtension(false, false, 0, true));
request.CertificateExtensions.Add(new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, true));
try
{
Directory.CreateDirectory(certificateDirectory);

using RSA rsa = RSA.Create(2048);
CertificateRequest request = new CertificateRequest(RootSubjectName, rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
request.CertificateExtensions.Add(new X509BasicConstraintsExtension(false, false, 0, true));
request.CertificateExtensions.Add(new X509KeyUsageExtension(X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, true));

OidCollection enhancedKeyUsages = new OidCollection();
enhancedKeyUsages.Add(new Oid("1.3.6.1.5.5.7.3.1"));
request.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(enhancedKeyUsages, false));
OidCollection enhancedKeyUsages = new OidCollection();
enhancedKeyUsages.Add(new Oid("1.3.6.1.5.5.7.3.1"));
request.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(enhancedKeyUsages, false));

SubjectAlternativeNameBuilder subjectAlternativeNames = new SubjectAlternativeNameBuilder();
subjectAlternativeNames.AddDnsName(LocalhostName);
subjectAlternativeNames.AddIpAddress(IPAddress.Parse(LoopbackAddress));
request.CertificateExtensions.Add(subjectAlternativeNames.Build());
SubjectAlternativeNameBuilder subjectAlternativeNames = new SubjectAlternativeNameBuilder();
subjectAlternativeNames.AddDnsName(LocalhostName);
subjectAlternativeNames.AddIpAddress(IPAddress.Parse(LoopbackAddress));
request.CertificateExtensions.Add(subjectAlternativeNames.Build());

request.CertificateExtensions.Add(new X509SubjectKeyIdentifierExtension(request.PublicKey, false));
request.CertificateExtensions.Add(new X509SubjectKeyIdentifierExtension(request.PublicKey, false));

using X509Certificate2 certificate = request.CreateSelfSigned(DateTimeOffset.UtcNow.AddDays(-1), DateTimeOffset.UtcNow.AddDays(30));
byte[] pfxBytes = certificate.Export(X509ContentType.Pfx, PasswordValue);
byte[] certificateBytes = certificate.Export(X509ContentType.Cert);
using X509Certificate2 certificate = request.CreateSelfSigned(DateTimeOffset.UtcNow.AddDays(-1), DateTimeOffset.UtcNow.AddDays(30));
byte[] pfxBytes = certificate.Export(X509ContentType.Pfx, PasswordValue);
byte[] certificateBytes = certificate.Export(X509ContentType.Cert);

string serverCertificatePath = Path.Combine(certificateDirectory, ServerCertificateFileName);
string rootCertificatePath = Path.Combine(certificateDirectory, RootCertificateFileName);
File.WriteAllBytes(serverCertificatePath, pfxBytes);
File.WriteAllBytes(rootCertificatePath, certificateBytes);
string serverCertificatePath = Path.Combine(certificateDirectory, ServerCertificateFileName);
string rootCertificatePath = Path.Combine(certificateDirectory, RootCertificateFileName);
File.WriteAllBytes(serverCertificatePath, pfxBytes);
File.WriteAllBytes(rootCertificatePath, certificateBytes);

var result = new IntegrationTestCertificate(certificateDirectory, X509CertificateLoader.LoadPkcs12(pfxBytes, PasswordValue, X509KeyStorageFlags.EphemeralKeySet));
result.InstallTrustedRoot();
return result;
result = new IntegrationTestCertificate(certificateDirectory, X509CertificateLoader.LoadPkcs12(pfxBytes, PasswordValue, X509KeyStorageFlags.EphemeralKeySet));
result.InstallTrustedRoot();
return result;
}
catch
{
result?.Dispose();
TryDeleteDirectory(certificateDirectory);
throw;
}
}

public void InstallTrustedRoot()
Expand All @@ -94,18 +105,23 @@ public void Dispose()
return;
}

if (_trustedRootInstalled)
try
{
RemoveTrustedRoot();
if (_trustedRootInstalled)
{
RemoveTrustedRoot();
}
}

if (Directory.Exists(_certificateDirectory))
catch
{
Directory.Delete(_certificateDirectory, recursive: true);
// Cleanup must not mask the original test failure.
}
finally
{
TryDeleteDirectory(_certificateDirectory);
_certificate.Dispose();
_disposed = true;
}

_certificate.Dispose();
_disposed = true;
}

private void RemoveTrustedRoot()
Expand All @@ -121,6 +137,21 @@ private void RemoveTrustedRoot()
_trustedRootInstalled = false;
}

private static void TryDeleteDirectory(string directory)
{
try
{
if (Directory.Exists(directory))
{
Directory.Delete(directory, recursive: true);
}
}
catch
{
// Cleanup must not mask the original test failure.
}
}

private void ThrowIfDisposed()
{
ObjectDisposedException.ThrowIf(_disposed, this);
Expand Down
4 changes: 4 additions & 0 deletions SecurityService.IntegrationTesting.Helpers/ReqnrollExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,10 @@ public static List<UserResponse> ToUserResponses(this DataTableRows tableRows){
private static List<String> SplitString(this String stringToSplit){
List<string> result = new List<string>();

if (String.IsNullOrWhiteSpace(stringToSplit)){
return result;
}

List<String> splitString = stringToSplit.Split(",").ToList();
foreach (String split in splitString){
result.Add(split.Trim());
Expand Down
Loading
Loading