Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 13:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7.0.x'

Browse Source
This commit is contained in:
Josh Cummings
2026-03-09 17:13:45 -06:00
parent 8c0d2cccf1 e8e0da1ec6
commit 17d2131fe9
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/src/main/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfiguration.java
+3 -1
View File
@@ -255,7 +255,9 @@ class ServerHttpSecurityConfiguration {
if (this.passwordEncoder != null) { if (this.passwordEncoder != null) {
manager.setPasswordEncoder(this.passwordEncoder); manager.setPasswordEncoder(this.passwordEncoder);
} }
manager.setUserDetailsPasswordService(this.userDetailsPasswordService); if (this.userDetailsPasswordService != null) {
manager.setUserDetailsPasswordService(this.userDetailsPasswordService);
}
manager.setCompromisedPasswordChecker(this.compromisedPasswordChecker); manager.setCompromisedPasswordChecker(this.compromisedPasswordChecker);
return this.postProcessor.postProcess(manager); return this.postProcessor.postProcess(manager);
} }
config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTests.java
+21 -1
View File
@@ -107,7 +107,7 @@ public class ServerHttpSecurityConfigurationTests {
} }
@Test @Test
public void loadConfigWhenReactiveUserDetailsServiceConfiguredThenServerHttpSecurityExists() { public void loadConfigWhenReactiveUserAuthenticationServiceConfiguredThenServerHttpSecurityExists() {
this.spring this.spring
.register(ServerHttpSecurityConfiguration.class, ReactiveAuthenticationTestConfiguration.class, .register(ServerHttpSecurityConfiguration.class, ReactiveAuthenticationTestConfiguration.class,
WebFluxSecurityConfiguration.class) WebFluxSecurityConfiguration.class)
@@ -116,6 +116,16 @@ public class ServerHttpSecurityConfigurationTests {
assertThat(serverHttpSecurity).isNotNull(); assertThat(serverHttpSecurity).isNotNull();
} }
@Test
public void loadConfigWhenOnlyReactiveUserDetailsServiceConfiguredThenServerHttpSecurityExists() {
this.spring
.register(ServerHttpSecurityConfiguration.class, ReactiveUserDetailsServiceOnlyTestConfiguration.class,
WebFluxSecurityConfiguration.class)
.autowire();
ServerHttpSecurity serverHttpSecurity = this.spring.getContext().getBean(ServerHttpSecurity.class);
assertThat(serverHttpSecurity).isNotNull();
}
@Test @Test
public void loadConfigWhenProxyingEnabledAndSubclassThenServerHttpSecurityExists() { public void loadConfigWhenProxyingEnabledAndSubclassThenServerHttpSecurityExists() {
this.spring this.spring
@@ -581,4 +591,14 @@ public class ServerHttpSecurityConfigurationTests {
} }
@Configuration(proxyBeanMethods = false)
static class ReactiveUserDetailsServiceOnlyTestConfiguration {
@Bean
static ReactiveUserDetailsService userDetailsService() {
return (username) -> Mono.just(PasswordEncodedUser.user());
}
}
} }