Skip to content

Apply SessionAuthenticationStrategy to WebAuthnAuthenticationFilter #19039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hqqw2h-lgtm wants to merge 2 commits into
base: main
Choose a base branch
from
+52 −0
Open

Apply SessionAuthenticationStrategy to WebAuthnAuthenticationFilter #19039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2b12e8
Apply SessionAuthenticationStrategy to WebAuthnAuthenticationFilter
skyhww Apr 4, 2026
45f5413
Scope WebAuthn session strategy fix and clean test imports
skyhww Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...va/org/springframework/security/config/annotation/web/configurers/WebAuthnConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.security.web.access.intercept.AuthorizationFilter;
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter;
import org.springframework.security.web.authentication.ui.DefaultResourcesFilter;
import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
Expand Down Expand Up @@ -178,6 +179,11 @@ public void configure(H http) {
WebAuthnAuthenticationFilter webAuthnAuthnFilter = new WebAuthnAuthenticationFilter();
webAuthnAuthnFilter.setAuthenticationManager(
new ProviderManager(new WebAuthnAuthenticationProvider(rpOperations, userDetailsService)));
SessionAuthenticationStrategy sessionAuthenticationStrategy = http
.getSharedObject(SessionAuthenticationStrategy.class);
if (sessionAuthenticationStrategy != null) {
webAuthnAuthnFilter.setSessionAuthenticationStrategy(sessionAuthenticationStrategy);
}
webAuthnAuthnFilter = postProcess(webAuthnAuthnFilter);
WebAuthnRegistrationFilter webAuthnRegistrationFilter = new WebAuthnRegistrationFilter(userCredentials,
rpOperations);
Expand Down
46 changes: 46 additions & 0 deletions ...g/springframework/security/config/annotation/web/configurers/WebAuthnConfigurerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.web.FilterChainProxy;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.session.CompositeSessionAuthenticationStrategy;
import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
import org.springframework.security.web.authentication.ui.DefaultResourcesFilter;
import org.springframework.security.web.webauthn.api.Bytes;
import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity;
Expand All @@ -55,6 +57,7 @@
import org.springframework.security.web.webauthn.management.UserCredentialRepository;
import org.springframework.security.web.webauthn.management.WebAuthnRelyingPartyOperations;
import org.springframework.security.web.webauthn.registration.HttpSessionPublicKeyCredentialCreationOptionsRepository;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.test.web.servlet.MockMvc;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -408,6 +411,49 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {

}

// gh-16685
@Test
public void webAuthnWhenSessionManagementConfiguredThenSessionAuthenticationStrategyApplied() {
this.spring.register(SessionManagementWebauthnConfiguration.class).autowire();
FilterChainProxy filterChain = this.spring.getContext().getBean(FilterChainProxy.class);
List<jakarta.servlet.Filter> filters = filterChain.getFilterChains().get(0).getFilters();
WebAuthnAuthenticationFilter webAuthnFilter = filters.stream()
.filter(WebAuthnAuthenticationFilter.class::isInstance)
.map(WebAuthnAuthenticationFilter.class::cast)
.findFirst()
.orElseThrow(() -> new AssertionError("WebAuthnAuthenticationFilter not found"));
SessionAuthenticationStrategy strategy = (SessionAuthenticationStrategy) ReflectionTestUtils
.getField(webAuthnFilter, "sessionStrategy");
assertThat(strategy).isNotNull();
assertThat(strategy).isInstanceOf(CompositeSessionAuthenticationStrategy.class);
}

@Configuration
@EnableWebSecurity
static class SessionManagementWebauthnConfiguration {

@Bean
UserDetailsService userDetailsService() {
return new InMemoryUserDetailsManager();
}

@Bean
SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
// @formatter:off
http
.formLogin(Customizer.withDefaults())
.sessionManagement((session) -> session
.maximumSessions(1)
)
.webAuthn((authn) -> authn
.rpId("example.com")
);
// @formatter:on
return http.build();
}

}

@Configuration
@EnableWebSecurity
static class CustomRpNameWebauthnConfiguration {
Expand Down