Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#170 - LinkBuilder takes X-Forwarded-Port header into account if present.

Browse Source 
ControllerLinkBuilder now inspects the X-Forwarded-Port and uses that if present. If an X-Forwarded-Host header doesn't contain a :, we now also reset the port to prevent the local one from leaking into links generated.
This commit is contained in:
Vladimir Lyubitelev
2014-04-15 12:12:36 +02:00
committed by Oliver Gierke
parent eafbda0c8a
commit 2c6fa4d1b3
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
View File

@@ -174,13 +174,13 @@ public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuil
builder.scheme("https");
}
String header = request.getHeader("X-Forwarded-Host");
String host = request.getHeader("X-Forwarded-Host");
if (!StringUtils.hasText(header)) {
if (!StringUtils.hasText(host)) {
return builder;
}
String[] hosts = StringUtils.commaDelimitedListToStringArray(header);
String[] hosts = StringUtils.commaDelimitedListToStringArray(host);
String hostToUse = hosts[0];
if (hostToUse.contains(":")) {
@@ -192,6 +192,13 @@ public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuil
} else {
builder.host(hostToUse);
builder.port(-1); // reset port if it was forwarded from default port
}
String port = request.getHeader("X-Forwarded-Port");
if (StringUtils.hasText(port)) {
builder.port(Integer.parseInt(port));
}
return builder;