Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-1187: Moved pre-authentication status check inside try/catch block and repeated the call after reloading the user during the "cacheWasUsed" logic.

This commit is contained in:
Luke Taylor 2009-07-07 17:09:44 +00:00
parent eae670269d
commit 6b53703e37
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java
View File

@ -135,16 +135,16 @@ public abstract class AbstractUserDetailsAuthenticationProvider implements Authe
Assert.notNull(user, "retrieveUser returned null - a violation of the interface contract"); Assert.notNull(user, "retrieveUser returned null - a violation of the interface contract");
} }
preAuthenticationChecks.check(user);
try { try {
preAuthenticationChecks.check(user);
additionalAuthenticationChecks(user, (UsernamePasswordAuthenticationToken) authentication); additionalAuthenticationChecks(user, (UsernamePasswordAuthenticationToken) authentication);
} catch (AuthenticationException exception) { } catch (AuthenticationException exception) {
if (cacheWasUsed) { if (cacheWasUsed) {
// There was a problem, so try again after checking // There was a problem, so try again after checking
// we're using latest data (ie not from the cache) // we're using latest data (i.e. not from the cache)
cacheWasUsed = false; cacheWasUsed = false;
user = retrieveUser(username, (UsernamePasswordAuthenticationToken) authentication); user = retrieveUser(username, (UsernamePasswordAuthenticationToken) authentication);
preAuthenticationChecks.check(user);
additionalAuthenticationChecks(user, (UsernamePasswordAuthenticationToken) authentication); additionalAuthenticationChecks(user, (UsernamePasswordAuthenticationToken) authentication);
} else { } else {
throw exception; throw exception;