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

ForwardedHeaderFilter works with Servlet FORWARD

Browse Source 
Issue: SPR-16983
This commit is contained in:
Rossen Stoyanchev
2018-10-23 11:52:09 -04:00
parent 51bb96db47
commit feeec344e5
2 changed files with 135 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,9 @@
package org.springframework.web.filter;
import java.io.IOException;
import java.net.URI;
import java.util.Enumeration;
import javax.servlet.DispatcherType;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
@@ -308,6 +310,28 @@ public class ForwardedHeaderFilterTests {
assertEquals("bar", actual.getHeader("foo"));
}
@Test // SPR-16983
public void forwardedRequestWithServletForward() throws Exception {
this.request.setRequestURI("/foo");
this.request.addHeader(X_FORWARDED_PROTO, "https");
this.request.addHeader(X_FORWARDED_HOST, "www.mycompany.com");
this.request.addHeader(X_FORWARDED_PORT, "443");
this.filter.doFilter(this.request, new MockHttpServletResponse(), this.filterChain);
HttpServletRequest wrappedRequest = (HttpServletRequest) this.filterChain.getRequest();
this.request.setDispatcherType(DispatcherType.FORWARD);
this.request.setRequestURI("/bar");
this.filterChain.reset();
this.filter.doFilter(wrappedRequest, new MockHttpServletResponse(), this.filterChain);
HttpServletRequest actual = (HttpServletRequest) this.filterChain.getRequest();
assertNotNull(actual);
assertEquals("/bar", actual.getRequestURI());
assertEquals("https://www.mycompany.com/bar", actual.getRequestURL().toString());
}
@Test
public void requestUriWithForwardedPrefix() throws Exception {
this.request.addHeader(X_FORWARDED_PREFIX, "/prefix");