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

ForwardedHeaderFilter supports ERROR requestUri attribute

Browse Source 
Closes gh-30828
This commit is contained in:
rstoyanchev
2023-11-30 13:10:06 +00:00
parent 19bca03aa2
commit 8090a52f5c
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.web.testfixture.servlet.MockFilterChain;
import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
import org.springframework.web.util.WebUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -187,7 +188,7 @@ public class ForwardedHeaderFilterTests {
}
@Test // SPR-16983
public void forwardedRequestWithServletForward() throws Exception {
public void forwardedRequestWithForwardDispatch() throws Exception {
this.request.setRequestURI("/foo");
this.request.addHeader(X_FORWARDED_PROTO, "https");
this.request.addHeader(X_FORWARDED_HOST, "www.mycompany.example");
@@ -208,6 +209,26 @@ public class ForwardedHeaderFilterTests {
assertThat(actual.getRequestURL().toString()).isEqualTo("https://www.mycompany.example/bar");
}
@Test // gh-30828
public void forwardedRequestWithErrorDispatch() throws Exception {
this.request.setRequestURI("/foo");
this.request.setDispatcherType(DispatcherType.ERROR);
this.request.addHeader(X_FORWARDED_PROTO, "https");
this.request.addHeader(X_FORWARDED_HOST, "www.mycompany.example");
this.request.addHeader(X_FORWARDED_PORT, "443");
this.request.addHeader(X_FORWARDED_PREFIX, "/app");
this.request.setAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE, "/foo");
this.filter.doFilter(this.request, new MockHttpServletResponse(), this.filterChain);
HttpServletRequest wrappedRequest = (HttpServletRequest) this.filterChain.getRequest();
assertThat(wrappedRequest).isNotNull();
assertThat(wrappedRequest.getRequestURI()).isEqualTo("/app/foo");
assertThat(wrappedRequest.getRequestURL().toString()).isEqualTo("https://www.mycompany.example/app/foo");
assertThat(wrappedRequest.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).isEqualTo("/app/foo");
}
@Nested
class ForwardedPrefix {