Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added methods to add filter relatively in ServerHttpSecurity 

Addition of two new methods addFilterBefore and addFilterAfter in
ServerHttpSecurity to allow addition of WebFilter before and after of
specified order

Fixes: gh-6138
This commit is contained in:
Ankur Pathak 2018-11-30 12:34:10 +05:30 committed by Rob Winch
parent 3c35f4cfab
commit 8b3fb55aea
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
View File

@ -288,6 +288,32 @@ public class ServerHttpSecurity {
return this;
}
/**
* Adds a {@link WebFilter} before specific position.
* @param webFilter the {@link WebFilter} to add
* @param order the place before which to insert the {@link WebFilter}
* @return the {@link ServerHttpSecurity} to continue configuring
* @since 5.2.0
* @author Ankur Pathak
*/
public ServerHttpSecurity addFilterBefore(WebFilter webFilter, SecurityWebFiltersOrder order) {
this.webFilters.add(new OrderedWebFilter(webFilter, order.getOrder() - 1));
return this;
}
/**
* Adds a {@link WebFilter} after specific position.
* @param webFilter the {@link WebFilter} to add
* @param order the place after which to insert the {@link WebFilter}
* @return the {@link ServerHttpSecurity} to continue configuring
* @since 5.2.0
* @author Ankur Pathak
*/
public ServerHttpSecurity addFilterAfter(WebFilter webFilter, SecurityWebFiltersOrder order) {
this.webFilters.add(new OrderedWebFilter(webFilter, order.getOrder() + 1));
return this;
}
/**
* Gets the ServerExchangeMatcher that determines which requests apply to this HttpSecurity instance.
* @return the ServerExchangeMatcher that determines which requests apply to this HttpSecurity instance.

34
config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java
View File

@ -34,6 +34,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.security.web.server.context.SecurityContextServerWebExchangeWebFilter;
import org.springframework.web.server.WebFilterChain;
import reactor.core.publisher.Mono;
import reactor.test.publisher.TestPublisher;
@ -190,6 +192,30 @@ public class ServerHttpSecurityTests {
.isEqualTo(Arrays.asList(SecurityContextServerLogoutHandler.class, CsrfServerLogoutHandler.class));
}
@Test
@SuppressWarnings("unchecked")
public void addFilterAfterIsApplied(){
SecurityWebFilterChain securityWebFilterChain = this.http.addFilterAfter(new TestWebFilter(), SecurityWebFiltersOrder.SECURITY_CONTEXT_SERVER_WEB_EXCHANGE).build();
List filters = securityWebFilterChain.getWebFilters().map(WebFilter::getClass).collectList().block();
assertThat(filters).isNotNull()
.isNotEmpty()
.containsSequence(SecurityContextServerWebExchangeWebFilter.class, TestWebFilter.class);
}
@Test
@SuppressWarnings("unchecked")
public void addFilterBeforeIsApplied(){
SecurityWebFilterChain securityWebFilterChain = this.http.addFilterBefore(new TestWebFilter(), SecurityWebFiltersOrder.SECURITY_CONTEXT_SERVER_WEB_EXCHANGE).build();
List filters = securityWebFilterChain.getWebFilters().map(WebFilter::getClass).collectList().block();
assertThat(filters).isNotNull()
.isNotEmpty()
.containsSequence(TestWebFilter.class, SecurityContextServerWebExchangeWebFilter.class);
}
private <T extends WebFilter> Optional<T> getWebFilter(SecurityWebFilterChain filterChain, Class<T> filterClass) {
return (Optional<T>) filterChain.getWebFilters()
.filter(Objects::nonNull)
@ -214,4 +240,12 @@ public class ServerHttpSecurityTests {
.map(e -> e.getRequest().getPath().pathWithinApplication().value());
}
}
private static class TestWebFilter implements WebFilter {
@Override
public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
return chain.filter(exchange);
}
}
}