Commit 81e63420 authored by Bechny, Ondrej's avatar Bechny, Ondrej

CertificateManager in ProxyServer is created during ProxyServer start, not in...

CertificateManager in ProxyServer is created during ProxyServer start, not in the constructor, fixes #114
parent d3baf3f0
...@@ -131,9 +131,6 @@ namespace Titanium.Web.Proxy ...@@ -131,9 +131,6 @@ namespace Titanium.Web.Proxy
RootCertificateName = RootCertificateName ?? "Titanium Root Certificate Authority"; RootCertificateName = RootCertificateName ?? "Titanium Root Certificate Authority";
RootCertificateIssuerName = RootCertificateIssuerName ?? "Titanium"; RootCertificateIssuerName = RootCertificateIssuerName ?? "Titanium";
certificateCacheManager = new CertificateManager(RootCertificateIssuerName,
RootCertificateName);
} }
/// <summary> /// <summary>
...@@ -265,6 +262,9 @@ namespace Titanium.Web.Proxy ...@@ -265,6 +262,9 @@ namespace Titanium.Web.Proxy
throw new Exception("Proxy is already running."); throw new Exception("Proxy is already running.");
} }
certificateCacheManager = new CertificateManager(RootCertificateIssuerName,
RootCertificateName);
certTrusted = certificateCacheManager.CreateTrustedRootCertificate().Result; certTrusted = certificateCacheManager.CreateTrustedRootCertificate().Result;
foreach (var endPoint in ProxyEndPoints) foreach (var endPoint in ProxyEndPoints)
...@@ -304,7 +304,7 @@ namespace Titanium.Web.Proxy ...@@ -304,7 +304,7 @@ namespace Titanium.Web.Proxy
ProxyEndPoints.Clear(); ProxyEndPoints.Clear();
certificateCacheManager.StopClearIdleCertificates(); certificateCacheManager?.StopClearIdleCertificates();
proxyRunning = false; proxyRunning = false;
} }
...@@ -420,7 +420,7 @@ namespace Titanium.Web.Proxy ...@@ -420,7 +420,7 @@ namespace Titanium.Web.Proxy
Stop(); Stop();
} }
certificateCacheManager.Dispose(); certificateCacheManager?.Dispose();
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment