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

UriComponentsBuilder.fromHttpRequest sets port correctly

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

22
spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,15 +36,18 @@ public class ServletUriComponentsBuilderTests {
private MockHttpServletRequest request;
@Before
public void setup() {
this.request = new MockHttpServletRequest();
this.request.setScheme("http");
this.request.setServerName("localhost");
this.request.setServerPort(-1);
this.request.setRequestURI("/mvc-showcase");
this.request.setContextPath("/mvc-showcase");
}
@Test
public void fromRequest() {
this.request.setRequestURI("/mvc-showcase/data/param");
@@ -64,7 +67,7 @@ public class ServletUriComponentsBuilderTests {
public void fromRequestAtypicalHttpPort() {
this.request.setServerPort(8080);
String result = ServletUriComponentsBuilder.fromRequest(this.request).build().toUriString();
assertEquals("http://localhost:8080", result);
assertEquals("http://localhost:8080/mvc-showcase", result);
}
@Test
@@ -72,7 +75,7 @@ public class ServletUriComponentsBuilderTests {
this.request.setScheme("https");
this.request.setServerPort(9043);
String result = ServletUriComponentsBuilder.fromRequest(this.request).build().toUriString();
assertEquals("https://localhost:9043", result);
assertEquals("https://localhost:9043/mvc-showcase", result);
}
@Test
@@ -150,6 +153,19 @@ public class ServletUriComponentsBuilderTests {
assertEquals("should have used the default port of the forwarded request", -1, result.getPort());
}
// SPR-12771
@Test
public void fromRequestWithForwardedProtoAndDefaultPort() {
this.request.addHeader("X-Forwarded-Proto", "https");
this.request.addHeader("X-Forwarded-Host", "84.198.58.199");
this.request.addHeader("X-Forwarded-Port", "443");
this.request.setServerPort(80);
UriComponents result = ServletUriComponentsBuilder.fromRequest(this.request).build();
assertEquals("https://84.198.58.199/mvc-showcase", result.toString());
}
@Test
public void fromRequestWithForwardedPrefix() {
this.request.setRequestURI("/bar");