Commit 58cbb338 authored by titanium007's avatar titanium007

fix bug in setting certificate

parent 98fba874
...@@ -43,8 +43,7 @@ namespace Titanium.Web.Proxy.Test ...@@ -43,8 +43,7 @@ namespace Titanium.Web.Proxy.Test
private static bool ConsoleEventCallback(int eventType) private static bool ConsoleEventCallback(int eventType)
{ {
if (eventType == 2) if (eventType != 2) return false;
{
try try
{ {
Controller.Stop(); Controller.Stop();
...@@ -53,7 +52,6 @@ namespace Titanium.Web.Proxy.Test ...@@ -53,7 +52,6 @@ namespace Titanium.Web.Proxy.Test
{ {
// ignored // ignored
} }
}
return false; return false;
} }
} }
......
...@@ -18,10 +18,10 @@ namespace Titanium.Web.Proxy ...@@ -18,10 +18,10 @@ namespace Titanium.Web.Proxy
public partial class ProxyServer public partial class ProxyServer
{ {
private static readonly int BUFFER_SIZE = 8192; private static readonly int BUFFER_SIZE = 8192;
private static readonly char[] SemiSplit = {';'}; private static readonly char[] SemiSplit = { ';' };
private static readonly string[] ColonSpaceSplit = {": "}; private static readonly string[] ColonSpaceSplit = { ": " };
private static readonly char[] SpaceSplit = {' '}; private static readonly char[] SpaceSplit = { ' ' };
private static readonly Regex CookieSplitRegEx = new Regex(@",(?! )"); private static readonly Regex CookieSplitRegEx = new Regex(@",(?! )");
...@@ -62,8 +62,8 @@ namespace Titanium.Web.Proxy ...@@ -62,8 +62,8 @@ namespace Titanium.Web.Proxy
ServicePointManager.Expect100Continue = false; ServicePointManager.Expect100Continue = false;
WebRequest.DefaultWebProxy = null; WebRequest.DefaultWebProxy = null;
ServicePointManager.DefaultConnectionLimit = 10; ServicePointManager.DefaultConnectionLimit = 10;
ServicePointManager.DnsRefreshTimeout = 3*60*1000; //3 minutes ServicePointManager.DnsRefreshTimeout = 3 * 60 * 1000; //3 minutes
ServicePointManager.MaxServicePointIdleTime = 3*60*1000; ServicePointManager.MaxServicePointIdleTime = 3 * 60 * 1000;
//HttpWebRequest certificate validation callback //HttpWebRequest certificate validation callback
ServicePointManager.ServerCertificateValidationCallback = ServicePointManager.ServerCertificateValidationCallback =
...@@ -85,10 +85,15 @@ namespace Titanium.Web.Proxy ...@@ -85,10 +85,15 @@ namespace Titanium.Web.Proxy
_listener = new TcpListener(ListeningIpAddress, ListeningPort); _listener = new TcpListener(ListeningIpAddress, ListeningPort);
_listener.Start(); _listener.Start();
ListeningPort = ((IPEndPoint) _listener.LocalEndpoint).Port; ListeningPort = ((IPEndPoint)_listener.LocalEndpoint).Port;
// accept clients asynchronously // accept clients asynchronously
_listener.BeginAcceptTcpClient(OnAcceptConnection, _listener); _listener.BeginAcceptTcpClient(OnAcceptConnection, _listener);
var certTrusted = false;
if (EnableSsl)
certTrusted = CertManager.CreateTrustedRootCertificate();
if (SetAsSystemProxy) if (SetAsSystemProxy)
{ {
SystemProxyHelper.EnableProxyHttp( SystemProxyHelper.EnableProxyHttp(
...@@ -100,7 +105,6 @@ namespace Titanium.Web.Proxy ...@@ -100,7 +105,6 @@ namespace Titanium.Web.Proxy
{ {
RootCertificateName = RootCertificateName ?? "Titanium_Proxy_Test_Root"; RootCertificateName = RootCertificateName ?? "Titanium_Proxy_Test_Root";
var certTrusted = CertManager.CreateTrustedRootCertificate();
//If certificate was trusted by the machine //If certificate was trusted by the machine
if (certTrusted) if (certTrusted)
{ {
......
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