[camel-kafka-connector] 02/05: Fix issue #159: camel components secret options are showed in logs

[gi...@apache.org]

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 7cde6f06e950852834e3b1a01d76a00262d53174
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Jan 7 11:06:19 2021 +0100

    Fix issue #159: camel components secret options are showed in logs
---
 .../kafkaconnector/utils/CamelKafkaConnectMain.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 5eb0df5..d031b20 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -17,8 +17,10 @@
 package org.apache.camel.kafkaconnector.utils;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.apache.camel.AggregationStrategy;
 import org.apache.camel.CamelContext;
@@ -33,6 +35,7 @@ import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.SensitiveUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -203,6 +206,15 @@ public class CamelKafkaConnectMain extends SimpleMain {
             return this;
         }
 
+        private String filterSensitive(Map.Entry<Object, Object> entry) {
+
+            if (SensitiveUtils.containsSensitive((String) entry.getKey())) {
+                return entry.getKey() + "=xxxxxxx";
+            }
+            return entry.getKey() + "=" + entry.getValue();
+        }
+
+
         public CamelKafkaConnectMain build(CamelContext camelContext) {
             CamelKafkaConnectMain camelMain = new CamelKafkaConnectMain(camelContext);
             camelMain.configure().setAutoConfigurationLogSummary(false);
@@ -210,7 +222,9 @@ public class CamelKafkaConnectMain extends SimpleMain {
             Properties camelProperties = new Properties();
             camelProperties.putAll(props);
 
-            LOG.info("Setting initial properties in Camel context: [{}]", camelProperties);
+            List<String> filteredProps = camelProperties.entrySet().stream().map(this::filterSensitive).collect(Collectors.toList());
+
+            LOG.info("Setting initial properties in Camel context: [{}]", filteredProps);
             camelMain.setInitialProperties(camelProperties);
             
             // Instantianting the idempotent Repository here and inject it in registry to be referenced