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

SecurityContextRepositoryServerWebExchange defaults to principal 

This is necessary for the test support to work

Issue gh-4343
This commit is contained in:
Rob Winch 2017-05-19 14:35:57 -05:00
parent 3c7c256fc9
commit 7b703a3b98
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webflux/src/main/java/org/springframework/security/web/server/context/SecurityContextRepositoryServerWebExchange.java
View File

@ -43,6 +43,7 @@ final class SecurityContextRepositoryServerWebExchange extends ServerWebExchange
this.repository.load(this) this.repository.load(this)
.filter(c -> c.getAuthentication() != null) .filter(c -> c.getAuthentication() != null)
.flatMap(c -> Mono.just((T) c.getAuthentication())) .flatMap(c -> Mono.just((T) c.getAuthentication()))
.switchIfEmpty( super.getPrincipal() )
); );
} }
} }

27
webflux/src/test/java/org/springframework/security/web/server/context/SecurityContextRepositoryWebFilterTests.java
View File

@ -24,11 +24,15 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest; import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextImpl;
import org.springframework.security.test.web.reactive.server.WebTestHandler; import org.springframework.security.test.web.reactive.server.WebTestHandler;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.security.Principal; import java.security.Principal;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
@ -39,6 +43,9 @@ import static org.mockito.Mockito.*;
*/ */
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class SecurityContextRepositoryWebFilterTests { public class SecurityContextRepositoryWebFilterTests {
@Mock
Authentication principal;
@Mock @Mock
SecurityContextRepository repository; SecurityContextRepository repository;
@ -80,13 +87,29 @@ public class SecurityContextRepositoryWebFilterTests {
verifyZeroInteractions(repository); verifyZeroInteractions(repository);
} }
// We must use the original principal if the result is empty for test support to work
@Test @Test
public void filterWhenGetPrincipalThenInteract() { public void filterWhenEmptyAndGetPrincipalThenInteractAndUseOriginalPrincipal() {
when(repository.load(any())).thenReturn(Mono.empty()); when(repository.load(any())).thenReturn(Mono.empty());
filters = WebTestHandler.bindToWebFilters(filter, (e,c) -> e.getPrincipal().flatMap( p-> c.filter(e))) ; filters = WebTestHandler.bindToWebFilters(filter, (e,c) -> e.getPrincipal().flatMap( p-> c.filter(e))) ;
filters.exchange(exchange); ServerWebExchange exchangeWithPrincipal = this.exchange.toExchange().mutate().principal(Mono.just(principal)).build();
WebTestHandler.WebHandlerResult result = filters.exchange(exchangeWithPrincipal);
verify(repository).load(any()); verify(repository).load(any());
assertThat(result.getExchange().getPrincipal().block()).isSameAs(principal);
}
@Test
public void filterWhenPrincipalAndGetPrincipalThenInteractAndUseOriginalPrincipal() {
SecurityContextImpl context = new SecurityContextImpl();
context.setAuthentication(principal);
when(repository.load(any())).thenReturn(Mono.just(context));
filters = WebTestHandler.bindToWebFilters(filter, (e,c) -> e.getPrincipal().flatMap( p-> c.filter(e))) ;
WebTestHandler.WebHandlerResult result = filters.exchange(exchange);
verify(repository).load(any());
assertThat(result.getExchange().getPrincipal().block()).isSameAs(principal);
} }
} }