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 c4e1566d6d8 Remove keystore and sslKeystore as sensitive key
c4e1566d6d8 is described below
commit c4e1566d6d8f3b9edd78b64e73668307f3cdf8fc
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Sep 27 19:05:22 2024 +0200
Remove keystore and sslKeystore as sensitive key
---
.../resources/org/apache/camel/catalog/components/cometd.json | 2 +-
.../resources/org/apache/camel/catalog/components/cometds.json | 2 +-
.../resources/org/apache/camel/catalog/components/jetty.json | 2 +-
.../resources/org/apache/camel/catalog/components/salesforce.json | 2 +-
.../resources/org/apache/camel/catalog/main/sensitive-keys.json | 2 --
.../META-INF/org/apache/camel/component/cometd/cometd.json | 2 +-
.../META-INF/org/apache/camel/component/cometd/cometds.json | 2 +-
.../java/org/apache/camel/component/cometd/CometdComponent.java | 2 +-
.../java/org/apache/camel/component/jetty/JettyHttpComponent.java | 2 +-
.../META-INF/org/apache/camel/component/jetty12/jetty.json | 2 +-
.../META-INF/org/apache/camel/component/salesforce/salesforce.json | 2 +-
.../org/apache/camel/component/salesforce/SalesforceComponent.java | 2 +-
.../src/main/java/org/apache/camel/util/SensitiveUtils.java | 6 +-----
13 files changed, 12 insertions(+), 18 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
index 03dc75267d4..8f1e8acb0d5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
@@ -31,7 +31,7 @@
"securityPolicy": { "index": 4, "kind": "property", "displayName":
"Security Policy", "group": "security", "label": "security", "required": false,
"type": "object", "javaType": "org.cometd.bayeux.server.SecurityPolicy",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom configured SecurityPolicy to control authorization" },
"sslContextParameters": { "index": 5, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "To configure security
using SSLContextParameters" },
"sslKeyPassword": { "index": 6, "kind": "property", "displayName": "Ssl
Key Password", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "The password for the
keystore when using SSL." },
- "sslKeystore": { "index": 7, "kind": "property", "displayName": "Ssl
Keystore", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "The path to the keystore." },
+ "sslKeystore": { "index": 7, "kind": "property", "displayName": "Ssl
Keystore", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The path to the keystore." },
"sslPassword": { "index": 8, "kind": "property", "displayName": "Ssl
Password", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "The password when using SSL." },
"useGlobalSslContextParameters": { "index": 9, "kind": "property",
"displayName": "Use Global Ssl Context Parameters", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Enable usage of global SSL context
parameters." }
},
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
index 6c0aa3a5a86..06f568c2b0f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
@@ -31,7 +31,7 @@
"securityPolicy": { "index": 4, "kind": "property", "displayName":
"Security Policy", "group": "security", "label": "security", "required": false,
"type": "object", "javaType": "org.cometd.bayeux.server.SecurityPolicy",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom configured SecurityPolicy to control authorization" },
"sslContextParameters": { "index": 5, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "To configure security
using SSLContextParameters" },
"sslKeyPassword": { "index": 6, "kind": "property", "displayName": "Ssl
Key Password", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "The password for the
keystore when using SSL." },
- "sslKeystore": { "index": 7, "kind": "property", "displayName": "Ssl
Keystore", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "The path to the keystore." },
+ "sslKeystore": { "index": 7, "kind": "property", "displayName": "Ssl
Keystore", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The path to the keystore." },
"sslPassword": { "index": 8, "kind": "property", "displayName": "Ssl
Password", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "The password when using SSL." },
"useGlobalSslContextParameters": { "index": 9, "kind": "property",
"displayName": "Use Global Ssl Context Parameters", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Enable usage of global SSL context
parameters." }
},
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
index 1575cd195ce..41c303eeccc 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
@@ -51,7 +51,7 @@
"headerFilterStrategy": { "index": 24, "kind": "property", "displayName":
"Header Filter Strategy", "group": "filter", "label": "filter", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired":
false, "secret": false, "description": "To use a custom
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel
message." },
"proxyHost": { "index": 25, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "To use a http proxy to
configure the hostname." },
"proxyPort": { "index": 26, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
use a http proxy to configure the port number." },
- "keystore": { "index": 27, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": true, "description": "Specifies the location of
the Java keystore file, which contains the Jetty server's own X.509 certificate
in a key entry." },
+ "keystore": { "index": 27, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Specifies the location of
the Java keystore file, which contains the Jetty server's own X.509 certificate
in a key entry." },
"socketConnectorProperties": { "index": 28, "kind": "property",
"displayName": "Socket Connector Properties", "group": "security", "label":
"security", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains general HTTP connector properties. Uses the same principle
as sslSocketConnectorProperties." },
"socketConnectors": { "index": 29, "kind": "property", "displayName":
"Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.Connector>", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "A map which contains
per port number specific HTTP connectors. Uses the same principle as
sslSocketConnectors." },
"sslContextParameters": { "index": 30, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
configure security using SSLContextParameters" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
index 333f0bef86b..ca4b9d7a519 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
@@ -114,7 +114,7 @@
"httpProxyUsername": { "index": 87, "kind": "property", "displayName":
"Http Proxy Username", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Username to use to authenticate against the HTTP proxy server." },
"instanceUrl": { "index": 88, "kind": "property", "displayName": "Instance
Url", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "URL of the Salesforce
instance used after authentication, by default received from Salesforce on
successful authentication" },
"jwtAudience": { "index": 89, "kind": "property", "displayName": "Jwt
Audience", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Value to use for the
Audience claim (aud) when using OAuth JWT flow. If not set, the login URL will
be used, which is appropriate in most cases." },
- "keystore": { "index": 90, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "common,security", "required": false, "type":
"object", "javaType": "org.apache.camel.support.jsse.KeyStoreParameters",
"deprecated": false, "autowired": false, "secret": true, "description":
"KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only
one entry with private key and certificate. Salesforce does not verify the
certificate chain, so this can easily [...]
+ "keystore": { "index": 90, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "common,security", "required": false, "type":
"object", "javaType": "org.apache.camel.support.jsse.KeyStoreParameters",
"deprecated": false, "autowired": false, "secret": false, "description":
"KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only
one entry with private key and certificate. Salesforce does not verify the
certificate chain, so this can easil [...]
"lazyLogin": { "index": 91, "kind": "property", "displayName": "Lazy
Login", "group": "security", "label": "common,security", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "If set to true
prevents the component from authenticating to Salesforce with the start of the
component. You would generally set this to the (default) false and authenticate
early and be immediately aware [...]
"loginConfig": { "index": 92, "kind": "property", "displayName": "Login
Config", "group": "security", "label": "common,security", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.salesforce.SalesforceLoginConfig", "deprecated":
false, "autowired": false, "secret": false, "description": "All authentication
configuration in one nested bean, all properties set there can be set directly
on the component as well" },
"loginUrl": { "index": 93, "kind": "property", "displayName": "Login Url",
"group": "security", "label": "common,security", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "https:\/\/login.salesforce.com",
"description": "URL of the Salesforce instance used for authentication, by
default set to https:\/\/login.salesforce.com" },
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 229da62c249..fb9497e16b0 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
@@ -25,7 +25,6 @@
"consumersecret",
"emailaddress",
"httpproxypassword",
- "keystore",
"keystorePassword",
"login",
"oauthclientid",
@@ -59,7 +58,6 @@
"sharedaccesskey",
"sourceblobaccesskey",
"sslkeypassword",
- "sslkeystore",
"sslkeystorepassword",
"sslpassword",
"ssltruststorepassword",
diff --git
a/components/camel-cometd/src/generated/resources/META-INF/org/apache/camel/component/cometd/cometd.json
b/components/camel-cometd/src/generated/resources/META-INF/org/apache/camel/component/cometd/cometd.json
index 03dc75267d4..8f1e8acb0d5 100644
---
a/components/camel-cometd/src/generated/resources/META-INF/org/apache/camel/component/cometd/cometd.json
+++
b/components/camel-cometd/src/generated/resources/META-INF/org/apache/camel/component/cometd/cometd.json
@@ -31,7 +31,7 @@
"securityPolicy": { "index": 4, "kind": "property", "displayName":
"Security Policy", "group": "security", "label": "security", "required": false,
"type": "object", "javaType": "org.cometd.bayeux.server.SecurityPolicy",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom configured SecurityPolicy to control authorization" },
"sslContextParameters": { "index": 5, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "To configure security
using SSLContextParameters" },
"sslKeyPassword": { "index": 6, "kind": "property", "displayName": "Ssl
Key Password", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "The password for the
keystore when using SSL." },
- "sslKeystore": { "index": 7, "kind": "property", "displayName": "Ssl
Keystore", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "The path to the keystore." },
+ "sslKeystore": { "index": 7, "kind": "property", "displayName": "Ssl
Keystore", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The path to the keystore." },
"sslPassword": { "index": 8, "kind": "property", "displayName": "Ssl
Password", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "The password when using SSL." },
"useGlobalSslContextParameters": { "index": 9, "kind": "property",
"displayName": "Use Global Ssl Context Parameters", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Enable usage of global SSL context
parameters." }
},
diff --git
a/components/camel-cometd/src/generated/resources/META-INF/org/apache/camel/component/cometd/cometds.json
b/components/camel-cometd/src/generated/resources/META-INF/org/apache/camel/component/cometd/cometds.json
index 6c0aa3a5a86..06f568c2b0f 100644
---
a/components/camel-cometd/src/generated/resources/META-INF/org/apache/camel/component/cometd/cometds.json
+++
b/components/camel-cometd/src/generated/resources/META-INF/org/apache/camel/component/cometd/cometds.json
@@ -31,7 +31,7 @@
"securityPolicy": { "index": 4, "kind": "property", "displayName":
"Security Policy", "group": "security", "label": "security", "required": false,
"type": "object", "javaType": "org.cometd.bayeux.server.SecurityPolicy",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom configured SecurityPolicy to control authorization" },
"sslContextParameters": { "index": 5, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "To configure security
using SSLContextParameters" },
"sslKeyPassword": { "index": 6, "kind": "property", "displayName": "Ssl
Key Password", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "The password for the
keystore when using SSL." },
- "sslKeystore": { "index": 7, "kind": "property", "displayName": "Ssl
Keystore", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "The path to the keystore." },
+ "sslKeystore": { "index": 7, "kind": "property", "displayName": "Ssl
Keystore", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The path to the keystore." },
"sslPassword": { "index": 8, "kind": "property", "displayName": "Ssl
Password", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "description": "The password when using SSL." },
"useGlobalSslContextParameters": { "index": 9, "kind": "property",
"displayName": "Use Global Ssl Context Parameters", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Enable usage of global SSL context
parameters." }
},
diff --git
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 6aa663fd688..00e859df754 100644
---
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -67,7 +67,7 @@ public class CometdComponent extends DefaultComponent
implements SSLContextParam
private String sslKeyPassword;
@Metadata(label = "security", secret = true)
private String sslPassword;
- @Metadata(label = "security", secret = true)
+ @Metadata(label = "security")
private String sslKeystore;
@Metadata(label = "security")
private SecurityPolicy securityPolicy;
diff --git
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 9503776bd3a..d38f9d6f1ed 100644
---
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -538,7 +538,7 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
* key entry.
*/
@Metadata(description = "Specifies the location of the Java keystore file,
which contains the Jetty server's own X.509 certificate in a key entry.",
- label = "security", secret = true)
+ label = "security")
public void setKeystore(String sslKeystore) {
this.sslKeystore = sslKeystore;
}
diff --git
a/components/camel-jetty/src/generated/resources/META-INF/org/apache/camel/component/jetty12/jetty.json
b/components/camel-jetty/src/generated/resources/META-INF/org/apache/camel/component/jetty12/jetty.json
index 1575cd195ce..41c303eeccc 100644
---
a/components/camel-jetty/src/generated/resources/META-INF/org/apache/camel/component/jetty12/jetty.json
+++
b/components/camel-jetty/src/generated/resources/META-INF/org/apache/camel/component/jetty12/jetty.json
@@ -51,7 +51,7 @@
"headerFilterStrategy": { "index": 24, "kind": "property", "displayName":
"Header Filter Strategy", "group": "filter", "label": "filter", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired":
false, "secret": false, "description": "To use a custom
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel
message." },
"proxyHost": { "index": 25, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "To use a http proxy to
configure the hostname." },
"proxyPort": { "index": 26, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
use a http proxy to configure the port number." },
- "keystore": { "index": 27, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": true, "description": "Specifies the location of
the Java keystore file, which contains the Jetty server's own X.509 certificate
in a key entry." },
+ "keystore": { "index": 27, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Specifies the location of
the Java keystore file, which contains the Jetty server's own X.509 certificate
in a key entry." },
"socketConnectorProperties": { "index": 28, "kind": "property",
"displayName": "Socket Connector Properties", "group": "security", "label":
"security", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains general HTTP connector properties. Uses the same principle
as sslSocketConnectorProperties." },
"socketConnectors": { "index": 29, "kind": "property", "displayName":
"Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.Connector>", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "A map which contains
per port number specific HTTP connectors. Uses the same principle as
sslSocketConnectors." },
"sslContextParameters": { "index": 30, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
configure security using SSLContextParameters" },
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/META-INF/org/apache/camel/component/salesforce/salesforce.json
b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/META-INF/org/apache/camel/component/salesforce/salesforce.json
index 333f0bef86b..ca4b9d7a519 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/META-INF/org/apache/camel/component/salesforce/salesforce.json
+++
b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/META-INF/org/apache/camel/component/salesforce/salesforce.json
@@ -114,7 +114,7 @@
"httpProxyUsername": { "index": 87, "kind": "property", "displayName":
"Http Proxy Username", "group": "security", "label": "common,proxy,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Username to use to authenticate against the HTTP proxy server." },
"instanceUrl": { "index": 88, "kind": "property", "displayName": "Instance
Url", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "URL of the Salesforce
instance used after authentication, by default received from Salesforce on
successful authentication" },
"jwtAudience": { "index": 89, "kind": "property", "displayName": "Jwt
Audience", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Value to use for the
Audience claim (aud) when using OAuth JWT flow. If not set, the login URL will
be used, which is appropriate in most cases." },
- "keystore": { "index": 90, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "common,security", "required": false, "type":
"object", "javaType": "org.apache.camel.support.jsse.KeyStoreParameters",
"deprecated": false, "autowired": false, "secret": true, "description":
"KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only
one entry with private key and certificate. Salesforce does not verify the
certificate chain, so this can easily [...]
+ "keystore": { "index": 90, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "common,security", "required": false, "type":
"object", "javaType": "org.apache.camel.support.jsse.KeyStoreParameters",
"deprecated": false, "autowired": false, "secret": false, "description":
"KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only
one entry with private key and certificate. Salesforce does not verify the
certificate chain, so this can easil [...]
"lazyLogin": { "index": 91, "kind": "property", "displayName": "Lazy
Login", "group": "security", "label": "common,security", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "If set to true
prevents the component from authenticating to Salesforce with the start of the
component. You would generally set this to the (default) false and authenticate
early and be immediately aware [...]
"loginConfig": { "index": 92, "kind": "property", "displayName": "Login
Config", "group": "security", "label": "common,security", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.salesforce.SalesforceLoginConfig", "deprecated":
false, "autowired": false, "secret": false, "description": "All authentication
configuration in one nested bean, all properties set there can be set directly
on the component as well" },
"loginUrl": { "index": 93, "kind": "property", "displayName": "Login Url",
"group": "security", "label": "common,security", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "https:\/\/login.salesforce.com",
"description": "URL of the Salesforce instance used for authentication, by
default set to https:\/\/login.salesforce.com" },
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 6e88f559467..794e6b88240 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -145,7 +145,7 @@ public class SalesforceComponent extends DefaultComponent
implements SSLContextP
@Metadata(description = "KeyStore parameters to use in OAuth JWT flow. The
KeyStore should contain only one entry"
+ " with private key and certificate. Salesforce
does not verify the certificate chain, so this can easily be"
+ " a selfsigned certificate. Make sure that you
upload the certificate to the corresponding connected app.",
- label = "common,security", secret = true)
+ label = "common,security")
private KeyStoreParameters keystore;
@Metadata(description = "Value to use for the Audience claim (aud) when
using OAuth JWT flow. If not set, the login URL will be used, which is"
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 99fd4b4f6e4..a1019b57cf1 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
@@ -54,7 +54,6 @@ public final class SensitiveUtils {
"consumersecret",
"emailaddress",
"httpproxypassword",
- "keystore",
"keystorePassword",
"login",
"oauthclientid",
@@ -88,7 +87,6 @@ public final class SensitiveUtils {
"sharedaccesskey",
"sourceblobaccesskey",
"sslkeypassword",
- "sslkeystore",
"sslkeystorepassword",
"sslpassword",
"ssltruststorepassword",
@@ -134,7 +132,6 @@ public final class SensitiveUtils {
+ "|\\Qconsumersecret\\E"
+ "|\\Qemailaddress\\E"
+
"|\\Qhttpproxypassword\\E"
- + "|\\Qkeystore\\E"
+ "|\\QkeystorePassword\\E"
+ "|\\Qlogin\\E"
+ "|\\Qoauthclientid\\E"
@@ -168,7 +165,6 @@ public final class SensitiveUtils {
+ "|\\Qsharedaccesskey\\E"
+
"|\\Qsourceblobaccesskey\\E"
+ "|\\Qsslkeypassword\\E"
- + "|\\Qsslkeystore\\E"
+
"|\\Qsslkeystorepassword\\E"
+ "|\\Qsslpassword\\E"
+
"|\\Qssltruststorepassword\\E"
@@ -182,7 +178,7 @@ public final class SensitiveUtils {
+ "|\\Qverificationcode\\E"
+
"|\\Qwebhookverifytoken\\E"
+
"|\\Qzookeeperpassword\\E"
- // SENSITIVE-PATTERN: END
+ // SENSITIVE-PATTERN: END
;
private SensitiveUtils() {
