Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2026-05-07 13:41:21 +02:00
Code Issues Projects Releases Wiki Activity

Fixed: update server to send full certificate chain when provided

Browse source
This commit is contained in:
Tamer Wahba 2026-05-02 15:46:10 -04:00
parent 0134fdedca
commit 15f83cf005
No known key found for this signature in database
GPG key ID: B934B3FE68CD2A72
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/NzbDrone.Host/Bootstrap.cs
View file

@ -2,6 +2,8 @@
using System.Collections.Generic;
using System.Data.SQLite;
using System.IO;
using System.Linq;
using System.Net.Security;
using System.Reflection;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
@ -192,7 +194,13 @@ public static IHostBuilder CreateConsoleHostBuilder(string[] args, StartupContex
{
options.ConfigureHttpsDefaults(configureOptions =>
{
configureOptions.ServerCertificate = ValidateSslCertificate(sslCertPath, sslCertPassword);
var sslContext = ValidateSslCertificate(sslCertPath, sslCertPassword);
configureOptions.ServerCertificate = sslContext.TargetCertificate;
configureOptions.OnAuthenticate = (context, authOptions) =>
{
authOptions.ServerCertificateContext = sslContext;
};
});
}
});
@ -272,13 +280,13 @@ private static string BuildUrl(string scheme, string bindAddress, int port)
return $"{scheme}://{bindAddress}:{port}";
}
private static X509Certificate2 ValidateSslCertificate(string cert, string password)
private static SslStreamCertificateContext ValidateSslCertificate(string cert, string password)
{
X509Certificate2 certificate;
var certificateCollection = new X509Certificate2Collection();
try
{
certificate = new X509Certificate2(cert, password, X509KeyStorageFlags.DefaultKeySet);
certificateCollection.Import(cert, password, X509KeyStorageFlags.DefaultKeySet);
}
catch (CryptographicException ex)
{
@ -291,7 +299,17 @@ private static X509Certificate2 ValidateSslCertificate(string cert, string passw
throw new RadarrStartupException(ex);
}
return certificate;
var leafCert = certificateCollection.FirstOrDefault(c => c.HasPrivateKey);
if (leafCert == null)
{
throw new RadarrStartupException(
$"The SSL certificate file {cert} does not contain a certificate with an associated private key");
}
certificateCollection.Remove(leafCert);
return SslStreamCertificateContext.Create(leafCert, certificateCollection, offline: true);
}
}
}