Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10595-1.3.3 [created] 1876b96d1
#ignite-gg-10595: Visor security fixes. (cherry picked from commit 6816071) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1876b96d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1876b96d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1876b96d Branch: refs/heads/ignite-gg-10595-1.3.3 Commit: 1876b96d128cf9632778c24cd2d1279d13403a83 Parents: 993dec4 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Jul 22 16:18:27 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Jul 22 16:28:13 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/security/SecurityContext.java | 4 +++- .../ignite/internal/processors/task/GridTaskProcessor.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1876b96d/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java index 3151f68..cb61dea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.security; +import org.apache.ignite.internal.*; import org.apache.ignite.plugin.security.*; /** @@ -33,9 +34,10 @@ public interface SecurityContext { * * @param taskClsName Task class name. * @param perm Permission to check. + * @param ctx Grid kernal context. * @return {@code True} if task operation is allowed. */ - public boolean taskOperationAllowed(String taskClsName, SecurityPermission perm); + public boolean taskOperationAllowed(String taskClsName, SecurityPermission perm, GridKernalContext ctx); /** * Checks whether cache operation is allowed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1876b96d/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index d59a51d..a19b0b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -113,7 +113,8 @@ public class GridTaskProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void onKernalStart() throws IgniteCheckedException { - tasksMetaCache = ctx.security().enabled() ? ctx.cache().<GridTaskNameHashKey, String>utilityCache() : null; + tasksMetaCache = ctx.security().enabled() && !ctx.isDaemon() ? + ctx.cache().<GridTaskNameHashKey, String>utilityCache() : null; startLatch.countDown(); }
