Make reactive user details back off with Auth Manager Resolver bean

Closes gh-31317
spring-projects · Jun 22, 2022 · c9e0e88 · c9e0e88
1 parent 611b029
commit c9e0e88
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/...ork/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java b/...ork/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java
@@ -37,6 +37,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
 import org.springframework.security.authentication.ReactiveAuthenticationManager;
+import org.springframework.security.authentication.ReactiveAuthenticationManagerResolver;
 import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
 import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
 import org.springframework.security.core.userdetails.User;
@@ -48,14 +49,17 @@
  * Default user {@link Configuration @Configuration} for a reactive web application.
  * Configures a {@link ReactiveUserDetailsService} with a default user and generated
  * password. This backs-off completely if there is a bean of type
- * {@link ReactiveUserDetailsService} or {@link ReactiveAuthenticationManager}.
+ * {@link ReactiveUserDetailsService}, {@link ReactiveAuthenticationManager}, or
+ * {@link ReactiveAuthenticationManagerResolver}.
  *
  * @author Madhura Bhave
  * @since 2.0.0
  */
 @AutoConfiguration(after = RSocketMessagingAutoConfiguration.class)
 @ConditionalOnClass({ ReactiveAuthenticationManager.class })
-@ConditionalOnMissingBean(value = { ReactiveAuthenticationManager.class, ReactiveUserDetailsService.class },
+@ConditionalOnMissingBean(
+		value = { ReactiveAuthenticationManager.class, ReactiveUserDetailsService.class,
+				ReactiveAuthenticationManagerResolver.class },
 		type = { "org.springframework.security.oauth2.jwt.ReactiveJwtDecoder",
 				"org.springframework.security.oauth2.server.resource.introspection.ReactiveOpaqueTokenIntrospector" })
 @Conditional(ReactiveUserDetailsServiceAutoConfiguration.ReactiveUserDetailsServiceCondition.class)

diff --git a/...oot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java b/...oot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.security.authentication.ReactiveAuthenticationManager;
+import org.springframework.security.authentication.ReactiveAuthenticationManagerResolver;
 import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
@@ -91,6 +92,13 @@ void doesNotConfigureDefaultUserIfAuthenticationManagerAvailable() {
 				.run((context) -> assertThat(context).getBean(ReactiveUserDetailsService.class).isNull());
 	}
 
+	@Test
+	void doesNotConfigureDefaultUserIfAuthenticationManagerResolverAvailable() {
+		this.contextRunner.withUserConfiguration(AuthenticationManagerResolverConfig.class)
+				.run((context) -> assertThat(context).hasSingleBean(ReactiveAuthenticationManagerResolver.class)
+						.doesNotHaveBean(ReactiveUserDetailsService.class));
+	}
+
 	@Test
 	void doesNotConfigureDefaultUserIfResourceServerWithJWTIsUsed() {
 		this.contextRunner.withUserConfiguration(JwtDecoderConfiguration.class).run((context) -> {
@@ -179,6 +187,16 @@ ReactiveAuthenticationManager reactiveAuthenticationManager() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class AuthenticationManagerResolverConfig {
+
+		@Bean
+		ReactiveAuthenticationManagerResolver<?> reactiveAuthenticationManagerResolver() {
+			return mock(ReactiveAuthenticationManagerResolver.class);
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@Import(TestSecurityConfiguration.class)
 	static class TestConfigWithPasswordEncoder {