[camel] branch camel-3.7.x updated: Backport sensitive utils improvements (#4843)

[davsclaus]

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

davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.7.x by this push:
     new 4307072  Backport sensitive utils improvements (#4843)
4307072 is described below

commit 43070720e1839678023b39e11fbdf1f97424c865
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Fri Jan 8 14:44:14 2021 +0100

    Backport sensitive utils improvements (#4843)
    
    * make use of HashSet#contains instead of streaming + regex which is slower
    
    * polish
    
    Co-authored-by: Babak Vahdat <bvah...@apache.org>
---
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java    | 10 ++++++----
 .../test/java/org/apache/camel/util/SensitiveUtilsTest.java    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java 
b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 9854fec..89923ba 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -18,17 +18,19 @@
 package org.apache.camel.util;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Locale;
+import java.util.Set;
 
 public final class SensitiveUtils {
-    public static final String SENSITIVE_KEYS
-            = 
"passphrase|password|secretkey|accesstoken|clientsecret|authorizationtoken|sasljaasconfig|accesskey";
+    private static final Set<String> SENSITIVE_KEYS = new HashSet<>(
+            Arrays.asList("passphrase", "password", "secretkey", 
"accesstoken", "clientsecret", "authorizationtoken",
+                    "sasljaasconfig", "accesskey"));
 
     private SensitiveUtils() {
-
     }
 
     public static boolean containsSensitive(String text) {
-        return Arrays.stream(SENSITIVE_KEYS.split("\\|")).anyMatch(s -> 
text.toLowerCase(Locale.ENGLISH).contains(s));
+        return SENSITIVE_KEYS.contains(text.toLowerCase(Locale.ENGLISH));
     }
 }
diff --git 
a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java 
b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
index 08fd28e..90ace7f 100644
--- 
a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
+++ 
b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
@@ -26,7 +26,7 @@ class SensitiveUtilsTest {
     @Test
     void testContainsSensitive() {
         assertTrue(SensitiveUtils.containsSensitive("accessKey"));
-        assertTrue(SensitiveUtils.containsSensitive("accesskey"));
+        assertTrue(SensitiveUtils.containsSensitive("passphrase"));
     }
 
 }