(camel) branch main updated: CAMEL-22516: camel-main - Property placeholders with RAW() values should be masked.

[davsclaus]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new c2f180bea3ac CAMEL-22516: camel-main - Property placeholders with 
RAW() values should be masked.
c2f180bea3ac is described below

commit c2f180bea3accc23836dac1f6cfe615e53229b68
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Oct 9 13:09:53 2025 +0200

    CAMEL-22516: camel-main - Property placeholders with RAW() values should be 
masked.
---
 .../src/main/java/org/apache/camel/main/BaseMainSupport.java  |  3 ++-
 .../org/apache/camel/main/MainConfigurationDevConsole.java    |  3 +--
 .../src/main/java/org/apache/camel/main/MainHelper.java       | 11 ++++++++++-
 .../java/org/apache/camel/support/CamelContextHelper.java     |  4 +++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java 
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 179d605a447b..5a8f17293ad1 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -2869,7 +2869,7 @@ public abstract class BaseMainSupport extends BaseService 
{
                             header = false;
                         }
                         String loc = locationSummary(propertyPlaceholders, k);
-                        if (CamelContextHelper.containsSensitive(camelContext, 
k)) {
+                        if (MainHelper.containsSensitive(camelContext, k, v)) {
                             LOG.info("    {} {} = xxxxxx", loc, k);
                         } else {
                             LOG.info("    {} {} = {}", loc, k, v);
@@ -2879,4 +2879,5 @@ public abstract class BaseMainSupport extends BaseService 
{
             }
         }
     }
+
 }
diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationDevConsole.java
 
b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationDevConsole.java
index 6d290ccad36c..477d867d8907 100644
--- 
a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationDevConsole.java
+++ 
b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationDevConsole.java
@@ -20,7 +20,6 @@ import java.util.Map;
 
 import org.apache.camel.spi.PropertiesComponent;
 import org.apache.camel.spi.annotations.DevConsole;
-import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.console.AbstractDevConsole;
 import org.apache.camel.util.OrderedLocationProperties;
 import org.apache.camel.util.json.JsonArray;
@@ -56,7 +55,7 @@ public class MainConfigurationDevConsole extends 
AbstractDevConsole {
                 String k = entry.getKey().toString();
                 Object v = entry.getValue();
                 String loc = locationSummary(startupConfiguration, k);
-                if (CamelContextHelper.containsSensitive(getCamelContext(), 
k)) {
+                if (MainHelper.containsSensitive(getCamelContext(), k, v)) {
                     sb.append(String.format("    %s %s = xxxxxx%n", loc, k));
                 } else {
                     sb.append(String.format("    %s %s = %s%n", loc, k, v));
diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java 
b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
index 04275fd9a580..ef05d8e4b6a5 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
@@ -618,12 +618,21 @@ public final class MainHelper {
         toRemove.forEach(autoConfiguredProperties::remove);
     }
 
+    public static boolean containsSensitive(CamelContext camelContext, String 
key, Object value) {
+        boolean answer = CamelContextHelper.containsSensitive(camelContext, 
key);
+        if (!answer && value != null) {
+            String v = value.toString();
+            answer = v.startsWith("RAW(");
+        }
+        return answer;
+    }
+
     public static void sensitiveAwareLogging(
             CamelContext camelContext, Logger log, String k, Object v, String 
loc, boolean debug) {
         if (log == null) {
             log = LOG;
         }
-        if (CamelContextHelper.containsSensitive(camelContext, k)) {
+        if (containsSensitive(camelContext, k, v)) {
             if (debug) {
                 log.debug("    {} {} = xxxxxx", loc, k);
             } else {
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
index 529c05b04312..7e8b29c80caa 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
@@ -78,7 +78,9 @@ public final class CamelContextHelper {
             }
             text = text.toLowerCase(Locale.ENGLISH);
             text = text.replace("-", "");
-            return 
camelContext.getCamelContextExtension().getAdditionalSensitiveKeywords().contains(text);
+            String words = 
camelContext.getCamelContextExtension().getAdditionalSensitiveKeywords();
+            words = words.toLowerCase(Locale.ENGLISH);
+            return words.contains(text);
         }
         return false;
     }