[camel] branch camel-3.7.x updated: CAMEL-16190 Sensitive configuration values not redacted in Auto-configuration summary (#5081)

[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 e30baa2  CAMEL-16190 Sensitive configuration values not redacted in 
Auto-configuration summary (#5081)
e30baa2 is described below

commit e30baa24a7f1f429c924f857f56281f10e714c30
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Fri Feb 12 14:53:30 2021 +0000

    CAMEL-16190 Sensitive configuration values not redacted in 
Auto-configuration summary (#5081)
---
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java       | 8 +++++++-
 .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java   | 3 +++
 2 files changed, 10 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 89923ba..dadeaac 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
@@ -31,6 +31,12 @@ public final class SensitiveUtils {
     }
 
     public static boolean containsSensitive(String text) {
-        return SENSITIVE_KEYS.contains(text.toLowerCase(Locale.ENGLISH));
+        int lastPeriod = text.lastIndexOf('.');
+        if (lastPeriod >= 0) {
+            text = text.substring(lastPeriod + 1);
+        }
+        text = text.toLowerCase(Locale.ENGLISH);
+        text = StringHelper.replaceAll(text, "-", "");
+        return SENSITIVE_KEYS.contains(text);
     }
 }
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 90ace7f..20cfe8e 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
@@ -27,6 +27,9 @@ class SensitiveUtilsTest {
     void testContainsSensitive() {
         assertTrue(SensitiveUtils.containsSensitive("accessKey"));
         assertTrue(SensitiveUtils.containsSensitive("passphrase"));
+        assertTrue(SensitiveUtils.containsSensitive("foo.bar.accessKey"));
+
+        assertFalse(SensitiveUtils.containsSensitive("foo.bar.accessKey."));
     }
 
 }