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

bug 6655: when verifying request signature for API requests that use keys, pass the userId of the requester as a Long to avoid NPEs when converting it to a string. Also set up the UserContext for both normal users and admins. 

status 6655: resolved fixed
This commit is contained in:
Kris McQueen 2010-10-19 11:41:04 -07:00
parent 408822e358
commit f4f00cbe2d
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/com/cloud/api/ApiServer.java
View File

@ -436,7 +436,7 @@ public class ApiServer implements HttpRequestHandler {
*/
}
public boolean verifyRequest(Map<String, Object[]> requestParameters, String userId) {
public boolean verifyRequest(Map<String, Object[]> requestParameters, Long userId) {
try {
String apiKey = null;
String secretKey = null;
@ -453,7 +453,7 @@ public class ApiServer implements HttpRequestHandler {
//if userId not null, that mean that user is logged in
if (userId != null) {
Long accountId = ApiDBUtils.findUserById(Long.valueOf(userId)).getAccountId();
Long accountId = ApiDBUtils.findUserById(userId).getAccountId();
Account userAccount = _ms.findAccountById(accountId);
short accountType = userAccount.getType();
@ -519,22 +519,7 @@ public class ApiServer implements HttpRequestHandler {
return false;
}
if (account.getType() == Account.ACCOUNT_TYPE_NORMAL) {
UserContext.updateContext(user.getId(), account, account.getAccountName(), account.getId(), account.getDomainId(), null);
/*
requestParameters.put(BaseCmd.Properties.USER_ID.getName(), new String[] { user.getId().toString() });
requestParameters.put(BaseCmd.Properties.ACCOUNT.getName(), new String[] { account.getAccountName() });
requestParameters.put(BaseCmd.Properties.DOMAIN_ID.getName(), new String[] { Long.toString(account.getDomainId()) });
requestParameters.put(BaseCmd.Properties.ACCOUNT_OBJ.getName(), new Object[] { account });
*/
} else {
UserContext.updateContext(user.getId(), account, null, null, null, null);
/*
requestParameters.put(BaseCmd.Properties.USER_ID.getName(), new String[] { user.getId().toString() });
requestParameters.put(BaseCmd.Properties.ACCOUNT_OBJ.getName(), new Object[] { account });
*/
}
UserContext.updateContext(user.getId(), account, account.getAccountName(), account.getId(), account.getDomainId(), null);
if (!isCommandAvailable(account.getType(), commandName)) {
return false;

2
server/src/com/cloud/api/ApiServlet.java
View File

@ -209,7 +209,7 @@ public class ApiServlet extends HttpServlet {
}
}
if (_apiServer.verifyRequest(params, userId.toString())) {
if (_apiServer.verifyRequest(params, userId)) {
/*
if (accountObj != null) {
Account userAccount = (Account)accountObj;