Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-01 09:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-1156: Modified JdbcUserDetailsManager to only save/update authorities if enableAuthorities is set

Browse Source
This commit is contained in:
Luke Taylor 2009-06-14 22:26:44 +00:00
parent 37d3401d0c
commit ab7f06c108
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
View File

@ -28,7 +28,13 @@ import java.sql.SQLException;
import java.util.List; import java.util.List;
/** /**
* Jdbc user management service. * Jdbc user management service, based on the same table structure as its parent class, <tt>JdbcDaoImpl</tt>.
* <p>
* Provides CRUD operations for both users and groups. Note that if the {@link #setEnableAuthorities(boolean)
* enableAuthorities} property is set to false, calls to createUser and updateUser will not store the
* authorities from the <tt>UserDetails</tt>. Since this class cannot differentiate between authorities which were
* loaded for an individual or for a group of which the individual is a member, it's important that you take this
* into account when using this implementation for managing your users.
* *
* @author Luke Taylor * @author Luke Taylor
* @version $Id$ * @version $Id$
@ -141,7 +147,9 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa
}); });
insertUserAuthorities(user); if (getEnableAuthorities()) {
insertUserAuthorities(user);
}
} }
public void updateUser(final UserDetails user) { public void updateUser(final UserDetails user) {
@ -154,8 +162,10 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa
} }
}); });
deleteUserAuthorities(user.getUsername()); if (getEnableAuthorities()) {
insertUserAuthorities(user); deleteUserAuthorities(user.getUsername());
insertUserAuthorities(user);
}
userCache.removeUserFromCache(user.getUsername()); userCache.removeUserFromCache(user.getUsername());
} }

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

@ -1,9 +1,6 @@
package org.springframework.security.provisioning; package org.springframework.security.provisioning;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -30,7 +27,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserCache; import org.springframework.security.core.userdetails.UserCache;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.provisioning.JdbcUserDetailsManager;
/** /**
* Tests for {@link JdbcUserDetailsManager} * Tests for {@link JdbcUserDetailsManager}
@ -282,6 +278,24 @@ public class JdbcUserDetailsManagerTests {
assertEquals(2, template.queryForList("select authority from group_authorities where group_id = 2").size()); assertEquals(2, template.queryForList("select authority from group_authorities where group_id = 2").size());
} }
// SEC-1156
@Test
public void createUserDoesNotSaveAuthoritiesIfEnableAuthoritiesIsFalse() throws Exception {
manager.setEnableAuthorities(false);
manager.createUser(joe);
assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size());
}
// SEC-1156
@Test
public void updateUserDoesNotSaveAuthoritiesIfEnableAuthoritiesIsFalse() throws Exception {
manager.setEnableAuthorities(false);
insertJoe();
template.execute("delete from authorities where username='joe'");
manager.updateUser(joe);
assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size());
}
private Authentication authenticateJoe() { private Authentication authenticateJoe() {
UsernamePasswordAuthenticationToken auth = UsernamePasswordAuthenticationToken auth =
new UsernamePasswordAuthenticationToken("joe","password", joe.getAuthorities()); new UsernamePasswordAuthenticationToken("joe","password", joe.getAuthorities());
@ -290,6 +304,7 @@ public class JdbcUserDetailsManagerTests {
return auth; return auth;
} }
private void insertJoe() { private void insertJoe() {
template.execute("insert into users (username, password, enabled) values ('joe','password','true')"); template.execute("insert into users (username, password, enabled) values ('joe','password','true')");
template.execute("insert into authorities (username, authority) values ('joe','A')"); template.execute("insert into authorities (username, authority) values ('joe','A')");