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

bug 8728: deleteSshKey - make account permission check 

status 8728: resolved fixed
This commit is contained in:
alena 2011-03-14 15:46:01 -07:00
parent c32198838f
commit 1b880da804
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -4834,20 +4834,22 @@ public class ManagementServerImpl implements ManagementServer {
Long domainId = cmd.getDomainId();
Account owner = null;
if (accountName != null && domainId != null) {
owner = _accountMgr.getActiveAccount(accountName, domainId);
}
if (owner == null) {
owner = caller;
} else {
if (accountName != null) {
if (domainId != null) {
owner = _accountMgr.getActiveAccount(accountName, domainId);
} else {
throw new InvalidParameterValueException("DomainId has to be specified along with account");
}
//check account permissions
_accountMgr.checkAccess(caller, owner);
} else {
owner = caller;
}
SSHKeyPairVO s = _sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), cmd.getName());
if (s == null) {
throw new InvalidParameterValueException("A key pair with name '" + cmd.getName() + "' does not exist.");
throw new InvalidParameterValueException("A key pair with name '" + cmd.getName() + "' does not exist for account " + owner.getAccountName() + " in domain id=" + owner.getDomainId());
}
return _sshKeyPairDao.deleteByName(caller.getAccountId(), caller.getDomainId(), cmd.getName());