Do not alter headers in forwarding scenarios

Co-authored-by: Daniel Marbach <daniel.marbach@openplace.net>
Particular · Feb 2, 2024 · 8f9e562 · 8f9e562
1 parent e2dee3a
commit 8f9e562
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/src/ServiceControl/Infrastructure/WebApi/CachingHttpHandler.cs b/src/ServiceControl/Infrastructure/WebApi/CachingHttpHandler.cs
@@ -6,6 +6,12 @@ class CachingHttpHandler : IResultFilter
     {
         public void OnResultExecuting(ResultExecutingContext context)
         {
+            if (context.HttpContext.Response.HasStarted)
+            {
+                // In forwarding scenarios we don't want to alter headers set by other instances
+                return;
+            }
+
             // TODO do we even need to do this
             var response = context.HttpContext.Response;
             if (!response.Headers.ContainsKey("Cache-Control"))

diff --git a/src/ServiceControl/Infrastructure/WebApi/NotModifiedStatusHttpHandler.cs b/src/ServiceControl/Infrastructure/WebApi/NotModifiedStatusHttpHandler.cs
@@ -17,6 +17,12 @@ class NotModifiedStatusHttpHandler : IResultFilter
 
         public void OnResultExecuting(ResultExecutingContext context)
         {
+            if (context.HttpContext.Response.HasStarted)
+            {
+                // In forwarding scenarios we don't want to alter headers set by other instances
+                return;
+            }
+
             var statusCode = context.HttpContext.Response.StatusCode;
             if (statusCode is < 200 or > 299)
             {

diff --git a/src/ServiceControl/Infrastructure/WebApi/XParticularVersionHttpHandler.cs b/src/ServiceControl/Infrastructure/WebApi/XParticularVersionHttpHandler.cs
@@ -27,6 +27,11 @@ static string GetFileVersion()
         static readonly string FileVersion;
         public void OnResultExecuting(ResultExecutingContext context)
         {
+            if (context.HttpContext.Response.HasStarted)
+            {
+                // In forwarding scenarios we don't want to alter headers set by other instances
+                return;
+            }
             context.HttpContext.Response.Headers["X-Particular-Version"] = FileVersion;
         }