cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/rbac to b725035
Date Wed, 15 Jan 2014 02:21:00 GMT
Updated Branches:
  refs/heads/rbac cc66d03f8 -> b725035b2


Fix NPE about accessType in RoleBasedApiAccessChecker.start.

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

Branch: refs/heads/rbac
Commit: b725035b229f2182bfabbb83c381f5994bb0848d
Parents: cc66d03
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Jan 14 18:20:32 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Tue Jan 14 18:20:32 2014 -0800

----------------------------------------------------------------------
 .../org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b725035b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
----------------------------------------------------------------------
diff --git a/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
index d193c94..dd49eb1 100644
--- a/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
+++ b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java
@@ -28,10 +28,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.acl.APIChecker;
-import org.apache.cloudstack.acl.AclEntityType;
-import org.apache.cloudstack.acl.PermissionScope;
-import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.BaseCmd;
@@ -207,11 +203,11 @@ public class RoleBasedAPIAccessChecker extends AdapterBase implements
APIChecker
        
         if (entityTypes == null || entityTypes.length == 0) {
             _iamSrv.addAclPermissionToAclPolicy(new Long(role.ordinal()) + 1, null, permissionScope.toString(),
new Long(-1),
-                    apiName, accessType.toString(), Permission.Allow);
+                    apiName, (accessType == null) ? null : accessType.toString(), Permission.Allow);
         } else {
             for (AclEntityType entityType : entityTypes) {
                 _iamSrv.addAclPermissionToAclPolicy(new Long(role.ordinal()) + 1, entityType.toString(),
permissionScope.toString(), new Long(-1),
-                        apiName, accessType.toString(), Permission.Allow);
+                        apiName, (accessType == null) ? null : accessType.toString(), Permission.Allow);
             }
          }
 


Mime
View raw message