Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use SecurityContextHolderStrategy for Database Support

Browse Source 
Issue gh-11060
This commit is contained in:
Josh Cummings
2022-06-21 16:39:30 -06:00
parent 52dc120269
commit ec1bfa12f0
4 changed files with 68 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/test/java/org/springframework/security/provisioning/InMemoryUserDetailsManagerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 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.
@@ -20,12 +20,19 @@ import java.util.Properties;
import org.junit.jupiter.api.Test;
import org.springframework.security.authentication.TestAuthentication;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolderStrategy;
import org.springframework.security.core.context.SecurityContextImpl;
import org.springframework.security.core.userdetails.PasswordEncodedUser;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
* @author Rob Winch
@@ -79,4 +86,15 @@ public class InMemoryUserDetailsManagerTests {
.withMessage("The entry with username 'joe' could not be converted to an UserDetails");
}
@Test
public void changePasswordWhenCustomSecurityContextHolderStrategyThenUses() {
Authentication authentication = TestAuthentication.authenticatedUser();
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager((User) authentication.getPrincipal());
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
given(strategy.getContext()).willReturn(new SecurityContextImpl(authentication));
manager.setSecurityContextHolderStrategy(strategy);
manager.changePassword("password", "newpassword");
verify(strategy).getContext();
}
}

15
core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java
View File

@@ -39,6 +39,8 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.context.SecurityContextHolderStrategy;
import org.springframework.security.core.context.SecurityContextImpl;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserCache;
import org.springframework.security.core.userdetails.UserDetails;
@@ -48,6 +50,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
* Tests for {@link JdbcUserDetailsManager}
@@ -205,6 +208,18 @@ public class JdbcUserDetailsManagerTests {
assertThat(this.cache.getUserMap().containsKey("joe")).isFalse();
}
@Test
public void changePasswordWhenCustomSecurityContextHolderStrategyThenUses() {
insertJoe();
Authentication authentication = authenticateJoe();
SecurityContextHolderStrategy strategy = mock(SecurityContextHolderStrategy.class);
given(strategy.getContext()).willReturn(new SecurityContextImpl(authentication));
given(strategy.createEmptyContext()).willReturn(new SecurityContextImpl());
this.manager.setSecurityContextHolderStrategy(strategy);
this.manager.changePassword("wrongpassword", "newPassword");
verify(strategy).getContext();
}
@Test
public void changePasswordSucceedsWithIfReAuthenticationSucceeds() {
insertJoe();