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

Allow configuring scheduler on ReactiveAuthenticationManagerAdapter

Browse Source 
Currently, authentication logic will be performed on hardcoded elastic
scheduler in ReactiveAuthenticationManagerAdapter.
This commit makes the authentication logic scheduler configureable.
This commit is contained in:
Tadaya Tsuyukubo 2019-05-08 18:21:07 -07:00 committed by Rob Winch
parent e6ace0891f
commit 71dc4f39be
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,6 +18,7 @@ package org.springframework.security.authentication;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.scheduler.Scheduler;
import reactor.core.scheduler.Schedulers; import reactor.core.scheduler.Schedulers;
/** /**
@ -27,11 +28,14 @@ import reactor.core.scheduler.Schedulers;
* from coming in unless it was put on another thread. * from coming in unless it was put on another thread.
* *
* @author Rob Winch * @author Rob Winch
* @author Tadaya Tsuyukubo
* @since 5.0 * @since 5.0
*/ */
public class ReactiveAuthenticationManagerAdapter implements ReactiveAuthenticationManager { public class ReactiveAuthenticationManagerAdapter implements ReactiveAuthenticationManager {
private final AuthenticationManager authenticationManager; private final AuthenticationManager authenticationManager;
private Scheduler scheduler = Schedulers.elastic();
public ReactiveAuthenticationManagerAdapter(AuthenticationManager authenticationManager) { public ReactiveAuthenticationManagerAdapter(AuthenticationManager authenticationManager) {
Assert.notNull(authenticationManager, "authenticationManager cannot be null"); Assert.notNull(authenticationManager, "authenticationManager cannot be null");
this.authenticationManager = authenticationManager; this.authenticationManager = authenticationManager;
@ -40,7 +44,7 @@ public class ReactiveAuthenticationManagerAdapter implements ReactiveAuthenticat
@Override @Override
public Mono<Authentication> authenticate(Authentication token) { public Mono<Authentication> authenticate(Authentication token) {
return Mono.just(token) return Mono.just(token)
.publishOn(Schedulers.elastic()) .publishOn(this.scheduler)
.flatMap( t -> { .flatMap( t -> {
try { try {
return Mono.just(authenticationManager.authenticate(t)); return Mono.just(authenticationManager.authenticate(t));
@ -50,4 +54,15 @@ public class ReactiveAuthenticationManagerAdapter implements ReactiveAuthenticat
}) })
.filter( a -> a.isAuthenticated()); .filter( a -> a.isAuthenticated());
} }
/**
* Set a scheduler that will be published on to perform the authentication logic.
* @param scheduler a scheduler to be published on
* @throws IllegalArgumentException if the scheduler is {@code null}
*/
public void setScheduler(Scheduler scheduler) {
Assert.notNull(scheduler, "scheduler cannot be null");
this.scheduler = scheduler;
}
} }

7
core/src/test/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapterTests.java
View File

@ -52,8 +52,13 @@ public class ReactiveAuthenticationManagerAdapterTests {
new ReactiveAuthenticationManagerAdapter(null); new ReactiveAuthenticationManagerAdapter(null);
} }
@Test(expected = IllegalArgumentException.class)
public void setSchedulerNull() {
this.manager.setScheduler(null);
}
@Test @Test
public void authenticateWhenSuccessThenSucces() { public void authenticateWhenSuccessThenSuccess() {
when(delegate.authenticate(any())).thenReturn(authentication); when(delegate.authenticate(any())).thenReturn(authentication);
when(authentication.isAuthenticated()).thenReturn(true); when(authentication.isAuthenticated()).thenReturn(true);