Merge pull request #890 from dlcs/fix/orchestrator_cache_length

Update Orchestrator `PathRewriteTransformer` to set correct `max-age` header values with 404 responses
dlcs · Aug 2, 2024 · 4bc6bfb · 4bc6bfb
2 parents 18c5606 + 097db04
commit 4bc6bfb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...protagonist/Orchestrator.Tests/Infrastructure/ReverseProxy/PathRewriteTransformerTests.cs b/...protagonist/Orchestrator.Tests/Infrastructure/ReverseProxy/PathRewriteTransformerTests.cs
@@ -166,6 +166,8 @@ public async Task TransformResponseAsync_AddsCacheHeaders_IfImageServer_AndPubli
     [InlineData(HttpStatusCode.BadGateway)]
     [InlineData(HttpStatusCode.ServiceUnavailable)]
     [InlineData(HttpStatusCode.GatewayTimeout)]
+    [InlineData(HttpStatusCode.NotFound)]
+    [InlineData(HttpStatusCode.BadRequest)]
     public async Task TransformResponseAsync_AddsSmallMaxAge_RegardlessOfDestination_IfError(HttpStatusCode statusCode)
     {
         // Arrange

diff --git a/src/protagonist/Orchestrator/Infrastructure/ReverseProxy/PathRewriteTransformer.cs b/src/protagonist/Orchestrator/Infrastructure/ReverseProxy/PathRewriteTransformer.cs
@@ -61,14 +61,8 @@ public override ValueTask<bool> TransformResponseAsync(
         return new ValueTask<bool>(true);
     }
 
-    private bool IsDownstreamError(HttpResponseMessage? proxyResponse)
-    {
-        var downstreamStatus = proxyResponse?.StatusCode ?? HttpStatusCode.InternalServerError;
-        return downstreamStatus is HttpStatusCode.InternalServerError
-            or HttpStatusCode.BadGateway
-            or HttpStatusCode.ServiceUnavailable
-            or HttpStatusCode.GatewayTimeout;
-    }
+    private bool IsDownstreamError(HttpResponseMessage? proxyResponse) 
+        => proxyResponse == null || !proxyResponse.IsSuccessStatusCode;
 
     private void EnsureCacheHeaders(HttpContext httpContext, bool isDownstreamError)
     {