diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java index c1225737859..7db4759726e 100755 --- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java +++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java @@ -225,7 +225,7 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain " + domainId); } - _accountMgr.checkAccess(caller, owner); + _accountMgr.checkAccess(caller, null, owner); long accountId = owner.getId(); DataCenterVO dc = _dcDao.findById(cmd.getZoneId()); @@ -300,7 +300,7 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet sshPublicKey = pair.getPublicKey(); } - _accountMgr.checkAccess(caller, template); + _accountMgr.checkAccess(caller, null, template); DataCenterDeployment plan = new DataCenterDeployment(dc.getId()); diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index d96aee6a302..cd43a6c10d9 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -833,7 +833,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG } // Verify permissions - _accountMgr.checkAccess(caller, securityGroup); + _accountMgr.checkAccess(caller, null, securityGroup); Long domainId = owner.getDomainId(); if (protocol == null) { @@ -910,7 +910,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG } // Check permissions - _accountMgr.checkAccess(caller, groupVO); + _accountMgr.checkAccess(caller, null, groupVO); authorizedGroups.add(groupVO); } @@ -993,7 +993,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG // Check permissions SecurityGroup securityGroup = _securityGroupDao.findById(rule.getSecurityGroupId()); - _accountMgr.checkAccess(caller, securityGroup); + _accountMgr.checkAccess(caller, null, securityGroup); SecurityGroupVO groupHandle = null; final Transaction txn = Transaction.currentTxn(); diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java index f25182f45a5..15ea79fd7da 100644 --- a/server/src/com/cloud/projects/ProjectManagerImpl.java +++ b/server/src/com/cloud/projects/ProjectManagerImpl.java @@ -122,7 +122,7 @@ public class ProjectManagerImpl implements ProjectManager, Manager{ throw new InvalidParameterValueException("Unable to find project by id " + projectId); } - _accountMgr.checkAccess(caller, project); + _accountMgr.checkAccess(caller, null, project); //TODO - delete all project resources here diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index c422030f70c..a981d9f7aee 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3295,7 +3295,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager VirtualMachineTemplate template = _templateDao.findById(vm.getTemplateId()); if (!template.isPublicTemplate()) { Account templateOwner = _accountMgr.getAccount(template.getAccountId()); - _accountMgr.checkAccess(newAccount, templateOwner); + _accountMgr.checkAccess(newAccount, null, templateOwner); } // VV 5: check that vm owner can create vm in the domain