Small HTTP/2 and other improvements

examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml

@@ -36,13 +36,20 @@
         </ListView>
         <TabControl Grid.Column="2" Grid.Row="0">
             <TabItem Header="Session">
-                <Grid Background="Red" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                     <Grid.RowDefinitions>
                         <RowDefinition />
                         <RowDefinition />
                     </Grid.RowDefinitions>
                     <TextBox x:Name="TextBoxRequest" Grid.Row="0" />
-                    <TextBox x:Name="TextBoxResponse" Grid.Row="1" />
+                    <TabControl Grid.Row="1">
+                        <TabItem Header="Text">
+                            <TextBox x:Name="TextBoxResponse" />
+                        </TabItem>
+                        <TabItem Header="Image">
+                            <Image x:Name="ImageResponse" HorizontalAlignment="Center"  VerticalAlignment="Center" Stretch="None" />
+                        </TabItem>
+                    </TabControl>
                 </Grid>
             </TabItem>
         </TabControl>

examples/Titanium.Web.Proxy.Examples.Wpf/MainWindow.xaml.cs

@@ -1,13 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media.Imaging;
 using Titanium.Web.Proxy.EventArguments;
 using Titanium.Web.Proxy.Http;
 using Titanium.Web.Proxy.Models;
@@ -99,7 +101,7 @@ public MainWindow()
             InitializeComponent();
         }
 
-        public ObservableCollection<SessionListItem> Sessions { get; } = new ObservableCollection<SessionListItem>();
+        public ObservableCollectionEx<SessionListItem> Sessions { get; } = new ObservableCollectionEx<SessionListItem>();
 
         public SessionListItem SelectedSession
         {
@@ -278,11 +280,14 @@ private void ListViewSessions_OnKeyDown(object sender, KeyEventArgs e)
             if (e.Key == Key.Delete)
             {
                 var selectedItems = ((ListView)sender).SelectedItems;
+                Sessions.SuppressNotification = true;
                 foreach (var item in selectedItems.Cast<SessionListItem>().ToArray())
                 {
                     Sessions.Remove(item);
                     sessionDictionary.Remove(item.HttpClient);
                 }
+
+                Sessions.SuppressNotification = false;
             }
         }
 
@@ -297,7 +302,8 @@ private void selectedSessionChanged()
 
             var session = SelectedSession.HttpClient;
             var request = session.Request;
-            var data = (request.IsBodyRead ? request.Body : null) ?? new byte[0];
+            var fullData = (request.IsBodyRead ? request.Body : null) ?? new byte[0];
+            var data = fullData;
             bool truncated = data.Length > truncateLimit;
             if (truncated)
             {
@@ -313,7 +319,8 @@ private void selectedSessionChanged()
             TextBoxRequest.Text = sb.ToString();
 
             var response = session.Response;
-            data = (response.IsBodyRead ? response.Body : null) ?? new byte[0];
+            fullData = (response.IsBodyRead ? response.Body : null) ?? new byte[0];
+            data = fullData;
             truncated = data.Length > truncateLimit;
             if (truncated)
             {
@@ -333,6 +340,19 @@ private void selectedSessionChanged()
             }
 
             TextBoxResponse.Text = sb.ToString();
+
+            try
+            {
+                using (MemoryStream stream = new MemoryStream(fullData))
+                {
+                    ImageResponse.Source =
+                        BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+                }
+            }
+            catch
+            {
+                ImageResponse.Source = null;
+            }
         }
     }
 }

examples/Titanium.Web.Proxy.Examples.Wpf/ObservableCollectionEx.cs

@@ -0,0 +1,36 @@
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+
+namespace Titanium.Web.Proxy.Examples.Wpf
+{
+    public class ObservableCollectionEx<T> : ObservableCollection<T>
+    {
+        private bool notificationSuppressed;
+        private bool suppressNotification;
+
+        public bool SuppressNotification
+        {
+            get => suppressNotification;
+            set
+            {
+                suppressNotification = value;
+                if (suppressNotification == false && notificationSuppressed)
+                {
+                    OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+                    notificationSuppressed = false;
+                }
+            }
+        }
+
+        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (SuppressNotification)
+            {
+                notificationSuppressed = true;
+                return;
+            }
+
+            base.OnCollectionChanged(e);
+        }
+    }
+}

examples/Titanium.Web.Proxy.Examples.Wpf/Titanium.Web.Proxy.Examples.Wpf.csproj

@@ -92,6 +92,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="ObservableCollectionEx.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="SessionListItem.cs" />
     <Page Include="MainWindow.xaml">

src/StreamExtended/Network/CustomBufferedStream.cs

@@ -245,8 +245,7 @@ public override int ReadByte()
             {
                 return -1;
             }
-
-
+
             return streamBuffer[bufferPos + index];
         }
 
@@ -491,7 +490,7 @@ public bool FillBuffer()
             if (bufferLength > 0)
             {
                 //normally we fill the buffer only when it is empty, but sometimes we need more data
-                //move the remanining data to the beginning of the buffer 
+                //move the remaining data to the beginning of the buffer 
                 Buffer.BlockCopy(streamBuffer, bufferPos, streamBuffer, 0, bufferLength);
             }
 
@@ -516,7 +515,6 @@ public bool FillBuffer()
             }
 
             return result;
-
         }
 
         /// <summary>

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

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using StreamExtended;
 using StreamExtended.Network;
+using Titanium.Web.Proxy.Exceptions;
 
 namespace Titanium.Web.Proxy.EventArguments
 {
@@ -60,7 +61,11 @@ private void getNextChunk()
                 chunkHead = chunkHead.Substring(0, idx);
             }
 
-            int chunkSize = int.Parse(chunkHead, NumberStyles.HexNumber);
+            if (!int.TryParse(chunkHead, NumberStyles.HexNumber, null, out int chunkSize))
+            {
+                throw new ProxyHttpException($"Invalid chunk length: '{chunkHead}'", null, null);
+            }
+
             bytesRemaining = chunkSize;
 
             if (chunkSize == 0)

src/Titanium.Web.Proxy/ExplicitClientHandler.cs

@@ -47,8 +47,7 @@ private async Task handleClient(ExplicitProxyEndPoint endPoint, TcpClientConnect
             {
                 string connectHostname = null;
                 TunnelConnectSessionEventArgs connectArgs = null;
-
-
+
                 // Client wants to create a secure tcp tunnel (probably its a HTTPS or Websocket request)
                 if (await HttpHelper.IsConnectMethod(clientStream) == 1)
                 {
@@ -142,15 +141,22 @@ await clientStreamWriter.WriteResponseAsync(connectArgs.HttpClient.Response,
                         if (alpn != null && alpn.Contains(SslApplicationProtocol.Http2))
                         {
                             // test server HTTP/2 support
-                            // todo: this is a hack, because Titanium does not support HTTP protocol changing currently
-                            var connection = await tcpConnectionFactory.GetServerConnection(this, connectArgs,
-                                                    isConnect: true, applicationProtocols: SslExtensions.Http2ProtocolAsList,
-                                                    noCache: true, cancellationToken: cancellationToken);
-
-                            http2Supported = connection.NegotiatedApplicationProtocol == SslApplicationProtocol.Http2;
-
-                            //release connection back to pool instead of closing when connection pool is enabled.
-                            await tcpConnectionFactory.Release(connection, true);
+                            try
+                            {
+                                // todo: this is a hack, because Titanium does not support HTTP protocol changing currently
+                                var connection = await tcpConnectionFactory.GetServerConnection(this, connectArgs,
+                                    isConnect: true, applicationProtocols: SslExtensions.Http2ProtocolAsList,
+                                    noCache: true, cancellationToken: cancellationToken);
+
+                                http2Supported = connection.NegotiatedApplicationProtocol ==
+                                                 SslApplicationProtocol.Http2;
+                                //release connection back to pool instead of closing when connection pool is enabled.
+                                await tcpConnectionFactory.Release(connection, true);
+                            }
+                            catch (Exception)
+                            {
+                                // ignore
+                            }
                         }
 
                         if (EnableTcpServerConnectionPrefetch)

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

@@ -23,7 +23,7 @@ internal HttpRequestWriter(Stream stream, IBufferPool bufferPool, int bufferSize
         internal async Task WriteRequestAsync(Request request, bool flush = true,
             CancellationToken cancellationToken = default)
         {
-            await WriteLineAsync(Request.CreateRequestLine(request.Method, request.OriginalUrl, request.HttpVersion),
+            await WriteLineAsync(Request.CreateRequestLine(request.Method, request.RequestUriString, request.HttpVersion),
                 cancellationToken);
             await WriteAsync(request, flush, cancellationToken);
         }

src/Titanium.Web.Proxy/Http/HttpWebClient.cs

@@ -99,7 +99,7 @@ internal async Task SendRequest(bool enable100ContinueBehaviour, bool isTranspar
 
             // prepare the request & headers
             await writer.WriteLineAsync(Request.CreateRequestLine(Request.Method,
-                useUpstreamProxy || isTransparent ? Request.OriginalUrl : Request.RequestUri.PathAndQuery,
+                useUpstreamProxy || isTransparent ? Request.RequestUriString : Request.RequestUri.PathAndQuery,
                 Request.HttpVersion), cancellationToken);
 
             var headerBuilder = new StringBuilder();

src/Titanium.Web.Proxy/Http/Request.cs

@@ -14,6 +14,8 @@ namespace Titanium.Web.Proxy.Http
     [TypeConverter(typeof(ExpandableObjectConverter))]
     public class Request : RequestResponseBase
     {
+        private string originalUrl;
+
         /// <summary>
         ///     Request Method.
         /// </summary>
@@ -32,7 +34,20 @@ public class Request : RequestResponseBase
         /// <summary>
         ///     The original request Url.
         /// </summary>
-        public string OriginalUrl { get; set; }
+        public string OriginalUrl
+        {
+            get => originalUrl;
+            internal set
+            {
+                originalUrl = value;
+                RequestUriString = value;
+            }
+        }
+
+        /// <summary>
+        ///     The request uri as it is in the HTTP header
+        /// </summary>
+        public string RequestUriString { get; set; }
 
         /// <summary>
         ///     Has request body?
@@ -140,7 +155,7 @@ public override string HeaderText
             get
             {
                 var sb = new StringBuilder();
-                sb.Append($"{CreateRequestLine(Method, OriginalUrl, HttpVersion)}{ProxyConstants.NewLine}");
+                sb.Append($"{CreateRequestLine(Method, RequestUriString, HttpVersion)}{ProxyConstants.NewLine}");
                 foreach (var header in Headers)
                 {
                     sb.Append($"{header.ToString()}{ProxyConstants.NewLine}");