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

Support errorOnInvalidType for Reactive AuthenticationPrincipal

Browse Source 
Fixes: gh-5096
This commit is contained in:
Rob Winch
2018-03-09 11:14:58 -06:00
parent a2073b2b91
commit d21338d212
3 changed files with 88 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/AuthenticationPrincipalArgumentResolverTests.java
View File

@@ -34,6 +34,7 @@ import reactor.core.publisher.Mono;
import java.lang.annotation.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
@@ -121,6 +122,17 @@ public class AuthenticationPrincipalArgumentResolverTests {
assertThat(argument.cast(Mono.class).block().block()).isEqualTo(authentication.getPrincipal());
}
@Test
public void resolveArgumentWhenMonoIsAuthenticationAndNoGenericThenObtainsPrincipal() throws Exception {
MethodParameter parameter = ResolvableMethod.on(getClass()).named("authenticationPrincipalNoGeneric").build().arg(Mono.class);
when(authentication.getPrincipal()).thenReturn("user");
when(exchange.getPrincipal()).thenReturn(Mono.just(authentication));
Mono<Object> argument = resolver.resolveArgument(parameter, bindingContext, exchange);
assertThat(argument.cast(Mono.class).block().block()).isEqualTo(authentication.getPrincipal());
}
@Test
public void resolveArgumentWhenSpelThenObtainsPrincipal() throws Exception {
MyUser user = new MyUser(3L);
@@ -157,15 +169,55 @@ public class AuthenticationPrincipalArgumentResolverTests {
assertThat(argument.block()).isEqualTo("user");
}
@Test
public void resolveArgumentWhenErrorOnInvalidTypeImplicit() throws Exception {
MethodParameter parameter = ResolvableMethod.on(getClass()).named("errorOnInvalidTypeWhenImplicit").build().arg(Integer.class);
when(authentication.getPrincipal()).thenReturn("user");
when(exchange.getPrincipal()).thenReturn(Mono.just(authentication));
Mono<Object> argument = resolver.resolveArgument(parameter, bindingContext, exchange);
assertThat(argument.block()).isNull();
}
@Test
public void resolveArgumentWhenErrorOnInvalidTypeExplicitFalse() throws Exception {
MethodParameter parameter = ResolvableMethod.on(getClass()).named("errorOnInvalidTypeWhenExplicitFalse").build().arg(Integer.class);
when(authentication.getPrincipal()).thenReturn("user");
when(exchange.getPrincipal()).thenReturn(Mono.just(authentication));
Mono<Object> argument = resolver.resolveArgument(parameter, bindingContext, exchange);
assertThat(argument.block()).isNull();
}
@Test
public void resolveArgumentWhenErrorOnInvalidTypeExplicitTrue() throws Exception {
MethodParameter parameter = ResolvableMethod.on(getClass()).named("errorOnInvalidTypeWhenExplicitTrue").build().arg(Integer.class);
when(authentication.getPrincipal()).thenReturn("user");
when(exchange.getPrincipal()).thenReturn(Mono.just(authentication));
Mono<Object> argument = resolver.resolveArgument(parameter, bindingContext, exchange);
assertThatThrownBy(() -> argument.block()).isInstanceOf(ClassCastException.class);
}
void authenticationPrincipal(@AuthenticationPrincipal String principal, @AuthenticationPrincipal Mono<String> monoPrincipal) {}
void authenticationPrincipalNoGeneric(@AuthenticationPrincipal Mono monoPrincipal) {}
void spel(@AuthenticationPrincipal(expression = "id") Long id) {}
void bean(@AuthenticationPrincipal(expression = "@beanName.methodName(#this)") Long id) {}
void meta(@CurrentUser String principal) {}
void errorOnInvalidTypeWhenImplicit(@AuthenticationPrincipal Integer implicit) {}
void errorOnInvalidTypeWhenExplicitFalse(@AuthenticationPrincipal(errorOnInvalidType = false) Integer implicit) {}
void errorOnInvalidTypeWhenExplicitTrue(@AuthenticationPrincipal(errorOnInvalidType = true) Integer implicit) {}
static class Bean {
public Long methodName(MyUser user) {
return user.getId();