Detect UserDetailsService bean in remember me

Closes gh-11170
This commit is contained in:
Eleftheria Stein
2022-04-28 12:43:13 +02:00
parent a3e7e54b70
commit 8e34cedcfe
2 changed files with 61 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-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.
@@ -42,6 +42,7 @@ import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.RememberMeServices;
import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter;
import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices;
@@ -117,6 +118,20 @@ public class RememberMeConfigurerTests {
verify(DuplicateDoesNotOverrideConfig.userDetailsService).loadUserByUsername("user");
}
@Test
public void rememberMeWhenUserDetailsServiceNotConfiguredThenUsesBean() throws Exception {
this.spring.register(UserDetailsServiceBeanConfig.class).autowire();
MvcResult mvcResult = this.mvc.perform(post("/login").with(csrf()).param("username", "user")
.param("password", "password").param("remember-me", "true")).andReturn();
Cookie rememberMeCookie = mvcResult.getResponse().getCookie("remember-me");
// @formatter:off
MockHttpServletRequestBuilder request = get("/abc").cookie(rememberMeCookie);
SecurityMockMvcResultMatchers.AuthenticatedMatcher remembermeAuthentication = authenticated()
.withAuthentication((auth) -> assertThat(auth).isInstanceOf(RememberMeAuthenticationToken.class));
// @formatter:on
this.mvc.perform(request).andExpect(remembermeAuthentication);
}
@Test
public void loginWhenRememberMeTrueThenRespondsWithRememberMeCookie() throws Exception {
this.spring.register(RememberMeConfig.class).autowire();
@@ -370,6 +385,26 @@ public class RememberMeConfigurerTests {
}
@EnableWebSecurity
static class UserDetailsServiceBeanConfig {
@Bean
SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
// @formatter:off
http
.formLogin(withDefaults())
.rememberMe(withDefaults());
// @formatter:on
return http.build();
}
@Bean
UserDetailsService customUserDetailsService() {
return new InMemoryUserDetailsManager(PasswordEncodedUser.user());
}
}
@EnableWebSecurity
static class RememberMeConfig extends WebSecurityConfigurerAdapter {