Add StoreWebApInfoInHttpContextAuthorizeFilter to add enricher data for unauthorized requests. Fixes #12

Author: gareth-james

src/SerilogWeb.Classic.WebApi/Classic/WebApi/HttpActionContextExtensions.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Http.Controllers;
+
+namespace SerilogWeb.Classic.WebApi
+{
+    internal static class HttpActionContextExtensions
+    {
+        public static void StoreWebApInfoInHttpContext(this HttpActionContext actionContext)
+        {
+            var currentHttpContext = HttpContext.Current;
+            if (currentHttpContext == null)
+                return;
+
+            var actionDescriptor = actionContext.ActionDescriptor;
+            var routeData = actionContext.RequestContext.RouteData;
+
+            var actionName = actionDescriptor.ActionName;
+            var controllerName = actionDescriptor.ControllerDescriptor.ControllerName;
+
+            var routeTemplate = routeData.Route.RouteTemplate;
+            var routeDataDictionary = new Dictionary<string, object>(routeData.Values);
+
+            var contextualInfo =
+                new Dictionary<WebApiRequestInfoKey, object>
+                {
+                    [WebApiRequestInfoKey.RouteUrlTemplate] = routeTemplate,
+                    [WebApiRequestInfoKey.RouteData] = routeDataDictionary,
+                    [WebApiRequestInfoKey.ActionName] = actionName,
+                    [WebApiRequestInfoKey.ControllerName] = controllerName
+                };
+
+            currentHttpContext.Items[Constants.WebApiContextInfoKey] = contextualInfo;
+        }
+    }
+}

src/SerilogWeb.Classic.WebApi/Classic/WebApi/StoreWebApInfoInHttpContextActionFilter.cs

@@ -11,42 +11,14 @@ internal class StoreWebApInfoInHttpContextActionFilter : ActionFilterAttribute
     {
         public override void OnActionExecuting(HttpActionContext actionContext)
         {
-            StoreWebApInfoInHttpContext(actionContext);
+            actionContext.StoreWebApInfoInHttpContext();
             base.OnActionExecuting(actionContext);
         }
 
         public override Task OnActionExecutingAsync(HttpActionContext actionContext, CancellationToken cancellationToken)
         {
-            StoreWebApInfoInHttpContext(actionContext);
+            actionContext.StoreWebApInfoInHttpContext();
             return base.OnActionExecutingAsync(actionContext, cancellationToken);
         }
-
-
-        private static void StoreWebApInfoInHttpContext(HttpActionContext actionContext)
-        {
-            var currentHttpContext = HttpContext.Current;
-            if (currentHttpContext == null)
-                return;
-
-            var actionDescriptor = actionContext.ActionDescriptor;
-            var routeData = actionContext.RequestContext.RouteData;
-
-            var actionName = actionDescriptor.ActionName;
-            var controllerName = actionDescriptor.ControllerDescriptor.ControllerName;
-
-            var routeTemplate = routeData.Route.RouteTemplate;
-            var routeDataDictionary = new Dictionary<string, object>(routeData.Values);
-
-            var contextualInfo =
-                new Dictionary<WebApiRequestInfoKey, object>
-                {
-                    [WebApiRequestInfoKey.RouteUrlTemplate] = routeTemplate,
-                    [WebApiRequestInfoKey.RouteData] = routeDataDictionary,
-                    [WebApiRequestInfoKey.ActionName] = actionName,
-                    [WebApiRequestInfoKey.ControllerName] = controllerName
-                };
-
-            currentHttpContext.Items[Constants.WebApiContextInfoKey] = contextualInfo;
-        }
     }
 }

src/SerilogWeb.Classic.WebApi/Classic/WebApi/StoreWebApInfoInHttpContextAuthorizeFilter.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.Filters;
+
+namespace SerilogWeb.Classic.WebApi
+{
+    public class StoreWebApInfoInHttpContextAuthorizeFilter : AuthorizeAttribute
+    {
+        protected override void HandleUnauthorizedRequest(HttpActionContext actionContext)
+        {
+            actionContext.StoreWebApInfoInHttpContext();
+            base.HandleUnauthorizedRequest(actionContext);
+        }
+    }
+}

src/SerilogWeb.Classic.WebApi/SerilogWeb.Classic.WebApi.csproj

@@ -79,7 +79,9 @@
     <Compile Include="Classic\WebApi\Enrichers\WebApiControllerNameEnricher.cs" />
     <Compile Include="Classic\WebApi\Enrichers\WebApiRouteDataEnricher.cs" />
     <Compile Include="Classic\WebApi\Enrichers\WebApiRouteTemplateEnricher.cs" />
+    <Compile Include="Classic\WebApi\HttpActionContextExtensions.cs" />
     <Compile Include="Classic\WebApi\PreApplicationStartModule.cs" />
+    <Compile Include="Classic\WebApi\StoreWebApInfoInHttpContextAuthorizeFilter.cs" />
     <Compile Include="Classic\WebApi\StoreWebApInfoInHttpContextActionFilter.cs" />
     <Compile Include="Classic\WebApi\WebApiExceptionLogger.cs" />
     <Compile Include="Classic\WebApi\WebApiRequestInfoKey.cs" />

test/SerilogWeb.Classic.WebApi.Test/Controllers/ValuesController.cs

@@ -18,6 +18,13 @@ public string ShouldThrowException()
             throw new SyntheticException(nameof(ShouldThrowException));
         }
 
+        [Route("api/values/shouldbeunauthorized")]
+        [HttpGet]
+        [StoreWebApInfoInHttpContextAuthorizeFilter]
+        public void ShouldBeUnauthorized()
+        {
+        }
+
         // GET api/values/5
         public string Get(int id)
         {