Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 14:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Reactor Refactor

Browse Source 
- contextStart -> subscriberContext
This commit is contained in:
Rob Winch 2017-08-29 08:24:35 -05:00
parent b6212cba66
commit c4917f359a
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java
View File

@ -89,7 +89,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.just("result")); when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.just("result"));
Mono<String> findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L) Mono<String> findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L)
.contextStart(withAdmin); .subscriberContext(withAdmin);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("result") .expectNext("result")
@ -114,7 +114,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.from(result)); when(this.delegate.monoPreAuthorizeHasRoleFindById(1L)).thenReturn(Mono.from(result));
Mono<String> findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L) Mono<String> findById = this.messageService.monoPreAuthorizeHasRoleFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -128,7 +128,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.monoPreAuthorizeBeanFindById(2L)).thenReturn(Mono.just("result")); when(this.delegate.monoPreAuthorizeBeanFindById(2L)).thenReturn(Mono.just("result"));
Mono<String> findById = this.messageService.monoPreAuthorizeBeanFindById(2L) Mono<String> findById = this.messageService.monoPreAuthorizeBeanFindById(2L)
.contextStart(withAdmin); .subscriberContext(withAdmin);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("result") .expectNext("result")
@ -164,7 +164,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.monoPreAuthorizeBeanFindById(1L)).thenReturn(Mono.from(result)); when(this.delegate.monoPreAuthorizeBeanFindById(1L)).thenReturn(Mono.from(result));
Mono<String> findById = this.messageService.monoPreAuthorizeBeanFindById(1L) Mono<String> findById = this.messageService.monoPreAuthorizeBeanFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -178,7 +178,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.monoPostAuthorizeFindById(1L)).thenReturn(Mono.just("user")); when(this.delegate.monoPostAuthorizeFindById(1L)).thenReturn(Mono.just("user"));
Mono<String> findById = this.messageService.monoPostAuthorizeFindById(1L) Mono<String> findById = this.messageService.monoPostAuthorizeFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("user") .expectNext("user")
@ -190,7 +190,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.monoPostAuthorizeBeanFindById(1L)).thenReturn(Mono.just("not-authorized")); when(this.delegate.monoPostAuthorizeBeanFindById(1L)).thenReturn(Mono.just("not-authorized"));
Mono<String> findById = this.messageService.monoPostAuthorizeBeanFindById(1L) Mono<String> findById = this.messageService.monoPostAuthorizeBeanFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -202,7 +202,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.monoPostAuthorizeBeanFindById(2L)).thenReturn(Mono.just("user")); when(this.delegate.monoPostAuthorizeBeanFindById(2L)).thenReturn(Mono.just("user"));
Mono<String> findById = this.messageService.monoPostAuthorizeBeanFindById(2L) Mono<String> findById = this.messageService.monoPostAuthorizeBeanFindById(2L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("user") .expectNext("user")
@ -225,7 +225,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.monoPostAuthorizeBeanFindById(1L)).thenReturn(Mono.just("not-authorized")); when(this.delegate.monoPostAuthorizeBeanFindById(1L)).thenReturn(Mono.just("not-authorized"));
Mono<String> findById = this.messageService.monoPostAuthorizeBeanFindById(1L) Mono<String> findById = this.messageService.monoPostAuthorizeBeanFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -257,7 +257,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.just("result")); when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.just("result"));
Flux<String> findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L) Flux<String> findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L)
.contextStart(withAdmin); .subscriberContext(withAdmin);
StepVerifier StepVerifier
.create(findById) .create(findById)
.consumeNextWith( s -> AssertionsForClassTypes.assertThat(s).isEqualTo("result")) .consumeNextWith( s -> AssertionsForClassTypes.assertThat(s).isEqualTo("result"))
@ -282,7 +282,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.from(result)); when(this.delegate.fluxPreAuthorizeHasRoleFindById(1L)).thenReturn(Flux.from(result));
Flux<String> findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L) Flux<String> findById = this.messageService.fluxPreAuthorizeHasRoleFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -296,7 +296,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.fluxPreAuthorizeBeanFindById(2L)).thenReturn(Flux.just("result")); when(this.delegate.fluxPreAuthorizeBeanFindById(2L)).thenReturn(Flux.just("result"));
Flux<String> findById = this.messageService.fluxPreAuthorizeBeanFindById(2L) Flux<String> findById = this.messageService.fluxPreAuthorizeBeanFindById(2L)
.contextStart(withAdmin); .subscriberContext(withAdmin);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("result") .expectNext("result")
@ -332,7 +332,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.fluxPreAuthorizeBeanFindById(1L)).thenReturn(Flux.from(result)); when(this.delegate.fluxPreAuthorizeBeanFindById(1L)).thenReturn(Flux.from(result));
Flux<String> findById = this.messageService.fluxPreAuthorizeBeanFindById(1L) Flux<String> findById = this.messageService.fluxPreAuthorizeBeanFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -346,7 +346,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.fluxPostAuthorizeFindById(1L)).thenReturn(Flux.just("user")); when(this.delegate.fluxPostAuthorizeFindById(1L)).thenReturn(Flux.just("user"));
Flux<String> findById = this.messageService.fluxPostAuthorizeFindById(1L) Flux<String> findById = this.messageService.fluxPostAuthorizeFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("user") .expectNext("user")
@ -358,7 +358,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.fluxPostAuthorizeBeanFindById(1L)).thenReturn(Flux.just("not-authorized")); when(this.delegate.fluxPostAuthorizeBeanFindById(1L)).thenReturn(Flux.just("not-authorized"));
Flux<String> findById = this.messageService.fluxPostAuthorizeBeanFindById(1L) Flux<String> findById = this.messageService.fluxPostAuthorizeBeanFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -370,7 +370,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.fluxPostAuthorizeBeanFindById(2L)).thenReturn(Flux.just("user")); when(this.delegate.fluxPostAuthorizeBeanFindById(2L)).thenReturn(Flux.just("user"));
Flux<String> findById = this.messageService.fluxPostAuthorizeBeanFindById(2L) Flux<String> findById = this.messageService.fluxPostAuthorizeBeanFindById(2L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("user") .expectNext("user")
@ -393,7 +393,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.fluxPostAuthorizeBeanFindById(1L)).thenReturn(Flux.just("not-authorized")); when(this.delegate.fluxPostAuthorizeBeanFindById(1L)).thenReturn(Flux.just("not-authorized"));
Flux<String> findById = this.messageService.fluxPostAuthorizeBeanFindById(1L) Flux<String> findById = this.messageService.fluxPostAuthorizeBeanFindById(1L)
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -425,7 +425,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(publisherJust("result")); when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(publisherJust("result"));
Publisher<String> findById = Flux.from(this.messageService.publisherPreAuthorizeHasRoleFindById(1L)) Publisher<String> findById = Flux.from(this.messageService.publisherPreAuthorizeHasRoleFindById(1L))
.contextStart(withAdmin); .subscriberContext(withAdmin);
StepVerifier StepVerifier
.create(findById) .create(findById)
.consumeNextWith( s -> AssertionsForClassTypes.assertThat(s).isEqualTo("result")) .consumeNextWith( s -> AssertionsForClassTypes.assertThat(s).isEqualTo("result"))
@ -450,7 +450,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(result); when(this.delegate.publisherPreAuthorizeHasRoleFindById(1L)).thenReturn(result);
Publisher<String> findById = Flux.from(this.messageService.publisherPreAuthorizeHasRoleFindById(1L)) Publisher<String> findById = Flux.from(this.messageService.publisherPreAuthorizeHasRoleFindById(1L))
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -464,7 +464,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.publisherPreAuthorizeBeanFindById(2L)).thenReturn(publisherJust("result")); when(this.delegate.publisherPreAuthorizeBeanFindById(2L)).thenReturn(publisherJust("result"));
Publisher<String> findById = Flux.from(this.messageService.publisherPreAuthorizeBeanFindById(2L)) Publisher<String> findById = Flux.from(this.messageService.publisherPreAuthorizeBeanFindById(2L))
.contextStart(withAdmin); .subscriberContext(withAdmin);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("result") .expectNext("result")
@ -500,7 +500,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.publisherPreAuthorizeBeanFindById(1L)).thenReturn(result); when(this.delegate.publisherPreAuthorizeBeanFindById(1L)).thenReturn(result);
Publisher<String> findById = Flux.from(this.messageService.publisherPreAuthorizeBeanFindById(1L)) Publisher<String> findById = Flux.from(this.messageService.publisherPreAuthorizeBeanFindById(1L))
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -514,7 +514,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.publisherPostAuthorizeFindById(1L)).thenReturn(publisherJust("user")); when(this.delegate.publisherPostAuthorizeFindById(1L)).thenReturn(publisherJust("user"));
Publisher<String> findById = Flux.from(this.messageService.publisherPostAuthorizeFindById(1L)) Publisher<String> findById = Flux.from(this.messageService.publisherPostAuthorizeFindById(1L))
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("user") .expectNext("user")
@ -526,7 +526,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.publisherPostAuthorizeBeanFindById(1L)).thenReturn(publisherJust("not-authorized")); when(this.delegate.publisherPostAuthorizeBeanFindById(1L)).thenReturn(publisherJust("not-authorized"));
Publisher<String> findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(1L)) Publisher<String> findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(1L))
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)
@ -538,7 +538,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.publisherPostAuthorizeBeanFindById(2L)).thenReturn(publisherJust("user")); when(this.delegate.publisherPostAuthorizeBeanFindById(2L)).thenReturn(publisherJust("user"));
Publisher<String> findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(2L)) Publisher<String> findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(2L))
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectNext("user") .expectNext("user")
@ -561,7 +561,7 @@ public class EnableReactiveMethodSecurityTests {
when(this.delegate.publisherPostAuthorizeBeanFindById(1L)).thenReturn(publisherJust("not-authorized")); when(this.delegate.publisherPostAuthorizeBeanFindById(1L)).thenReturn(publisherJust("not-authorized"));
Publisher<String> findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(1L)) Publisher<String> findById = Flux.from(this.messageService.publisherPostAuthorizeBeanFindById(1L))
.contextStart(withUser); .subscriberContext(withUser);
StepVerifier StepVerifier
.create(findById) .create(findById)
.expectError(AccessDeniedException.class) .expectError(AccessDeniedException.class)

2
webflux/src/main/java/org/springframework/security/web/server/context/AuthenticationReactorContextFilter.java
View File

@ -40,6 +40,6 @@ public class AuthenticationReactorContextFilter implements WebFilter {
public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) { public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
return chain.filter(exchange) return chain.filter(exchange)
.contextStart((Context context) -> context.put(Authentication.class, exchange.getPrincipal())); .subscriberContext((Context context) -> context.put(Authentication.class, exchange.getPrincipal()));
} }
} }

2
webflux/src/test/java/org/springframework/security/web/server/context/AuthenticationReactorContextFilterTests.java
View File

@ -56,7 +56,7 @@ public class AuthenticationReactorContextFilterTests {
.then() .then()
) )
) )
.contextStart( context -> context.put("foo", "bar"))) .subscriberContext( context -> context.put("foo", "bar")))
.verifyComplete(); .verifyComplete();
} }