nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 00:52:49 -05:00
Code Activity

Include Root Certificates in Custom Trust Store (#5624)

Browse Source 
* Add new tests

* Include root CA's in custom trust store
This commit is contained in:
Justin Baur
2025-04-08 13:36:34 -04:00
committed by GitHub
parent 65f382ee67
commit f29b5c531f
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Platform/X509ChainCustomization/X509ChainOptions.cs
View File

@ -53,6 +53,10 @@ public sealed class X509ChainOptions
return false;
}
// Do this outside of the callback so that we aren't opening the root store every request.
using var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine, OpenFlags.ReadOnly);
var rootCertificates = store.Certificates;
// Ref: https://github.com/dotnet/runtime/issues/39835#issuecomment-663020581
callback = (certificate, chain, errors) =>
{
@ -62,6 +66,10 @@ public sealed class X509ChainOptions
}
chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
// We want our additional certificates to be in addition to the machines root store.
chain.ChainPolicy.CustomTrustStore.AddRange(rootCertificates);
foreach (var additionalCertificate in AdditionalCustomTrustCertificates)
{
chain.ChainPolicy.CustomTrustStore.Add(additionalCertificate);