Fixes #8750 - AbstractProxyServlet.onServerResponseHeaders does not s…

…upport headers with empty values (#8904) Fixed support for empty headers. Added test case. Signed-off-by: Simone Bordet <[email protected]>
jetty · Nov 16, 2022 · 3569f65 · 3569f65
1 parent df265e0
commit 3569f65
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AbstractProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AbstractProxyServlet.java
@@ -663,7 +663,7 @@ protected void onServerResponseHeaders(HttpServletRequest clientRequest, HttpSer
                 continue;
 
             String newHeaderValue = filterServerResponseHeader(clientRequest, serverResponse, headerName, field.getValue());
-            if (newHeaderValue == null || newHeaderValue.trim().length() == 0)
+            if (newHeaderValue == null)
                 continue;
 
             proxyResponse.addHeader(headerName, newHeaderValue);

diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
@@ -999,6 +999,36 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         assertTrue(response.getHeaders().contains(PROXIED_HEADER));
     }
 
+    @ParameterizedTest
+    @MethodSource("transparentImpls")
+    public void testTransparentProxyEmptyHeaderValue(AbstractProxyServlet proxyServletClass) throws Exception
+    {
+        String emptyHeaderName = "X-Empty";
+        startServer(new EmptyHttpServlet()
+        {
+            @Override
+            protected void service(HttpServletRequest request, HttpServletResponse response)
+            {
+                assertEquals("", request.getHeader(emptyHeaderName));
+                response.setHeader(emptyHeaderName, "");
+            }
+        });
+        String proxyTo = "http://localhost:" + serverConnector.getLocalPort();
+        Map<String, String> initParams = new HashMap<>();
+        initParams.put("proxyTo", proxyTo);
+        startProxy(proxyServletClass, initParams);
+        startClient();
+
+        // Make the request to the proxy, it should transparently forward to the server.
+        ContentResponse response = client.newRequest("localhost", proxyConnector.getLocalPort())
+            .headers(headers -> headers.put(emptyHeaderName, ""))
+            .timeout(5, TimeUnit.SECONDS)
+            .send();
+
+        assertEquals(200, response.getStatus());
+        assertEquals("", response.getHeaders().get(emptyHeaderName));
+    }
+
     /**
      * Only tests overridden ProxyServlet behavior, see CachingProxyServlet
      */