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 bdd8ee5454a CAMEL-20774: Add more SSL configuration to camel.ssl in
camel-main
bdd8ee5454a is described below
commit bdd8ee5454a48a21bcafa974c7c440299dcddced
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Aug 22 07:14:13 2024 +0200
CAMEL-20774: Add more SSL configuration to camel.ssl in camel-main
---
.../main/camel-main-configuration-metadata.json | 4 +--
.../camel-main-configuration-metadata.json | 4 +--
core/camel-main/src/main/docs/main.adoc | 4 +--
.../camel/main/SSLConfigurationProperties.java | 34 +++++++++++++++-------
4 files changed, 30 insertions(+), 16 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 51b045e5ed9..1e86fc2a4c8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -285,7 +285,7 @@
{ "name": "camel.ssl.enabled", "description": "Enables SSL in your Camel
application.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.ssl.keyManagerAlgorithm", "description": "Algorithm name
used for creating the KeyManagerFactory. See
https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/specs\/security\/standard-names.html",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
{ "name": "camel.ssl.keyManagerProvider", "description": "To use a
specific provider for creating KeyManagerFactory. The list of available
providers returned by java.security.Security.getProviders() or null to use the
highest priority provider implementing the secure socket protocol.",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
- { "name": "camel.ssl.keyStore", "description": "The file path, class path
resource, or URL of the resource used to load the key store. file:nameOfFile -
to refer to the file system classpath:nameOfFile - to refer to the classpath
(default) http:uri - to load the resource using HTTP ref:nameOfBean - to lookup
an existing KeyStore instance from the registry.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
+ { "name": "camel.ssl.keyStore", "description": "The key store to load. The
key store is by default loaded from classpath. If you must load from file
system, then use file: as prefix. file:nameOfFile (to refer to the file system)
classpath:nameOfFile (to refer to the classpath; default) http:uri (to load the
resource using HTTP) ref:nameOfBean (to lookup an existing KeyStore instance
from the registry, for example for testing and development).", "sourceType":
"org.apache.camel.main.SS [...]
{ "name": "camel.ssl.keystorePassword", "description": "Sets the SSL
Keystore password.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.ssl.keyStoreProvider", "description": "To use a specific
provider for creating KeyStore. The list of available providers returned by
java.security.Security.getProviders() or null to use the highest priority
provider implementing the secure socket protocol.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.ssl.keyStoreType", "description": "The type of the key
store to load. See
https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/specs\/security\/standard-names.html",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
@@ -294,7 +294,7 @@
{ "name": "camel.ssl.secureRandomProvider", "description": "To use a
specific provider for creating SecureRandom. The list of available providers
returned by java.security.Security.getProviders() or null to use the highest
priority provider implementing the secure socket protocol.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.ssl.secureSocketProtocol", "description": "The protocol
for the secure sockets created by the SSLContext. See
https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/specs\/security\/standard-names.html",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String", "defaultValue": "TLSv1.3" },
{ "name": "camel.ssl.sessionTimeout", "description": "Timeout in seconds
to use for SSLContext. The default is 24 hours.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "integer",
"javaType": "int", "defaultValue": 86400 },
- { "name": "camel.ssl.trustStore", "description": "The file path, class
path resource, or URL of the resource used to load the trust store. An existing
java.security.KeyStore can also be referred using #bean:name syntax.",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
+ { "name": "camel.ssl.trustStore", "description": "The trust store to load.
The trust store is by default loaded from classpath. If you must load from file
system, then use file: as prefix. file:nameOfFile (to refer to the file system)
classpath:nameOfFile (to refer to the classpath; default) http:uri (to load the
resource using HTTP) ref:nameOfBean (to lookup an existing KeyStore instance
from the registry, for example for testing and development).", "sourceType":
"org.apache.camel.m [...]
{ "name": "camel.ssl.trustStorePassword", "description": "Sets the SSL
Truststore password.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.threadpool.allowCoreThreadTimeOut", "description": "Sets
default whether to allow core threads to timeout", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": "false" },
{ "name": "camel.threadpool.config", "description": "Adds a configuration
for a specific thread pool profile (inherits default values)", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "object",
"javaType": "java.util.Map" },
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 51b045e5ed9..1e86fc2a4c8 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -285,7 +285,7 @@
{ "name": "camel.ssl.enabled", "description": "Enables SSL in your Camel
application.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.ssl.keyManagerAlgorithm", "description": "Algorithm name
used for creating the KeyManagerFactory. See
https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/specs\/security\/standard-names.html",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
{ "name": "camel.ssl.keyManagerProvider", "description": "To use a
specific provider for creating KeyManagerFactory. The list of available
providers returned by java.security.Security.getProviders() or null to use the
highest priority provider implementing the secure socket protocol.",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
- { "name": "camel.ssl.keyStore", "description": "The file path, class path
resource, or URL of the resource used to load the key store. file:nameOfFile -
to refer to the file system classpath:nameOfFile - to refer to the classpath
(default) http:uri - to load the resource using HTTP ref:nameOfBean - to lookup
an existing KeyStore instance from the registry.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
+ { "name": "camel.ssl.keyStore", "description": "The key store to load. The
key store is by default loaded from classpath. If you must load from file
system, then use file: as prefix. file:nameOfFile (to refer to the file system)
classpath:nameOfFile (to refer to the classpath; default) http:uri (to load the
resource using HTTP) ref:nameOfBean (to lookup an existing KeyStore instance
from the registry, for example for testing and development).", "sourceType":
"org.apache.camel.main.SS [...]
{ "name": "camel.ssl.keystorePassword", "description": "Sets the SSL
Keystore password.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.ssl.keyStoreProvider", "description": "To use a specific
provider for creating KeyStore. The list of available providers returned by
java.security.Security.getProviders() or null to use the highest priority
provider implementing the secure socket protocol.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.ssl.keyStoreType", "description": "The type of the key
store to load. See
https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/specs\/security\/standard-names.html",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
@@ -294,7 +294,7 @@
{ "name": "camel.ssl.secureRandomProvider", "description": "To use a
specific provider for creating SecureRandom. The list of available providers
returned by java.security.Security.getProviders() or null to use the highest
priority provider implementing the secure socket protocol.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.ssl.secureSocketProtocol", "description": "The protocol
for the secure sockets created by the SSLContext. See
https:\/\/docs.oracle.com\/en\/java\/javase\/17\/docs\/specs\/security\/standard-names.html",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String", "defaultValue": "TLSv1.3" },
{ "name": "camel.ssl.sessionTimeout", "description": "Timeout in seconds
to use for SSLContext. The default is 24 hours.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "integer",
"javaType": "int", "defaultValue": 86400 },
- { "name": "camel.ssl.trustStore", "description": "The file path, class
path resource, or URL of the resource used to load the trust store. An existing
java.security.KeyStore can also be referred using #bean:name syntax.",
"sourceType": "org.apache.camel.main.SSLConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
+ { "name": "camel.ssl.trustStore", "description": "The trust store to load.
The trust store is by default loaded from classpath. If you must load from file
system, then use file: as prefix. file:nameOfFile (to refer to the file system)
classpath:nameOfFile (to refer to the classpath; default) http:uri (to load the
resource using HTTP) ref:nameOfBean (to lookup an existing KeyStore instance
from the registry, for example for testing and development).", "sourceType":
"org.apache.camel.m [...]
{ "name": "camel.ssl.trustStorePassword", "description": "Sets the SSL
Truststore password.", "sourceType":
"org.apache.camel.main.SSLConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.threadpool.allowCoreThreadTimeOut", "description": "Sets
default whether to allow core threads to timeout", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": "false" },
{ "name": "camel.threadpool.config", "description": "Adds a configuration
for a specific thread pool profile (inherits default values)", "sourceType":
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "object",
"javaType": "java.util.Map" },
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index 64529ec5376..ac421623ad7 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -259,7 +259,7 @@ The camel.ssl supports 19 options, which are listed below.
| *camel.ssl.enabled* | Enables SSL in your Camel application. | false |
boolean
| *camel.ssl.keyManagerAlgorithm* | Algorithm name used for creating the
KeyManagerFactory. See
\https://docs.oracle.com/en/java/javase/17/docs/specs/security/standard-names.html
| | String
| *camel.ssl.keyManagerProvider* | To use a specific provider for creating
KeyManagerFactory. The list of available providers returned by
java.security.Security.getProviders() or null to use the highest priority
provider implementing the secure socket protocol. | | String
-| *camel.ssl.keyStore* | The file path, class path resource, or URL of the
resource used to load the key store. file:nameOfFile - to refer to the file
system classpath:nameOfFile - to refer to the classpath (default) http:uri - to
load the resource using HTTP ref:nameOfBean - to lookup an existing KeyStore
instance from the registry. | | String
+| *camel.ssl.keyStore* | The key store to load. The key store is by default
loaded from classpath. If you must load from file system, then use file: as
prefix. file:nameOfFile (to refer to the file system) classpath:nameOfFile (to
refer to the classpath; default) http:uri (to load the resource using HTTP)
ref:nameOfBean (to lookup an existing KeyStore instance from the registry, for
example for testing and development). | | String
| *camel.ssl.keystorePassword* | Sets the SSL Keystore password. | | String
| *camel.ssl.keyStoreProvider* | To use a specific provider for creating
KeyStore. The list of available providers returned by
java.security.Security.getProviders() or null to use the highest priority
provider implementing the secure socket protocol. | | String
| *camel.ssl.keyStoreType* | The type of the key store to load. See
\https://docs.oracle.com/en/java/javase/17/docs/specs/security/standard-names.html
| | String
@@ -268,7 +268,7 @@ The camel.ssl supports 19 options, which are listed below.
| *camel.ssl.secureRandomProvider* | To use a specific provider for creating
SecureRandom. The list of available providers returned by
java.security.Security.getProviders() or null to use the highest priority
provider implementing the secure socket protocol. | | String
| *camel.ssl.secureSocketProtocol* | The protocol for the secure sockets
created by the SSLContext. See
\https://docs.oracle.com/en/java/javase/17/docs/specs/security/standard-names.html
| TLSv1.3 | String
| *camel.ssl.sessionTimeout* | Timeout in seconds to use for SSLContext. The
default is 24 hours. | 86400 | int
-| *camel.ssl.trustStore* | The file path, class path resource, or URL of the
resource used to load the trust store. An existing java.security.KeyStore can
also be referred using #bean:name syntax. | | String
+| *camel.ssl.trustStore* | The trust store to load. The trust store is by
default loaded from classpath. If you must load from file system, then use
file: as prefix. file:nameOfFile (to refer to the file system)
classpath:nameOfFile (to refer to the classpath; default) http:uri (to load the
resource using HTTP) ref:nameOfBean (to lookup an existing KeyStore instance
from the registry, for example for testing and development). | | String
| *camel.ssl.trustStorePassword* | Sets the SSL Truststore password. | |
String
|===
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/SSLConfigurationProperties.java
b/core/camel-main/src/main/java/org/apache/camel/main/SSLConfigurationProperties.java
index 4a4c32120e7..675b620e6e6 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/SSLConfigurationProperties.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/SSLConfigurationProperties.java
@@ -188,10 +188,13 @@ public class SSLConfigurationProperties implements
BootstrapCloseable {
}
/**
- * The file path, class path resource, or URL of the resource used to load
the key store.
+ * The key store to load.
*
- * file:nameOfFile - to refer to the file system classpath:nameOfFile - to
refer to the classpath (default) http:uri
- * - to load the resource using HTTP ref:nameOfBean - to lookup an
existing KeyStore instance from the registry.
+ * The key store is by default loaded from classpath. If you must load
from file system, then use file: as prefix.
+ *
+ * file:nameOfFile (to refer to the file system) classpath:nameOfFile (to
refer to the classpath; default) http:uri
+ * (to load the resource using HTTP) ref:nameOfBean (to lookup an existing
KeyStore instance from the registry, for
+ * example for testing and development).
*/
public void setKeyStore(String keyStore) {
this.keyStore = keyStore;
@@ -240,9 +243,13 @@ public class SSLConfigurationProperties implements
BootstrapCloseable {
}
/**
- * The file path, class path resource, or URL of the resource used to load
the trust store.
+ * The trust store to load.
+ *
+ * The trust store is by default loaded from classpath. If you must load
from file system, then use file: as prefix.
*
- * An existing java.security.KeyStore can also be referred using
#bean:name syntax.
+ * file:nameOfFile (to refer to the file system) classpath:nameOfFile (to
refer to the classpath; default) http:uri
+ * (to load the resource using HTTP) ref:nameOfBean (to lookup an existing
KeyStore instance from the registry, for
+ * example for testing and development).
*/
public void setTrustStore(String trustStore) {
this.trustStore = trustStore;
@@ -404,10 +411,13 @@ public class SSLConfigurationProperties implements
BootstrapCloseable {
}
/**
- * The file path, class path resource, or URL of the resource used to load
the key store.
+ * The keystore to load.
*
- * file:nameOfFile - to refer to the file system classpath:nameOfFile - to
refer to the classpath (default) http:uri
- * - to load the resource using HTTP ref:nameOfBean - to lookup an
existing KeyStore instance from the registry.
+ * The keystore is by default loaded from classpath. If you must load from
file system, then use file: as prefix.
+ *
+ * file:nameOfFile (to refer to the file system) classpath:nameOfFile (to
refer to the classpath; default) http:uri
+ * (to load the resource using HTTP) ref:nameOfBean (to lookup an existing
KeyStore instance from the registry, for
+ * example for testing and development).
*/
public SSLConfigurationProperties withKeyStore(String keyStore) {
this.keyStore = keyStore;
@@ -444,9 +454,13 @@ public class SSLConfigurationProperties implements
BootstrapCloseable {
}
/**
- * The file path, class path resource, or URL of the resource used to load
the trust store.
+ * The trust store to load.
+ *
+ * The trust store is by default loaded from classpath. If you must load
from file system, then use file: as prefix.
*
- * An existing java.security.KeyStore can also be referred using
#bean:name syntax.
+ * file:nameOfFile (to refer to the file system) classpath:nameOfFile (to
refer to the classpath; default) http:uri
+ * (to load the resource using HTTP) ref:nameOfBean (to lookup an existing
KeyStore instance from the registry, for
+ * example for testing and development).
*/
public SSLConfigurationProperties withTrustStore(String trustStore) {
this.trustStore = trustStore;
