Repository: ignite Updated Branches: refs/heads/ignite-10435 [created] 0379f945c
Removing. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d2f8bae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d2f8bae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d2f8bae Branch: refs/heads/ignite-10435 Commit: 8d2f8bae27befe91af0c7763739d026163a6e3b7 Parents: d21f86f Author: devozerov <voze...@gridgain.com> Authored: Wed Nov 28 11:40:29 2018 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Wed Nov 28 11:40:29 2018 +0300 ---------------------------------------------------------------------- .../platform/client/ClientRequest.java | 11 +------ .../cache/ClientCacheClearKeyRequest.java | 2 -- .../cache/ClientCacheClearKeysRequest.java | 2 -- .../client/cache/ClientCacheClearRequest.java | 2 -- .../cache/ClientCacheContainsKeyRequest.java | 2 -- .../cache/ClientCacheContainsKeysRequest.java | 2 -- ...ientCacheCreateWithConfigurationRequest.java | 2 -- .../cache/ClientCacheCreateWithNameRequest.java | 5 ++-- .../client/cache/ClientCacheDestroyRequest.java | 2 -- .../client/cache/ClientCacheGetAllRequest.java | 4 +-- .../ClientCacheGetAndPutIfAbsentRequest.java | 2 -- .../cache/ClientCacheGetAndPutRequest.java | 2 -- .../cache/ClientCacheGetAndRemoveRequest.java | 2 -- .../cache/ClientCacheGetAndReplaceRequest.java | 2 -- ...acheGetOrCreateWithConfigurationRequest.java | 5 ++-- .../ClientCacheGetOrCreateWithNameRequest.java | 2 -- .../client/cache/ClientCacheGetRequest.java | 2 -- .../client/cache/ClientCacheGetSizeRequest.java | 2 -- .../cache/ClientCacheLocalPeekRequest.java | 2 -- .../cache/ClientCacheNodePartitionsRequest.java | 1 - .../client/cache/ClientCachePutAllRequest.java | 2 -- .../cache/ClientCachePutIfAbsentRequest.java | 2 -- .../client/cache/ClientCachePutRequest.java | 2 -- .../cache/ClientCacheRemoveAllRequest.java | 2 -- .../cache/ClientCacheRemoveIfEqualsRequest.java | 2 -- .../cache/ClientCacheRemoveKeyRequest.java | 2 -- .../cache/ClientCacheRemoveKeysRequest.java | 2 -- .../ClientCacheReplaceIfEqualsRequest.java | 2 -- .../client/cache/ClientCacheReplaceRequest.java | 2 -- .../client/cache/ClientCacheRequest.java | 30 -------------------- .../cache/ClientCacheScanQueryRequest.java | 2 -- 31 files changed, 6 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java index 6a53517..3e4bf06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java @@ -64,6 +64,7 @@ public class ClientRequest implements ClientListenerRequest { /** * Run the code with converting {@link SecurityException} to {@link IgniteClientException}. */ + // TODO protected static void runWithSecurityExceptionHandler(Runnable runnable) { try { runnable.run(); @@ -76,14 +77,4 @@ public class ClientRequest implements ClientListenerRequest { ); } } - - /** - * Authorize for specified permission. - */ - protected void authorize(ClientConnectionContext ctx, SecurityPermission perm) { -// SecurityContext secCtx = ctx.securityContext(); -// -// if (secCtx != null) -// runWithSecurityExceptionHandler(() -> ctx.kernalContext().security().authorize(null, perm, secCtx)); - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java index 5f8e952..10b4be2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeyRequest.java @@ -38,8 +38,6 @@ public class ClientCacheClearKeyRequest extends ClientCacheKeyRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_REMOVE); - cache(ctx).clear(key()); return super.process(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeysRequest.java index d803f69..348aaa2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearKeysRequest.java @@ -38,8 +38,6 @@ public class ClientCacheClearKeysRequest extends ClientCacheKeysRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_REMOVE); - cache(ctx).clearAll(keys()); return super.process(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearRequest.java index 59d0ec5..850996f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheClearRequest.java @@ -37,8 +37,6 @@ public class ClientCacheClearRequest extends ClientCacheRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_REMOVE); - cache(ctx).clear(); return super.process(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeyRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeyRequest.java index 386f448..2eb05fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeyRequest.java @@ -39,8 +39,6 @@ public class ClientCacheContainsKeyRequest extends ClientCacheKeyRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ); - boolean val = cache(ctx).containsKey(key()); return new ClientBooleanResponse(requestId(), val); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeysRequest.java index b5184bf..bdbd2af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheContainsKeysRequest.java @@ -39,8 +39,6 @@ public class ClientCacheContainsKeysRequest extends ClientCacheKeysRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ); - boolean val = cache(ctx).containsKeys(keys()); return new ClientBooleanResponse(requestId(), val); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java index 9f1d63fc..3683cfe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java @@ -50,8 +50,6 @@ public class ClientCacheCreateWithConfigurationRequest extends ClientRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_CREATE); - try { // Use security exception handler since the code authorizes "enable on-heap cache" permission runWithSecurityExceptionHandler(() -> ctx.kernalContext().grid().createCache(cacheCfg)); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithNameRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithNameRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithNameRequest.java index cacf099..71d6670 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithNameRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithNameRequest.java @@ -46,11 +46,10 @@ public class ClientCacheCreateWithNameRequest extends ClientRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_CREATE); - try { ctx.kernalContext().grid().createCache(cacheName); - } catch (CacheExistsException e) { + } + catch (CacheExistsException e) { throw new IgniteClientException(ClientStatus.CACHE_EXISTS, e.getMessage()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheDestroyRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheDestroyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheDestroyRequest.java index b6f85ee..96a0f06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheDestroyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheDestroyRequest.java @@ -43,8 +43,6 @@ public class ClientCacheDestroyRequest extends ClientRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_DESTROY); - String cacheName = ClientCacheRequest.cacheDescriptor(ctx, cacheId).cacheName(); ctx.kernalContext().grid().destroyCache(cacheName); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java index a07305c..5972a57 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAllRequest.java @@ -40,9 +40,7 @@ public class ClientCacheGetAllRequest extends ClientCacheKeysRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ); - - Map val = cache(ctx).getAll(keys()); + Map val = cache(ctx).getAll(keys()); return new ClientCacheGetAllResponse(requestId(), val); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutIfAbsentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutIfAbsentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutIfAbsentRequest.java index 8713a21..f219cbf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutIfAbsentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutIfAbsentRequest.java @@ -39,8 +39,6 @@ public class ClientCacheGetAndPutIfAbsentRequest extends ClientCacheKeyValueRequ /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ, SecurityPermission.CACHE_PUT); - Object res = cache(ctx).getAndPutIfAbsent(key(), val()); return new ClientObjectResponse(requestId(), res); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutRequest.java index dde5181..8c3645c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndPutRequest.java @@ -39,8 +39,6 @@ public class ClientCacheGetAndPutRequest extends ClientCacheKeyValueRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ, SecurityPermission.CACHE_PUT); - Object res = cache(ctx).getAndPut(key(), val()); return new ClientObjectResponse(requestId(), res); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndRemoveRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndRemoveRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndRemoveRequest.java index 3b9dd4b..02e38ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndRemoveRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndRemoveRequest.java @@ -39,8 +39,6 @@ public class ClientCacheGetAndRemoveRequest extends ClientCacheKeyRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ, SecurityPermission.CACHE_REMOVE); - Object val = cache(ctx).getAndRemove(key()); return new ClientObjectResponse(requestId(), val); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndReplaceRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndReplaceRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndReplaceRequest.java index 8ba157a..4f79e80 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndReplaceRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetAndReplaceRequest.java @@ -39,8 +39,6 @@ public class ClientCacheGetAndReplaceRequest extends ClientCacheKeyValueRequest /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ, SecurityPermission.CACHE_PUT); - Object res = cache(ctx).getAndReplace(key(), val()); return new ClientObjectResponse(requestId(), res); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java index b005fb2..6d39eeb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java @@ -50,12 +50,11 @@ public class ClientCacheGetOrCreateWithConfigurationRequest extends ClientReques /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_CREATE); - try { // Use security exception handler since the code authorizes "enable on-heap cache" permission runWithSecurityExceptionHandler(() -> ctx.kernalContext().grid().getOrCreateCache(cacheCfg)); - } catch (CacheExistsException e) { + } + catch (CacheExistsException e) { throw new IgniteClientException(ClientStatus.CACHE_EXISTS, e.getMessage()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithNameRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithNameRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithNameRequest.java index 3c4ce7b..57065f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithNameRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithNameRequest.java @@ -43,8 +43,6 @@ public class ClientCacheGetOrCreateWithNameRequest extends ClientRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_CREATE); - ctx.kernalContext().grid().getOrCreateCache(cacheName); return super.process(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetRequest.java index dc17cbf..ce8f158 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetRequest.java @@ -39,8 +39,6 @@ public class ClientCacheGetRequest extends ClientCacheKeyRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ); - Object val = cache(ctx).get(key()); return new ClientObjectResponse(requestId(), val); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetSizeRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetSizeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetSizeRequest.java index ea88fa3..ea74068 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetSizeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetSizeRequest.java @@ -50,8 +50,6 @@ public class ClientCacheGetSizeRequest extends ClientCacheRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ); - long res = cache(ctx).sizeLong(modes); return new ClientLongResponse(requestId(), res); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheLocalPeekRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheLocalPeekRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheLocalPeekRequest.java index 068bbc9..3b254e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheLocalPeekRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheLocalPeekRequest.java @@ -41,8 +41,6 @@ public class ClientCacheLocalPeekRequest extends ClientCacheKeyRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ); - Object val = cache(ctx).localPeek(key(), CachePeekMode.ALL); return new ClientObjectResponse(requestId(), val); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheNodePartitionsRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheNodePartitionsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheNodePartitionsRequest.java index 5e33860..e55269a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheNodePartitionsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheNodePartitionsRequest.java @@ -45,7 +45,6 @@ public class ClientCacheNodePartitionsRequest extends ClientCacheRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ); IgniteCache cache = cache(ctx); GridDiscoveryManager discovery = ctx.kernalContext().discovery(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutAllRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutAllRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutAllRequest.java index 57e3144..8df4be6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutAllRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutAllRequest.java @@ -51,8 +51,6 @@ public class ClientCachePutAllRequest extends ClientCacheRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_PUT); - cache(ctx).putAll(map); return super.process(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutIfAbsentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutIfAbsentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutIfAbsentRequest.java index ec81bc0..eaa02d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutIfAbsentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutIfAbsentRequest.java @@ -39,8 +39,6 @@ public class ClientCachePutIfAbsentRequest extends ClientCacheKeyValueRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ, SecurityPermission.CACHE_PUT); - boolean res = cache(ctx).putIfAbsent(key(), val()); return new ClientBooleanResponse(requestId(), res); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutRequest.java index 116460e..d7b48fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePutRequest.java @@ -38,8 +38,6 @@ public class ClientCachePutRequest extends ClientCacheKeyValueRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_PUT); - cache(ctx).put(key(), val()); return super.process(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveAllRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveAllRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveAllRequest.java index a3733a9..bb4661b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveAllRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveAllRequest.java @@ -37,8 +37,6 @@ public class ClientCacheRemoveAllRequest extends ClientCacheRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_REMOVE); - cache(ctx).removeAll(); return super.process(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveIfEqualsRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveIfEqualsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveIfEqualsRequest.java index 26c191f..7212639 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveIfEqualsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveIfEqualsRequest.java @@ -39,8 +39,6 @@ public class ClientCacheRemoveIfEqualsRequest extends ClientCacheKeyValueRequest /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ, SecurityPermission.CACHE_REMOVE); - boolean res = cache(ctx).remove(key(), val()); return new ClientBooleanResponse(requestId(), res); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeyRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeyRequest.java index 5af9743..55021de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeyRequest.java @@ -39,8 +39,6 @@ public class ClientCacheRemoveKeyRequest extends ClientCacheKeyRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_REMOVE); - boolean val = cache(ctx).remove(key()); return new ClientBooleanResponse(requestId(), val); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeysRequest.java index 62dea00..c162982 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRemoveKeysRequest.java @@ -38,8 +38,6 @@ public class ClientCacheRemoveKeysRequest extends ClientCacheKeysRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_REMOVE); - cache(ctx).removeAll(keys()); return super.process(ctx); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceIfEqualsRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceIfEqualsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceIfEqualsRequest.java index 056367d..f477e22 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceIfEqualsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceIfEqualsRequest.java @@ -44,8 +44,6 @@ public class ClientCacheReplaceIfEqualsRequest extends ClientCacheKeyValueReques /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ, SecurityPermission.CACHE_PUT); - boolean res = cache(ctx).replace(key(), val(), newVal); return new ClientBooleanResponse(requestId(), res); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceRequest.java index ea04593..6f88a82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheReplaceRequest.java @@ -39,8 +39,6 @@ public class ClientCacheReplaceRequest extends ClientCacheKeyValueRequest { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ, SecurityPermission.CACHE_PUT); - boolean res = cache(ctx).replace(key(), val()); return new ClientBooleanResponse(requestId(), res); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java index 9e39b56..bbbe99a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java @@ -121,34 +121,4 @@ class ClientCacheRequest extends ClientRequest { protected int cacheId() { return cacheId; } - - /** {@inheritDoc} */ - @Override protected void authorize(ClientConnectionContext ctx, SecurityPermission perm) { - SecurityContext secCtx = ctx.securityContext(); - - if (secCtx != null) { - DynamicCacheDescriptor cacheDesc = cacheDescriptor(ctx, cacheId); - - runWithSecurityExceptionHandler(() -> { - ctx.kernalContext().security().authorize(cacheDesc.cacheName(), perm, secCtx); - }); - } - } - - /** - * Authorize for multiple permissions. - */ - protected void authorize(ClientConnectionContext ctx, SecurityPermission... perm) - throws IgniteClientException { - SecurityContext secCtx = ctx.securityContext(); - - if (secCtx != null) { - DynamicCacheDescriptor cacheDesc = cacheDescriptor(ctx, cacheId); - - runWithSecurityExceptionHandler(() -> { - for (SecurityPermission p : perm) - ctx.kernalContext().security().authorize(cacheDesc.cacheName(), p, secCtx); - }); - } - } } http://git-wip-us.apache.org/repos/asf/ignite/blob/8d2f8bae/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheScanQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheScanQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheScanQueryRequest.java index 70b6966..2701e36 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheScanQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheScanQueryRequest.java @@ -81,8 +81,6 @@ public class ClientCacheScanQueryRequest extends ClientCacheRequest { /** {@inheritDoc} */ @Override public ClientResponse process(ClientConnectionContext ctx) { - authorize(ctx, SecurityPermission.CACHE_READ); - IgniteCache cache = filterPlatform == FILTER_PLATFORM_JAVA && !isKeepBinary() ? rawCache(ctx) : cache(ctx); ScanQuery qry = new ScanQuery()
