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

Check X-Forwarded-Host in ServletUriComponentsBuilder

Browse Source 
Issue: SPR-11855
This commit is contained in:
Rossen Stoyanchev
2014-06-11 22:40:48 -04:00
parent c809143cc4
commit 9f4d4d1829
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 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.
@@ -24,8 +24,12 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.util.UriComponents;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
* Unit tests for
* {@link org.springframework.web.servlet.support.ServletUriComponentsBuilder}.
*
* @author Rossen Stoyanchev
*/
public class ServletUriComponentsBuilderTests {
@@ -85,7 +89,7 @@ public class ServletUriComponentsBuilderTests {
}
@Test
public void fromRequestWithForwardedHostHeader() {
public void fromRequestWithForwardedHost() {
request.addHeader("X-Forwarded-Host", "anotherHost");
request.setRequestURI("/mvc-showcase/data/param");
request.setQueryString("foo=123");
@@ -97,7 +101,7 @@ public class ServletUriComponentsBuilderTests {
// SPR-10701
@Test
public void fromRequestWithForwardedHostAndPortHeader() {
public void fromRequestWithForwardedHostIncludingPort() {
request.addHeader("X-Forwarded-Host", "webtest.foo.bar.com:443");
request.setRequestURI("/mvc-showcase/data/param");
request.setQueryString("foo=123");
@@ -116,6 +120,19 @@ public class ServletUriComponentsBuilderTests {
assertEquals("a.example.org", ServletUriComponentsBuilder.fromRequest(this.request).build().getHost());
}
// SPR-11855
@Test
public void fromRequestWithForwardedHostAndPort() {
this.request.addHeader("X-Forwarded-Host", "foobarhost");
this.request.addHeader("X-Forwarded-Port", "9090");
this.request.setServerPort(8080);
UriComponents uriComponents = ServletUriComponentsBuilder.fromRequest(this.request).build();
assertEquals("foobarhost", uriComponents.getHost());
assertEquals(9090, uriComponents.getPort());
}
@Test
public void fromContextPath() {
request.setRequestURI("/mvc-showcase/data/param");