lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update ValidateSslCertificate

Browse Source
This commit is contained in:
Luke Pulverenti 2015-12-29 12:15:19 -05:00
parent fc1faa65d4
commit 2f75af8563
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@ -188,28 +188,15 @@ namespace MediaBrowser.Server.Implementations.Configuration
{ {
var serverConfig = (ServerConfiguration)newConfig; var serverConfig = (ServerConfiguration)newConfig;
var certPath = serverConfig.CertificatePath; var newPath = serverConfig.CertificatePath;
if (!string.IsNullOrWhiteSpace(certPath)) if (!string.IsNullOrWhiteSpace(newPath)
&& !string.Equals(Configuration.CertificatePath ?? string.Empty, newPath))
{ {
// Validate // Validate
if (!File.Exists(certPath)) if (!FileSystem.FileExists(newPath))
{ {
throw new FileNotFoundException(string.Format("Certificate file '{0}' does not exist.", certPath)); throw new FileNotFoundException(string.Format("Certificate file '{0}' does not exist.", newPath));
}
try
{
var cert = new System.Security.Cryptography.X509Certificates.X509Certificate2(certPath);
if (cert.PrivateKey == null)
{
throw new ArgumentException("Certificate does not contain a private key!");
}
}
catch (Exception ex)
{
throw new ArgumentException(string.Format("Exception loading certificate: '{0}' - {1}", certPath, ex.Message));
} }
} }
} }