[ignite] branch master updated: IGNITE-11673: SQL: It looks like security check is missed in h2 indexing. This closes #6390.

[am...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new e228241  IGNITE-11673: SQL: It looks like security check is missed in h2 indexing. This closes #6390.
e228241 is described below

commit e22824169c99c7615be32b8ae0e3aed25368ceb1
Author: rkondakov <ko...@mail.ru>
AuthorDate: Thu Apr 4 18:10:26 2019 +0300

    IGNITE-11673: SQL: It looks like security check is missed in h2 indexing. This closes #6390.
---
 .../ignite/internal/processors/query/h2/IgniteH2Indexing.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 2434e27..dc1ccc0 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1155,10 +1155,6 @@ public class IgniteH2Indexing implements GridQueryIndexing {
         if (cancel == null)
             cancel = new GridQueryCancel();
 
-        // Check security.
-        if (ctx.security().enabled())
-            checkSecurity(select.cacheIds());
-
         // Register query.
         Long qryId = registerRunningQuery(qryDesc, cancel);
 
@@ -1294,6 +1290,10 @@ public class IgniteH2Indexing implements GridQueryIndexing {
     ) throws IgniteCheckedException {
         assert !select.mvccEnabled() || mvccTracker != null;
 
+        // Check security.
+        if (ctx.security().enabled())
+            checkSecurity(select.cacheIds());
+
         Iterable<List<?>> iter;
 
         if (select.splitNeeded()) {