Merge pull request #252 from justcoding121/develop

Beta

Author: justcoding121

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

@@ -116,8 +116,7 @@ public async Task OnRequest(object sender, SessionEventArgs e)
             //read request headers
             var requestHeaders = e.WebSession.Request.RequestHeaders;
 
-            var method = e.WebSession.Request.Method.ToUpper();
-            if (method == "POST" || method == "PUT" || method == "PATCH")
+            if (e.WebSession.Request.HasBody)
             {
                 //Get/Set request body bytes
                 byte[] bodyBytes = await e.GetRequestBody();

Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

@@ -111,8 +111,7 @@ internal SessionEventArgs(int bufferSize, Func<SessionEventArgs, Task> httpRespo
         private async Task ReadRequestBody()
         {
             //GET request don't have a request body to read
-            var method = WebSession.Request.Method.ToUpper();
-            if (method != "POST" && method != "PUT" && method != "PATCH")
+            if (!WebSession.Request.HasBody)
             {
                 throw new BodyNotFoundException("Request don't have a body. " +
                                                 "Please verify that this request is a Http POST/PUT/PATCH and request " +

Titanium.Web.Proxy/Helpers/RunTime.cs

@@ -7,15 +7,16 @@ namespace Titanium.Web.Proxy.Helpers
     /// </summary>
     internal class RunTime
     {
-        private static Lazy<bool> isMonoRuntime 
-            = new Lazy<bool>(()=> Type.GetType("Mono.Runtime") != null);
         /// <summary>
-        /// Checks if current run time is Mono
+        /// cache for mono runtime check
         /// </summary>
         /// <returns></returns>
-        internal static bool IsRunningOnMono()
-        {
-            return isMonoRuntime.Value;
-        }
+        private static Lazy<bool> isRunningOnMono
+            = new Lazy<bool>(()=> Type.GetType("Mono.Runtime") != null);
+      
+        /// <summary>
+        /// Is running on Mono?
+        /// </summary>
+        internal static bool IsRunningOnMono => isRunningOnMono.Value;
     }
 }

Titanium.Web.Proxy/Http/Request.cs

@@ -26,6 +26,11 @@ public class Request : IDisposable
         /// </summary>
         public Version HttpVersion { get; set; }
 
+        /// <summary>
+        /// Has request body?
+        /// </summary>
+        public bool HasBody => Method == "POST" || Method == "PUT" || Method == "PATCH";
+
         /// <summary>
         /// Request Http hostanem
         /// </summary>

Titanium.Web.Proxy/Network/CertificateManager.cs

@@ -39,7 +39,7 @@ internal CertificateEngine Engine
             set
             {
                 //For Mono only Bouncy Castle is supported
-                if (RunTime.IsRunningOnMono())
+                if (RunTime.IsRunningOnMono)
                 {
                     value = CertificateEngine.BouncyCastle;
                 }
@@ -226,7 +226,7 @@ public void TrustRootCertificate()
         /// <returns></returns>
         public bool TrustRootCertificateAsAdministrator()
         {
-            if (RunTime.IsRunningOnMono())
+            if (RunTime.IsRunningOnMono)
             {
                 return false;
             }

Titanium.Web.Proxy/ProxyServer.cs

@@ -348,7 +348,7 @@ public void RemoveEndPoint(ProxyEndPoint endPoint)
         /// <param name="endPoint"></param>
         public void SetAsSystemHttpProxy(ExplicitProxyEndPoint endPoint)
         {
-            if (RunTime.IsRunningOnMono())
+            if (RunTime.IsRunningOnMono)
             {
                 throw new Exception("Mono Runtime do not support system proxy settings.");
             }
@@ -375,7 +375,7 @@ public void SetAsSystemHttpProxy(ExplicitProxyEndPoint endPoint)
         /// <param name="endPoint"></param>
         public void SetAsSystemHttpsProxy(ExplicitProxyEndPoint endPoint)
         {
-            if (RunTime.IsRunningOnMono())
+            if (RunTime.IsRunningOnMono)
             {
                 throw new Exception("Mono Runtime do not support system proxy settings.");
             }
@@ -416,7 +416,7 @@ public void SetAsSystemHttpsProxy(ExplicitProxyEndPoint endPoint)
         /// </summary>
         public void DisableSystemHttpProxy()
         {
-            if (RunTime.IsRunningOnMono())
+            if (RunTime.IsRunningOnMono)
             {
                 throw new Exception("Mono Runtime do not support system proxy settings.");
             }
@@ -429,7 +429,7 @@ public void DisableSystemHttpProxy()
         /// </summary>
         public void DisableSystemHttpsProxy()
         {
-            if (RunTime.IsRunningOnMono())
+            if (RunTime.IsRunningOnMono)
             {
                 throw new Exception("Mono Runtime do not support system proxy settings.");
             }
@@ -442,7 +442,7 @@ public void DisableSystemHttpsProxy()
         /// </summary>
         public void DisableAllSystemProxies()
         {
-            if (RunTime.IsRunningOnMono())
+            if (RunTime.IsRunningOnMono)
             {
                 throw new Exception("Mono Runtime do not support system proxy settings.");
             }
@@ -474,8 +474,9 @@ public void Start()
 
             CertificateManager.ClearIdleCertificates(CertificateCacheTimeOutMinutes);
 
-            if (!RunTime.IsRunningOnMono())
+            if (!RunTime.IsRunningOnMono)
             {
+                //clear orphaned windows auth states every 2 minutes
                 WinAuthEndPoint.ClearIdleStates(2);
             }
 

Titanium.Web.Proxy/RequestHandler.cs

@@ -322,6 +322,16 @@ await CheckAuthorization(clientStreamWriter,
                     PrepareRequestHeaders(args.WebSession.Request.RequestHeaders, args.WebSession);
                     args.WebSession.Request.Host = args.WebSession.Request.RequestUri.Authority;
 
+                    //if win auth is enabled
+                    //we need a cache of request body
+                    //so that we can send it after authentication in WinAuthHandler.cs
+                    if (EnableWinAuth
+                        && !RunTime.IsRunningOnMono
+                        && args.WebSession.Request.HasBody)
+                    {
+                        await args.GetRequestBody();
+                    }
+
                     //If user requested interception do it
                     if (BeforeRequest != null)
                     {
@@ -461,8 +471,7 @@ await WriteResponseStatus(args.WebSession.Response.HttpVersion, "417",
                     if (!args.WebSession.Request.ExpectationFailed)
                     {
                         //If its a post/put/patch request, then read the client html body and send it to server
-                        var method = args.WebSession.Request.Method.ToUpper();
-                        if (method == "POST" || method == "PUT" || method == "PATCH")
+                        if (args.WebSession.Request.HasBody)
                         {
                             await SendClientRequestBody(args);
                         }

Titanium.Web.Proxy/ResponseHandler.cs

@@ -38,7 +38,7 @@ private async Task<bool> HandleHttpSessionResponse(SessionEventArgs args)
 
                 //check for windows authentication
                 if(EnableWinAuth
-                    && !RunTime.IsRunningOnMono()
+                    && !RunTime.IsRunningOnMono
                     && args.WebSession.Response.ResponseStatusCode == "401")
                 {
                     var disposed = await Handle401UnAuthorized(args);

Titanium.Web.Proxy/WinAuthHandler.cs

@@ -96,7 +96,8 @@ internal async Task<bool> Handle401UnAuthorized(SessionEventArgs args)
                 //challenge value will start with any of the scheme selected
                 else
                 {
-                    scheme = authSchemes.FirstOrDefault(x => authHeader.Value.StartsWith(x, StringComparison.OrdinalIgnoreCase));
+                    scheme = authSchemes.FirstOrDefault(x => authHeader.Value.StartsWith(x, StringComparison.OrdinalIgnoreCase)
+                    && authHeader.Value.Length > x.Length + 1);
 
                     var serverToken = authHeader.Value.Substring(scheme.Length + 1);
                     var clientToken = WinAuthHandler.GetFinalAuthToken(args.WebSession.Request.Host, serverToken, args.Id);