Merge pull request #390 from justcoding121/develop

merge to beta (again)

Author: honfika

Examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs

@@ -5,6 +5,7 @@
 using System.Net.Security;
 using System.Threading.Tasks;
 using Titanium.Web.Proxy.EventArguments;
+using Titanium.Web.Proxy.Exceptions;
 using Titanium.Web.Proxy.Helpers;
 using Titanium.Web.Proxy.Http;
 using Titanium.Web.Proxy.Models;
@@ -13,6 +14,8 @@ namespace Titanium.Web.Proxy.Examples.Basic
 {
     public class ProxyTestController
     {
+        private readonly object lockObj = new object();
+
         private readonly ProxyServer proxyServer;
         private ExplicitProxyEndPoint explicitEndPoint;
 
@@ -33,11 +36,28 @@ public ProxyTestController()
 
             //generate root certificate without storing it in file system
             //proxyServer.CertificateManager.CreateRootCertificate(false);
-            
+
             //proxyServer.CertificateManager.TrustRootCertificate();
             //proxyServer.CertificateManager.TrustRootCertificateAsAdmin();
 
-            proxyServer.ExceptionFunc = exception => Console.WriteLine(exception.Message);
+            proxyServer.ExceptionFunc = exception =>
+            {
+                lock (lockObj)
+                {
+                    var color = Console.ForegroundColor;
+                    Console.ForegroundColor = ConsoleColor.Red;
+                    if (exception is ProxyHttpException phex)
+                    {
+                        Console.WriteLine(exception.Message + ": " + phex.InnerException?.Message);
+                    }
+                    else
+                    {
+                        Console.WriteLine(exception.Message);
+                    }
+
+                    Console.ForegroundColor = color;
+                }
+            };
             proxyServer.ForwardToUpstreamGateway = true;
             proxyServer.CertificateManager.SaveFakeCertificates = true;
             //optionally set the Certificate Engine
@@ -52,20 +72,20 @@ public void StartProxy()
         {
             proxyServer.BeforeRequest += OnRequest;
             proxyServer.BeforeResponse += OnResponse;
-            
+
             proxyServer.ServerCertificateValidationCallback += OnCertificateValidation;
             proxyServer.ClientCertificateSelectionCallback += OnCertificateSelection;
 
             //proxyServer.EnableWinAuth = true;
 
             explicitEndPoint = new ExplicitProxyEndPoint(IPAddress.Any, 8000, true)
             {
-            //You can set only one of the ExcludedHttpsHostNameRegex and IncludedHttpsHostNameRegex properties, otherwise ArgumentException will be thrown
+                //You can set only one of the ExcludedHttpsHostNameRegex and IncludedHttpsHostNameRegex properties, otherwise ArgumentException will be thrown
 
-            //Use self-issued generic certificate on all https requests
-            //Optimizes performance by not creating a certificate for each https-enabled domain
-            //Useful when certificate trust is not required by proxy clients
-            //GenericCertificate = new X509Certificate2(Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "genericcert.pfx"), "password")
+                //Use self-issued generic certificate on all https requests
+                //Optimizes performance by not creating a certificate for each https-enabled domain
+                //Useful when certificate trust is not required by proxy clients
+                //GenericCertificate = new X509Certificate2(Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "genericcert.pfx"), "password")
             };
 
             //Fired when a CONNECT request is received
@@ -125,7 +145,7 @@ public void Stop()
         private async Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e)
         {
             string hostname = e.WebSession.Request.RequestUri.Host;
-            Console.WriteLine("Tunnel to: " + hostname);
+            WriteToConsole("Tunnel to: " + hostname);
 
             if (hostname.Contains("dropbox.com"))
             {
@@ -143,8 +163,8 @@ private async Task OnBeforeTunnelConnectResponse(object sender, TunnelConnectSes
         //intecept & cancel redirect or update requests
         private async Task OnRequest(object sender, SessionEventArgs e)
         {
-            Console.WriteLine("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
-            Console.WriteLine(e.WebSession.Request.Url);
+            WriteToConsole("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
+            WriteToConsole(e.WebSession.Request.Url);
 
             //read request headers
             requestHeaderHistory[e.Id] = e.WebSession.Request.Headers;
@@ -192,16 +212,16 @@ private async Task OnRequest(object sender, SessionEventArgs e)
         private void MultipartRequestPartSent(object sender, MultipartRequestPartSentEventArgs e)
         {
             var session = (SessionEventArgs)sender;
-            Console.WriteLine("Multipart form data headers:");
+            WriteToConsole("Multipart form data headers:");
             foreach (var header in e.Headers)
             {
-                Console.WriteLine(header);
+                WriteToConsole(header.ToString());
             }
         }
 
         private async Task OnResponse(object sender, SessionEventArgs e)
         {
-            Console.WriteLine("Active Server Connections:" + ((ProxyServer)sender).ServerConnectionCount);
+            WriteToConsole("Active Server Connections:" + ((ProxyServer)sender).ServerConnectionCount);
 
             //if (requestBodyHistory.ContainsKey(e.Id))
             //{
@@ -213,7 +233,7 @@ private async Task OnResponse(object sender, SessionEventArgs e)
             //responseHeaderHistory[e.Id] = e.WebSession.Response.Headers;
 
             //// print out process id of current session
-            ////Console.WriteLine($"PID: {e.WebSession.ProcessId.Value}");
+            ////WriteToConsole($"PID: {e.WebSession.ProcessId.Value}");
 
             ////if (!e.ProxySession.Request.Host.Equals("medeczane.sgk.gov.tr")) return;
             //if (e.WebSession.Request.Method == "GET" || e.WebSession.Request.Method == "POST")
@@ -259,5 +279,13 @@ public Task OnCertificateSelection(object sender, CertificateSelectionEventArgs
 
             return Task.FromResult(0);
         }
+
+        private void WriteToConsole(string message)
+        {
+            lock (lockObj)
+            {
+                Console.WriteLine(message);
+            }
+        }
     }
 }

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

@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net;
+using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -102,6 +103,7 @@ public MainWindow()
 
             proxyServer.BeforeRequest += ProxyServer_BeforeRequest;
             proxyServer.BeforeResponse += ProxyServer_BeforeResponse;
+            proxyServer.AfterResponse += ProxyServer_AfterResponse;
             explicitEndPoint.BeforeTunnelConnectRequest += ProxyServer_BeforeTunnelConnectRequest;
             explicitEndPoint.BeforeTunnelConnectResponse += ProxyServer_BeforeTunnelConnectResponse;
             proxyServer.ClientConnectionCountChanged += delegate { Dispatcher.Invoke(() => { ClientConnectionCount = proxyServer.ClientConnectionCount; }); };
@@ -179,6 +181,17 @@ await Dispatcher.InvokeAsync(() =>
             }
         }
 
+        private async Task ProxyServer_AfterResponse(object sender, SessionEventArgs e)
+        {
+            await Dispatcher.InvokeAsync(() =>
+            {
+                if (sessionDictionary.TryGetValue(e.WebSession, out var item))
+                {
+                    item.Exception = e.Exception;
+                }
+            });
+        }
+
         private SessionListItem AddSession(SessionEventArgs e)
         {
             var item = CreateSessionListItem(e);
@@ -255,9 +268,12 @@ private void SelectedSessionChanged()
             }
 
             //string hexStr = string.Join(" ", data.Select(x => x.ToString("X2")));
-            TextBoxRequest.Text = request.HeaderText + request.Encoding.GetString(data) +
-                                  (truncated ? Environment.NewLine + $"Data is truncated after {truncateLimit} bytes" : null) +
-                                  (request as ConnectRequest)?.ClientHelloInfo;
+            var sb = new StringBuilder();
+            sb.Append(request.HeaderText);
+            sb.Append(request.Encoding.GetString(data));
+            sb.Append(truncated ? Environment.NewLine + $"Data is truncated after {truncateLimit} bytes" : null);
+            sb.Append((request as ConnectRequest)?.ClientHelloInfo);
+            TextBoxRequest.Text = sb.ToString();
 
             var response = session.Response;
             data = (response.IsBodyRead ? response.Body : null) ?? new byte[0];
@@ -268,9 +284,18 @@ private void SelectedSessionChanged()
             }
 
             //hexStr = string.Join(" ", data.Select(x => x.ToString("X2")));
-            TextBoxResponse.Text = session.Response.HeaderText + session.Response.Encoding.GetString(data) +
-                                   (truncated ? Environment.NewLine + $"Data is truncated after {truncateLimit} bytes" : null) +
-                                   (session.Response as ConnectResponse)?.ServerHelloInfo;
+            sb = new StringBuilder();
+            sb.Append(response.HeaderText);
+            sb.Append(response.Encoding.GetString(data));
+            sb.Append(truncated ? Environment.NewLine + $"Data is truncated after {truncateLimit} bytes" : null);
+            sb.Append((response as ConnectResponse)?.ServerHelloInfo);
+            if (SelectedSession.Exception != null)
+            {
+                sb.Append(Environment.NewLine);
+                sb.Append(SelectedSession.Exception);
+            }
+
+            TextBoxResponse.Text = sb.ToString();
         }
     }
 }

Examples/Titanium.Web.Proxy.Examples.Wpf/SessionListItem.cs

@@ -17,6 +17,7 @@ public class SessionListItem : INotifyPropertyChanged
         private string process;
         private long receivedDataCount;
         private long sentDataCount;
+        private Exception exception;
 
         public int Number { get; set; }
 
@@ -72,6 +73,12 @@ public long SentDataCount
             set => SetField(ref sentDataCount, value);
         }
 
+        public Exception Exception
+        {
+            get => exception;
+            set => SetField(ref exception, value);
+        }
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         protected void SetField<T>(ref T field, T value,[CallerMemberName] string propertyName = null)

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

@@ -51,8 +51,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="StreamExtended, Version=1.0.138.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\StreamExtended.1.0.138-beta\lib\net45\StreamExtended.dll</HintPath>
+    <Reference Include="StreamExtended, Version=1.0.141.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\StreamExtended.1.0.141-beta\lib\net45\StreamExtended.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

Examples/Titanium.Web.Proxy.Examples.Wpf/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="StreamExtended" version="1.0.138-beta" targetFramework="net45" />
+  <package id="StreamExtended" version="1.0.141-beta" targetFramework="net45" />
 </packages>

Tests/Titanium.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj

@@ -8,14 +8,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Titanium.Web.Proxy.UnitTests</RootNamespace>
     <AssemblyName>Titanium.Web.Proxy.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Titanium.Web.Proxy/Compression/CompressionFactory.cs

@@ -1,26 +1,27 @@
 using System;
+using Titanium.Web.Proxy.Http;
 
 namespace Titanium.Web.Proxy.Compression
 {
     /// <summary>
     ///  A factory to generate the compression methods based on the type of compression
     /// </summary>
-    internal class CompressionFactory
+    internal static class CompressionFactory
     {
         //cache
-        private static Lazy<ICompression> gzip = new Lazy<ICompression>(() => new GZipCompression());
-        private static Lazy<ICompression> deflate = new Lazy<ICompression>(() => new DeflateCompression());
+        private static readonly Lazy<ICompression> gzip = new Lazy<ICompression>(() => new GZipCompression());
+        private static readonly Lazy<ICompression> deflate = new Lazy<ICompression>(() => new DeflateCompression());
 
         public static ICompression GetCompression(string type)
         {
             switch (type)
             {
-                case "gzip":
+                case KnownHeaders.ContentEncodingGzip:
                     return gzip.Value;
-                case "deflate":
+                case KnownHeaders.ContentEncodingDeflate:
                     return deflate.Value;
                 default:
-                    return null;
+                    throw new Exception($"Unsupported compression mode: {type}");
             }
         }
     }

Titanium.Web.Proxy/Compression/DeflateCompression.cs

@@ -9,17 +9,9 @@ namespace Titanium.Web.Proxy.Compression
     /// </summary>
     internal class DeflateCompression : ICompression
     {
-        public async Task<byte[]> Compress(byte[] responseBody)
+        public Stream GetStream(Stream stream)
         {
-            using (var ms = new MemoryStream())
-            {
-                using (var zip = new DeflateStream(ms, CompressionMode.Compress, true))
-                {
-                    await zip.WriteAsync(responseBody, 0, responseBody.Length);
-                }
-
-                return ms.ToArray();
-            }
+            return new DeflateStream(stream, CompressionMode.Compress, true);
         }
     }
 }

Titanium.Web.Proxy/Compression/GZipCompression.cs

@@ -9,17 +9,9 @@ namespace Titanium.Web.Proxy.Compression
     /// </summary>
     internal class GZipCompression : ICompression
     {
-        public async Task<byte[]> Compress(byte[] responseBody)
+        public Stream GetStream(Stream stream)
         {
-            using (var ms = new MemoryStream())
-            {
-                using (var zip = new GZipStream(ms, CompressionMode.Compress, true))
-                {
-                    await zip.WriteAsync(responseBody, 0, responseBody.Length);
-                }
-
-                return ms.ToArray();
-            }
+            return new GZipStream(stream, CompressionMode.Compress, true);
         }
     }
 }

Titanium.Web.Proxy/Compression/ICompression.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace Titanium.Web.Proxy.Compression
 {
@@ -7,6 +8,6 @@ namespace Titanium.Web.Proxy.Compression
     /// </summary>
     interface ICompression
     {
-        Task<byte[]> Compress(byte[] responseBody);
+        Stream GetStream(Stream stream);
     }
 }