passing rethrow flag through ctor, not throught CorsPolicy

Author: Trofimov Ivan Andreevich

src/System.Web.Cors/CorsPolicy.cs

@@ -85,11 +85,6 @@ public long? PreflightMaxAge
         /// </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>

src/System.Web.Http.Cors/CorsHttpConfigurationExtensions.cs

@@ -24,18 +24,21 @@ public static class CorsHttpConfigurationExtensions
         /// Enables the support for CORS.
         /// </summary>
         /// <param name="httpConfiguration">The <see cref="HttpConfiguration"/>.</param>
-        public static void EnableCors(this HttpConfiguration httpConfiguration)
+        /// <param name="rethrowExceptions">Indicates whether upstream exceptions should be rethrown</param>
+        public static void EnableCors(this HttpConfiguration httpConfiguration, bool rethrowExceptions = false)
         {
-            EnableCors(httpConfiguration, null);
+            EnableCors(httpConfiguration, null, rethrowExceptions);
         }
 
         /// <summary>
         /// Enables the support for CORS.
         /// </summary>
         /// <param name="httpConfiguration">The <see cref="HttpConfiguration"/>.</param>
         /// <param name="defaultPolicyProvider">The default <see cref="ICorsPolicyProvider"/>.</param>
+        /// <param name="rethrowExceptions">Indicates whether upstream exceptions should be rethrown</param>
         /// <exception cref="System.ArgumentNullException">httpConfiguration</exception>
-        public static void EnableCors(this HttpConfiguration httpConfiguration, ICorsPolicyProvider defaultPolicyProvider)
+        public static void EnableCors(this HttpConfiguration httpConfiguration, ICorsPolicyProvider defaultPolicyProvider,
+            bool rethrowExceptions = false)
         {
             if (httpConfiguration == null)
             {
@@ -49,11 +52,11 @@ public static void EnableCors(this HttpConfiguration httpConfiguration, ICorsPol
                 httpConfiguration.SetCorsPolicyProviderFactory(policyProviderFactory);
             }
 
-            AddCorsMessageHandler(httpConfiguration);
+            AddCorsMessageHandler(httpConfiguration, rethrowExceptions);
         }
 
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Caller owns the disposable object")]
-        private static void AddCorsMessageHandler(this HttpConfiguration httpConfiguration)
+        private static void AddCorsMessageHandler(this HttpConfiguration httpConfiguration, bool rethrowExceptions)
         {
             object corsEnabled;
             if (!httpConfiguration.Properties.TryGetValue(CorsEnabledKey, out corsEnabled))
@@ -64,7 +67,7 @@ private static void AddCorsMessageHandler(this HttpConfiguration httpConfigurati
                     if (!config.Properties.TryGetValue(CorsEnabledKey, out corsEnabled))
                     {
                         // Execute this in the Initializer to ensure that the CorsMessageHandler is added last.
-                        config.MessageHandlers.Add(new CorsMessageHandler(config));
+                        config.MessageHandlers.Add(new CorsMessageHandler(config, rethrowExceptions));
 
                         ITraceWriter traceWriter = config.Services.GetTraceWriter();
 

src/System.Web.Http.Cors/CorsMessageHandler.cs

@@ -18,20 +18,23 @@ namespace System.Web.Http.Cors
     public class CorsMessageHandler : DelegatingHandler
     {
         private HttpConfiguration _httpConfiguration;
+        private bool _rethrowExceptions;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CorsMessageHandler"/> class.
         /// </summary>
         /// <param name="httpConfiguration">The <see cref="HttpConfiguration"/>.</param>
+        /// <param name="rethrowExceptions">Indicates whether upstream exceptions should be rethrown</param>
         /// <exception cref="System.ArgumentNullException">httpConfiguration</exception>
-        public CorsMessageHandler(HttpConfiguration httpConfiguration)
+        public CorsMessageHandler(HttpConfiguration httpConfiguration, bool rethrowExceptions = false)
         {
             if (httpConfiguration == null)
             {
                 throw new ArgumentNullException("httpConfiguration");
             }
 
             _httpConfiguration = httpConfiguration;
+            _rethrowExceptions = rethrowExceptions;
         }
 
         /// <summary>
@@ -47,25 +50,20 @@ protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             CorsRequestContext corsRequestContext = request.GetCorsRequestContext();
             if (corsRequestContext != null)
             {
-                CorsPolicy corsPolicy = null;
                 try
                 {
-                    HttpResponseMessage responseMessage;
                     if (corsRequestContext.IsPreflight)
                     {
-                        responseMessage = await HandleCorsPreflightRequestAsync(request, corsRequestContext, cancellationToken);
+                        return await HandleCorsPreflightRequestAsync(request, corsRequestContext, cancellationToken);
                     }
                     else
                     {
-                        responseMessage = await HandleCorsRequestAsync(request, corsRequestContext, cancellationToken);
+                        return await HandleCorsRequestAsync(request, corsRequestContext, cancellationToken);
                     }
-
-                    corsPolicy = await GetCorsPolicyAsync(request, cancellationToken);
-                    return responseMessage;
                 }
                 catch (Exception exception)
                 {
-                    if (corsPolicy != null && corsPolicy.RethrowExceptions)
+                    if (_rethrowExceptions)
                         throw;
 
                     return HandleException(request, exception);