etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException "

This commit is contained in:
Rohit Yadav 2012-10-05 11:32:45 -07:00 committed by Alex Huang
parent e7e486204e
commit 5cd7fb8408
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/user/UserAccount.java
View File

@ -56,4 +56,6 @@ public interface UserAccount {
String getRegistrationToken();
boolean isRegistered();
int getLoginAttempts();
}

15
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -1862,24 +1862,25 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
}
UserAccount userAccount = _userAccountDao.getUserAccount(username, domainId);
UserAccountVO user = _userAccountDao.findById(userAccount.getId());
if (user != null) {
if ((user.getState().toString()).equals("enabled")) {
if (!isInternalAccount(user.getType())) {
if (userAccount != null) {
if (userAccount.getState().equalsIgnoreCase(Account.State.enabled.toString())) {
if (!isInternalAccount(userAccount.getType())) {
//Internal accounts are not disabled
int attemptsMade = user.getLoginAttempts() + 1;
int attemptsMade = userAccount.getLoginAttempts() + 1;
if (attemptsMade < _allowedLoginAttempts) {
updateLoginAttempts(userAccount.getId(), attemptsMade, false);
s_logger.warn("Login attempt failed. You have " + ( _allowedLoginAttempts - attemptsMade ) + " attempt(s) remaining");
} else {
updateLoginAttempts(userAccount.getId(), _allowedLoginAttempts, true);
s_logger.warn("User " + user.getUsername() + " has been disabled due to multiple failed login attempts." +
s_logger.warn("User " + userAccount.getUsername() + " has been disabled due to multiple failed login attempts." +
" Please contact admin.");
}
}
} else {
s_logger.info("User " + user.getUsername() + " is disabled/locked");
s_logger.info("User " + userAccount.getUsername() + " is disabled/locked");
}
} else {
s_logger.warn("Authentication failure: No user with name " + username + " for domainId " + domainId);
}
return null;
}