root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix ForwardedHeaderFilter with non-empty contextPath 

Issue: SPR-15088
This commit is contained in:
Rob Winch 2017-01-03 14:48:00 -06:00
parent e78ea34711
commit df98d304fd
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
View File

@ -262,7 +262,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
// Relative to Servlet container root or to current request // Relative to Servlet container root or to current request
String path; String path;
if (location.startsWith(FOLDER_SEPARATOR)) { if (location.startsWith(FOLDER_SEPARATOR)) {
path = this.request.getContextPath() + location; path = location;
} }
else { else {
path = StringUtils.applyRelativePath(this.request.getRequestURI(), location); path = StringUtils.applyRelativePath(this.request.getRequestURI(), location);

25
spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java
View File

@ -240,33 +240,10 @@ public class ForwardedHeaderFilterTests {
this.request.addHeader(X_FORWARDED_PORT, "443"); this.request.addHeader(X_FORWARDED_PORT, "443");
this.request.setContextPath("/context"); this.request.setContextPath("/context");
String redirectedUrl = sendRedirect("/foo/bar"); String redirectedUrl = sendRedirect("/context/foo/bar");
assertEquals("https://example.com/context/foo/bar", redirectedUrl); assertEquals("https://example.com/context/foo/bar", redirectedUrl);
} }
@Test
public void sendRedirectWithXForwardedPrefix() throws Exception {
this.request.addHeader(X_FORWARDED_PROTO, "https");
this.request.addHeader(X_FORWARDED_HOST, "example.com");
this.request.addHeader(X_FORWARDED_PORT, "443");
this.request.addHeader(X_FORWARDED_PREFIX, "/prefix");
String redirectedUrl = sendRedirect("/foo/bar");
assertEquals("https://example.com/prefix/foo/bar", redirectedUrl);
}
@Test
public void sendRedirectWithXForwardedPrefixAndContextPath() throws Exception {
this.request.addHeader(X_FORWARDED_PROTO, "https");
this.request.addHeader(X_FORWARDED_HOST, "example.com");
this.request.addHeader(X_FORWARDED_PORT, "443");
this.request.addHeader(X_FORWARDED_PREFIX, "/prefix");
this.request.setContextPath("/context");
String redirectedUrl = sendRedirect("/foo/bar");
assertEquals("https://example.com/prefix/foo/bar", redirectedUrl);
}
@Test @Test
public void sendRedirectWithRelativePath() throws Exception { public void sendRedirectWithRelativePath() throws Exception {
this.request.addHeader(X_FORWARDED_PROTO, "https"); this.request.addHeader(X_FORWARDED_PROTO, "https");