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

Fix logic in accountAndUserValidation to correctly detect child domains and throw an exception only when the domain is not in the hierarchy.

This commit is contained in:
Kris McQueen 2010-09-21 18:24:18 -07:00
parent 50da0d918f
commit 8101ffb636
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1340,16 +1340,11 @@ public class UserVmManagerImpl implements UserVmManager {
}
private Long accountAndUserValidation(Long virtualMachineId,Account account, Long userId, UserVmVO vmInstance) throws ServerApiException
{
if (account != null)
{
if (!isAdmin(account.getType()) && (account.getId().longValue() != vmInstance.getAccountId()))
{
private Long accountAndUserValidation(Long virtualMachineId,Account account, Long userId, UserVmVO vmInstance) throws ServerApiException {
if (account != null) {
if (!isAdmin(account.getType()) && (account.getId().longValue() != vmInstance.getAccountId())) {
throw new ServerApiException(BaseCmd.VM_INVALID_PARAM_ERROR, "unable to find a virtual machine with id " + virtualMachineId + " for this account");
}
else if (_domainDao.isChildDomain(account.getDomainId(),vmInstance.getDomainId()))
{
} else if (!_domainDao.isChildDomain(account.getDomainId(),vmInstance.getDomainId())) {
throw new ServerApiException(BaseCmd.PARAM_ERROR, "Invalid virtual machine id (" + virtualMachineId + ") given, unable to upgrade virtual machine.");
}
}