general idea of fix for aspnet#147

itrofimow · Aug 8, 2018 · a890df4 · a890df4
1 parent c40bca3
commit a890df4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/System.Web.Cors/CorsPolicy.cs b/src/System.Web.Cors/CorsPolicy.cs
@@ -85,6 +85,11 @@ public CorsPolicy()
         /// </summary>
         public bool SupportsCredentials { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether upstream exceptions should be rethrown.
+        /// </summary>
+        public bool RethrowExceptions { get; set; }
+
         /// <summary>
         /// Returns a <see cref="System.String" /> that represents this instance.
         /// </summary>

diff --git a/src/System.Web.Http.Cors/CorsMessageHandler.cs b/src/System.Web.Http.Cors/CorsMessageHandler.cs
@@ -47,6 +47,7 @@ protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             CorsRequestContext corsRequestContext = request.GetCorsRequestContext();
             if (corsRequestContext != null)
             {
+                CorsPolicy corsPolicy = await GetCorsPolicyAsync(request, cancellationToken);
                 try
                 {
                     if (corsRequestContext.IsPreflight)
@@ -60,6 +61,9 @@ protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 }
                 catch (Exception exception)
                 {
+                    if (corsPolicy.RethrowExceptions)
+                        throw;
+
                     return HandleException(request, exception);
                 }
             }