Merge pull request #656 from justcoding121/master

better uri handling

Author: honfika

src/Titanium.Web.Proxy/Compression/CompressionFactory.cs

@@ -10,15 +10,15 @@ namespace Titanium.Web.Proxy.Compression
     /// </summary>
     internal static class CompressionFactory
     {
-        internal static Stream Create(string type, Stream stream, bool leaveOpen = true)
+        internal static Stream Create(HttpCompression type, Stream stream, bool leaveOpen = true)
         {
             switch (type)
             {
-                case KnownHeaders.ContentEncodingGzip:
+                case HttpCompression.Gzip:
                     return new GZipStream(stream, CompressionMode.Compress, leaveOpen);
-                case KnownHeaders.ContentEncodingDeflate:
+                case HttpCompression.Deflate:
                     return new DeflateStream(stream, CompressionMode.Compress, leaveOpen);
-                case KnownHeaders.ContentEncodingBrotli:
+                case HttpCompression.Brotli:
                     return new BrotliSharpLib.BrotliStream(stream, CompressionMode.Compress, leaveOpen);
                 default:
                     throw new Exception($"Unsupported compression mode: {type}");

src/Titanium.Web.Proxy/Compression/CompressionUtil.cs

@@ -0,0 +1,22 @@
+using System;
+using Titanium.Web.Proxy.Http;
+
+namespace Titanium.Web.Proxy.Compression
+{
+    internal static class CompressionUtil
+    {
+        public static HttpCompression CompressionNameToEnum(string name)
+        {
+            if (KnownHeaders.ContentEncodingGzip.Equals(name.AsSpan()))
+                return HttpCompression.Gzip;
+
+            if (KnownHeaders.ContentEncodingDeflate.Equals(name.AsSpan()))
+                return HttpCompression.Deflate;
+
+            if (KnownHeaders.ContentEncodingBrotli.Equals(name.AsSpan()))
+                return HttpCompression.Brotli;
+
+            return HttpCompression.Unsupported;
+        }
+    }
+}

src/Titanium.Web.Proxy/Compression/DecompressionFactory.cs

@@ -10,15 +10,15 @@ namespace Titanium.Web.Proxy.Compression
     /// </summary>
     internal class DecompressionFactory
     {
-        internal static Stream Create(string type, Stream stream, bool leaveOpen = true)
+        internal static Stream Create(HttpCompression type, Stream stream, bool leaveOpen = true)
         {
             switch (type)
             {
-                case KnownHeaders.ContentEncodingGzip:
+                case HttpCompression.Gzip:
                     return new GZipStream(stream, CompressionMode.Decompress, leaveOpen);
-                case KnownHeaders.ContentEncodingDeflate:
+                case HttpCompression.Deflate:
                     return new DeflateStream(stream, CompressionMode.Decompress, leaveOpen);
-                case KnownHeaders.ContentEncodingBrotli:
+                case HttpCompression.Brotli:
                     return new BrotliSharpLib.BrotliStream(stream, CompressionMode.Decompress, leaveOpen);
                 default:
                     throw new Exception($"Unsupported decompression mode: {type}");

src/Titanium.Web.Proxy/Compression/HttpCompression.cs

@@ -0,0 +1,12 @@
+using System.IO.Compression;
+
+namespace Titanium.Web.Proxy.Compression
+{
+    internal enum HttpCompression
+    {
+        Unsupported,
+        Gzip,
+        Deflate,
+        Brotli,
+    }
+}

src/Titanium.Web.Proxy/EventArguments/LimitedStream.cs

@@ -54,7 +54,7 @@ private void getNextChunk()
 
             readChunkTrail = true;
 
-            string? chunkHead = baseStream.ReadLineAsync().Result;
+            string? chunkHead = baseStream.ReadLineAsync().Result!;
             int idx = chunkHead.IndexOf(";", StringComparison.Ordinal);
             if (idx >= 0)
             {

src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

@@ -38,7 +38,7 @@ public class SessionEventArgs : SessionEventArgsBase
         /// Constructor to initialize the proxy
         /// </summary>
         internal SessionEventArgs(ProxyServer server, ProxyEndPoint endPoint, ProxyClient proxyClient, ConnectRequest? connectRequest, CancellationTokenSource cancellationTokenSource)
-            : base(server, endPoint, proxyClient, connectRequest, null, cancellationTokenSource)
+            : base(server, endPoint, proxyClient, connectRequest, new Request(), cancellationTokenSource)
         {
         }
 
@@ -304,7 +304,7 @@ private async Task copyBodyAsync(bool isRequest, bool useOriginalHeaderValues, H
 
             if (transformation == TransformationMode.Uncompress && contentEncoding != null)
             {
-                s = decompressStream = DecompressionFactory.Create(contentEncoding, s);
+                s = decompressStream = DecompressionFactory.Create(CompressionUtil.CompressionNameToEnum(contentEncoding), s);
             }
 
             try

src/Titanium.Web.Proxy/EventArguments/SessionEventArgsBase.cs

@@ -41,7 +41,7 @@ public abstract class SessionEventArgsBase : EventArgs, IDisposable
         ///     Initializes a new instance of the <see cref="SessionEventArgsBase" /> class.
         /// </summary>
         private protected SessionEventArgsBase(ProxyServer server, ProxyEndPoint endPoint,
-            ProxyClient proxyClient, ConnectRequest? connectRequest, Request? request, CancellationTokenSource cancellationTokenSource)
+            ProxyClient proxyClient, ConnectRequest? connectRequest, Request request, CancellationTokenSource cancellationTokenSource)
         {
             BufferPool = server.BufferPool;
             ExceptionFunc = server.ExceptionFunc;

src/Titanium.Web.Proxy/ExplicitClientHandler.cs

@@ -62,12 +62,15 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect
 
                     Request.ParseRequestLine(httpCmd!, out string _, out string httpUrl, out var version);
 
-                    var httpRemoteUri = new Uri("http://" + httpUrl);
-                    connectHostname = httpRemoteUri.Host;
+                    connectHostname = httpUrl;
+                    int idx = connectHostname.IndexOf(":");
+                    if (idx >= 0)
+                    {
+                        connectHostname = connectHostname.Substring(0, idx);
+                    }
 
-                    var connectRequest = new ConnectRequest
+                    var connectRequest = new ConnectRequest(connectHostname)
                     {
-                        RequestUri = httpRemoteUri,
                         OriginalUrlData = HttpHeader.Encoding.GetBytes(httpUrl),
                         HttpVersion = version
                     };
@@ -127,6 +130,7 @@ await clientStreamWriter.WriteResponseAsync(connectArgs.HttpClient.Response,
                     bool isClientHello = clientHelloInfo != null;
                     if (clientHelloInfo != null)
                     {
+                        connectRequest.Scheme = ProxyServer.UriSchemeHttps;
                         connectRequest.TunnelType = TunnelType.Https;
                         connectRequest.ClientHelloInfo = clientHelloInfo;
                     }
@@ -136,7 +140,6 @@ await clientStreamWriter.WriteResponseAsync(connectArgs.HttpClient.Response,
                     if (decryptSsl && clientHelloInfo != null)
                     {
                         clientConnection.SslProtocol = clientHelloInfo.SslProtocol;
-                        connectRequest.RequestUri = new Uri("https://" + httpUrl);
 
                         bool http2Supported = false;
 
@@ -355,7 +358,7 @@ await Http2Helper.SendHttp2(clientStream, connection.Stream,
 
                 // Now create the request
                 await handleHttpSessionRequest(endPoint, clientConnection, clientStream, clientStreamWriter,
-                    cancellationTokenSource, connectHostname, connectArgs, prefetchConnectionTask);
+                    cancellationTokenSource, connectArgs, prefetchConnectionTask);
             }
             catch (ProxyException e)
             {

src/Titanium.Web.Proxy/Extensions/StreamExtensions.cs

@@ -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)
+        private 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))

src/Titanium.Web.Proxy/Helpers/HttpHelper.cs

@@ -78,7 +78,7 @@ internal static Encoding GetEncodingFromContentType(string? contentType)
                 {
                     var parameter = p.Span;
                     int equalsIndex = parameter.IndexOf('=');
-                    if (equalsIndex != -1 && parameter.Slice(0, equalsIndex).TrimStart().EqualsIgnoreCase(KnownHeaders.ContentTypeCharset.AsSpan()))
+                    if (equalsIndex != -1 && KnownHeaders.ContentTypeCharset.Equals(parameter.Slice(0, equalsIndex).TrimStart()))
                     {
                         var value = parameter.Slice(equalsIndex + 1);
                         if (value.EqualsIgnoreCase("x-user-defined".AsSpan()))
@@ -113,7 +113,7 @@ internal static ReadOnlyMemory<char> GetBoundaryFromContentType(string? contentT
                 foreach (var parameter in new SemicolonSplitEnumerator(contentType))
                 {
                     int equalsIndex = parameter.Span.IndexOf('=');
-                    if (equalsIndex != -1 && parameter.Span.Slice(0, equalsIndex).TrimStart().EqualsIgnoreCase(KnownHeaders.ContentTypeBoundary.AsSpan()))
+                    if (equalsIndex != -1 && KnownHeaders.ContentTypeBoundary.Equals(parameter.Span.Slice(0, equalsIndex).TrimStart()))
                     {
                         var value = parameter.Slice(equalsIndex + 1);
                         if (value.Length > 2 && value.Span[0] == '"' && value.Span[value.Length - 1] == '"')