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

UriComponentsBuilder.fromHttpRequest sets port correctly

Browse Source 
Cherry-picked from commit d64c48 on master

Issue: SPR-12771
This commit is contained in:
Rossen Stoyanchev
2015-03-05 21:52:27 -05:00
parent 3783591083
commit 410fc6d763
3 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
View File

@@ -307,6 +307,7 @@ public class UriComponentsBuilder implements Cloneable {
builder.scheme(scheme);
builder.host(host);
builder.port(null);
if (scheme.equals("http") && port != 80 || scheme.equals("https") && port != 443) {
builder.port(port);
}

20
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
View File

@@ -256,6 +256,26 @@ public class UriComponentsBuilderTests {
assertEquals("a=1", result.getQuery());
}
// SPR-12771
@Test
public void fromHttpRequestResetsPortBeforeSettingIt() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("X-Forwarded-Proto", "https");
request.addHeader("X-Forwarded-Host", "84.198.58.199");
request.addHeader("X-Forwarded-Port", 443);
request.setScheme("http");
request.setServerName("example.com");
request.setServerPort(80);
request.setRequestURI("/rest/mobile/users/1");
UriComponents result = UriComponentsBuilder.fromHttpRequest(new ServletServerHttpRequest(request)).build();
assertEquals("https", result.getScheme());
assertEquals("84.198.58.199", result.getHost());
assertEquals(-1, result.getPort());
assertEquals("/rest/mobile/users/1", result.getPath());
}
@Test
public void path() throws URISyntaxException {
UriComponentsBuilder builder = UriComponentsBuilder.fromPath("/foo/bar");