You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/01/09 14:26:47 UTC
[39/50] [abbrv] git commit: ApiDispatcher: Remove unused methods
which were for acl processing
ApiDispatcher: Remove unused methods which were for acl processing
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fc92f04c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fc92f04c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fc92f04c
Branch: refs/heads/javelin
Commit: fc92f04c6b3dcde4ae1177309b762ea8bea702c1
Parents: 765504c
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Jan 9 04:17:30 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Jan 9 04:18:35 2013 -0800
----------------------------------------------------------------------
server/src/com/cloud/api/ApiDispatcher.java | 33 +++------------------
1 files changed, 5 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc92f04c/server/src/com/cloud/api/ApiDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index fa9114e..75e3617 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -149,31 +149,9 @@ public class ApiDispatcher {
}
}
- private void checkACLOnCommand(BaseCmd cmd) {
- // TODO Auto-generated method stub
- //need to write an commandACLChecker adapter framework to check ACL on commands - default one will use the static roles by referring to commands.properties.
- //one can write another commandACLChecker to check access via custom roles.
- }
-
- private List<Role> determineRole(Account caller) {
- // TODO Auto-generated method stub
- List<Role> effectiveRoles = new ArrayList<Role>();
- return effectiveRoles;
-
- }
-
private void doAccessChecks(BaseCmd cmd, List<Object> entitiesToAccess) {
- //owner
- Account caller = UserContext.current().getCaller();
- Account owner = _accountMgr.getActiveAccountById(cmd.getEntityOwnerId());
-
- // REMOVE ME:
- // List<Role> callerRoles = determineRole(caller);
- // List<Role> ownerRoles = determineRole(owner);
- // check permission to call this command for the caller
- // this needs checking of static roles of the caller
- // Role based acl is done in ApiServer before api gets to ApiDispatcher
- // checkACLOnCommand(cmd);
+ Account caller = UserContext.current().getCaller();
+ Account owner = _accountMgr.getActiveAccountById(cmd.getEntityOwnerId());
if(cmd instanceof BaseAsyncCreateCmd) {
//check that caller can access the owner account.
@@ -188,13 +166,13 @@ public class ApiDispatcher {
_accountMgr.checkAccess(caller, null, true, (ControlledEntity) entity);
}
else if (entity instanceof InfrastructureEntity) {
- //do something here:D
+ //FIXME: Move this code in adapter, remove code from Account manager
}
}
}
- }
+ }
- public void dispatch(BaseCmd cmd, Map<String, String> params) {
+ public void dispatch(BaseCmd cmd, Map<String, String> params) {
try {
processParameters(cmd, params);
UserContext ctx = UserContext.current();
@@ -524,7 +502,6 @@ public class ApiDispatcher {
}
Long internalId = null;
// If annotation's empty, the cmd existed before 3.x try conversion to long
- // FIXME: Fails if someone adds since field for any pre 3.x apis
boolean isPre3x = annotation.since().isEmpty();
// Match against Java's UUID regex to check if input is uuid string
boolean isUuid = uuid.matches("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$");