connection count locking + usings sorted

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

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
+using System.Net.Security;
 using System.Threading.Tasks;
 using Titanium.Web.Proxy.EventArguments;
 using Titanium.Web.Proxy.Models;
@@ -47,18 +47,18 @@ public void StartProxy()
                 //Exclude Https addresses you don't want to proxy
                 //Useful for clients that use certificate pinning
                 //for example google.com and dropbox.com
-                 ExcludedHttpsHostNameRegex = new List<string>() { "dropbox.com" }
+                ExcludedHttpsHostNameRegex = new List<string> { "dropbox.com" }
 
                 //Include Https addresses you want to proxy (others will be excluded)
                 //for example github.com
-                // IncludedHttpsHostNameRegex = new List<string>() { "github.com" }
+                //IncludedHttpsHostNameRegex = new List<string> { "github.com" }
 
                 //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")
+                //GenericCertificate = new X509Certificate2(Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "genericcert.pfx"), "password")
             };
 
             //An explicit endpoint is where the client knows about the existence of a proxy
@@ -150,7 +150,7 @@ public async Task OnRequest(object sender, SessionEventArgs e)
         //Modify response
         public async Task OnResponse(object sender, SessionEventArgs e)
         {
-            Console.WriteLine("Active Server Connections:" + (sender as ProxyServer).ServerConnectionCount);
+            Console.WriteLine("Active Server Connections:" + ((ProxyServer) sender).ServerConnectionCount);
 
             if (requestBodyHistory.ContainsKey(e.Id))
             {
@@ -189,7 +189,7 @@ public async Task OnResponse(object sender, SessionEventArgs e)
         public Task OnCertificateValidation(object sender, CertificateValidationEventArgs e)
         {
             //set IsValid to true/false based on Certificate Errors
-            if (e.SslPolicyErrors == System.Net.Security.SslPolicyErrors.None)
+            if (e.SslPolicyErrors == SslPolicyErrors.None)
             {
                 e.IsValid = true;
             }

Tests/Titanium.Web.Proxy.IntegrationTests/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

Tests/Titanium.Web.Proxy.IntegrationTests/SslTests.cs

@@ -1,19 +1,19 @@
 using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Diagnostics;
 using System.Net;
+using System.Net.Http;
+using System.Net.Security;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Titanium.Web.Proxy.EventArguments;
 using Titanium.Web.Proxy.Models;
-using System.Net.Http;
-using System.Diagnostics;
 
 namespace Titanium.Web.Proxy.IntegrationTests
 {
     [TestClass]
     public class SslTests
     {
         [TestMethod]
-
         public void TestSsl()
         {
             //expand this to stress test to find
@@ -103,7 +103,7 @@ public async Task OnResponse(object sender, SessionEventArgs e)
         public Task OnCertificateValidation(object sender, CertificateValidationEventArgs e)
         {
             //set IsValid to true/false based on Certificate Errors
-            if (e.SslPolicyErrors == System.Net.Security.SslPolicyErrors.None)
+            if (e.SslPolicyErrors == SslPolicyErrors.None)
             {
                 e.IsValid = true;
             }

Tests/Titanium.Web.Proxy.UnitTests/CertificateManagerTests.cs

@@ -1,17 +1,16 @@
 using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Titanium.Web.Proxy.Network;
-using System.Threading.Tasks;
-using System.Collections.Generic;
 
 namespace Titanium.Web.Proxy.UnitTests
 {
     [TestClass]
     public class CertificateManagerTests
     {
         private static readonly string[] hostNames
-            = new string[] { "facebook.com", "youtube.com", "google.com",
-                                "bing.com", "yahoo.com"};
+            = { "facebook.com", "youtube.com", "google.com", "bing.com", "yahoo.com"};
 
         private readonly Random random = new Random();
 

Titanium.Web.Proxy.sln.DotSettings

@@ -1,8 +1,20 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">240</s:Int64>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BC/@EntryIndexedValue">BC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CN/@EntryIndexedValue">CN</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DN/@EntryIndexedValue">DN</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EKU/@EntryIndexedValue">EKU</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=KU/@EntryIndexedValue">KU</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MTA/@EntryIndexedValue">MTA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OID/@EntryIndexedValue">OID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OIDS/@EntryIndexedValue">OIDS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<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/=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></wpf:ResourceDictionary>
+	<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_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Titanium.Web.Proxy/CertificateHandler.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
 using Titanium.Web.Proxy.EventArguments;
+using Titanium.Web.Proxy.Extensions;
 
 namespace Titanium.Web.Proxy
 {
@@ -32,17 +32,8 @@ internal bool ValidateServerCertificate(
                     SslPolicyErrors = sslPolicyErrors
                 };
 
-
-                Delegate[] invocationList = ServerCertificateValidationCallback.GetInvocationList();
-                Task[] handlerTasks = new Task[invocationList.Length];
-
-                for (int i = 0; i < invocationList.Length; i++)
-                {
-                    handlerTasks[i] = ((Func<object, CertificateValidationEventArgs, Task>) invocationList[i])(null, args);
-                }
-
-                Task.WhenAll(handlerTasks).Wait();
-
+                //why is the sender null?
+                ServerCertificateValidationCallback.InvokeParallel(this, args);
                 return args.IsValid;
             }
 
@@ -108,17 +99,8 @@ internal X509Certificate SelectClientCertificate(
                     ClientCertificate = clientCertificate
                 };
 
-
-                Delegate[] invocationList = ClientCertificateSelectionCallback.GetInvocationList();
-                Task[] handlerTasks = new Task[invocationList.Length];
-
-                for (int i = 0; i < invocationList.Length; i++)
-                {
-                    handlerTasks[i] = ((Func<object, CertificateSelectionEventArgs, Task>) invocationList[i])(null, args);
-                }
-
-                Task.WhenAll(handlerTasks).Wait();
-
+                //why is the sender null?
+                ClientCertificateSelectionCallback.InvokeParallel(this, args);
                 return args.ClientCertificate;
             }
 

Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

@@ -1,16 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using System.Text;
-using Titanium.Web.Proxy.Exceptions;
+using System.Threading.Tasks;
 using Titanium.Web.Proxy.Decompression;
+using Titanium.Web.Proxy.Exceptions;
+using Titanium.Web.Proxy.Extensions;
 using Titanium.Web.Proxy.Http;
 using Titanium.Web.Proxy.Http.Responses;
-using Titanium.Web.Proxy.Extensions;
-using System.Threading.Tasks;
-using Titanium.Web.Proxy.Network;
-using System.Net;
 using Titanium.Web.Proxy.Models;
+using Titanium.Web.Proxy.Network;
 
 namespace Titanium.Web.Proxy.EventArguments
 {
@@ -56,7 +56,7 @@ public class SessionEventArgs : EventArgs, IDisposable
         /// <summary>
         /// Client End Point.
         /// </summary>
-        public IPEndPoint ClientEndPoint => (IPEndPoint) ProxyClient.TcpClient.Client.RemoteEndPoint;
+        public IPEndPoint ClientEndPoint => (IPEndPoint)ProxyClient.TcpClient.Client.RemoteEndPoint;
 
         /// <summary>
         /// A web session corresponding to a single request/response sequence
@@ -158,7 +158,7 @@ private async Task ReadResponseBody()
                             await WebSession.ServerConnection.StreamReader.CopyBytesToStream(bufferSize, responseBodyStream,
                                 WebSession.Response.ContentLength);
                         }
-                        else if ((WebSession.Response.HttpVersion.Major == 1 && WebSession.Response.HttpVersion.Minor == 0) || WebSession.Response.ContentLength == -1)
+                        else if (WebSession.Response.HttpVersion.Major == 1 && WebSession.Response.HttpVersion.Minor == 0 || WebSession.Response.ContentLength == -1)
                         {
                             await WebSession.ServerConnection.StreamReader.CopyBytesToStream(bufferSize, responseBodyStream, long.MaxValue);
                         }

Titanium.Web.Proxy/Extensions/FuncExtensions.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Titanium.Web.Proxy.Extensions
+{
+    internal static class FuncExtensions
+    {
+        public static void InvokeParallel<T>(this Func<object, T, Task> callback, object sender, T args)
+        {
+            Delegate[] invocationList = callback.GetInvocationList();
+            Task[] handlerTasks = new Task[invocationList.Length];
+
+            for (int i = 0; i < invocationList.Length; i++)
+            {
+                handlerTasks[i] = ((Func<object, T, Task>)invocationList[i])(sender, args);
+            }
+
+            Task.WhenAll(handlerTasks).Wait();
+        }
+
+        public static async Task InvokeParallelAsync<T>(this Func<object, T, Task> callback, object sender, T args)
+        {
+            Delegate[] invocationList = callback.GetInvocationList();
+            Task[] handlerTasks = new Task[invocationList.Length];
+
+            for (int i = 0; i < invocationList.Length; i++)
+            {
+                handlerTasks[i] = ((Func<object, T, Task>)invocationList[i])(sender, args);
+            }
+
+            await Task.WhenAll(handlerTasks);
+        }
+    }
+}

Titanium.Web.Proxy/Extensions/StreamExtensions.cs

@@ -136,7 +136,7 @@ internal static async Task WriteResponseBody(this CustomBinaryReader inStreamRea
 
                 if (contentLength < bufferSize)
                 {
-                    bytesToRead = (int) contentLength;
+                    bytesToRead = (int)contentLength;
                 }
 
                 var buffer = new byte[bufferSize];
@@ -153,8 +153,8 @@ internal static async Task WriteResponseBody(this CustomBinaryReader inStreamRea
                         break;
 
                     bytesRead = 0;
-                    var remainingBytes = (contentLength - totalBytesRead);
-                    bytesToRead = remainingBytes > (long) bufferSize ? bufferSize : (int) remainingBytes;
+                    var remainingBytes = contentLength - totalBytesRead;
+                    bytesToRead = remainingBytes > (long)bufferSize ? bufferSize : (int)remainingBytes;
                 }
             }
             else

Titanium.Web.Proxy/Helpers/CustomBinaryReader.cs

@@ -118,7 +118,7 @@ internal async Task<byte[]> ReadBytesAsync(long totalBytesToRead)
             var buffer = staticBuffer;
             if (totalBytesToRead < bufferSize)
             {
-                bytesToRead = (int) totalBytesToRead;
+                bytesToRead = (int)totalBytesToRead;
                 buffer = new byte[bytesToRead];
             }
 
@@ -133,7 +133,7 @@ internal async Task<byte[]> ReadBytesAsync(long totalBytesToRead)
                     break;
 
                 var remainingBytes = totalBytesToRead - totalBytesRead;
-                bytesToRead = Math.Min(bufferSize, (int) remainingBytes);
+                bytesToRead = Math.Min(bufferSize, (int)remainingBytes);
 
                 if (totalBytesRead + bytesToRead > buffer.Length)
                 {

Titanium.Web.Proxy/Helpers/CustomBufferedStream.cs

@@ -198,7 +198,7 @@ public override int EndRead(IAsyncResult asyncResult)
         {
             if (asyncResult is ReadAsyncResult)
             {
-                return ((ReadAsyncResult) asyncResult).ReadBytes;
+                return ((ReadAsyncResult)asyncResult).ReadBytes;
             }
 
             return baseStream.EndRead(asyncResult);

Titanium.Web.Proxy/Helpers/SystemProxy.cs

@@ -1,9 +1,9 @@
 using System;
-using System.Runtime.InteropServices;
-using Microsoft.Win32;
-using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
+using Microsoft.Win32;
 
 // Helper classes for setting system proxy settings
 namespace Titanium.Web.Proxy.Helpers
@@ -84,7 +84,7 @@ private void SetProxy(string hostname, int port, ProxyProtocolType protocolType)
                 var exisitingContent = reg.GetValue("ProxyServer") as string;
                 var existingSystemProxyValues = GetSystemProxyValues(exisitingContent);
                 existingSystemProxyValues.RemoveAll(x => protocolType == ProxyProtocolType.Https ? x.IsHttps : !x.IsHttps);
-                existingSystemProxyValues.Add(new HttpSystemProxyValue()
+                existingSystemProxyValues.Add(new HttpSystemProxyValue
                 {
                     HostName = hostname,
                     IsHttps = protocolType == ProxyProtocolType.Https,

Titanium.Web.Proxy/Helpers/Tcp.cs

@@ -3,10 +3,9 @@
 using System.IO;
 using System.Linq;
 using System.Net.NetworkInformation;
-using System.Net.Security;
 using System.Runtime.InteropServices;
-using System.Security.Authentication;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Titanium.Web.Proxy.Extensions;
 using Titanium.Web.Proxy.Models;
@@ -15,8 +14,6 @@
 
 namespace Titanium.Web.Proxy.Helpers
 {
-    using System.Net;
-
     internal enum IpVersion
     {
         Ipv4 = 1,
@@ -232,7 +229,7 @@ internal static async Task SendRaw(ProxyServer server,
             finally
             {
                 tcpConnection.Dispose();
-                server.ServerConnectionCount--;
+                Interlocked.Decrement(ref server.ServerConnectionCountField);
             }
         }
     }

Titanium.Web.Proxy/Http/HeaderParser.cs

@@ -8,8 +8,8 @@ namespace Titanium.Web.Proxy.Http
 {
     internal static class HeaderParser
     {
-        internal static async Task ReadHeaders(CustomBinaryReader reader, 
-            Dictionary<string, List<HttpHeader>> nonUniqueResponseHeaders, 
+        internal static async Task ReadHeaders(CustomBinaryReader reader,
+            Dictionary<string, List<HttpHeader>> nonUniqueResponseHeaders,
             Dictionary<string, HttpHeader> headers)
         {
             string tmpLine;
@@ -29,7 +29,7 @@ internal static async Task ReadHeaders(CustomBinaryReader reader,
                 {
                     var existing = headers[newHeader.Name];
 
-                    var nonUniqueHeaders = new List<HttpHeader> { existing, newHeader };
+                    var nonUniqueHeaders = new List<HttpHeader> {existing, newHeader};
 
                     nonUniqueResponseHeaders.Add(newHeader.Name, nonUniqueHeaders);
                     headers.Remove(newHeader.Name);

Titanium.Web.Proxy/Http/HttpWebClient.cs

@@ -79,7 +79,7 @@ internal async Task SendRequest(bool enable100ContinueBehaviour)
             var requestLines = new StringBuilder();
 
             //prepare the request & headers
-            if ((ServerConnection.UpStreamHttpProxy != null && ServerConnection.IsHttps == false) || (ServerConnection.UpStreamHttpsProxy != null && ServerConnection.IsHttps))
+            if (ServerConnection.UpStreamHttpProxy != null && ServerConnection.IsHttps == false || ServerConnection.UpStreamHttpsProxy != null && ServerConnection.IsHttps)
             {
                 requestLines.AppendLine($"{Request.Method} {Request.RequestUri.AbsoluteUri} HTTP/{Request.HttpVersion.Major}.{Request.HttpVersion.Minor}");
             }
@@ -93,7 +93,7 @@ internal async Task SendRequest(bool enable100ContinueBehaviour)
             {
                 requestLines.AppendLine("Proxy-Connection: keep-alive");
                 requestLines.AppendLine("Proxy-Authorization" + ": Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes(
-                                                $"{ServerConnection.UpStreamHttpProxy.UserName}:{ServerConnection.UpStreamHttpProxy.Password}")));
+                                            $"{ServerConnection.UpStreamHttpProxy.UserName}:{ServerConnection.UpStreamHttpProxy.Password}")));
             }
             //write request headers
             foreach (var headerItem in Request.RequestHeaders)