[camel] branch master updated: Improve SensitiveUtils class

[ac...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 6641e41d Improve SensitiveUtils class
6641e41d is described below

commit 6641e41d4a1b683806d70d9c051a6d5c0b3a90c6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 4 14:12:51 2021 +0100

    Improve SensitiveUtils class
---
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java           | 3 ++-
 .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java       | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 2484907..5fb6455 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
@@ -25,7 +25,8 @@ import java.util.Set;
 public final class SensitiveUtils {
     private static final Set<String> SENSITIVE_KEYS = new HashSet<>(
             Arrays.asList("accesskey", "accesstoken", "authorizationtoken", "clientsecret", "passphrase", "password",
-                    "sasljaasconfig", "secretkey"));
+                    "sasljaasconfig", "secretkey", "access-key", "secret-key", "client-secret", "access-token",
+                    "sasl-jaas-config", "authorization-token"));
 
     private SensitiveUtils() {
     }
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 9a8a46d..cebe89e 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
@@ -34,6 +34,10 @@ class SensitiveUtilsTest {
         assertTrue(SensitiveUtils.containsSensitive("password"));
         assertTrue(SensitiveUtils.containsSensitive("sasljaasconfig"));
         assertTrue(SensitiveUtils.containsSensitive("secretkey"));
+        assertTrue(SensitiveUtils.containsSensitive("secret-key"));
+        assertTrue(SensitiveUtils.containsSensitive("access-key"));
+        assertTrue(SensitiveUtils.containsSensitive("client-secret"));
+        assertTrue(SensitiveUtils.containsSensitive("authorization-token"));
 
         assertFalse(SensitiveUtils.containsSensitive("foo"));
         assertFalse(SensitiveUtils.containsSensitive("bar"));