Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-04 17:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pick Up OidcSessionRegistry Bean

Browse Source 
Closes gh-15813
This commit is contained in:
Josh Cummings 2024-09-15 21:46:20 -06:00
parent 590aef0af1
commit b311b811a1
4 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerUtils.java
View File

@ -116,10 +116,17 @@ final class OAuth2ClientConfigurerUtils {
static <B extends HttpSecurityBuilder<B>> OidcSessionRegistry getOidcSessionRegistry(B builder) { static <B extends HttpSecurityBuilder<B>> OidcSessionRegistry getOidcSessionRegistry(B builder) {
OidcSessionRegistry sessionRegistry = builder.getSharedObject(OidcSessionRegistry.class); OidcSessionRegistry sessionRegistry = builder.getSharedObject(OidcSessionRegistry.class);
if (sessionRegistry == null) { if (sessionRegistry != null) {
sessionRegistry = new InMemoryOidcSessionRegistry(); return sessionRegistry;
builder.setSharedObject(OidcSessionRegistry.class, sessionRegistry);
} }
ApplicationContext context = builder.getSharedObject(ApplicationContext.class);
if (context.getBeanNamesForType(OidcSessionRegistry.class).length == 1) {
sessionRegistry = context.getBean(OidcSessionRegistry.class);
}
else {
sessionRegistry = new InMemoryOidcSessionRegistry();
}
builder.setSharedObject(OidcSessionRegistry.class, sessionRegistry);
return sessionRegistry; return sessionRegistry;
} }

2
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
View File

@ -5496,7 +5496,7 @@ public class ServerHttpSecurity {
private ReactiveOidcSessionRegistry getSessionRegistry() { private ReactiveOidcSessionRegistry getSessionRegistry() {
if (this.sessionRegistry == null && ServerHttpSecurity.this.oauth2Login == null) { if (this.sessionRegistry == null && ServerHttpSecurity.this.oauth2Login == null) {
return new InMemoryReactiveOidcSessionRegistry(); return getBeanOrDefault(ReactiveOidcSessionRegistry.class, new InMemoryReactiveOidcSessionRegistry());
} }
if (this.sessionRegistry == null) { if (this.sessionRegistry == null) {
return ServerHttpSecurity.this.oauth2Login.oidcSessionRegistry; return ServerHttpSecurity.this.oauth2Login.oidcSessionRegistry;

24
config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurerTests.java
View File

@ -396,15 +396,13 @@ public class OidcLogoutConfigurerTests {
@Import(RegistrationConfig.class) @Import(RegistrationConfig.class)
static class SelfLogoutUriConfig { static class SelfLogoutUriConfig {
private final OidcSessionRegistry sessionRegistry = new InMemoryOidcSessionRegistry();
@Bean @Bean
@Order(1) @Order(1)
SecurityFilterChain filters(HttpSecurity http) throws Exception { SecurityFilterChain filters(HttpSecurity http) throws Exception {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()) .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated())
.oauth2Login((oauth2) -> oauth2.oidcSessionRegistry(this.sessionRegistry)) .oauth2Login(Customizer.withDefaults())
.oidcLogout((oidc) -> oidc .oidcLogout((oidc) -> oidc
.backChannel(Customizer.withDefaults()) .backChannel(Customizer.withDefaults())
); );
@ -413,11 +411,6 @@ public class OidcLogoutConfigurerTests {
return http.build(); return http.build();
} }
@Bean
OidcBackChannelLogoutHandler oidcLogoutHandler() {
return new OidcBackChannelLogoutHandler(this.sessionRegistry);
}
} }
@Configuration @Configuration
@ -427,15 +420,13 @@ public class OidcLogoutConfigurerTests {
private final MockWebServer server = new MockWebServer(); private final MockWebServer server = new MockWebServer();
private final OidcSessionRegistry sessionRegistry = new InMemoryOidcSessionRegistry();
@Bean @Bean
@Order(1) @Order(1)
SecurityFilterChain filters(HttpSecurity http) throws Exception { SecurityFilterChain filters(HttpSecurity http) throws Exception {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()) .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated())
.oauth2Login((oauth2) -> oauth2.oidcSessionRegistry(this.sessionRegistry)) .oauth2Login(Customizer.withDefaults())
.oidcLogout((oidc) -> oidc .oidcLogout((oidc) -> oidc
.backChannel(Customizer.withDefaults()) .backChannel(Customizer.withDefaults())
); );
@ -445,8 +436,13 @@ public class OidcLogoutConfigurerTests {
} }
@Bean @Bean
OidcBackChannelLogoutHandler oidcLogoutHandler() { OidcSessionRegistry sessionRegistry() {
OidcBackChannelLogoutHandler logoutHandler = new OidcBackChannelLogoutHandler(this.sessionRegistry); return new InMemoryOidcSessionRegistry();
}
@Bean
OidcBackChannelLogoutHandler oidcLogoutHandler(OidcSessionRegistry sessionRegistry) {
OidcBackChannelLogoutHandler logoutHandler = new OidcBackChannelLogoutHandler(sessionRegistry);
logoutHandler.setSessionCookieName("SESSION"); logoutHandler.setSessionCookieName("SESSION");
return logoutHandler; return logoutHandler;
} }
@ -485,7 +481,7 @@ public class OidcLogoutConfigurerTests {
// @formatter:off // @formatter:off
http http
.authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()) .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated())
.oauth2Login((oauth2) -> oauth2.oidcSessionRegistry(this.sessionRegistry)) .oauth2Login(Customizer.withDefaults())
.oidcLogout((oidc) -> oidc.backChannel(Customizer.withDefaults())); .oidcLogout((oidc) -> oidc.backChannel(Customizer.withDefaults()));
// @formatter:on // @formatter:on

16
config/src/test/java/org/springframework/security/config/web/server/OidcLogoutSpecTests.java
View File

@ -519,8 +519,6 @@ public class OidcLogoutSpecTests {
@Import(RegistrationConfig.class) @Import(RegistrationConfig.class)
static class CookieConfig { static class CookieConfig {
private final ReactiveOidcSessionRegistry sessionRegistry = new InMemoryReactiveOidcSessionRegistry();
private final MockWebServer server = new MockWebServer(); private final MockWebServer server = new MockWebServer();
@Bean @Bean
@ -529,7 +527,7 @@ public class OidcLogoutSpecTests {
// @formatter:off // @formatter:off
http http
.authorizeExchange((authorize) -> authorize.anyExchange().authenticated()) .authorizeExchange((authorize) -> authorize.anyExchange().authenticated())
.oauth2Login((oauth2) -> oauth2.oidcSessionRegistry(this.sessionRegistry)) .oauth2Login(Customizer.withDefaults())
.oidcLogout((oidc) -> oidc .oidcLogout((oidc) -> oidc
.backChannel(Customizer.withDefaults()) .backChannel(Customizer.withDefaults())
); );
@ -539,9 +537,13 @@ public class OidcLogoutSpecTests {
} }
@Bean @Bean
OidcBackChannelServerLogoutHandler oidcLogoutHandler() { ReactiveOidcSessionRegistry oidcSessionRegistry() {
OidcBackChannelServerLogoutHandler logoutHandler = new OidcBackChannelServerLogoutHandler( return new InMemoryReactiveOidcSessionRegistry();
this.sessionRegistry); }
@Bean
OidcBackChannelServerLogoutHandler oidcLogoutHandler(ReactiveOidcSessionRegistry sessionRegistry) {
OidcBackChannelServerLogoutHandler logoutHandler = new OidcBackChannelServerLogoutHandler(sessionRegistry);
logoutHandler.setSessionCookieName("JSESSIONID"); logoutHandler.setSessionCookieName("JSESSIONID");
return logoutHandler; return logoutHandler;
} }
@ -580,7 +582,7 @@ public class OidcLogoutSpecTests {
// @formatter:off // @formatter:off
http http
.authorizeExchange((authorize) -> authorize.anyExchange().authenticated()) .authorizeExchange((authorize) -> authorize.anyExchange().authenticated())
.oauth2Login((oauth2) -> oauth2.oidcSessionRegistry(this.sessionRegistry)) .oauth2Login(Customizer.withDefaults())
.oidcLogout((oidc) -> oidc.backChannel(Customizer.withDefaults())); .oidcLogout((oidc) -> oidc.backChannel(Customizer.withDefaults()));
// @formatter:on // @formatter:on