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

Issue #5417 - Honoring implied ports on ForwardedRequestCustomizer better 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2020-10-09 09:54:57 -05:00
parent ef0618489a
commit 149f389fd8
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 77 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,12 +512,7 @@ public class ForwardedRequestCustomizer implements Customizer
{
port = requestURI.getPort();
}
if (port == MutableHostPort.IMPLIED) // is implied
{
// get Implied port (from protocol / scheme) and HttpConfiguration
int defaultPort = 80;
port = proto.equalsIgnoreCase(config.getSecureScheme()) ? getSecurePort(config) : defaultPort;
}
// if (port == MutableHostPort.IMPLIED) // is implied, no port change needed
// Update authority if different from metadata
if (!host.equalsIgnoreCase(requestURI.getHost()) ||

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

@ -46,8 +46,10 @@ public class ForwardedRequestCustomizerTest
private Server server;
private RequestHandler handler;
private LocalConnector connector;
private LocalConnector connectorAlt;
private LocalConnector connectorConfigured;
private ForwardedRequestCustomizer customizer;
private ForwardedRequestCustomizer customizerAlt;
private ForwardedRequestCustomizer customizerConfigured;
private static class Actual
@ -82,6 +84,15 @@ public class ForwardedRequestCustomizerTest
connector = new LocalConnector(server, http);
server.addConnector(connector);
// Alternate behavior Connector
HttpConnectionFactory httpAlt = new HttpConnectionFactory();
httpAlt.setInputBufferSize(1024);
httpAlt.getHttpConfiguration().setSecurePort(8443);
customizerAlt = new ForwardedRequestCustomizer();
httpAlt.getHttpConfiguration().addCustomizer(customizerAlt);
connectorAlt = new LocalConnector(server, httpAlt);
server.addConnector(connectorAlt);
// Configured behavior Connector
http = new HttpConnectionFactory();
http.setInputBufferSize(1024);
@ -783,6 +794,71 @@ public class ForwardedRequestCustomizerTest
expectations.accept(actual);
}
public static Stream<Arguments> nonStandardPortCases()
{
return Stream.of(
// RFC7239 Tests with https.
Arguments.of(new Request("RFC7239 with https and h2")
.headers(
"GET /test/forwarded.jsp HTTP/1.1",
"Host: web.euro.de",
"Forwarded: for=192.168.2.6;host=web.euro.de;proto=https;proto-version=h2"
// Client: https://web.euro.de/test/forwarded.jsp
),
new Expectations()
.scheme("https").serverName("web.euro.de").serverPort(443)
.requestURL("https://web.euro.de/test/forwarded.jsp")
.remoteAddr("192.168.2.6").remotePort(0)
),
// RFC7239 Tests with https and proxy provided port
Arguments.of(new Request("RFC7239 with proxy provided port on https and h2")
.headers(
"GET /test/forwarded.jsp HTTP/1.1",
"Host: web.euro.de:9443",
"Forwarded: for=192.168.2.6;host=web.euro.de:9443;proto=https;proto-version=h2"
// Client: https://web.euro.de:9443/test/forwarded.jsp
),
new Expectations()
.scheme("https").serverName("web.euro.de").serverPort(9443)
.requestURL("https://web.euro.de:9443/test/forwarded.jsp")
.remoteAddr("192.168.2.6").remotePort(0)
),
// RFC7239 Tests with https, no port in Host, but proxy provided port
Arguments.of(new Request("RFC7239 with client provided host and different proxy provided port on https and h2")
.headers(
"GET /test/forwarded.jsp HTTP/1.1",
"Host: web.euro.de",
"Forwarded: for=192.168.2.6;host=new.euro.de:7443;proto=https;proto-version=h2"
// Client: https://web.euro.de/test/forwarded.jsp
// Proxy Requests: https://new.euro.de/test/forwarded.jsp
),
new Expectations()
.scheme("https").serverName("new.euro.de").serverPort(7443)
.requestURL("https://new.euro.de:7443/test/forwarded.jsp")
.remoteAddr("192.168.2.6").remotePort(0)
)
);
}
/**
* Tests against a Connector with a HttpConfiguration on non-standard ports.
* HttpConfiguration is set to securePort of 8443
*/
@ParameterizedTest(name = "{0}")
@MethodSource("nonStandardPortCases")
public void testNonStandardPortBehavior(Request request, Expectations expectations) throws Exception
{
request.configure(customizerAlt);
String rawRequest = request.getRawRequest((header) -> header);
// System.out.println(rawRequest);
HttpTester.Response response = HttpTester.parseResponse(connectorAlt.getResponse(rawRequest));
assertThat("status", response.getStatus(), is(200));
expectations.accept(actual);
}
@Test
public void testBadInput() throws Exception
{