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

Handle scopeId=-1 properly, which indicates current caller domain or 

account.
This commit is contained in:
Min Chen 2014-02-07 15:56:03 -08:00
parent 0b5b861994
commit 63e42d3c47
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedEntityQuerySelector.java
View File

@ -50,7 +50,11 @@ public class RoleBasedEntityQuerySelector extends AdapterBase implements QuerySe
if (pp != null) {
for (AclPolicyPermission p : pp) {
if (p.getScopeId() != null) {
domainIds.add(p.getScopeId());
if (p.getScopeId().longValue() == -1) {
domainIds.add(caller.getDomainId());
} else {
domainIds.add(p.getScopeId());
}
}
}
}
@ -70,7 +74,11 @@ public class RoleBasedEntityQuerySelector extends AdapterBase implements QuerySe
if (pp != null) {
for (AclPolicyPermission p : pp) {
if (p.getScopeId() != null) {
accountIds.add(p.getScopeId());
if (p.getScopeId().longValue() == -1) {
accountIds.add(caller.getId());
} else {
accountIds.add(p.getScopeId());
}
}
}
}