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

Fixing #7975 - ForwardedRequestCustomizer should clear old MethodHandles when renaming headers. (#8102) 

* Adding test case to prove report
* Fixing updateHandles() to clear the stored handles list.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2022-06-02 14:17:26 -05:00 committed by GitHub
parent d12ee70b5a
commit 944ce6354f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java
View File

@ -593,6 +593,8 @@ public class ForwardedRequestCustomizer implements Customizer
private void updateHandles()
{
_handles.clear();
MethodHandles.Lookup lookup = MethodHandles.lookup();
try
{

51
jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
View File

@ -1112,6 +1112,57 @@ public class ForwardedRequestCustomizerTest
assertThat("status", response.getStatus(), is(400));
}
public static Stream<Arguments> customHeaderNameRequestCases()
{
return Stream.of(
Arguments.of(new Request("Old name then new name")
.headers(
"GET / HTTP/1.1",
"Host: myhost",
"X-Forwarded-For: 1.1.1.1",
"X-Custom-For: 2.2.2.2"
)
.configureCustomizer((forwardedRequestCustomizer) ->
forwardedRequestCustomizer.setForwardedForHeader("X-Custom-For")),
new Expectations()
.scheme("http").serverName("myhost").serverPort(80)
.secure(false)
.requestURL("http://myhost/")
.remoteAddr("2.2.2.2").remotePort(0)
),
Arguments.of(new Request("New name then old name")
.headers(
"GET / HTTP/1.1",
"Host: myhost",
"X-Custom-For: 2.2.2.2",
"X-Forwarded-For: 1.1.1.1"
)
.configureCustomizer((forwardedRequestCustomizer) ->
forwardedRequestCustomizer.setForwardedForHeader("X-Custom-For")),
new Expectations()
.scheme("http").serverName("myhost").serverPort(80)
.secure(false)
.requestURL("http://myhost/")
.remoteAddr("2.2.2.2").remotePort(0)
)
);
}
@ParameterizedTest
@MethodSource("customHeaderNameRequestCases")
public void testCustomHeaderName(Request request, Expectations expectations) throws Exception
{
request.configure(customizer);
String rawRequest = request.getRawRequest((header) -> header);
// System.out.println(rawRequest);
HttpTester.Response response = HttpTester.parseResponse(connector.getResponse(rawRequest));
assertThat("status", response.getStatus(), is(200));
expectations.accept(actual);
}
private static class Request
{
String description;