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

Use ServerHttpSecurity Lambda DSL in Config

Browse Source 
Issue gh-13067
This commit is contained in:
Josh Cummings 2025-06-20 10:09:26 -06:00
parent 9fcfacf283
commit 461f00ed38
No known key found for this signature in database
GPG Key ID: 869B37A20E876129
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/src/main/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfiguration.java
View File

@ -43,6 +43,8 @@ import org.springframework.security.web.reactive.result.method.annotation.Curren
import org.springframework.web.reactive.config.WebFluxConfigurer;
import org.springframework.web.reactive.result.method.annotation.ArgumentResolverConfigurer;
import static org.springframework.security.config.Customizer.withDefaults;
/**
* @author Rob Winch
* @author Dan Zheng
@ -156,8 +158,8 @@ class ServerHttpSecurityConfiguration {
ContextAwareServerHttpSecurity http = new ContextAwareServerHttpSecurity();
// @formatter:off
return http.authenticationManager(authenticationManager())
.headers().and()
.logout().and();
.headers(withDefaults())
.logout(withDefaults());
// @formatter:on
}

12
config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java
View File

@ -40,6 +40,8 @@ import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.reactive.result.view.AbstractView;
import static org.springframework.security.config.Customizer.withDefaults;
/**
* @author Rob Winch
* @since 5.0
@ -121,13 +123,13 @@ class WebFluxSecurityConfiguration {
* @return
*/
private SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
http.authorizeExchange().anyExchange().authenticated();
http.authorizeExchange((exchange) -> exchange.anyExchange().authenticated());
if (isOAuth2Present && OAuth2ClasspathGuard.shouldConfigure(this.context)) {
OAuth2ClasspathGuard.configure(this.context, http);
}
else {
http.httpBasic();
http.formLogin();
http.httpBasic(withDefaults());
http.formLogin(withDefaults());
}
SecurityWebFilterChain result = http.build();
return result;
@ -136,8 +138,8 @@ class WebFluxSecurityConfiguration {
private static class OAuth2ClasspathGuard {
static void configure(ApplicationContext context, ServerHttpSecurity http) {
http.oauth2Login();
http.oauth2Client();
http.oauth2Login(withDefaults());
http.oauth2Client(withDefaults());
}
static boolean shouldConfigure(ApplicationContext context) {