Expect Continue Fixes

.build/default.ps1

@@ -31,15 +31,14 @@ Import-Module "$Here\Common" -DisableNameChecking
 
 $NuGet = Join-Path $SolutionRoot ".nuget\nuget.exe"
 
-$MSBuild ="${env:ProgramFiles(x86)}\MSBuild\12.0\Bin\msbuild.exe"
+$MSBuild ="${env:ProgramFiles(x86)}\MSBuild\14.0\Bin\msbuild.exe"
 
 FormatTaskName (("-"*25) + "[{0}]" + ("-"*25))
 
 Task default -depends Clean, Build, Package
 
 Task Build -depends Restore-Packages {
 	exec { . $MSBuild $SolutionFile /t:Build /v:normal /p:Configuration=$Configuration }
-    exec { . $MSBuild $SolutionFile /t:Build /v:normal /p:Configuration=$Configuration-Net45 }
 }
 
 Task Package -depends Build {

Titanium.Web.Proxy.Test/App.config

@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
 
-</configuration>
+</configuration>

Titanium.Web.Proxy.Test/ProxyTestController.cs

@@ -9,8 +9,6 @@ namespace Titanium.Web.Proxy.Test
 {
     public class ProxyTestController
     {
-
-
         public void StartProxy()
         {
             ProxyServer.BeforeRequest += OnRequest;
@@ -19,36 +17,35 @@ public void StartProxy()
             //Exclude Https addresses you don't want to proxy
             //Usefull for clients that use certificate pinning
             //for example dropbox.com
-            var explicitEndPoint = new ExplicitProxyEndPoint(IPAddress.Any, 8000, true){
-               // ExcludedHttpsHostNameRegex = new List<string>() { "google.com", "dropbox.com" }
+            var explicitEndPoint = new ExplicitProxyEndPoint(IPAddress.Any, 8000, true)
+            {
+                // ExcludedHttpsHostNameRegex = new List<string>() { "google.com", "dropbox.com" }
             };
 
             //An explicit endpoint is where the client knows about the existance of a proxy
             //So client sends request in a proxy friendly manner
             ProxyServer.AddEndPoint(explicitEndPoint);
             ProxyServer.Start();
 
-          
+
             //Transparent endpoint is usefull for reverse proxying (client is not aware of the existance of proxy)
             //A transparent endpoint usually requires a network router port forwarding HTTP(S) packets to this endpoint
             //Currently do not support Server Name Indication (It is not currently supported by SslStream class)
             //That means that the transparent endpoint will always provide the same Generic Certificate to all HTTPS requests
             //In this example only google.com will work for HTTPS requests
             //Other sites will receive a certificate mismatch warning on browser
             //Please read about it before asking questions!
-            var transparentEndPoint = new TransparentProxyEndPoint(IPAddress.Any, 8001, true) { 
+            var transparentEndPoint = new TransparentProxyEndPoint(IPAddress.Any, 8001, true)
+            {
                 GenericCertificateName = "google.com"
-            };         
+            };
             ProxyServer.AddEndPoint(transparentEndPoint);
-          
+
 
             foreach (var endPoint in ProxyServer.ProxyEndPoints)
-                Console.WriteLine("Listening on '{0}' endpoint at Ip {1} and port: {2} ", 
+                Console.WriteLine("Listening on '{0}' endpoint at Ip {1} and port: {2} ",
                     endPoint.GetType().Name, endPoint.IpAddress, endPoint.Port);
 
-            //You can also add/remove end points after proxy has been started
-            ProxyServer.RemoveEndPoint(transparentEndPoint);
-
             //Only explicit proxies can be set as system proxy!
             ProxyServer.SetAsSystemHttpProxy(explicitEndPoint);
             ProxyServer.SetAsSystemHttpsProxy(explicitEndPoint);
@@ -85,10 +82,20 @@ public void OnRequest(object sender, SessionEventArgs e)
 
             //To cancel a request with a custom HTML content
             //Filter URL
-
             if (e.ProxySession.Request.RequestUri.AbsoluteUri.Contains("google.com"))
             {
-                e.Ok("<!DOCTYPE html><html><body><h1>Website Blocked</h1><p>Blocked by titanium web proxy.</p></body></html>");
+                e.Ok("<!DOCTYPE html>" +
+                     "<html><body><h1>" +
+                     "Website Blocked" +
+                     "</h1>" +
+                     "<p>Blocked by titanium web proxy.</p>" +
+                     "</body>" +
+                     "</html>");
+            }
+            //Redirect example
+            if (e.ProxySession.Request.RequestUri.AbsoluteUri.Contains("wikipedia.org"))
+            {
+                e.Redirect("https://www.paypal.com");
             }
         }
 
@@ -107,7 +114,11 @@ public void OnResponse(object sender, SessionEventArgs e)
                 {
                     if (e.ProxySession.Response.ContentType.Trim().ToLower().Contains("text/html"))
                     {
+                        byte[] bodyBytes = e.GetResponseBody();
+                        e.SetResponseBody(bodyBytes);
+
                         string body = e.GetResponseBodyAsString();
+                        e.SetResponseBodyString(body);
                     }
                 }
             }

Titanium.Web.Proxy.Test/Titanium.Web.Proxy.Test.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,49 +11,32 @@
     <RootNamespace>Titanium.Web.Proxy.Test</RootNamespace>
     <AssemblyName>Titanium.Web.Proxy.Test</AssemblyName>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-	    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-	    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Net45|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug-Net45\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-	   <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Net45|AnyCPU'">
-    <OutputPath>bin\Release-Net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-	   <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

Titanium.Web.Proxy.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B6DBABDC-C985-4872-9C38-B4E5079CBC4B}"
 EndProject
@@ -19,27 +19,17 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug-Net45|Any CPU = Debug-Net45|Any CPU
 		Release|Any CPU = Release|Any CPU
-		Release-Net45|Any CPU = Release-Net45|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F3B7E553-1904-4E80-BDC7-212342B5C952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3B7E553-1904-4E80-BDC7-212342B5C952}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3B7E553-1904-4E80-BDC7-212342B5C952}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
-		{F3B7E553-1904-4E80-BDC7-212342B5C952}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
 		{F3B7E553-1904-4E80-BDC7-212342B5C952}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3B7E553-1904-4E80-BDC7-212342B5C952}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3B7E553-1904-4E80-BDC7-212342B5C952}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU
-		{F3B7E553-1904-4E80-BDC7-212342B5C952}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU
 		{8D73A1BE-868C-42D2-9ECE-F32CC1A02906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D73A1BE-868C-42D2-9ECE-F32CC1A02906}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D73A1BE-868C-42D2-9ECE-F32CC1A02906}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU
-		{8D73A1BE-868C-42D2-9ECE-F32CC1A02906}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU
 		{8D73A1BE-868C-42D2-9ECE-F32CC1A02906}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D73A1BE-868C-42D2-9ECE-F32CC1A02906}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D73A1BE-868C-42D2-9ECE-F32CC1A02906}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU
-		{8D73A1BE-868C-42D2-9ECE-F32CC1A02906}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Titanium.Web.Proxy/Compression/CompressionFactory.cs

@@ -0,0 +1,20 @@
+namespace Titanium.Web.Proxy.Compression
+{
+    class CompressionFactory
+    {
+        public ICompression Create(string type)
+        {
+            switch (type)
+            {
+                case "gzip":
+                    return new GZipCompression();
+                case "deflate":
+                    return new DeflateCompression();
+                case "zlib":
+                    return new ZlibCompression();
+                default:
+                    return null;
+            }
+        }
+    }
+}

Titanium.Web.Proxy/Compression/DeflateCompression.cs

@@ -0,0 +1,21 @@
+using System.IO;
+using System.IO.Compression;
+
+namespace Titanium.Web.Proxy.Compression
+{
+    class DeflateCompression : ICompression
+    {
+        public byte[] Compress(byte[] responseBody)
+        {
+            using (var ms = new MemoryStream())
+            {
+                using (var zip = new DeflateStream(ms, CompressionMode.Compress, true))
+                {
+                    zip.Write(responseBody, 0, responseBody.Length);
+                }
+
+                return ms.ToArray();
+            }
+        }
+    }
+}

Titanium.Web.Proxy/Compression/GZipCompression.cs

@@ -0,0 +1,21 @@
+using Ionic.Zlib;
+using System.IO;
+
+namespace Titanium.Web.Proxy.Compression
+{
+    class GZipCompression : ICompression
+    {
+        public byte[] Compress(byte[] responseBody)
+        {
+            using (var ms = new MemoryStream())
+            {
+                using (var zip = new GZipStream(ms, CompressionMode.Compress, true))
+                {
+                    zip.Write(responseBody, 0, responseBody.Length);
+                }
+
+                return ms.ToArray();
+            }
+        }
+    }
+}

Titanium.Web.Proxy/Compression/ICompression.cs

@@ -0,0 +1,7 @@
+namespace Titanium.Web.Proxy.Compression
+{
+    interface ICompression
+    {
+        byte[] Compress(byte[] responseBody);
+    }
+}

Titanium.Web.Proxy/Compression/ZlibCompression.cs

@@ -0,0 +1,21 @@
+using Ionic.Zlib;
+using System.IO;
+
+namespace Titanium.Web.Proxy.Compression
+{
+    class ZlibCompression : ICompression
+    {
+        public byte[] Compress(byte[] responseBody)
+        {
+            using (var ms = new MemoryStream())
+            {
+                using (var zip = new ZlibStream(ms, CompressionMode.Compress, true))
+                {
+                    zip.Write(responseBody, 0, responseBody.Length);
+                }
+
+                return ms.ToArray();
+            }
+        }
+    }
+}

Titanium.Web.Proxy/Decompression/DecompressionFactory.cs

@@ -0,0 +1,20 @@
+namespace Titanium.Web.Proxy.Decompression
+{
+    class DecompressionFactory
+    {
+        public IDecompression Create(string type)
+        {
+            switch(type)
+            {
+                case "gzip":
+                    return new GZipDecompression();
+                case "deflate":
+                    return new DeflateDecompression();
+                case "zlib":
+                    return new ZlibDecompression();
+                default:
+                    return new DefaultDecompression();
+            }
+        }
+    }
+}

Titanium.Web.Proxy/Decompression/DefaultDecompression.cs

@@ -0,0 +1,10 @@
+namespace Titanium.Web.Proxy.Decompression
+{
+    class DefaultDecompression : IDecompression
+    {
+        public byte[] Decompress(byte[] compressedArray)
+        {
+            return compressedArray;
+        }
+    }
+}

Titanium.Web.Proxy/Decompression/DeflateDecompression.cs

@@ -0,0 +1,29 @@
+using Ionic.Zlib;
+using System.IO;
+
+namespace Titanium.Web.Proxy.Decompression
+{
+    class DeflateDecompression : IDecompression
+    {
+        public byte[] Decompress(byte[] compressedArray)
+        {
+            var stream = new MemoryStream(compressedArray);
+
+            using (var decompressor = new DeflateStream(stream, CompressionMode.Decompress))
+            {
+                var buffer = new byte[ProxyServer.BUFFER_SIZE];
+
+                using (var output = new MemoryStream())
+                {
+                    int read;
+                    while ((read = decompressor.Read(buffer, 0, buffer.Length)) > 0)
+                    {
+                        output.Write(buffer, 0, read);
+                    }
+
+                    return output.ToArray();
+                }
+            }
+        }
+    }
+}