Merge pull request #472 from justcoding121/beta

Stable

Author: justcoding121

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

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Security;
+using System.Threading;
 using System.Threading.Tasks;
 using Titanium.Web.Proxy.EventArguments;
 using Titanium.Web.Proxy.Exceptions;
@@ -14,7 +15,7 @@ namespace Titanium.Web.Proxy.Examples.Basic
 {
     public class ProxyTestController
     {
-        private readonly object lockObj = new object();
+        private readonly SemaphoreSlim @lock = new SemaphoreSlim(1);
 
         private readonly ProxyServer proxyServer;
 
@@ -23,34 +24,41 @@ public class ProxyTestController
         public ProxyTestController()
         {
             proxyServer = new ProxyServer();
-
+            proxyServer.EnableConnectionPool = true;
             // generate root certificate without storing it in file system
             //proxyServer.CertificateManager.CreateRootCertificate(false);
 
             //proxyServer.CertificateManager.TrustRootCertificate();
             //proxyServer.CertificateManager.TrustRootCertificateAsAdmin();
 
-            proxyServer.ExceptionFunc = exception =>
+            proxyServer.ExceptionFunc = async exception =>
             {
-                lock (lockObj)
+                await @lock.WaitAsync();
+
+                try
                 {
-                    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;
+                        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;
+                    
+                }
+                finally
+                {
+                    @lock.Release();
                 }
             };
             proxyServer.ForwardToUpstreamGateway = true;
             proxyServer.CertificateManager.SaveFakeCertificates = true;
-            
+
             // optionally set the Certificate Engine
             // Under Mono or Non-Windows runtimes only BouncyCastle will be supported
             //proxyServer.CertificateManager.CertificateEngine = Network.CertificateEngine.BouncyCastle;
@@ -122,15 +130,15 @@ public void Stop()
             proxyServer.ClientCertificateSelectionCallback -= OnCertificateSelection;
 
             proxyServer.Stop();
-            
+
             // remove the generated certificates
             //proxyServer.CertificateManager.RemoveTrustedRootCertificates();
         }
 
         private async Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e)
         {
             string hostname = e.WebSession.Request.RequestUri.Host;
-            WriteToConsole("Tunnel to: " + hostname);
+            await WriteToConsole("Tunnel to: " + hostname);
 
             if (hostname.Contains("dropbox.com"))
             {
@@ -141,15 +149,16 @@ private async Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSess
             }
         }
 
-        private async Task OnBeforeTunnelConnectResponse(object sender, TunnelConnectSessionEventArgs e)
+        private Task OnBeforeTunnelConnectResponse(object sender, TunnelConnectSessionEventArgs e)
         {
+            return Task.FromResult(false);
         }
 
         // intecept & cancel redirect or update requests
         private async Task OnRequest(object sender, SessionEventArgs e)
         {
-            WriteToConsole("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
-            WriteToConsole(e.WebSession.Request.Url);
+            await WriteToConsole("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
+            await WriteToConsole(e.WebSession.Request.Url);
 
             // store it in the UserData property
             // It can be a simple integer, Guid, or any type
@@ -187,19 +196,19 @@ private async Task OnRequest(object sender, SessionEventArgs e)
         }
 
         // Modify response
-        private void MultipartRequestPartSent(object sender, MultipartRequestPartSentEventArgs e)
+        private async Task MultipartRequestPartSent(object sender, MultipartRequestPartSentEventArgs e)
         {
             var session = (SessionEventArgs)sender;
-            WriteToConsole("Multipart form data headers:");
+            await WriteToConsole("Multipart form data headers:");
             foreach (var header in e.Headers)
             {
-                WriteToConsole(header.ToString());
+                await WriteToConsole(header.ToString());
             }
         }
 
         private async Task OnResponse(object sender, SessionEventArgs e)
         {
-            WriteToConsole("Active Server Connections:" + ((ProxyServer)sender).ServerConnectionCount);
+            await WriteToConsole("Active Server Connections:" + ((ProxyServer)sender).ServerConnectionCount);
 
             string ext = System.IO.Path.GetExtension(e.WebSession.Request.RequestUri.AbsolutePath);
 
@@ -271,12 +280,18 @@ public Task OnCertificateSelection(object sender, CertificateSelectionEventArgs
             return Task.FromResult(0);
         }
 
-        private void WriteToConsole(string message)
+        private async Task WriteToConsole(string message)
         {
-            lock (lockObj)
+            await @lock.WaitAsync();
+
+            try
             {
                 Console.WriteLine(message);
             }
+            finally
+            {
+                @lock.Release();
+            }
         }
 
         ///// <summary>

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.164.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\StreamExtended.1.0.164\lib\net45\StreamExtended.dll</HintPath>
+    <Reference Include="StreamExtended, Version=1.0.179.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\StreamExtended.1.0.179\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.164" targetFramework="net45" />
+  <package id="StreamExtended" version="1.0.179" targetFramework="net45" />
 </packages>

PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
 Doneness:
 - [ ] Build is okay - I made sure that this change is building successfully.
 - [ ] No Bugs - I made sure that this change is working properly as expected. It doesn't have any bugs that you are aware of. 
-- [ ] Branching - If this is not a hotfix, I am making this request against develop branch 
+- [ ] Branching - If this is not a hotfix, I am making this request against master branch 

README.md

@@ -19,12 +19,9 @@ Kindly report only issues/bugs here . For programming help or questions use [Sta
 
 ### Features
 
-* Multithreaded & fully asynchronous proxy
-* Supports HTTP(S) and most features of HTTP 1.1 
-* Supports redirect/block/update requests and modifying responses
-* Safely relays Web Socket requests over HTTP
-* Supports mutual SSL authentication
-* Supports proxy authentication & automatic proxy detection
+* Multithreaded & fully asynchronous proxy employing server connection pooling, certificate cache & buffer pooling
+* View/modify/redirect/block requests & responses
+* Supports mutual SSL authentication, proxy authentication & automatic upstream proxy detection
 * Kerberos/NTLM authentication over HTTP protocols for windows domain
 
 ### Usage
@@ -36,7 +33,7 @@ Install by [nuget](https://www.nuget.org/packages/Titanium.Web.Proxy)
 
 For beta releases on [beta branch](https://github.com/justcoding121/Titanium-Web-Proxy/tree/beta)
 
-    Install-Package Titanium.Web.Proxy -Pre
+    Install-Package Titanium.Web.Proxy
 
 For stable releases on [stable branch](https://github.com/justcoding121/Titanium-Web-Proxy/tree/stable)
 

Titanium.Web.Proxy.sln.DotSettings

@@ -23,6 +23,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4ab2e69_002D4d9c_002D4345_002Dbcd1_002D5541dacf5d38/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="Method (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=dda2ffa1_002D435c_002D4111_002D88eb_002D1a7c93c382f0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="Property (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>

Titanium.Web.Proxy/EventArguments/LimitedStream.cs

@@ -2,23 +2,25 @@
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
-using StreamExtended.Helpers;
+using StreamExtended;
 using StreamExtended.Network;
 
 namespace Titanium.Web.Proxy.EventArguments
 {
     internal class LimitedStream : Stream
     {
+        private readonly IBufferPool bufferPool;
         private readonly ICustomStreamReader baseStream;
         private readonly bool isChunked;
         private long bytesRemaining;
 
         private bool readChunkTrail;
 
-        internal LimitedStream(ICustomStreamReader baseStream, bool isChunked,
+        internal LimitedStream(ICustomStreamReader baseStream, IBufferPool bufferPool, bool isChunked,
             long contentLength)
-        {
+        {  
             this.baseStream = baseStream;
+            this.bufferPool = bufferPool;
             this.isChunked = isChunked;
             bytesRemaining = isChunked
                 ? 0
@@ -41,7 +43,7 @@ public override long Position
             set => throw new NotSupportedException();
         }
 
-        private void GetNextChunk()
+        private void getNextChunk()
         {
             if (readChunkTrail)
             {
@@ -96,7 +98,7 @@ public override int Read(byte[] buffer, int offset, int count)
             {
                 if (isChunked)
                 {
-                    GetNextChunk();
+                    getNextChunk();
                 }
                 else
                 {
@@ -125,7 +127,7 @@ public async Task Finish()
         {
             if (bytesRemaining != -1)
             {
-                var buffer = BufferPool.GetBuffer(baseStream.BufferSize);
+                var buffer = bufferPool.GetBuffer(baseStream.BufferSize);
                 try
                 {
                     int res = await ReadAsync(buffer, 0, buffer.Length);
@@ -136,7 +138,7 @@ public async Task Finish()
                 }
                 finally
                 {
-                    BufferPool.ReturnBuffer(buffer);
+                    bufferPool.ReturnBuffer(buffer);
                 }
             }
         }