Commit 48e24626 authored by justcoding121's avatar justcoding121 Committed by justcoding121

#242 correctly disallow connecting to external proxy via external proxy

parent eb453835
...@@ -79,8 +79,8 @@ namespace Titanium.Web.Proxy.Examples.Basic ...@@ -79,8 +79,8 @@ namespace Titanium.Web.Proxy.Examples.Basic
}; };
proxyServer.AddEndPoint(transparentEndPoint); proxyServer.AddEndPoint(transparentEndPoint);
//ProxyServer.UpStreamHttpProxy = new ExternalProxy() { HostName = "localhost", Port = 8888 }; //proxyServer.UpStreamHttpProxy = new ExternalProxy() { HostName = "localhost", Port = 8888 };
//ProxyServer.UpStreamHttpsProxy = new ExternalProxy() { HostName = "localhost", Port = 8888 }; //proxyServer.UpStreamHttpsProxy = new ExternalProxy() { HostName = "localhost", Port = 8888 };
foreach (var endPoint in proxyServer.ProxyEndPoints) foreach (var endPoint in proxyServer.ProxyEndPoints)
Console.WriteLine("Listening on '{0}' endpoint at Ip {1} and port: {2} ", Console.WriteLine("Listening on '{0}' endpoint at Ip {1} and port: {2} ",
......
...@@ -39,12 +39,11 @@ namespace Titanium.Web.Proxy.Network.Tcp ...@@ -39,12 +39,11 @@ namespace Titanium.Web.Proxy.Network.Tcp
TcpClient client; TcpClient client;
CustomBufferedStream stream; CustomBufferedStream stream;
bool useHttpProxy = false;
bool useHttpProxy = false;
//check if external proxy is set for HTTP //check if external proxy is set for HTTP
if (!isHttps && externalHttpProxy != null if (!isHttps && externalHttpProxy != null
&& externalHttpProxy.HostName != remoteHostName) && !(externalHttpProxy.HostName == remoteHostName
&& externalHttpProxy.Port == remotePort))
{ {
useHttpProxy = true; useHttpProxy = true;
...@@ -59,7 +58,8 @@ namespace Titanium.Web.Proxy.Network.Tcp ...@@ -59,7 +58,8 @@ namespace Titanium.Web.Proxy.Network.Tcp
bool useHttpsProxy = false; bool useHttpsProxy = false;
//check if external proxy is set for HTTPS //check if external proxy is set for HTTPS
if (isHttps && externalHttpsProxy != null if (isHttps && externalHttpsProxy != null
&& externalHttpsProxy.HostName != remoteHostName) && !(externalHttpsProxy.HostName == remoteHostName
&& externalHttpsProxy.Port == remotePort))
{ {
useHttpsProxy = true; useHttpsProxy = true;
......
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