Commit 43acfe89 authored by Jehonathan's avatar Jehonathan Committed by GitHub

Merge pull request #117 from bechny/certificateManager_initialization

CertificateManager in ProxyServer is created during ProxyServer start…
parents dd29dc75 112f764b
...@@ -135,9 +135,6 @@ namespace Titanium.Web.Proxy ...@@ -135,9 +135,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>
...@@ -269,6 +266,9 @@ namespace Titanium.Web.Proxy ...@@ -269,6 +266,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)
...@@ -308,7 +308,7 @@ namespace Titanium.Web.Proxy ...@@ -308,7 +308,7 @@ namespace Titanium.Web.Proxy
ProxyEndPoints.Clear(); ProxyEndPoints.Clear();
certificateCacheManager.StopClearIdleCertificates(); certificateCacheManager?.StopClearIdleCertificates();
proxyRunning = false; proxyRunning = false;
} }
...@@ -424,7 +424,7 @@ namespace Titanium.Web.Proxy ...@@ -424,7 +424,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