Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-23 14:10:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

add error handling when loading cert

Browse source
This commit is contained in:
Luke Pulverenti 2016-11-10 17:38:58 -05:00
parent abb7bb4fd2
commit 2c64cc7d7d
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View file

@ -196,17 +196,25 @@ namespace MediaBrowser.Server.Implementations.HttpServer
return new WebSocketSharpListener(_logger, cert, _memoryStreamProvider, _textEncoding, _networkManager, _socketFactory, _cryptoProvider, new StreamFactory(), enableDualMode, GetRequest); return new WebSocketSharpListener(_logger, cert, _memoryStreamProvider, _textEncoding, _networkManager, _socketFactory, _cryptoProvider, new StreamFactory(), enableDualMode, GetRequest);
} }
public static ICertificate GetCert(string certificateLocation) public ICertificate GetCert(string certificateLocation)
{ {
X509Certificate2 localCert = new X509Certificate2(certificateLocation); try
//localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
if (localCert.PrivateKey == null)
{ {
//throw new FileNotFoundException("Secure requested, no private key included", certificateLocation); X509Certificate2 localCert = new X509Certificate2(certificateLocation);
//localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
if (localCert.PrivateKey == null)
{
//throw new FileNotFoundException("Secure requested, no private key included", certificateLocation);
return null;
}
return new Certificate(localCert);
}
catch (Exception ex)
{
Logger.ErrorException("Error loading cert from {0}", ex, certificateLocation);
return null; return null;
} }
return new Certificate(localCert);
} }
private IHttpRequest GetRequest(HttpListenerContext httpContext) private IHttpRequest GetRequest(HttpListenerContext httpContext)