Merge pull request #644 from justcoding121/master

honfika · web-flow · commit ef2019e3e86c · 2019-10-06T17:11:34.000+02:00
test fix
diff --git a/src/Titanium.Web.Proxy/Http2/Hpack/StaticTable.cs b/src/Titanium.Web.Proxy/Http2/Hpack/StaticTable.cs
@@ -28,7 +28,7 @@ public static class StaticTable
         /// Appendix A: Static Table Definition
         /// </summary>
         /// <see cref="http://tools.ietf.org/html/rfc7541#appendix-A"/>
-        private static readonly List<HttpHeader> staticTable = new List<HttpHeader>()
+        private static readonly List<HttpHeader> staticTable = new List<HttpHeader>
         {
             /*  1 */
             new HttpHeader(":authority", string.Empty),
diff --git a/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs b/src/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
@@ -294,6 +294,8 @@ private async Task<TcpServerConnection> createServerConnection(string remoteHost
                     session.TimeLine["Dns Resolved"] = DateTime.Now;
                 }
 
+                Array.Sort(ipAddresses, (x, y) => x.AddressFamily.CompareTo(y.AddressFamily));
+
                 for (int i = 0; i < ipAddresses.Length; i++)
                 {
                     try
@@ -319,7 +321,7 @@ private async Task<TcpServerConnection> createServerConnection(string remoteHost
                             tcpClient.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
                         }
 
-                        await tcpClient.ConnectAsync(ipAddresses[i], port);
+                        await tcpClient.ConnectAsync(ipAddress, port);
                         break;
                     }
                     catch (Exception e)
diff --git a/tests/Titanium.Web.Proxy.IntegrationTests/ExpectContinueTests.cs b/tests/Titanium.Web.Proxy.IntegrationTests/ExpectContinueTests.cs
@@ -22,7 +22,7 @@ public async Task ReverseProxy_GotContinueAndOkResponse()
         {
             var testSuite = new TestSuite();
             var server = testSuite.GetServer();
-            var continueServer = new HttpContinueServer()
+            var continueServer = new HttpContinueServer
             {
                 ExpectationResponse = HttpStatusCode.Continue,
                 ResponseBody = "I am server. I received your greetings."
@@ -50,7 +50,7 @@ public async Task ReverseProxy_GotExpectationFailedResponse()
         {
             var testSuite = new TestSuite();
             var server = testSuite.GetServer();
-            var continueServer = new HttpContinueServer() { ExpectationResponse = HttpStatusCode.ExpectationFailed };
+            var continueServer = new HttpContinueServer { ExpectationResponse = HttpStatusCode.ExpectationFailed };
             server.HandleTcpRequest(continueServer.HandleRequest);
 
             var proxy = testSuite.GetReverseProxy();
@@ -73,7 +73,7 @@ public async Task ReverseProxy_GotNotFoundResponse()
         {
             var testSuite = new TestSuite();
             var server = testSuite.GetServer();
-            var continueServer = new HttpContinueServer() { ExpectationResponse = HttpStatusCode.NotFound };
+            var continueServer = new HttpContinueServer { ExpectationResponse = HttpStatusCode.NotFound };
             server.HandleTcpRequest(continueServer.HandleRequest);
 
             var proxy = testSuite.GetReverseProxy();
@@ -96,7 +96,7 @@ public async Task ReverseProxy_BeforeRequestThrows()
         {
             var testSuite = new TestSuite();
             var server = testSuite.GetServer();
-            var continueServer = new HttpContinueServer() { ExpectationResponse = HttpStatusCode.Continue };
+            var continueServer = new HttpContinueServer { ExpectationResponse = HttpStatusCode.Continue };
             server.HandleTcpRequest(continueServer.HandleRequest);
 
             var dbzEx = new DivideByZeroException("Undefined");
diff --git a/tests/Titanium.Web.Proxy.IntegrationTests/Helpers/HttpContinueClient.cs b/tests/Titanium.Web.Proxy.IntegrationTests/Helpers/HttpContinueClient.cs
@@ -9,6 +9,8 @@ namespace Titanium.Web.Proxy.IntegrationTests.Helpers
 {
     class HttpContinueClient
     {
+        private const int waitTimeout = 200;
+
         private static Encoding MsgEncoding = HttpHelper.GetEncodingFromContentType(null);
 
         public async Task<Response> Post(string server, int port, string content)
@@ -37,7 +39,7 @@ public async Task<Response> Post(string server, int port, string content)
             while ((response = HttpMessageParsing.ParseResponse(responseMsg)) == null)
             {
                 var readTask = client.GetStream().ReadAsync(buffer, 0, 1024);
-                if (!readTask.Wait(200))
+                if (!readTask.Wait(waitTimeout))
                     return null;
 
                 responseMsg += MsgEncoding.GetString(buffer, 0, readTask.Result);
@@ -52,7 +54,7 @@ public async Task<Response> Post(string server, int port, string content)
                 while ((response = HttpMessageParsing.ParseResponse(responseMsg)) == null)
                 {
                     var readTask = client.GetStream().ReadAsync(buffer, 0, 1024);
-                    if (!readTask.Wait(200))
+                    if (!readTask.Wait(waitTimeout))
                         return null;
                     responseMsg += MsgEncoding.GetString(buffer, 0, readTask.Result);
                 }
diff --git a/tests/Titanium.Web.Proxy.IntegrationTests/Helpers/HttpMessageParsing.cs b/tests/Titanium.Web.Proxy.IntegrationTests/Helpers/HttpMessageParsing.cs
@@ -24,7 +24,7 @@ internal static Request ParseRequest(string messageText, bool requireBody)
             try
             {
                 Request.ParseRequestLine(line, out var method, out var url, out var version);
-                RequestResponseBase request = new Request()
+                RequestResponseBase request = new Request
                 {
                     Method = method, RequestUriString = url, HttpVersion = version
                 };
@@ -69,7 +69,7 @@ internal static Response ParseResponse(string messageText)
             try
             {
                 Response.ParseResponseLine(line, out var version, out var status, out var desc);
-                RequestResponseBase response = new Response()
+                RequestResponseBase response = new Response
                 {
                     HttpVersion = version, StatusCode = status, StatusDescription = desc
                 };
diff --git a/tests/Titanium.Web.Proxy.IntegrationTests/NestedProxyTests.cs b/tests/Titanium.Web.Proxy.IntegrationTests/NestedProxyTests.cs
@@ -61,7 +61,7 @@ public async Task Smoke_Test_Nested_Proxy_UserData()
             {
                 Assert.AreEqual("Test", session.UserData);
 
-                return await Task.FromResult(new Models.ExternalProxy()
+                return await Task.FromResult(new Models.ExternalProxy
                 {
                     HostName = "localhost",
                     Port = proxy2.ProxyEndPoints[0].Port
diff --git a/tests/Titanium.Web.Proxy.IntegrationTests/Setup/TestProxyServer.cs b/tests/Titanium.Web.Proxy.IntegrationTests/Setup/TestProxyServer.cs
@@ -18,21 +18,21 @@ public class TestProxyServer : IDisposable
         public TestProxyServer(bool isReverseProxy, ProxyServer upStreamProxy = null)
         {
             ProxyServer = new ProxyServer();
-            ProxyEndPoint explicitEndPoint = isReverseProxy ?
+            var explicitEndPoint = isReverseProxy ?
                 (ProxyEndPoint)new TransparentProxyEndPoint(IPAddress.Any, 0, true) :
                 new ExplicitProxyEndPoint(IPAddress.Any, 0, true);
 
             ProxyServer.AddEndPoint(explicitEndPoint);
 
             if (upStreamProxy != null)
             {
-                ProxyServer.UpStreamHttpProxy = new ExternalProxy()
+                ProxyServer.UpStreamHttpProxy = new ExternalProxy
                 {
                     HostName = "localhost",
                     Port = upStreamProxy.ProxyEndPoints[0].Port
                 };
 
-                ProxyServer.UpStreamHttpsProxy = new ExternalProxy()
+                ProxyServer.UpStreamHttpsProxy = new ExternalProxy
                 {
                     HostName = "localhost",
                     Port = upStreamProxy.ProxyEndPoints[0].Port
diff --git a/tests/Titanium.Web.Proxy.IntegrationTests/Setup/TestServer.cs b/tests/Titanium.Web.Proxy.IntegrationTests/Setup/TestServer.cs
@@ -62,14 +62,9 @@ public TestServer(X509Certificate2 serverCertificate)
                         .Get<IServerAddressesFeature>()
                         .Addresses.ToArray();
 
-            string httpAddress = addresses[0];
-            HttpListeningPort = int.Parse(httpAddress.Split(':')[2]);
-
-            string httpsAddress = addresses[1];
-            HttpsListeningPort = int.Parse(httpsAddress.Split(':')[2]);
-
-            string tcpAddress = addresses[2];
-            TcpListeningPort = int.Parse(tcpAddress.Split(':')[2]);
+            HttpListeningPort = new Uri(addresses[0]).Port;
+            HttpsListeningPort = new Uri(addresses[1]).Port;
+            TcpListeningPort = new Uri(addresses[2]).Port;
         }
 
         Func<HttpContext, Task> requestHandler = null;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static class StaticTable`
`28`	`28`	`/// Appendix A: Static Table Definition`
`29`	`29`	`/// </summary>`
`30`	`30`	`/// <see cref="http://tools.ietf.org/html/rfc7541#appendix-A"/>`
`31`		`- private static readonly List<HttpHeader> staticTable = new List<HttpHeader>()`
	`31`	`+ private static readonly List<HttpHeader> staticTable = new List<HttpHeader>`
`32`	`32`	`{`
`33`	`33`	`/* 1 */`
`34`	`34`	`new HttpHeader(":authority", string.Empty),`
Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,8 @@ private async Task<TcpServerConnection> createServerConnection(string remoteHost`
`294`	`294`	`session.TimeLine["Dns Resolved"] = DateTime.Now;`
`295`	`295`	`}`
`296`	`296`
	`297`	`+ Array.Sort(ipAddresses, (x, y) => x.AddressFamily.CompareTo(y.AddressFamily));`
	`298`	`+`
`297`	`299`	`for (int i = 0; i < ipAddresses.Length; i++)`
`298`	`300`	`{`
`299`	`301`	`try`
`@@ -319,7 +321,7 @@ private async Task<TcpServerConnection> createServerConnection(string remoteHost`
`319`	`321`	`tcpClient.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);`
`320`	`322`	`}`
`321`	`323`
`322`		`- await tcpClient.ConnectAsync(ipAddresses[i], port);`
	`324`	`+ await tcpClient.ConnectAsync(ipAddress, port);`
`323`	`325`	`break;`
`324`	`326`	`}`
`325`	`327`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ namespace Titanium.Web.Proxy.IntegrationTests.Helpers`
`9`	`9`	`{`
`10`	`10`	`class HttpContinueClient`
`11`	`11`	`{`
	`12`	`+ private const int waitTimeout = 200;`
	`13`	`+`
`12`	`14`	`private static Encoding MsgEncoding = HttpHelper.GetEncodingFromContentType(null);`
`13`	`15`
`14`	`16`	`public async Task<Response> Post(string server, int port, string content)`
`@@ -37,7 +39,7 @@ public async Task<Response> Post(string server, int port, string content)`
`37`	`39`	`while ((response = HttpMessageParsing.ParseResponse(responseMsg)) == null)`
`38`	`40`	`{`
`39`	`41`	`var readTask = client.GetStream().ReadAsync(buffer, 0, 1024);`
`40`		`- if (!readTask.Wait(200))`
	`42`	`+ if (!readTask.Wait(waitTimeout))`
`41`	`43`	`return null;`
`42`	`44`
`43`	`45`	`responseMsg += MsgEncoding.GetString(buffer, 0, readTask.Result);`
`@@ -52,7 +54,7 @@ public async Task<Response> Post(string server, int port, string content)`
`52`	`54`	`while ((response = HttpMessageParsing.ParseResponse(responseMsg)) == null)`
`53`	`55`	`{`
`54`	`56`	`var readTask = client.GetStream().ReadAsync(buffer, 0, 1024);`
`55`		`- if (!readTask.Wait(200))`
	`57`	`+ if (!readTask.Wait(waitTimeout))`
`56`	`58`	`return null;`
`57`	`59`	`responseMsg += MsgEncoding.GetString(buffer, 0, readTask.Result);`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ internal static Request ParseRequest(string messageText, bool requireBody)`
`24`	`24`	`try`
`25`	`25`	`{`
`26`	`26`	`Request.ParseRequestLine(line, out var method, out var url, out var version);`
`27`		`- RequestResponseBase request = new Request()`
	`27`	`+ RequestResponseBase request = new Request`
`28`	`28`	`{`
`29`	`29`	`Method = method, RequestUriString = url, HttpVersion = version`
`30`	`30`	`};`
`@@ -69,7 +69,7 @@ internal static Response ParseResponse(string messageText)`
`69`	`69`	`try`
`70`	`70`	`{`
`71`	`71`	`Response.ParseResponseLine(line, out var version, out var status, out var desc);`
`72`		`- RequestResponseBase response = new Response()`
	`72`	`+ RequestResponseBase response = new Response`
`73`	`73`	`{`
`74`	`74`	`HttpVersion = version, StatusCode = status, StatusDescription = desc`
`75`	`75`	`};`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public async Task Smoke_Test_Nested_Proxy_UserData()`
`61`	`61`	`{`
`62`	`62`	`Assert.AreEqual("Test", session.UserData);`
`63`	`63`
`64`		`- return await Task.FromResult(new Models.ExternalProxy()`
	`64`	`+ return await Task.FromResult(new Models.ExternalProxy`
`65`	`65`	`{`
`66`	`66`	`HostName = "localhost",`
`67`	`67`	`Port = proxy2.ProxyEndPoints[0].Port`
Original file line number	Diff line number	Diff line change
`@@ -18,21 +18,21 @@ public class TestProxyServer : IDisposable`
`18`	`18`	`public TestProxyServer(bool isReverseProxy, ProxyServer upStreamProxy = null)`
`19`	`19`	`{`
`20`	`20`	`ProxyServer = new ProxyServer();`
`21`		`- ProxyEndPoint explicitEndPoint = isReverseProxy ?`
	`21`	`+ var explicitEndPoint = isReverseProxy ?`
`22`	`22`	`(ProxyEndPoint)new TransparentProxyEndPoint(IPAddress.Any, 0, true) :`
`23`	`23`	`new ExplicitProxyEndPoint(IPAddress.Any, 0, true);`
`24`	`24`
`25`	`25`	`ProxyServer.AddEndPoint(explicitEndPoint);`
`26`	`26`
`27`	`27`	`if (upStreamProxy != null)`
`28`	`28`	`{`
`29`		`- ProxyServer.UpStreamHttpProxy = new ExternalProxy()`
	`29`	`+ ProxyServer.UpStreamHttpProxy = new ExternalProxy`
`30`	`30`	`{`
`31`	`31`	`HostName = "localhost",`
`32`	`32`	`Port = upStreamProxy.ProxyEndPoints[0].Port`
`33`	`33`	`};`
`34`	`34`
`35`		`- ProxyServer.UpStreamHttpsProxy = new ExternalProxy()`
	`35`	`+ ProxyServer.UpStreamHttpsProxy = new ExternalProxy`
`36`	`36`	`{`
`37`	`37`	`HostName = "localhost",`
`38`	`38`	`Port = upStreamProxy.ProxyEndPoints[0].Port`