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

Consistently remove forwarded headers in WebFlux 

Preparation for SPR-17072
This commit is contained in:
Rossen Stoyanchev 2018-07-24 14:59:57 -04:00
parent 41aa4218af
commit 2e4f5a7923
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ public class ForwardedHeaderFilter implements WebFilter {
builder.path(prefix + uri.getPath()); builder.path(prefix + uri.getPath());
builder.contextPath(prefix); builder.contextPath(prefix);
} }
removeForwardedHeaders(builder);
}) })
.build(); .build();
} }

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

@ -74,6 +74,7 @@ public class ForwardedHeaderFilterTests {
this.filter.filter(getExchange(headers), this.filterChain).block(Duration.ZERO); this.filter.filter(getExchange(headers), this.filterChain).block(Duration.ZERO);
assertEquals(new URI("https://84.198.58.199/path"), this.filterChain.uri); assertEquals(new URI("https://84.198.58.199/path"), this.filterChain.uri);
this.filterChain.assertForwardedHeadersRemoved();
} }
@Test @Test
@ -83,6 +84,7 @@ public class ForwardedHeaderFilterTests {
this.filter.filter(getExchange(headers), this.filterChain).block(Duration.ZERO); this.filter.filter(getExchange(headers), this.filterChain).block(Duration.ZERO);
assertEquals(new URI("https://84.198.58.199/path"), this.filterChain.uri); assertEquals(new URI("https://84.198.58.199/path"), this.filterChain.uri);
this.filterChain.assertForwardedHeadersRemoved();
} }
@Test @Test
@ -93,6 +95,7 @@ public class ForwardedHeaderFilterTests {
assertEquals(new URI("http://example.com/prefix/path"), this.filterChain.uri); assertEquals(new URI("http://example.com/prefix/path"), this.filterChain.uri);
assertEquals("/prefix/path", this.filterChain.requestPathValue); assertEquals("/prefix/path", this.filterChain.requestPathValue);
this.filterChain.assertForwardedHeadersRemoved();
} }
@Test @Test
@ -103,6 +106,7 @@ public class ForwardedHeaderFilterTests {
assertEquals(new URI("http://example.com/prefix/path"), this.filterChain.uri); assertEquals(new URI("http://example.com/prefix/path"), this.filterChain.uri);
assertEquals("/prefix/path", this.filterChain.requestPathValue); assertEquals("/prefix/path", this.filterChain.requestPathValue);
this.filterChain.assertForwardedHeadersRemoved();
} }
private MockServerWebExchange getExchange(HttpHeaders headers) { private MockServerWebExchange getExchange(HttpHeaders headers) {