Adding SecurityChecker list for the ParamProcessWorker
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b917184f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b917184f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b917184f Branch: refs/heads/4.4 Commit: b917184fdaeef3b796d731727f306b59abd05773 Parents: 9962cf1 Author: Prachi Damle <pra...@cloud.com> Authored: Tue Apr 1 12:05:41 2014 -0700 Committer: Prachi Damle <pra...@cloud.com> Committed: Tue Apr 1 12:06:16 2014 -0700 ---------------------------------------------------------------------- api/src/org/apache/cloudstack/acl/SecurityChecker.java | 2 +- .../META-INF/cloudstack/core/spring-server-core-misc-context.xml | 4 +++- server/src/com/cloud/api/dispatch/ParamProcessWorker.java | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b917184f/api/src/org/apache/cloudstack/acl/SecurityChecker.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/acl/SecurityChecker.java b/api/src/org/apache/cloudstack/acl/SecurityChecker.java index 0b29fb4..4170871 100644 --- a/api/src/org/apache/cloudstack/acl/SecurityChecker.java +++ b/api/src/org/apache/cloudstack/acl/SecurityChecker.java @@ -102,7 +102,7 @@ public interface SecurityChecker extends Adapter { /** * Checks if the account can access multiple objects. - * + * * @param caller * account to check against. * @param entities http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b917184f/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml ---------------------------------------------------------------------- diff --git a/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml b/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml index 91401e3..479dc9c 100644 --- a/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml +++ b/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml @@ -52,7 +52,9 @@ <bean id="dispatchChainFactory" class="com.cloud.api.dispatch.DispatchChainFactory" /> - <bean id="paramProcessWorker" class="com.cloud.api.dispatch.ParamProcessWorker" /> + <bean id="paramProcessWorker" class="com.cloud.api.dispatch.ParamProcessWorker"> + <property name="secChecker" value="#{securityCheckersRegistry.registered}" /> + </bean> <bean id="paramUnpackWorker" class="com.cloud.api.dispatch.ParamUnpackWorker" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b917184f/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 3f1b47f..21932f7 100644 --- a/server/src/com/cloud/api/dispatch/ParamProcessWorker.java +++ b/server/src/com/cloud/api/dispatch/ParamProcessWorker.java @@ -42,7 +42,6 @@ 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.EntityReference; import org.apache.cloudstack.api.InternalIdentity; @@ -56,7 +55,6 @@ 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.configuration.ConfigurationManager; import com.cloud.dc.DataCenter; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException;
