Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #8750 - AbstractProxyServlet.onServerResponseHeaders does not support headers with empty values (#8904) 

Fixed support for empty headers.
Added test case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2022-11-16 21:47:00 +01:00 committed by GitHub
parent df265e0abb
commit 3569f65066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AbstractProxyServlet.java
View File

@ -663,7 +663,7 @@ public abstract class AbstractProxyServlet extends HttpServlet
continue;
String newHeaderValue = filterServerResponseHeader(clientRequest, serverResponse, headerName, field.getValue());
if (newHeaderValue == null || newHeaderValue.trim().length() == 0)
if (newHeaderValue == null)
continue;
proxyResponse.addHeader(headerName, newHeaderValue);

30
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
View File

@ -999,6 +999,36 @@ public class ProxyServletTest
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
*/