(camel) branch camel-4.8.x updated: Add keystorePassword as sensitive key

[davsclaus]

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

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


The following commit(s) were added to refs/heads/camel-4.8.x by this push:
     new 10faf4de2aa Add keystorePassword as sensitive key
10faf4de2aa is described below

commit 10faf4de2aa36df3b21e64f0044d71d0f75a4c64
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Sep 27 18:56:17 2024 +0200

    Add keystorePassword as sensitive key
---
 .../resources/org/apache/camel/catalog/main/sensitive-keys.json         | 1 +
 core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 ++
 .../java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
index 14a695c9ab6..229da62c249 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
@@ -26,6 +26,7 @@
   "emailaddress",
   "httpproxypassword",
   "keystore",
+  "keystorePassword",
   "login",
   "oauthclientid",
   "oauthclientsecret",
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 ad29dad2a23..99fd4b4f6e4 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
@@ -55,6 +55,7 @@ public final class SensitiveUtils {
                     "emailaddress",
                     "httpproxypassword",
                     "keystore",
+                    "keystorePassword",
                     "login",
                     "oauthclientid",
                     "oauthclientsecret",
@@ -134,6 +135,7 @@ public final class SensitiveUtils {
                                                     + "|\\Qemailaddress\\E"
                                                     + 
"|\\Qhttpproxypassword\\E"
                                                     + "|\\Qkeystore\\E"
+                                                    + "|\\QkeystorePassword\\E"
                                                     + "|\\Qlogin\\E"
                                                     + "|\\Qoauthclientid\\E"
                                                     + 
"|\\Qoauthclientsecret\\E"
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
index 928f02b2b9e..4a3bdd2ca1c 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
@@ -55,7 +55,7 @@ public class UpdateSensitizeHelper extends 
AbstractGeneratorMojo {
     // extra keys that are regarded as secret which may not yet been in any 
component
     // they MUST be in lowercase and without a dash
     private static final String[] EXTRA_KEYS
-            = new String[] { "apipassword", "apiuser", "apiusername", 
"api_key", "api_secret", "secret" };
+            = new String[] { "apipassword", "apiuser", "apiusername", 
"api_key", "api_secret", "secret", "keystorePassword" };
 
     @Parameter(defaultValue = 
"${project.basedir}/src/generated/resources/org/apache/camel/catalog/")
     protected File jsonDir;