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

SEC-1804: Update InMemoryDaoImpl to use User class directly and create a copy. Otherwise credentials are cleared on cached user instances.

Browse Source
This commit is contained in:
Luke Taylor 2011-08-25 11:09:02 +01:00
parent 3dc4158f7d
commit 799a43d72e
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/springframework/security/core/userdetails/memory/InMemoryDaoImpl.java
View File

@ -53,8 +53,7 @@ public class InMemoryDaoImpl implements UserDetailsService, InitializingBean {
return userMap; return userMap;
} }
public UserDetails loadUserByUsername(String username) public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException {
throws UsernameNotFoundException, DataAccessException {
return userMap.getUser(username); return userMap.getUser(username);
} }

16
core/src/main/java/org/springframework/security/core/userdetails/memory/UserMap.java
View File

@ -18,6 +18,7 @@ package org.springframework.security.core.userdetails.memory;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -39,7 +40,7 @@ public class UserMap {
//~ Instance fields ================================================================================================ //~ Instance fields ================================================================================================
private Map<String, UserDetails> userMap = new HashMap<String, UserDetails>(); private Map<String, User> userMap = new HashMap<String, User>();
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
@ -50,7 +51,7 @@ public class UserMap {
* *
* @throws IllegalArgumentException if a null User was passed * @throws IllegalArgumentException if a null User was passed
*/ */
public void addUser(UserDetails user) throws IllegalArgumentException { public void addUser(User user) throws IllegalArgumentException {
Assert.notNull(user, "Must be a valid User"); Assert.notNull(user, "Must be a valid User");
logger.info("Adding user [" + user + "]"); logger.info("Adding user [" + user + "]");
@ -66,14 +67,15 @@ public class UserMap {
* *
* @throws UsernameNotFoundException if the user could not be found * @throws UsernameNotFoundException if the user could not be found
*/ */
public UserDetails getUser(String username) throws UsernameNotFoundException { public User getUser(String username) throws UsernameNotFoundException {
UserDetails result = this.userMap.get(username.toLowerCase()); User result = this.userMap.get(username.toLowerCase());
if (result == null) { if (result == null) {
throw new UsernameNotFoundException("Could not find user: " + username, username); throw new UsernameNotFoundException("Could not find user: " + username, username);
} }
return result; return new User(result.getUsername(), result.getPassword(), result.isEnabled(), result.isAccountNonExpired(),
result.isCredentialsNonExpired(), result.isAccountNonLocked(), result.getAuthorities());
} }
/** /**
@ -88,10 +90,10 @@ public class UserMap {
/** /**
* Set the users in this {@link UserMap}. Overrides previously added users. * Set the users in this {@link UserMap}. Overrides previously added users.
* *
* @param users {@link Map} &lt;{@link String}, {@link UserDetails}> with pairs (username, userdetails) * @param users {@link Map} &lt;{@link String}, {@link User}> with pairs (username, userdetails)
* @since 1.1 * @since 1.1
*/ */
public void setUsers(Map<String, UserDetails> users) { public void setUsers(Map<String, User> users) {
this.userMap = users; this.userMap = users;
} }
} }

5
core/src/main/java/org/springframework/security/core/userdetails/memory/UserMapEditor.java
View File

@ -60,9 +60,8 @@ public class UserMapEditor extends PropertyEditorSupport {
// Make a user object, assuming the properties were properly provided // Make a user object, assuming the properties were properly provided
if (attr != null) { if (attr != null) {
UserDetails user = new User(username, attr.getPassword(), attr.isEnabled(), true, true, true, userMap.addUser(new User(username, attr.getPassword(), attr.isEnabled(), true, true, true,
attr.getAuthorities()); attr.getAuthorities()));
userMap.addUser(user);
} }
} }

8
core/src/test/java/org/springframework/security/core/userdetails/memory/UserMapTests.java
View File

@ -34,11 +34,11 @@ public class UserMapTests {
@Test @Test
public void testAddAndRetrieveUser() { public void testAddAndRetrieveUser() {
UserDetails rod = new User("rod", "koala", true, true, true, true, User rod = new User("rod", "koala", true, true, true, true,
AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO")); AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO"));
UserDetails scott = new User("scott", "wombat", true, true, true, true, User scott = new User("scott", "wombat", true, true, true, true,
AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_THREE")); AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_THREE"));
UserDetails peter = new User("peter", "opal", true, true, true, true, User peter = new User("peter", "opal", true, true, true, true,
AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_FOUR")); AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_FOUR"));
UserMap map = new UserMap(); UserMap map = new UserMap();
map.addUser(rod); map.addUser(rod);
@ -66,7 +66,7 @@ public class UserMapTests {
@Test @Test
public void unknownUserIsNotRetrieved() { public void unknownUserIsNotRetrieved() {
UserDetails rod = new User("rod", "koala", true, true, true, true, User rod = new User("rod", "koala", true, true, true, true,
AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO")); AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO"));
UserMap map = new UserMap(); UserMap map = new UserMap();
assertEquals(0, map.getUserCount()); assertEquals(0, map.getUserCount());