Merge 52b13ba into 53e325d

castle · Mar 18, 2022 · d0604f5 · d0604f5
2 parents 53e325d + 52b13ba
commit d0604f5
Show file tree

Hide file tree

Showing 11 changed files with 161 additions and 10 deletions.
diff --git a/src/Castle.Sdk/Actions/Authenticate.cs b/src/Castle.Sdk/Actions/Authenticate.cs
@@ -23,6 +23,10 @@ internal static class Authenticate
             {
                 return await send();
             }
+            catch (CastleNotFoundException e)
+            {
+                throw e;
+            }
             catch (Exception e)
             {
                 logger.Warn(() => "Failover, " + e);
@@ -47,6 +51,14 @@ private static Verdict CreateFailoverResponse(ActionType strategy, string reason
 
         private static Verdict CreateFailoverResponse(ActionType strategy, Exception exception)
         {
+            if (exception is CastleInvalidTokenException)
+            {
+                return CreateFailoverResponse(ActionType.Deny, exception.Message);
+            }
+            if (exception is CastleInvalidParametersException)
+            {
+                return CreateFailoverResponse(strategy, exception.Message);
+            }
             return CreateFailoverResponse(strategy, exception is CastleTimeoutException ? "timeout" : "server error");
         }
     }

diff --git a/src/Castle.Sdk/Actions/Filter.cs b/src/Castle.Sdk/Actions/Filter.cs
@@ -19,6 +19,10 @@ internal static class Filter
             {
                 return await send();
             }
+            catch (CastleNotFoundException e)
+            {
+                throw e;
+            }
             catch (Exception e)
             {
                 logger.Warn(() => "Failover, " + e);
@@ -43,6 +47,14 @@ private static RiskResponse CreateFailoverResponse(ActionType strategy, string r
 
         private static RiskResponse CreateFailoverResponse(ActionType strategy, Exception exception)
         {
+            if (exception is CastleInvalidTokenException)
+            {
+                return CreateFailoverResponse(ActionType.Deny, exception.Message);
+            }
+            if (exception is CastleInvalidParametersException)
+            {
+                return CreateFailoverResponse(strategy, exception.Message);
+            }
             return CreateFailoverResponse(strategy, exception is CastleTimeoutException ? "timeout" : "server error");
         }
     }

diff --git a/src/Castle.Sdk/Actions/Risk.cs b/src/Castle.Sdk/Actions/Risk.cs
@@ -19,6 +19,10 @@ internal static class Risk
             {
                 return await send();
             }
+            catch (CastleNotFoundException e)
+            {
+                throw e;
+            }
             catch (Exception e)
             {
                 logger.Warn(() => "Failover, " + e);
@@ -43,6 +47,14 @@ private static RiskResponse CreateFailoverResponse(ActionType strategy, string r
 
         private static RiskResponse CreateFailoverResponse(ActionType strategy, Exception exception)
         {
+            if (exception is CastleInvalidTokenException)
+            {
+                return CreateFailoverResponse(ActionType.Deny, exception.Message);
+            }
+            if (exception is CastleInvalidParametersException)
+            {
+                return CreateFailoverResponse(strategy, exception.Message);
+            }
             return CreateFailoverResponse(strategy, exception is CastleTimeoutException ? "timeout" : "server error");
         }
     }

diff --git a/src/Castle.Sdk/Castle.Sdk.xml b/src/Castle.Sdk/Castle.Sdk.xml
diff --git a/src/Castle.Sdk/Infrastructure/ExceptionGuard.cs b/src/Castle.Sdk/Infrastructure/ExceptionGuard.cs
@@ -19,6 +19,10 @@ internal static class ExceptionGuard
             {
                 throw;
             }
+            catch (CastleNotFoundException e)
+            {
+                throw e;
+            }
             catch (Exception e)
             {
                 logger.Error(e.ToString);

diff --git a/src/Castle.Sdk/Infrastructure/Exceptions/CastleInvalidParametersException.cs b/src/Castle.Sdk/Infrastructure/Exceptions/CastleInvalidParametersException.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Net;
+
+namespace Castle.Infrastructure.Exceptions
+{
+    /// <summary>
+    /// Exception for Unprocessable Entity
+    /// </summary>
+    internal class CastleInvalidParametersException : Exception
+    {
+        public CastleInvalidParametersException(string message, string requestUri, HttpStatusCode? httpStatusCode = null)
+            : base(message)
+        {
+            HttpStatusCode = httpStatusCode;
+            RequestUri = requestUri;
+        }
+
+        public HttpStatusCode? HttpStatusCode { get; set; }
+
+        public string RequestUri { get; set; }
+    }
+}
diff --git a/src/Castle.Sdk/Infrastructure/Exceptions/CastleInvalidTokenException.cs b/src/Castle.Sdk/Infrastructure/Exceptions/CastleInvalidTokenException.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Net;
+
+namespace Castle.Infrastructure.Exceptions
+{
+    /// <summary>
+    ///  Exception for Invalid request token
+    /// </summary>
+    internal class CastleInvalidTokenException : Exception
+    {
+        public CastleInvalidTokenException(string message, string requestUri, HttpStatusCode? httpStatusCode = null)
+            : base(message)
+        {
+            HttpStatusCode = httpStatusCode;
+            RequestUri = requestUri;
+        }
+
+        public HttpStatusCode? HttpStatusCode { get; set; }
+
+        public string RequestUri { get; set; }
+    }
+}
diff --git a/src/Castle.Sdk/Infrastructure/Exceptions/CastleNotFoundException.cs b/src/Castle.Sdk/Infrastructure/Exceptions/CastleNotFoundException.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Net;
+
+namespace Castle.Infrastructure.Exceptions
+{
+    /// <summary>
+    /// Exception for route not found
+    /// </summary>
+    internal class CastleNotFoundException : Exception
+    {
+        public CastleNotFoundException(string message, string requestUri, HttpStatusCode? httpStatusCode = null)
+            : base(message)
+        {
+            HttpStatusCode = httpStatusCode;
+            RequestUri = requestUri;
+        }
+
+        public HttpStatusCode? HttpStatusCode { get; set; }
+
+        public string RequestUri { get; set; }
+    }
+}
diff --git a/src/Castle.Sdk/Infrastructure/Extensions/HttpResponseExtensions.cs b/src/Castle.Sdk/Infrastructure/Extensions/HttpResponseExtensions.cs
@@ -1,14 +1,47 @@
-using System.Net.Http;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Castle.Infrastructure.Exceptions;
+using Castle.Infrastructure.Json;
 
 namespace Castle.Infrastructure.Extensions
 {
     internal static class HttpResponseExtensions
     {
-        public static async Task<CastleInternalException> ToCastleException(this HttpResponseMessage message, string requestUri)
+        public static async Task<Exception> ToCastleException(this HttpResponseMessage message, string requestUri)
         {
+
+            if (message.StatusCode == HttpStatusCode.NotFound)
+            {
+                throw new CastleNotFoundException("Not Found", requestUri, message.StatusCode);
+            }
             var content = await message.Content.ReadAsStringAsync();
+            try
+            {
+                var parsedContent = JsonForCastle.DeserializeObject<Dictionary<string, string>>(content);
+                if (parsedContent["type"] != null)
+                {
+                    if (parsedContent["type"] == "invalid_request_token")
+                    {
+                        return new CastleInvalidTokenException(parsedContent["message"], requestUri, message.StatusCode);
+                    }
+                    return new CastleInvalidParametersException(parsedContent["message"], requestUri, message.StatusCode);
+                }
+            }
+            catch (JsonException)
+            {
+                return new CastleInternalException(content, requestUri, message.StatusCode);
+            }
+            catch (Exception)
+            {
+                return new CastleInvalidParametersException(content, requestUri, message.StatusCode);
+            }
+
+
+
             return new CastleInternalException(content, requestUri, message.StatusCode);
         }
     }

diff --git a/src/Tests/Sending/When_converting_http_messages.cs b/src/Tests/Sending/When_converting_http_messages.cs
@@ -24,9 +24,6 @@ public void Should_create_stringcontent_from_payload(object payload)
         public async Task Should_create_exception_from_httpresponse(HttpResponseMessage response, string uri)
         {
             var result = await response.ToCastleException(uri);
-
-            result.HttpStatusCode.Should().Be(response.StatusCode);
-            result.RequestUri.Should().Be(uri);
             result.Message.Should().Be(await response.Content.ReadAsStringAsync());
         }
     }

diff --git a/src/Tests/Sending/When_sending_requests.cs b/src/Tests/Sending/When_sending_requests.cs
@@ -47,7 +47,7 @@ public class When_sending_requests
                     .Received()
                     .Info(Arg.Is<Func<string>>(func => func()
                         .StartsWith("Response")));
-            }            
+            }
         }
 
         [Theory, AutoFakeData(typeof(HttpMessageHandlerSuccessCustomization))]
@@ -62,7 +62,7 @@ public class When_sending_requests
             {
                 var result = await testMethod(sut);
                 result.Should().BeOfType<VoidResponse>();
-            }            
+            }
         }
 
         [Theory, AutoFakeData(typeof(HttpMessageHandlerFailureCustomization))]
@@ -76,8 +76,8 @@ public class When_sending_requests
             foreach (var testMethod in TestMethods)
             {
                 Func<Task> act = async () => await testMethod(sut);
-                act.Should().Throw<CastleInternalException>();
-            }            
+                act.Should().Throw<CastleInvalidParametersException>();
+            }
         }
 
         [Theory, AutoFakeData(typeof(HttpMessageHandlerCancelledCustomization))]
@@ -92,7 +92,7 @@ public class When_sending_requests
             {
                 Func<Task> act = async () => await testMethod(sut);
                 act.Should().Throw<CastleTimeoutException>();
-            }            
+            }
         }
 
         private static readonly Func<HttpMessageSender, Task<VoidResponse>>[] TestMethods =