[ignite] branch master updated: [MINOR] IGNITE-13450 Mark query arguments as sensitive info

[nizhikov]

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

nizhikov 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 2ed8e7c  [MINOR] IGNITE-13450 Mark query arguments as sensitive info
2ed8e7c is described below

commit 2ed8e7c641f8b57986cd50dca55ff4e5026c9fc3
Author: Nikolay Izhikov <nizhi...@apache.org>
AuthorDate: Wed Nov 25 10:27:56 2020 +0300

    [MINOR] IGNITE-13450 Mark query arguments as sensitive info
---
 .../ignite/events/SqlQueryExecutionEvent.java      |  2 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java    | 23 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/events/SqlQueryExecutionEvent.java
 
b/modules/core/src/main/java/org/apache/ignite/events/SqlQueryExecutionEvent.java
index 0541dd8..4700d7b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/events/SqlQueryExecutionEvent.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/events/SqlQueryExecutionEvent.java
@@ -68,7 +68,7 @@ public class SqlQueryExecutionEvent extends EventAdapter {
     private final String text;
 
     /** Query arguments. */
-    @GridToStringInclude
+    @GridToStringInclude(sensitive = true)
     private final Object[] args;
 
     /** Security subject ID. */
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index 36e6d7a..660f56e 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -46,6 +46,7 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.cache.CacheAtomicityMode;
@@ -89,6 +90,7 @@ import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.WithSystemProperty;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
@@ -1544,15 +1546,30 @@ public abstract class IgniteCacheAbstractQuerySelfTest 
extends GridCommonAbstrac
         }
     }
 
-    /**
-     * @throws Exception If failed.
-     */
+    /** @throws Exception If failed. */
     @Test
+    @WithSystemProperty(key = 
IgniteSystemProperties.IGNITE_TO_STRING_INCLUDE_SENSITIVE, value = "false")
     public void testClientQueryExecutedEvents() throws Exception {
+        doTestClientQueryExecutedEvents(false);
+    }
+
+    /** @throws Exception If failed. */
+    @Test
+    @WithSystemProperty(key = 
IgniteSystemProperties.IGNITE_TO_STRING_INCLUDE_SENSITIVE, value = "true")
+    public void testClientQueryExecutedEventsIncludeSensitive() throws 
Exception {
+        doTestClientQueryExecutedEvents(true);
+    }
+
+    /** */
+    public void doTestClientQueryExecutedEvents(boolean inclSens) throws 
Exception {
         CountDownLatch execLatch = new CountDownLatch(9);
 
         IgnitePredicate<SqlQueryExecutionEvent> lsnr = evt -> {
             assertNotNull(evt.text());
+            if (inclSens)
+                assertTrue(evt.toString().contains("args="));
+            else
+                assertFalse(evt.toString().contains("args="));
 
             execLatch.countDown();