Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-01 11:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

Browse Source
This commit is contained in:
Joakim Erdfelt 2020-09-09 11:40:00 -05:00
commit fc0683ac17
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,16 +605,18 @@ public class ForwardedRequestCustomizer implements Customizer
@SuppressWarnings("unused") @SuppressWarnings("unused")
public void handleHost(HttpField field) public void handleHost(HttpField field)
{ {
HostPort hostField = new HostPort(getLeftMost(field.getValue()));
if (getForwardedPortAsAuthority() && !StringUtil.isEmpty(getForwardedPortHeader())) if (getForwardedPortAsAuthority() && !StringUtil.isEmpty(getForwardedPortHeader()))
{ {
if (_host == null) if (_host == null)
_host = new PossiblyPartialHostPort(getLeftMost(field.getValue())); _host = new PossiblyPartialHostPort(hostField.getHost(), hostField.getPort());
else if (_host instanceof PortSetHostPort) else if (_host instanceof PortSetHostPort)
_host = new HostPort(HostPort.normalizeHost(getLeftMost(field.getValue())), _host.getPort()); _host = new HostPort(hostField.getHost(), hostField.getPort() > 0 ? hostField.getPort() : _host.getPort());
} }
else if (_host == null) else if (_host == null)
{ {
_host = new HostPort(getLeftMost(field.getValue())); _host = hostField;
} }
} }

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

@ -497,7 +497,67 @@ public class ForwardedRequestCustomizerTest
.requestURL("http://fw.example.com:4333/") .requestURL("http://fw.example.com:4333/")
.remoteAddr("8.5.4.3").remotePort(2222) .remoteAddr("8.5.4.3").remotePort(2222)
), ),
Arguments.of(new Request("X-Forwarded-* (Multiple Ports)")
.headers(
"GET / HTTP/1.1",
"Host: myhost:10001",
"X-Forwarded-For: 127.0.0.1:8888,127.0.0.2:9999",
"X-Forwarded-Port: 10002",
"X-Forwarded-Proto: https",
"X-Forwarded-Host: sub1.example.com:10003",
"X-Forwarded-Server: sub2.example.com"
),
new Expectations()
.scheme("https").serverName("sub1.example.com").serverPort(10003)
.requestURL("https://sub1.example.com:10003/")
.remoteAddr("127.0.0.1").remotePort(8888)
),
Arguments.of(new Request("X-Forwarded-* (Multiple Ports - Server First)")
.headers(
"GET / HTTP/1.1",
"X-Forwarded-Server: sub2.example.com:10007",
"Host: myhost:10001",
"X-Forwarded-For: 127.0.0.1:8888,127.0.0.2:9999",
"X-Forwarded-Proto: https",
"X-Forwarded-Port: 10002",
"X-Forwarded-Host: sub1.example.com:10003"
),
new Expectations()
.scheme("https").serverName("sub1.example.com").serverPort(10003)
.requestURL("https://sub1.example.com:10003/")
.remoteAddr("127.0.0.1").remotePort(8888)
),
Arguments.of(new Request("X-Forwarded-* (Multiple Ports - setForwardedPortAsAuthority = false)")
.configureCustomizer((customizer) -> customizer.setForwardedPortAsAuthority(false))
.headers(
"GET / HTTP/1.1",
"Host: myhost:10001",
"X-Forwarded-For: 127.0.0.1:8888,127.0.0.2:9999",
"X-Forwarded-Port: 10002",
"X-Forwarded-Proto: https",
"X-Forwarded-Host: sub1.example.com:10003",
"X-Forwarded-Server: sub2.example.com"
),
new Expectations()
.scheme("https").serverName("sub1.example.com").serverPort(10003)
.requestURL("https://sub1.example.com:10003/")
.remoteAddr("127.0.0.1").remotePort(8888)
),
Arguments.of(new Request("X-Forwarded-* (Multiple Ports Alt Order)")
.headers(
"GET / HTTP/1.1",
"Host: myhost:10001",
"X-Forwarded-For: 127.0.0.1:8888,127.0.0.2:9999",
"X-Forwarded-Proto: https",
"X-Forwarded-Host: sub1.example.com:10003",
"X-Forwarded-Port: 10002",
"X-Forwarded-Server: sub2.example.com"
),
new Expectations()
.scheme("https").serverName("sub1.example.com").serverPort(10003)
.requestURL("https://sub1.example.com:10003/")
.remoteAddr("127.0.0.1").remotePort(8888)
),
// ================================================================= // =================================================================
// Mixed Behavior // Mixed Behavior
Arguments.of(new Request("RFC7239 mixed with X-Forwarded-* headers") Arguments.of(new Request("RFC7239 mixed with X-Forwarded-* headers")
@ -585,7 +645,6 @@ public class ForwardedRequestCustomizerTest
@ParameterizedTest(name = "{0}") @ParameterizedTest(name = "{0}")
@MethodSource("cases") @MethodSource("cases")
@SuppressWarnings("unused")
public void testDefaultBehavior(Request request, Expectations expectations) throws Exception public void testDefaultBehavior(Request request, Expectations expectations) throws Exception
{ {
request.configure(customizer); request.configure(customizer);
@ -601,7 +660,6 @@ public class ForwardedRequestCustomizerTest
@ParameterizedTest(name = "{0}") @ParameterizedTest(name = "{0}")
@MethodSource("cases") @MethodSource("cases")
@SuppressWarnings("unused")
public void testConfiguredBehavior(Request request, Expectations expectations) throws Exception public void testConfiguredBehavior(Request request, Expectations expectations) throws Exception
{ {
request.configure(customizerConfigured); request.configure(customizerConfigured);