Merge pull request #711 from justcoding121/master

stable
justcoding121 · Dec 24, 2019 · 17abd9b · 17abd9b
2 parents 30b1823 + d21ea35
commit 17abd9b
Show file tree

Hide file tree

Showing 33 changed files with 213 additions and 139 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,7 +5,7 @@
             "name": "NetCore|Debug|Basic Example",
             "type": "coreclr",
             "request": "launch",
-            "program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Debug/netcoreapp2.0/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
+            "program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Debug/netcoreapp3.1/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
             "args": [],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,
@@ -16,7 +16,7 @@
             "name": "NetCore|Release|Basic Example",
             "type": "coreclr",
             "request": "launch",
-            "program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Release/netcoreapp2.0/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
+            "program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Release/netcoreapp3.1/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
             "args": [],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,

diff --git a/examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs b/examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
@@ -207,6 +207,17 @@ private async Task onRequest(object sender, SessionEventArgs e)
         {
             e.GetState().PipelineInfo.AppendLine(nameof(onRequest) + ":" + e.HttpClient.Request.RequestUri);
 
+            var clientLocalIp = e.ClientLocalEndPoint.Address;
+            if (!clientLocalIp.Equals(IPAddress.Loopback) && !clientLocalIp.Equals(IPAddress.IPv6Loopback))
+            {
+                e.HttpClient.UpStreamEndPoint = new IPEndPoint(clientLocalIp, 0);
+            }
+
+            if (e.HttpClient.Request.Url.Contains("yahoo.com"))
+            {
+                e.CustomUpStreamProxy = new ExternalProxy("localhost", 8888);
+            }
+
             await writeToConsole("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
             await writeToConsole(e.HttpClient.Request.Url);
 

diff --git a/examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj b/examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>

diff --git a/examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.csproj b/examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>

diff --git a/...anium.Web.Proxy.Examples.WindowsService/Titanium.Web.Proxy.Examples.WindowsService.csproj b/...anium.Web.Proxy.Examples.WindowsService/Titanium.Web.Proxy.Examples.WindowsService.csproj
@@ -103,16 +103,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry">
-      <Version>4.6.0</Version>
+      <Version>4.7.0</Version>
     </PackageReference>
     <PackageReference Include="System.Numerics.Vectors">
       <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>4.6.0</Version>
+      <Version>4.7.0</Version>
     </PackageReference>
     <PackageReference Include="System.ServiceProcess.ServiceController">
-      <Version>4.6.0</Version>
+      <Version>4.7.0</Version>
     </PackageReference>
     <PackageReference Include="System.Threading.Tasks.Extensions">
       <Version>4.5.3</Version>

diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml b/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml
@@ -31,7 +31,7 @@
                     <GridViewColumn Header="Process" DisplayMemberBinding="{Binding Process}" />
                     <GridViewColumn Header="SentBytes" DisplayMemberBinding="{Binding SentDataCount}" />
                     <GridViewColumn Header="ReceivedBytes" DisplayMemberBinding="{Binding ReceivedDataCount}" />
-                    <GridViewColumn Header="ClientEndPoint" DisplayMemberBinding="{Binding ClientEndPoint}" />
+                    <GridViewColumn Header="ClientRemoteEndPoint" DisplayMemberBinding="{Binding ClientRemoteEndPoint}" />
                     <GridViewColumn Header="ClientConnectionId" DisplayMemberBinding="{Binding ClientConnectionId}" />
                     <GridViewColumn Header="ServerConnectionId" DisplayMemberBinding="{Binding ServerConnectionId}" />
                 </GridView>

diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs b/examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs
@@ -229,7 +229,8 @@ private SessionListItem createSessionListItem(SessionEventArgsBase e)
                 ClientConnectionId = e.ClientConnectionId,
                 ServerConnectionId = e.ServerConnectionId,
                 HttpClient = e.HttpClient,
-                ClientEndPoint = e.ClientEndPoint,
+                ClientRemoteEndPoint = e.ClientRemoteEndPoint,
+                ClientLocalEndPoint = e.ClientLocalEndPoint,
                 IsTunnelConnect = isTunnelConnect
             };
 

diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/SessionListItem.cs b/examples/Titanium.Web.Proxy.Examples.Wpf/SessionListItem.cs
@@ -38,7 +38,9 @@ public Guid ServerConnectionId
 
         public HttpWebClient HttpClient { get; set; }
 
-        public IPEndPoint ClientEndPoint { get; set; }
+        public IPEndPoint ClientLocalEndPoint { get; set; }
+
+        public IPEndPoint ClientRemoteEndPoint { get; set; }
 
         public bool IsTunnelConnect { get; set; }
 

diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.NetCore.csproj b/examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.NetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 

diff --git a/examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.csproj b/examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 

diff --git a/src/Titanium.Web.Proxy/EventArguments/EmptyProxyEventArgs.cs b/src/Titanium.Web.Proxy/EventArguments/EmptyProxyEventArgs.cs
@@ -0,0 +1,12 @@
+using System;
+using Titanium.Web.Proxy.Network.Tcp;
+
+namespace Titanium.Web.Proxy.EventArguments
+{
+    public class EmptyProxyEventArgs : ProxyEventArgsBase
+    {
+        internal EmptyProxyEventArgs(TcpClientConnection clientConnection) : base(clientConnection)
+        {
+        }
+    }
+}
diff --git a/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs b/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
@@ -25,7 +25,7 @@ public class SessionEventArgs : SessionEventArgsBase
         /// </summary>
         private bool reRequest;
 
-        private WebSocketDecoder webSocketDecoder;
+        private WebSocketDecoder? webSocketDecoder;
 
         /// <summary>
         ///     Is this session a HTTP/2 promise?
@@ -190,7 +190,7 @@ private async Task readResponseBodyAsync(CancellationToken cancellationToken)
         private async Task<byte[]> readBodyAsync(bool isRequest, CancellationToken cancellationToken)
         {
             using var bodyStream = new MemoryStream();
-            using var writer = new HttpStream(bodyStream, BufferPool);
+            using var writer = new HttpStream(bodyStream, BufferPool, cancellationToken);
 
             if (isRequest)
             {
@@ -221,7 +221,7 @@ internal async Task SyphonOutBodyAsync(bool isRequest, CancellationToken cancell
 
             var reader = isRequest ? (HttpStream)ClientStream : HttpClient.Connection.Stream;
 
-            await reader.CopyBodyAsync(requestResponse, true, new NullWriter(), TransformationMode.None, null, cancellationToken);
+            await reader.CopyBodyAsync(requestResponse, true, NullWriter.Instance, TransformationMode.None, null, cancellationToken);
         }
 
         /// <summary>

diff --git a/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs b/src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs
@@ -59,7 +59,7 @@ private protected SessionEventArgsBase(ProxyServer server, ProxyEndPoint endPoin
 
             ClientStream = clientStream;
             HttpClient = new HttpWebClient(connectRequest, request, new Lazy<int>(() => clientStream.Connection.GetProcessId(endPoint)));
-            LocalEndPoint = endPoint;
+            ProxyEndPoint = endPoint;
             EnableWinAuth = server.EnableWinAuth && isWindowsAuthenticationSupported;
         }
 
@@ -94,9 +94,17 @@ public bool EnableWinAuth
         public bool IsHttps => HttpClient.Request.IsHttps;
 
         /// <summary>
-        ///     Client End Point.
+        ///     Client Local End Point.
         /// </summary>
-        public IPEndPoint ClientEndPoint => (IPEndPoint)ClientConnection.RemoteEndPoint;
+        public IPEndPoint ClientLocalEndPoint => (IPEndPoint)ClientConnection.LocalEndPoint;
+
+        /// <summary>
+        ///     Client Remote End Point.
+        /// </summary>
+        public IPEndPoint ClientRemoteEndPoint => (IPEndPoint)ClientConnection.RemoteEndPoint;
+
+        [Obsolete("Use ClientRemoteEndPoint instead.")]
+        public IPEndPoint ClientEndPoint => ClientRemoteEndPoint;
 
         /// <summary>
         ///    The web client used to communicate with server for this session.
@@ -106,6 +114,14 @@ public bool EnableWinAuth
         [Obsolete("Use HttpClient instead.")]
         public HttpWebClient WebSession => HttpClient;
 
+        /// <summary>
+        ///     Gets or sets the custom up stream proxy.
+        /// </summary>
+        /// <value>
+        ///     The custom up stream proxy.
+        /// </value>
+        public IExternalProxy? CustomUpStreamProxy { get; set; }
+
         /// <summary>
         ///     Are we using a custom upstream HTTP(S) proxy?
         /// </summary>
@@ -114,12 +130,15 @@ public bool EnableWinAuth
         /// <summary>
         ///     Local endpoint via which we make the request.
         /// </summary>
-        public ProxyEndPoint LocalEndPoint { get; }
+        public ProxyEndPoint ProxyEndPoint { get; }
+
+        [Obsolete("Use ProxyEndPoint instead.")]
+        public ProxyEndPoint LocalEndPoint => ProxyEndPoint;
 
         /// <summary>
         ///     Is this a transparent endpoint?
         /// </summary>
-        public bool IsTransparent => LocalEndPoint is TransparentProxyEndPoint;
+        public bool IsTransparent => ProxyEndPoint is TransparentProxyEndPoint;
 
         /// <summary>
         ///     The last exception that happened.

diff --git a/src/Titanium.Web.Proxy/ExplicitClientHandler.cs b/src/Titanium.Web.Proxy/ExplicitClientHandler.cs
@@ -33,13 +33,10 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect
             var cancellationTokenSource = new CancellationTokenSource();
             var cancellationToken = cancellationTokenSource.Token;
 
-            var clientStream = new HttpClientStream(clientConnection, clientConnection.GetStream(), BufferPool);
+            var clientStream = new HttpClientStream(clientConnection, clientConnection.GetStream(), BufferPool, cancellationToken);
 
             Task<TcpServerConnection>? prefetchConnectionTask = null;
             bool closeServerConnection = false;
-            bool calledRequestHandler = false;
-
-            SslStream? sslStream = null;
 
             try
             {
@@ -191,6 +188,7 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect
                         }
 
                         X509Certificate2? certificate = null;
+                        SslStream? sslStream = null;
                         try
                         {
                             sslStream = new SslStream(clientStream, false);
@@ -221,14 +219,16 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect
 #endif
 
                             // HTTPS server created - we can now decrypt the client's traffic
-                            clientStream = new HttpClientStream(clientStream.Connection, sslStream, BufferPool);
+                            clientStream = new HttpClientStream(clientStream.Connection, sslStream, BufferPool, cancellationToken);
                             sslStream = null; // clientStream was created, no need to keep SSL stream reference
 
                             clientStream.DataRead += (o, args) => connectArgs.OnDecryptedDataSent(args.Buffer, args.Offset, args.Count);
                             clientStream.DataWrite += (o, args) => connectArgs.OnDecryptedDataReceived(args.Buffer, args.Offset, args.Count);
                         }
                         catch (Exception e)
                         {
+                            sslStream?.Dispose();
+
                             var certName = certificate?.GetNameInfo(X509NameType.SimpleName, false);
                             throw new ProxyConnectException(
                                 $"Couldn't authenticate host '{connectHostname}' with certificate '{certName}'.", e, connectArgs);
@@ -374,10 +374,11 @@ await Http2Helper.SendHttp2(clientStream, connection.Stream,
                     }
                 }
 
-                calledRequestHandler = true;
+                var prefetchTask = prefetchConnectionTask;
+                prefetchConnectionTask = null;
 
                 // Now create the request
-                await handleHttpSessionRequest(endPoint, clientStream, cancellationTokenSource, connectArgs, prefetchConnectionTask);
+                await handleHttpSessionRequest(endPoint, clientStream, cancellationTokenSource, connectArgs, prefetchTask);
             }
             catch (ProxyException e)
             {
@@ -401,12 +402,13 @@ await Http2Helper.SendHttp2(clientStream, connection.Stream,
             }
             finally
             {
-                if (!calledRequestHandler)
+                if (!cancellationTokenSource.IsCancellationRequested)
                 {
-                    await tcpConnectionFactory.Release(prefetchConnectionTask, closeServerConnection);
+                    cancellationTokenSource.Cancel();
                 }
 
-                sslStream?.Dispose();
+                await tcpConnectionFactory.Release(prefetchConnectionTask, closeServerConnection);
+
                 clientStream.Dispose();
             }
         }

diff --git a/src/Titanium.Web.Proxy/Extensions/StreamExtensions.cs b/src/Titanium.Web.Proxy/Extensions/StreamExtensions.cs
@@ -42,8 +42,8 @@ internal static async Task CopyToAsync(this Stream input, Stream output, Action<
                 {
                     // cancellation is not working on Socket ReadAsync
                     // https://github.com/dotnet/corefx/issues/15033
-                    int num = await input.ReadAsync(buffer, 0, buffer.Length, CancellationToken.None)
-                        .withCancellation(cancellationToken);
+                    int num = await input.ReadAsync(buffer, 0, buffer.Length, cancellationToken)
+                        .WithCancellation(cancellationToken);
                     int bytesRead;
                     if ((bytesRead = num) != 0 && !cancellationToken.IsCancellationRequested)
                     {
@@ -62,7 +62,7 @@ internal static async Task CopyToAsync(this Stream input, Stream output, Action<
             }
         }
 
-        private static async Task<T> withCancellation<T>(this Task<T> task, CancellationToken cancellationToken) where  T : struct
+        internal static async Task<T> WithCancellation<T>(this Task<T> task, CancellationToken cancellationToken) where  T : struct
         {
             var tcs = new TaskCompletionSource<bool>();
             using (cancellationToken.Register(s => ((TaskCompletionSource<bool>)s).TrySetResult(true), tcs))

diff --git a/src/Titanium.Web.Proxy/Helpers/HttpClientStream.cs b/src/Titanium.Web.Proxy/Helpers/HttpClientStream.cs
@@ -12,8 +12,8 @@ internal sealed class HttpClientStream : HttpStream
     {
         public TcpClientConnection Connection { get; }
 
-        internal HttpClientStream(TcpClientConnection connection, Stream stream, IBufferPool bufferPool) 
-            : base(stream, bufferPool)
+        internal HttpClientStream(TcpClientConnection connection, Stream stream, IBufferPool bufferPool, CancellationToken cancellationToken) 
+            : base(stream, bufferPool, cancellationToken)
         {
             Connection = connection;
         }

diff --git a/src/Titanium.Web.Proxy/Helpers/HttpServerStream.cs b/src/Titanium.Web.Proxy/Helpers/HttpServerStream.cs
@@ -10,8 +10,8 @@ namespace Titanium.Web.Proxy.Helpers
 {
     internal sealed class HttpServerStream : HttpStream
     {
-        internal HttpServerStream(Stream stream, IBufferPool bufferPool)
-            : base(stream, bufferPool)
+        internal HttpServerStream(Stream stream, IBufferPool bufferPool, CancellationToken cancellationToken)
+            : base(stream, bufferPool, cancellationToken)
         {
         }