feat: Add "forwarded" headers if present to a proxy request

contensis · Jun 25, 2024 · a038d2e · a038d2e
1 parent 1f5aa44
commit a038d2e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/src/Zengenti.Contensis.RequestHandler.Application/Middleware/RequestHandlerMiddleware.cs b/src/Zengenti.Contensis.RequestHandler.Application/Middleware/RequestHandlerMiddleware.cs
@@ -546,16 +546,30 @@ private static void EnsureResponseHeadersAndStatusCode(RouteInfo routeInfo, Endp
     {
         if (!routeInfo.IsIisFallback)
         {
-            if (routeInfo.ProxyId != null &&
-                routeInfo.ProxyId.Equals(Guid.Parse("8f2cc5be-b5dd-4e4b-b6fa-92b7fc6440e0")))
+            if (routeInfo is { ProxyId: not null, BlockVersionInfo: null })
             {
-                response.Headers[Constants.Headers.SurrogateControl] = new List<string>
+                foreach (var proxyHeaderName in Constants.Headers.ProxyHeaders)
                 {
-                    "max-age=60"
-                };
-            }
+                    var proxyHeaderValue = routeInfo.Headers.GetFirstValueIfExists(proxyHeaderName, true);
+                    if (proxyHeaderValue != null)
+                    {
+                        response.Headers[proxyHeaderName] = new List<string>
+                        {
+                            proxyHeaderValue
+                        };
+                    }
+                }
 
-            return;
+                if (routeInfo.ProxyId.Equals(Guid.Parse("8f2cc5be-b5dd-4e4b-b6fa-92b7fc6440e0")))
+                {
+                    response.Headers[Constants.Headers.SurrogateControl] = new List<string>
+                    {
+                        "max-age=60"
+                    };
+
+                    return;
+                }
+            }
         }
 
         // Unfortunately IIS returns an empty bodied 200 rather than a 404 when

diff --git a/src/Zengenti.Contensis.RequestHandler.Domain/Common/Constants.cs b/src/Zengenti.Contensis.RequestHandler.Domain/Common/Constants.cs
@@ -26,6 +26,10 @@ public static class Headers
         public const string HealthCheck = "x-healthcheck";
         public const string HidePreviewToolbar = "x-hide-preview-toolbar";
 
+        public const string ProxyForwardedFor = "x-forwarded-for";
+        public const string ProxyForwardedProto = "x-forwarded-proto";
+        public const string ProxyForwardedPort = "x-forwarded-port";
+
         public const string RequiresAlias = "x-requires-alias";
         public const string RequiresProjectApiId = "x-requires-project-api-id";
         public const string RequiresNodeId = "x-requires-node-id";
@@ -57,6 +61,13 @@ public static class Headers
             RendererConfigDefault
         };
 
+        public static readonly string[] ProxyHeaders =
+        {
+            ProxyForwardedFor,
+            ProxyForwardedProto,
+            ProxyForwardedPort
+        };
+
         public static readonly string[] RequiresHeaders =
         {
             RequiresAlias,

diff --git a/src/Zengenti.Contensis.RequestHandler.Domain/Domain.csproj b/src/Zengenti.Contensis.RequestHandler.Domain/Domain.csproj
@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Zengenti.Core" Version="6.1.0" />
+      <PackageReference Include="Zengenti.Core" Version="6.3.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Zengenti.Contensis.RequestHandler.Domain/ValueTypes/Headers.cs b/src/Zengenti.Contensis.RequestHandler.Domain/ValueTypes/Headers.cs
@@ -117,9 +117,9 @@ private void SetValue(string key, IEnumerable<string> value)
         }
     }
 
-    public string? GetFirstValueIfExists(string headerName)
+    public string? GetFirstValueIfExists(string headerName, bool caseInsensitive = false)
     {
-        var key = CaseInsensitiveHeaderNames.ContainsCaseInsensitive(headerName)
+        var key = caseInsensitive || CaseInsensitiveHeaderNames.ContainsCaseInsensitive(headerName)
             ? _values.Keys.SingleOrDefault(k => k.EqualsCaseInsensitive(headerName))
             : headerName;