#543 Fix reverse proxy. add tests.

Author: justcoding121

src/Titanium.Web.Proxy/TransparentClientHandler.cs

@@ -34,10 +34,6 @@ private async Task handleClient(TransparentProxyEndPoint endPoint, TcpClientConn
             var clientStream = new CustomBufferedStream(clientConnection.GetStream(), BufferPool, BufferSize);
             var clientStreamWriter = new HttpResponseWriter(clientStream, BufferPool, BufferSize);
 
-            Task<TcpServerConnection> prefetchConnectionTask = null;
-            bool closeServerConnection = false;
-            bool calledRequestHandler = false;
-
             try
             {
                 var clientHelloInfo = await SslTools.PeekClientHello(clientStream, BufferPool, cancellationToken);
@@ -63,16 +59,7 @@ private async Task handleClient(TransparentProxyEndPoint endPoint, TcpClientConn
 
                     if (endPoint.DecryptSsl && args.DecryptSsl)
                     {
-                        if(EnableTcpServerConnectionPrefetch)
-                        {
-                            //don't pass cancellation token here
-                            //it could cause floating server connections when client exits
-                            prefetchConnectionTask = tcpConnectionFactory.GetServerConnection(httpsHostName, endPoint.Port,
-                                    httpVersion: null, isHttps: true, applicationProtocols: null, isConnect: false,
-                                    proxyServer: this, session: null, upStreamEndPoint: UpStreamEndPoint, externalProxy: UpStreamHttpsProxy,
-                                    noCache: false, cancellationToken: CancellationToken.None);
-                        }
-                        
+
                         SslStream sslStream = null;
 
                         //do client authentication using fake certificate
@@ -140,39 +127,29 @@ await TcpHelper.SendRaw(clientStream, serverStream, BufferPool, BufferSize,
                         return;
                     }
                 }
-                calledRequestHandler = true;
                 // HTTPS server created - we can now decrypt the client's traffic
                 // Now create the request
                 await handleHttpSessionRequest(endPoint, clientConnection, clientStream, clientStreamWriter,
-                    cancellationTokenSource, isHttps ? httpsHostName : null, null, prefetchConnectionTask);
+                    cancellationTokenSource, isHttps ? httpsHostName : null, null, null);
             }
             catch (ProxyException e)
             {
-                closeServerConnection = true;
                 onException(clientStream, e);
             }
             catch (IOException e)
             {
-                closeServerConnection = true;
                 onException(clientStream, new Exception("Connection was aborted", e));
             }
             catch (SocketException e)
             {
-                closeServerConnection = true;
                 onException(clientStream, new Exception("Could not connect", e));
             }
             catch (Exception e)
             {
-                closeServerConnection = true;
                 onException(clientStream, new Exception("Error occured in whilst handling the client", e));
             }
             finally
             {
-                if (!calledRequestHandler)
-                {
-                    await tcpConnectionFactory.Release(prefetchConnectionTask, closeServerConnection);
-                }
-
                 clientStream.Dispose();
 
                 if (!cancellationTokenSource.IsCancellationRequested)

tests/Titanium.Web.Proxy.IntegrationTests/Utilities/TestHelper.cs renamed to tests/Titanium.Web.Proxy.IntegrationTests/Helpers/TestHelper.cs

@@ -2,11 +2,11 @@
 using System.Net;
 using System.Net.Http;
 
-namespace Titanium.Web.Proxy.IntegrationTests
+namespace Titanium.Web.Proxy.IntegrationTests.Helpers
 {
     public static class TestHelper
     {
-        public static HttpClient CreateHttpClient(int localProxyPort)
+        public static HttpClient GetHttpClient(int localProxyPort)
         {
             var proxy = new TestProxy($"http://localhost:{localProxyPort}");
 
@@ -19,6 +19,11 @@ public static HttpClient CreateHttpClient(int localProxyPort)
             return new HttpClient(handler);
         }
 
+        public static HttpClient GetHttpClient()
+        {
+            return new HttpClient(new HttpClientHandler());
+        }
+
         public class TestProxy : IWebProxy
         {
             public Uri ProxyUri { get; set; }

tests/Titanium.Web.Proxy.IntegrationTests/HttpsTests.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Titanium.Web.Proxy.IntegrationTests
+{
+    [TestClass]
+    public class HttpsTests
+    {
+        [TestMethod]
+        public async Task Can_Handle_Https_Request()
+        {
+            var testSuite = new TestSuite();
+
+            var server = testSuite.GetServer();
+            server.HandleRequest((context) =>
+            {
+                return context.Response.WriteAsync("I am server. I received your greetings.");
+            });
+
+            var proxy = testSuite.GetProxy();
+            var client = testSuite.GetClient(proxy);
+
+            var response = await client.PostAsync(new Uri(server.ListeningHttpsUrl),
+                                        new StringContent("hello server. I am a client."));
+
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+
+            Assert.AreEqual("I am server. I received your greetings.", body);
+        }
+
+    }
+}