You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/02/15 00:05:21 UTC
git commit: updated refs/heads/rbac to ebfe947

Repository: cloudstack
Updated Branches:
  refs/heads/rbac 586ee7400 -> ebfe947f4


Fixed some bugs encountered in testing iam-plugin apis.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ebfe947f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ebfe947f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ebfe947f

Branch: refs/heads/rbac
Commit: ebfe947f4164a8b2607b57115130010869e0c508
Parents: 586ee74
Author: Min Chen <mi...@citrix.com>
Authored: Fri Feb 14 15:04:29 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Fri Feb 14 15:04:29 2014 -0800

----------------------------------------------------------------------
 .../server/src/org/apache/cloudstack/iam/api/AclGroup.java    | 7 ++++++-
 .../server/src/org/apache/cloudstack/iam/api/AclPolicy.java   | 7 ++++++-
 .../src/org/apache/cloudstack/iam/server/IAMServiceImpl.java  | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebfe947f/services/iam/server/src/org/apache/cloudstack/iam/api/AclGroup.java
----------------------------------------------------------------------
diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/AclGroup.java b/services/iam/server/src/org/apache/cloudstack/iam/api/AclGroup.java
index 56ba0ed..2bdddf7 100644
--- a/services/iam/server/src/org/apache/cloudstack/iam/api/AclGroup.java
+++ b/services/iam/server/src/org/apache/cloudstack/iam/api/AclGroup.java
@@ -16,14 +16,19 @@
 // under the License.
 package org.apache.cloudstack.iam.api;
 
-public interface AclGroup {
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface AclGroup extends InternalIdentity, Identity {
 
     String getName();
 
     String getDescription();
 
+    @Override
     long getId();
 
+    @Override
     String getUuid();
 
     String getPath();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebfe947f/services/iam/server/src/org/apache/cloudstack/iam/api/AclPolicy.java
----------------------------------------------------------------------
diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/AclPolicy.java b/services/iam/server/src/org/apache/cloudstack/iam/api/AclPolicy.java
index db309c8..302bbf3 100644
--- a/services/iam/server/src/org/apache/cloudstack/iam/api/AclPolicy.java
+++ b/services/iam/server/src/org/apache/cloudstack/iam/api/AclPolicy.java
@@ -16,7 +16,10 @@
 // under the License.
 package org.apache.cloudstack.iam.api;
 
-public interface AclPolicy {
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface AclPolicy extends InternalIdentity, Identity {
 
     String getName();
 
@@ -26,8 +29,10 @@ public interface AclPolicy {
         Static, Dynamic
     }
 
+    @Override
     long getId();
 
+    @Override
     String getUuid();
 
     String getPath();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebfe947f/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
index 1398889..c20989c 100644
--- a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
+++ b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
@@ -651,7 +651,7 @@ public class IAMServiceImpl extends ManagerBase implements IAMService, Manager {
                     + "; failed to revoke permission from policy.");
         }
         // remove entry from acl_entity_permission table
-        AclPolicyPermissionVO permit = _policyPermissionDao.findByPolicyAndEntity(aclPolicyId, entityType, scope, scopeId, action, null);
+        AclPolicyPermissionVO permit = _policyPermissionDao.findByPolicyAndEntity(aclPolicyId, entityType, scope, scopeId, action, Permission.Allow);
         if (permit != null) {
             // not removed yet
             _policyPermissionDao.remove(permit.getId());