Merge pull request #713 from justcoding121/master

honfika · web-flow · commit 25f2d284c820 · 2019-12-25T08:58:08.000+01:00
socks endpoint
diff --git a/examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs b/examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
@@ -97,6 +97,15 @@ public void StartProxy()
             //proxyServer.UpStreamHttpProxy = new ExternalProxy("46.63.0.17", 4145) { ProxyType = ExternalProxyType.Socks4 };
             //proxyServer.UpStreamHttpsProxy = new ExternalProxy("46.63.0.17", 4145) { ProxyType = ExternalProxyType.Socks4 };
 
+            //var socksEndPoint = new SocksProxyEndPoint(IPAddress.Any, 1080, true)
+            //{
+            //    // Generic Certificate hostname to use
+            //    // When SNI is disabled by client
+            //    GenericCertificateName = "google.com"
+            //};
+
+            //proxyServer.AddEndPoint(socksEndPoint);
+
             foreach (var endPoint in proxyServer.ProxyEndPoints)
             {
                 Console.WriteLine("Listening on '{0}' endpoint at Ip {1} and port: {2} ", endPoint.GetType().Name,
diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs b/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs
@@ -81,6 +81,15 @@ public MainWindow()
             //    Password = "Titanium",
             //};
 
+            //var socksEndPoint = new SocksProxyEndPoint(IPAddress.Any, 1080, true)
+            //{
+            //    // Generic Certificate hostname to use
+            //    // When SNI is disabled by client
+            //    //GenericCertificateName = "google.com"
+            //};
+
+            //proxyServer.AddEndPoint(socksEndPoint);
+
             proxyServer.BeforeRequest += ProxyServer_BeforeRequest;
             proxyServer.BeforeResponse += ProxyServer_BeforeResponse;
             proxyServer.AfterResponse += ProxyServer_AfterResponse;
diff --git a/src/Titanium.Web.Proxy/Http2/Http2Helper.cs b/src/Titanium.Web.Proxy/Http2/Http2Helper.cs
@@ -1,6 +1,4 @@
-﻿
-using Titanium.Web.Proxy.Extensions;
-#if NETSTANDARD2_1
+﻿#if NETSTANDARD2_1
 using System;
 using System.Collections.Concurrent;
 using System.Diagnostics;
@@ -12,6 +10,7 @@
 using Titanium.Web.Proxy.Compression;
 using Titanium.Web.Proxy.EventArguments;
 using Titanium.Web.Proxy.Exceptions;
+using Titanium.Web.Proxy.Extensions;
 using Titanium.Web.Proxy.Http;
 using Titanium.Web.Proxy.Http2.Hpack;
 using Titanium.Web.Proxy.Models;
diff --git a/src/Titanium.Web.Proxy/Models/SocksProxyEndPoint.cs b/src/Titanium.Web.Proxy/Models/SocksProxyEndPoint.cs
@@ -0,0 +1,48 @@
+﻿using System.Diagnostics;
+using System.Net;
+using System.Threading.Tasks;
+using Titanium.Web.Proxy.EventArguments;
+using Titanium.Web.Proxy.Extensions;
+
+namespace Titanium.Web.Proxy.Models
+{
+    /// <summary>
+    ///     A proxy end point client is not aware of.
+    ///     Useful when requests are redirected to this proxy end point through port forwarding via router.
+    /// </summary>
+    [DebuggerDisplay("SOCKS: {IpAddress}:{Port}")]
+    public class SocksProxyEndPoint : TransparentBaseProxyEndPoint
+    {
+        /// <summary>
+        ///     Initialize a new instance.
+        /// </summary>
+        /// <param name="ipAddress">Listening Ip address.</param>
+        /// <param name="port">Listening port.</param>
+        /// <param name="decryptSsl">Should we decrypt ssl?</param>
+        public SocksProxyEndPoint(IPAddress ipAddress, int port, bool decryptSsl = true) : base(ipAddress, port,
+            decryptSsl)
+        {
+            GenericCertificateName = "localhost";
+        }
+
+        /// <summary>
+        ///     Name of the Certificate need to be sent (same as the hostname we want to proxy).
+        ///     This is valid only when UseServerNameIndication is set to false.
+        /// </summary>
+        public override string GenericCertificateName { get; set; }
+
+        /// <summary>
+        ///     Before Ssl authentication this event is fired.
+        /// </summary>
+        public event AsyncEventHandler<BeforeSslAuthenticateEventArgs>? BeforeSslAuthenticate;
+
+        internal override async Task InvokeBeforeSslAuthenticate(ProxyServer proxyServer,
+            BeforeSslAuthenticateEventArgs connectArgs, ExceptionHandler exceptionFunc)
+        {
+            if (BeforeSslAuthenticate != null)
+            {
+                await BeforeSslAuthenticate.InvokeAsync(proxyServer, connectArgs, exceptionFunc);
+            }
+        }
+    }
+}
diff --git a/src/Titanium.Web.Proxy/Models/TransparentBaseProxyEndPoint.cs b/src/Titanium.Web.Proxy/Models/TransparentBaseProxyEndPoint.cs
@@ -0,0 +1,19 @@
+﻿using System;
+using System.Net;
+using System.Threading.Tasks;
+using Titanium.Web.Proxy.EventArguments;
+
+namespace Titanium.Web.Proxy.Models
+{
+    public abstract class TransparentBaseProxyEndPoint : ProxyEndPoint
+    {
+        public abstract string GenericCertificateName { get; set; }
+
+        protected TransparentBaseProxyEndPoint(IPAddress ipAddress, int port, bool decryptSsl) : base(ipAddress, port, decryptSsl)
+        {
+        }
+
+        internal abstract Task InvokeBeforeSslAuthenticate(ProxyServer proxyServer,
+            BeforeSslAuthenticateEventArgs connectArgs, ExceptionHandler exceptionFunc);
+    }
+}
diff --git a/src/Titanium.Web.Proxy/Models/TransparentProxyEndPoint.cs b/src/Titanium.Web.Proxy/Models/TransparentProxyEndPoint.cs
@@ -11,7 +11,7 @@ namespace Titanium.Web.Proxy.Models
     ///     Useful when requests are redirected to this proxy end point through port forwarding via router.
     /// </summary>
     [DebuggerDisplay("Transparent: {IpAddress}:{Port}")]
-    public class TransparentProxyEndPoint : ProxyEndPoint
+    public class TransparentProxyEndPoint : TransparentBaseProxyEndPoint
     {
         /// <summary>
         ///     Initialize a new instance.
@@ -29,14 +29,14 @@ public TransparentProxyEndPoint(IPAddress ipAddress, int port, bool decryptSsl =
         ///     Name of the Certificate need to be sent (same as the hostname we want to proxy).
         ///     This is valid only when UseServerNameIndication is set to false.
         /// </summary>
-        public string GenericCertificateName { get; set; }
+        public override string GenericCertificateName { get; set; }
 
         /// <summary>
         ///     Before Ssl authentication this event is fired.
         /// </summary>
         public event AsyncEventHandler<BeforeSslAuthenticateEventArgs>? BeforeSslAuthenticate;
 
-        internal async Task InvokeBeforeSslAuthenticate(ProxyServer proxyServer,
+        internal override async Task InvokeBeforeSslAuthenticate(ProxyServer proxyServer,
             BeforeSslAuthenticateEventArgs connectArgs, ExceptionHandler exceptionFunc)
         {
             if (BeforeSslAuthenticate != null)
diff --git a/src/Titanium.Web.Proxy/Net45Compatibility.cs b/src/Titanium.Web.Proxy/Net45Compatibility.cs
@@ -1,8 +1,5 @@
 ﻿#if NET45
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Titanium.Web.Proxy
diff --git a/src/Titanium.Web.Proxy/Network/Tcp/TcpClientConnection.cs b/src/Titanium.Web.Proxy/Network/Tcp/TcpClientConnection.cs
@@ -5,7 +5,6 @@
 using System.Net.Sockets;
 using System.Security.Authentication;
 using System.Threading.Tasks;
-using Titanium.Web.Proxy.Extensions;
 using Titanium.Web.Proxy.Helpers;
 using Titanium.Web.Proxy.Models;
 
diff --git a/src/Titanium.Web.Proxy/Network/Tcp/TcpServerConnection.cs b/src/Titanium.Web.Proxy/Network/Tcp/TcpServerConnection.cs
@@ -3,7 +3,6 @@
 using System.Net.Security;
 using System.Net.Sockets;
 using System.Threading.Tasks;
-using Titanium.Web.Proxy.Extensions;
 using Titanium.Web.Proxy.Helpers;
 using Titanium.Web.Proxy.Models;
 
diff --git a/src/Titanium.Web.Proxy/ProxyServer.cs b/src/Titanium.Web.Proxy/ProxyServer.cs
@@ -798,13 +798,17 @@ private async Task handleClient(Socket tcpClientSocket, ProxyEndPoint endPoint)
 
             using (var clientConnection = new TcpClientConnection(this, tcpClientSocket))
             {
-                if (endPoint is TransparentProxyEndPoint tep)
+                if (endPoint is ExplicitProxyEndPoint eep)
+                {
+                    await handleClient(eep, clientConnection);
+                }
+                else if (endPoint is TransparentProxyEndPoint tep)
                 {
                     await handleClient(tep, clientConnection);
                 }
-                else
+                else if (endPoint is SocksProxyEndPoint sep)
                 {
-                    await handleClient((ExplicitProxyEndPoint)endPoint, clientConnection);
+                    await handleClient(sep, clientConnection);
                 }
             }
         }
diff --git a/src/Titanium.Web.Proxy/ProxySocket/SocksHandler.cs b/src/Titanium.Web.Proxy/ProxySocket/SocksHandler.cs
@@ -144,16 +144,8 @@ protected void HandleEndSend(IAsyncResult ar, int expectedLength)
         /// <exception cref="ArgumentNullException">The specified value is null.</exception>
         protected Socket Server
         {
-            get
-            {
-                return _server;
-            }
-            set
-            {
-                if (value == null)
-                    throw new ArgumentNullException();
-                _server = value;
-            }
+            get => _server;
+            set => _server = value ?? throw new ArgumentNullException();
         }
 
         /// <summary>
@@ -163,16 +155,8 @@ protected Socket Server
         /// <exception cref="ArgumentNullException">The specified value is null.</exception>
         protected string Username
         {
-            get
-            {
-                return _username;
-            }
-            set
-            {
-                if (value == null)
-                    throw new ArgumentNullException();
-                _username = value;
-            }
+            get => _username;
+            set => _username = value ?? throw new ArgumentNullException();
         }
 
         /// <summary>
@@ -181,47 +165,21 @@ protected string Username
         /// <value>An IAsyncProxyResult object that is the return value of the BeginConnect call.</value>
         protected IAsyncProxyResult AsyncResult
         {
-            get
-            {
-                return _asyncResult;
-            }
-            set
-            {
-                _asyncResult = value;
-            }
+            get => _asyncResult;
+            set => _asyncResult = value;
         }
 
         /// <summary>
         /// Gets or sets a byte buffer.
         /// </summary>
         /// <value>An array of bytes.</value>
-        protected byte[] Buffer
-        {
-            get
-            {
-                return _buffer;
-            }
-            set
-            {
-                _buffer = value;
-            }
-        }
+        protected byte[] Buffer { get; set; }
 
         /// <summary>
         /// Gets or sets the number of bytes that have been received from the remote proxy server.
         /// </summary>
         /// <value>An integer that holds the number of bytes that have been received from the remote proxy server.</value>
-        protected int Received
-        {
-            get
-            {
-                return _received;
-            }
-            set
-            {
-                _received = value;
-            }
-        }
+        protected int Received { get; set; }
 
         // private variables
         /// <summary>Holds the value of the Server property.</summary>
@@ -233,12 +191,6 @@ protected int Received
         /// <summary>Holds the value of the AsyncResult property.</summary>
         private IAsyncProxyResult _asyncResult;
 
-        /// <summary>Holds the value of the Buffer property.</summary>
-        private byte[] _buffer;
-
-        /// <summary>Holds the value of the Received property.</summary>
-        private int _received;
-
         /// <summary>Holds the address of the method to call when the SOCKS protocol has been completed.</summary>
         protected HandShakeComplete ProtocolComplete;
 
diff --git a/src/Titanium.Web.Proxy/RequestHandler.cs b/src/Titanium.Web.Proxy/RequestHandler.cs
@@ -32,9 +32,10 @@ public partial class ProxyServer
         /// <param name="cancellationTokenSource">The cancellation token source for this async task.</param>
         /// <param name="connectArgs">The Connect request if this is a HTTPS request from explicit endpoint.</param>
         /// <param name="prefetchConnectionTask">Prefetched server connection for current client using Connect/SNI headers.</param>
+        /// <param name="isHttps">Is HTTPS</param>
         private async Task handleHttpSessionRequest(ProxyEndPoint endPoint, HttpClientStream clientStream, 
             CancellationTokenSource cancellationTokenSource, TunnelConnectSessionEventArgs? connectArgs = null,
-            Task<TcpServerConnection>? prefetchConnectionTask = null)
+            Task<TcpServerConnection>? prefetchConnectionTask = null, bool isHttps = false)
         {
             var connectRequest = connectArgs?.HttpClient.ConnectRequest;
 
@@ -67,6 +68,8 @@ private async Task handleHttpSessionRequest(ProxyEndPoint endPoint, HttpClientSt
                         UserData = connectArgs?.UserData
                     };
 
+                    args.HttpClient.Request.IsHttps = isHttps;
+
                     try
                     {
                         try
@@ -217,7 +220,6 @@ await HeaderParser.ReadHeaders(clientStream, args.HttpClient.Request.Headers,
                                 await tcpConnectionFactory.Release(connection);
                                 connection = null;
                             }
-
                         }
                         catch (Exception e) when (!(e is ProxyHttpException))
                         {
diff --git a/src/Titanium.Web.Proxy/ResponseHandler.cs b/src/Titanium.Web.Proxy/ResponseHandler.cs
@@ -122,7 +122,6 @@ await serverStream.CopyBodyAsync(response, false, clientStream, TransformationMo
                 }
             }
 
-
             args.TimeLine["Response Sent"] = DateTime.Now;
         }
 
diff --git a/src/Titanium.Web.Proxy/SocksClientHandler.cs b/src/Titanium.Web.Proxy/SocksClientHandler.cs
diff --git a/src/Titanium.Web.Proxy/TransparentClientHandler.cs b/src/Titanium.Web.Proxy/TransparentClientHandler.cs

Original file line number	Diff line number	Diff line change
`@@ -798,13 +798,17 @@ private async Task handleClient(Socket tcpClientSocket, ProxyEndPoint endPoint)`
`798`	`798`
`799`	`799`	`using (var clientConnection = new TcpClientConnection(this, tcpClientSocket))`
`800`	`800`	`{`
`801`		`- if (endPoint is TransparentProxyEndPoint tep)`
	`801`	`+ if (endPoint is ExplicitProxyEndPoint eep)`
	`802`	`+ {`
	`803`	`+ await handleClient(eep, clientConnection);`
	`804`	`+ }`
	`805`	`+ else if (endPoint is TransparentProxyEndPoint tep)`
`802`	`806`	`{`
`803`	`807`	`await handleClient(tep, clientConnection);`
`804`	`808`	`}`
`805`		`- else`
	`809`	`+ else if (endPoint is SocksProxyEndPoint sep)`
`806`	`810`	`{`
`807`		`- await handleClient((ExplicitProxyEndPoint)endPoint, clientConnection);`
	`811`	`+ await handleClient(sep, clientConnection);`
`808`	`812`	`}`
`809`	`813`	`}`
`810`	`814`	`}`