cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: updated refs/heads/4.4-forward-iam-disabled to 14b5532
Date Wed, 14 May 2014 22:26:37 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward-iam-disabled 56b284f7f -> 14b5532e4


Disable processing of the @ACL annotation at ParamProcessWorker


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

Branch: refs/heads/4.4-forward-iam-disabled
Commit: 14b5532e4bb592ad797ce186a38ec90bfc56c092
Parents: 56b284f
Author: Prachi Damle <prachi@cloud.com>
Authored: Wed May 14 15:24:37 2014 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Wed May 14 15:24:37 2014 -0700

----------------------------------------------------------------------
 .../com/cloud/api/dispatch/ParamProcessWorker.java  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14b5532e/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/dispatch/ParamProcessWorker.java b/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
index addcf3f..eb4c76b 100644
--- a/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
+++ b/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
@@ -35,14 +35,10 @@ import javax.inject.Inject;
 
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.acl.ControlledEntity;
-import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.ACL;
-import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseAsyncCreateCmd;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseCmd.CommandType;
 import org.apache.cloudstack.api.EntityReference;
@@ -56,12 +52,7 @@ import org.apache.cloudstack.api.command.user.event.DeleteEventsCmd;
 import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
 import org.apache.cloudstack.context.CallContext;
 
-import com.cloud.dc.DataCenter;
 import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.PermissionDeniedException;
-import com.cloud.offering.DiskOffering;
-import com.cloud.offering.ServiceOffering;
-import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.utils.DateUtil;
 import com.cloud.utils.db.EntityManager;
@@ -218,11 +209,12 @@ public class ParamProcessWorker implements DispatchWorker {
 
         }
 
-        doAccessChecks(cmd, entitiesToAccess);
+        // doAccessChecks(cmd, entitiesToAccess);
     }
 
 
-    private void doAccessChecks(final BaseCmd cmd, final Map<Object, AccessType> entitiesToAccess)
{
+    /* IAM feature disabled.
+     * private void doAccessChecks(final BaseCmd cmd, final Map<Object, AccessType>
entitiesToAccess) {
         Account caller = CallContext.current().getCallingAccount();
         Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId());
         if (owner == null) {
@@ -327,7 +319,7 @@ public class ParamProcessWorker implements DispatchWorker {
         assert false : "How can all of the security checkers pass on checking this caller?";
         throw new PermissionDeniedException("There's no way to confirm " + caller + " has
access to zone:"
                 + zone.getId());
-    }
+    }*/
 
     @SuppressWarnings({"unchecked", "rawtypes"})
     private void setFieldValue(final Field field, final BaseCmd cmdObj, final Object paramObj,
final Parameter annotation) throws IllegalArgumentException, ParseException {


Mime
View raw message