This is an automated email from the ASF dual-hosted git repository.
oscerd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new f4bf48dc3 Fix #3242: wrap credential options in RAW() where they go
into an endpoint address (#3243)
f4bf48dc3 is described below
commit f4bf48dc37db0e8071bc0f8f00a5d279fbcac60d
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Nov 19 06:23:44 2026 +0100
Fix #3242: wrap credential options in RAW() where they go into an endpoint
address (#3243)
A password, key or token placed into an endpoint address without RAW()
is parsed as part of the URI, so a value with &, + or = is cut into
another parameter or changed. Wrap every option with format password
that goes into an address, as a query parameter or a parameters entry.
KameletsSecretsRawTest checks every Kamelet, and HttpSinkSecretTest runs
http-sink with a password that has those characters against a local
server.
Signed-off-by: Claus Ibsen <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
kamelets/azure-functions-sink.kamelet.yaml | 2 +-
.../azure-storage-blob-append-sink.kamelet.yaml | 2 +-
kamelets/azure-storage-blob-sink.kamelet.yaml | 2 +-
kamelets/azure-storage-blob-source.kamelet.yaml | 4 +-
kamelets/azure-storage-datalake-sink.kamelet.yaml | 4 +-
.../azure-storage-datalake-source.kamelet.yaml | 4 +-
kamelets/cassandra-sink.kamelet.yaml | 2 +-
kamelets/ceph-event-based-source.kamelet.yaml | 2 +-
kamelets/google-bigquery-sink.kamelet.yaml | 2 +-
kamelets/google-calendar-source.kamelet.yaml | 2 +-
kamelets/google-mail-source.kamelet.yaml | 2 +-
kamelets/google-pubsub-sink.kamelet.yaml | 2 +-
kamelets/google-pubsub-source.kamelet.yaml | 2 +-
kamelets/google-sheets-sink.kamelet.yaml | 2 +-
kamelets/google-sheets-source.kamelet.yaml | 2 +-
.../google-storage-event-based-source.kamelet.yaml | 4 +-
kamelets/google-storage-sink.kamelet.yaml | 2 +-
kamelets/google-storage-source.kamelet.yaml | 2 +-
kamelets/google-vertexai-sink.kamelet.yaml | 2 +-
kamelets/http-sink.kamelet.yaml | 6 +-
kamelets/http-source.kamelet.yaml | 6 +-
kamelets/infinispan-sink.kamelet.yaml | 2 +-
kamelets/infinispan-source.kamelet.yaml | 2 +-
...fka-batch-apicurio-registry-source.kamelet.yaml | 4 +-
...ured-apicurio-registry-json-source.kamelet.yaml | 4 +-
...not-secured-apicurio-registry-sink.kamelet.yaml | 4 +-
...t-secured-apicurio-registry-source.kamelet.yaml | 4 +-
kamelets/mail-sink.kamelet.yaml | 2 +-
kamelets/nats-sink.kamelet.yaml | 2 +-
kamelets/nats-source.kamelet.yaml | 2 +-
kamelets/slack-sink.kamelet.yaml | 2 +-
library/camel-kamelets-catalog/pom.xml | 7 ++
.../camel/kamelets/catalog/HttpSinkSecretTest.java | 89 +++++++++++++++++
.../kamelets/catalog/KameletsSecretsRawTest.java | 107 +++++++++++++++++++++
.../kamelets/azure-functions-sink.kamelet.yaml | 2 +-
.../azure-storage-blob-append-sink.kamelet.yaml | 2 +-
.../kamelets/azure-storage-blob-sink.kamelet.yaml | 2 +-
.../azure-storage-blob-source.kamelet.yaml | 4 +-
.../azure-storage-datalake-sink.kamelet.yaml | 4 +-
.../azure-storage-datalake-source.kamelet.yaml | 4 +-
.../resources/kamelets/cassandra-sink.kamelet.yaml | 2 +-
.../kamelets/ceph-event-based-source.kamelet.yaml | 2 +-
.../kamelets/google-bigquery-sink.kamelet.yaml | 2 +-
.../kamelets/google-calendar-source.kamelet.yaml | 2 +-
.../kamelets/google-mail-source.kamelet.yaml | 2 +-
.../kamelets/google-pubsub-sink.kamelet.yaml | 2 +-
.../kamelets/google-pubsub-source.kamelet.yaml | 2 +-
.../kamelets/google-sheets-sink.kamelet.yaml | 2 +-
.../kamelets/google-sheets-source.kamelet.yaml | 2 +-
.../google-storage-event-based-source.kamelet.yaml | 4 +-
.../kamelets/google-storage-sink.kamelet.yaml | 2 +-
.../kamelets/google-storage-source.kamelet.yaml | 2 +-
.../kamelets/google-vertexai-sink.kamelet.yaml | 2 +-
.../main/resources/kamelets/http-sink.kamelet.yaml | 6 +-
.../resources/kamelets/http-source.kamelet.yaml | 6 +-
.../kamelets/infinispan-sink.kamelet.yaml | 2 +-
.../kamelets/infinispan-source.kamelet.yaml | 2 +-
...fka-batch-apicurio-registry-source.kamelet.yaml | 4 +-
...ured-apicurio-registry-json-source.kamelet.yaml | 4 +-
...not-secured-apicurio-registry-sink.kamelet.yaml | 4 +-
...t-secured-apicurio-registry-source.kamelet.yaml | 4 +-
.../main/resources/kamelets/mail-sink.kamelet.yaml | 2 +-
.../main/resources/kamelets/nats-sink.kamelet.yaml | 2 +-
.../resources/kamelets/nats-source.kamelet.yaml | 2 +-
.../resources/kamelets/slack-sink.kamelet.yaml | 2 +-
65 files changed, 289 insertions(+), 86 deletions(-)
diff --git a/kamelets/azure-functions-sink.kamelet.yaml
b/kamelets/azure-functions-sink.kamelet.yaml
index d3e96ad0c..0676c4e19 100644
--- a/kamelets/azure-functions-sink.kamelet.yaml
+++ b/kamelets/azure-functions-sink.kamelet.yaml
@@ -105,4 +105,4 @@ spec:
uri: vertx-http
parameters:
httpUri: "{{url}}"
- code: "{{?key}}"
+ code: "RAW({{?key}})"
diff --git a/kamelets/azure-storage-blob-append-sink.kamelet.yaml
b/kamelets/azure-storage-blob-append-sink.kamelet.yaml
index a5495ed79..e3aa66019 100644
--- a/kamelets/azure-storage-blob-append-sink.kamelet.yaml
+++ b/kamelets/azure-storage-blob-append-sink.kamelet.yaml
@@ -146,4 +146,4 @@ spec:
simple:
expression: "${exchangeId}"
- to:
- uri:
"azure-storage-blob://{{accountName}}/{{containerName}}?accessKey=RAW({{?accessKey}})&azureClientId=RAW({{?clientId}})&azureClientSecret=RAW({{?clientSecret}})&azureTenantId={{?tenantId}}&blobType=appendBlob&credentialType={{credentialType}}&operation=commitAppendBlob&sasToken=RAW({{?sasToken}})"
+ uri:
"azure-storage-blob://{{accountName}}/{{containerName}}?accessKey=RAW({{?accessKey}})&azureClientId=RAW({{?clientId}})&azureClientSecret=RAW({{?clientSecret}})&azureTenantId=RAW({{?tenantId}})&blobType=appendBlob&credentialType={{credentialType}}&operation=commitAppendBlob&sasToken=RAW({{?sasToken}})"
diff --git a/kamelets/azure-storage-blob-sink.kamelet.yaml
b/kamelets/azure-storage-blob-sink.kamelet.yaml
index af6572759..955794e5f 100644
--- a/kamelets/azure-storage-blob-sink.kamelet.yaml
+++ b/kamelets/azure-storage-blob-sink.kamelet.yaml
@@ -146,4 +146,4 @@ spec:
simple:
expression: "${exchangeId}"
- to:
- uri:
"azure-storage-blob://{{accountName}}/{{containerName}}?accessKey=RAW({{?accessKey}})&azureClientId=RAW({{?clientId}})&azureClientSecret=RAW({{?clientSecret}})&azureTenantId={{?tenantId}}&credentialType={{credentialType}}&operation=uploadBlockBlob&sasToken=RAW({{?sasToken}})"
+ uri:
"azure-storage-blob://{{accountName}}/{{containerName}}?accessKey=RAW({{?accessKey}})&azureClientId=RAW({{?clientId}})&azureClientSecret=RAW({{?clientSecret}})&azureTenantId=RAW({{?tenantId}})&credentialType={{credentialType}}&operation=uploadBlockBlob&sasToken=RAW({{?sasToken}})"
diff --git a/kamelets/azure-storage-blob-source.kamelet.yaml
b/kamelets/azure-storage-blob-source.kamelet.yaml
index 93bb1aca5..b9b9b1b49 100644
--- a/kamelets/azure-storage-blob-source.kamelet.yaml
+++ b/kamelets/azure-storage-blob-source.kamelet.yaml
@@ -208,7 +208,7 @@ spec:
accessKey: "RAW({{?accessKey}})"
azureClientId: "RAW({{?clientId}})"
azureClientSecret: "RAW({{?clientSecret}})"
- azureTenantId: "{{?tenantId}}"
+ azureTenantId: "RAW({{?tenantId}})"
credentialType: "{{credentialType}}"
sasToken: "RAW({{?sasToken}})"
delay: "{{delay}}"
@@ -234,7 +234,7 @@ spec:
accessKey: "RAW({{?accessKey}})"
azureClientId: "RAW({{?clientId}})"
azureClientSecret: "RAW({{?clientSecret}})"
- azureTenantId: "{{?tenantId}}"
+ azureTenantId: "RAW({{?tenantId}})"
credentialType: "{{credentialType}}"
sasToken: "RAW({{?sasToken}})"
operation: deleteBlob
diff --git a/kamelets/azure-storage-datalake-sink.kamelet.yaml
b/kamelets/azure-storage-datalake-sink.kamelet.yaml
index f8ac04f61..6b59ae091 100644
--- a/kamelets/azure-storage-datalake-sink.kamelet.yaml
+++ b/kamelets/azure-storage-datalake-sink.kamelet.yaml
@@ -168,10 +168,10 @@ spec:
parameters:
accountName: "{{accountName}}"
fileSystemName: "{{fileSystemName}}"
- clientId: "{{?clientId}}"
+ clientId: "RAW({{?clientId}})"
clientSecret: "RAW({{?clientSecret}})"
credentialType: "{{credentialType}}"
operation: upload
- tenantId: "{{?tenantId}}"
+ tenantId: "RAW({{?tenantId}})"
accountKey: "RAW({{?accountKey}})"
sasSignature: "RAW({{?sasSignature}})"
diff --git a/kamelets/azure-storage-datalake-source.kamelet.yaml
b/kamelets/azure-storage-datalake-source.kamelet.yaml
index b1935c270..717348a9b 100644
--- a/kamelets/azure-storage-datalake-source.kamelet.yaml
+++ b/kamelets/azure-storage-datalake-source.kamelet.yaml
@@ -272,11 +272,11 @@ spec:
parameters:
accountName: "{{accountName}}"
fileSystemName: "{{fileSystemName}}"
- clientId: "{{?clientId}}"
+ clientId: "RAW({{?clientId}})"
clientSecret: "RAW({{?clientSecret}})"
credentialType: "{{credentialType}}"
delay: "{{delay}}"
- tenantId: "{{?tenantId}}"
+ tenantId: "RAW({{?tenantId}})"
accountKey: "RAW({{?accountKey}})"
sasSignature: "RAW({{?sasSignature}})"
path: "RAW({{?directoryName}})"
diff --git a/kamelets/cassandra-sink.kamelet.yaml
b/kamelets/cassandra-sink.kamelet.yaml
index 7f102791a..98754f3fc 100644
--- a/kamelets/cassandra-sink.kamelet.yaml
+++ b/kamelets/cassandra-sink.kamelet.yaml
@@ -135,4 +135,4 @@ spec:
- removeHeader:
name: CamelCqlQuery
- to:
- uri:
"{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&datacenter={{?datacenter}}&prepareStatements={{prepareStatements}}&consistencyLevel={{consistencyLevel}}&cql=RAW({{query}})&extraTypeCodecs={{?extraTypeCodecs}}"
+ uri:
"{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password=RAW({{?password}})&datacenter={{?datacenter}}&prepareStatements={{prepareStatements}}&consistencyLevel={{consistencyLevel}}&cql=RAW({{query}})&extraTypeCodecs={{?extraTypeCodecs}}"
diff --git a/kamelets/ceph-event-based-source.kamelet.yaml
b/kamelets/ceph-event-based-source.kamelet.yaml
index 29c851c79..fdf20828c 100644
--- a/kamelets/ceph-event-based-source.kamelet.yaml
+++ b/kamelets/ceph-event-based-source.kamelet.yaml
@@ -229,6 +229,6 @@ spec:
jsonpath:
expression: "$.Records[0].s3.bucket.name"
- toD:
- uri:
"aws2-s3:${exchangeProperty.ceph-bucket-name}?accessKey={{accessKey}}&secretKey={{secretKey}}®ion={{zoneGroup}}&operation=getObject&keyName=${exchangeProperty.ceph-object-key}&uriEndpointOverride={{cephUrl}}&overrideEndpoint=true"
+ uri:
"aws2-s3:${exchangeProperty.ceph-bucket-name}?accessKey=RAW({{accessKey}})&secretKey=RAW({{secretKey}})®ion={{zoneGroup}}&operation=getObject&keyName=${exchangeProperty.ceph-object-key}&uriEndpointOverride={{cephUrl}}&overrideEndpoint=true"
- to:
uri: kamelet:sink
diff --git a/kamelets/google-bigquery-sink.kamelet.yaml
b/kamelets/google-bigquery-sink.kamelet.yaml
index 2cc6932e4..39bfbd2d7 100644
--- a/kamelets/google-bigquery-sink.kamelet.yaml
+++ b/kamelets/google-bigquery-sink.kamelet.yaml
@@ -94,5 +94,5 @@ spec:
projectId: "{{projectId}}"
datasetId: "{{dataset}}"
tableId: "{{table}}"
- serviceAccountKey: "base64:{{serviceAccountKey}}"
+ serviceAccountKey: "RAW(base64:{{serviceAccountKey}})"
useAsInsertId: "{{?useAsInsertId}}"
diff --git a/kamelets/google-calendar-source.kamelet.yaml
b/kamelets/google-calendar-source.kamelet.yaml
index 0673a7533..26a4a9b16 100644
--- a/kamelets/google-calendar-source.kamelet.yaml
+++ b/kamelets/google-calendar-source.kamelet.yaml
@@ -183,7 +183,7 @@ spec:
- "camel:kamelet"
template:
from:
- uri:
"google-calendar-stream://{{index}}?accessToken=RAW({{?accessToken}})&applicationName={{applicationName}}&calendarId={{calendarId}}&clientId={{?clientId}}&clientSecret=RAW({{?clientSecret}})&considerLastUpdate={{?considerLastUpdate}}&consumeFromNow={{consumeFromNow}}&delay={{delay}}&delegate=RAW({{?delegate}})&maxResults={{?maxResults}}&query=RAW({{?query}})&refreshToken=RAW({{?refreshToken}})&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})&syncFlow={{syncFlow}}"
+ uri:
"google-calendar-stream://{{index}}?accessToken=RAW({{?accessToken}})&applicationName={{applicationName}}&calendarId={{calendarId}}&clientId=RAW({{?clientId}})&clientSecret=RAW({{?clientSecret}})&considerLastUpdate={{?considerLastUpdate}}&consumeFromNow={{consumeFromNow}}&delay={{delay}}&delegate=RAW({{?delegate}})&maxResults={{?maxResults}}&query=RAW({{?query}})&refreshToken=RAW({{?refreshToken}})&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})&syncFlow={{syn
[...]
steps:
- marshal:
json: {}
diff --git a/kamelets/google-mail-source.kamelet.yaml
b/kamelets/google-mail-source.kamelet.yaml
index 633714da2..974db5f28 100644
--- a/kamelets/google-mail-source.kamelet.yaml
+++ b/kamelets/google-mail-source.kamelet.yaml
@@ -197,7 +197,7 @@ spec:
- "camel:google-mail"
template:
from:
- uri:
"google-mail-stream://{{index}}?accessToken=RAW({{?accessToken}})&applicationName={{applicationName}}&clientId={{?clientId}}&clientSecret=RAW({{?clientSecret}})&delay={{delay}}&delegate=RAW({{?delegate}})&labels={{?labels}}&markAsRead={{markAsRead}}&maxResults={{?maxResults}}&query={{query}}&raw={{?raw}}&refreshToken=RAW({{?refreshToken}})&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})"
+ uri:
"google-mail-stream://{{index}}?accessToken=RAW({{?accessToken}})&applicationName={{applicationName}}&clientId=RAW({{?clientId}})&clientSecret=RAW({{?clientSecret}})&delay={{delay}}&delegate=RAW({{?delegate}})&labels={{?labels}}&markAsRead={{markAsRead}}&maxResults={{?maxResults}}&query={{query}}&raw={{?raw}}&refreshToken=RAW({{?refreshToken}})&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})"
steps:
- marshal:
json: {}
diff --git a/kamelets/google-pubsub-sink.kamelet.yaml
b/kamelets/google-pubsub-sink.kamelet.yaml
index d3cf209fc..f9d408787 100644
--- a/kamelets/google-pubsub-sink.kamelet.yaml
+++ b/kamelets/google-pubsub-sink.kamelet.yaml
@@ -94,4 +94,4 @@ spec:
uri: kamelet:source
steps:
- to:
- uri:
"google-pubsub://{{projectId}}:{{destinationName}}?messageOrderingEnabled={{?messageOrderingEnabled}}&pubsubEndpoint={{?pubsubEndpoint}}&serviceAccountKey=base64:{{?serviceAccountKey}}"
+ uri:
"google-pubsub://{{projectId}}:{{destinationName}}?messageOrderingEnabled={{?messageOrderingEnabled}}&pubsubEndpoint={{?pubsubEndpoint}}&serviceAccountKey=RAW(base64:{{?serviceAccountKey}})"
diff --git a/kamelets/google-pubsub-source.kamelet.yaml
b/kamelets/google-pubsub-source.kamelet.yaml
index e7e26b6cc..72894305e 100644
--- a/kamelets/google-pubsub-source.kamelet.yaml
+++ b/kamelets/google-pubsub-source.kamelet.yaml
@@ -119,7 +119,7 @@ spec:
- "camel:jackson3"
template:
from:
- uri:
"google-pubsub://{{projectId}}:{{subscriptionName}}?ackMode={{?ackMode}}&concurrentConsumers={{concurrentConsumers}}&maxAckExtensionPeriod={{?maxAckExtensionPeriod}}&maxDeliveryAttempts={{?maxDeliveryAttempts}}&maxMessagesPerPoll={{maxMessagesPerPoll}}&serviceAccountKey=base64:{{?serviceAccountKey}}&synchronousPull={{synchronousPull}}"
+ uri:
"google-pubsub://{{projectId}}:{{subscriptionName}}?ackMode={{?ackMode}}&concurrentConsumers={{concurrentConsumers}}&maxAckExtensionPeriod={{?maxAckExtensionPeriod}}&maxDeliveryAttempts={{?maxDeliveryAttempts}}&maxMessagesPerPoll={{maxMessagesPerPoll}}&serviceAccountKey=RAW(base64:{{?serviceAccountKey}})&synchronousPull={{synchronousPull}}"
steps:
- to:
uri: kamelet:sink
diff --git a/kamelets/google-sheets-sink.kamelet.yaml
b/kamelets/google-sheets-sink.kamelet.yaml
index acd60e298..786d2d7a0 100644
--- a/kamelets/google-sheets-sink.kamelet.yaml
+++ b/kamelets/google-sheets-sink.kamelet.yaml
@@ -210,7 +210,7 @@ spec:
methodName: "{{operation}}"
accessToken: "RAW({{?accessToken}})"
applicationName: "{{?applicationName}}"
- clientId: "{{?clientId}}"
+ clientId: "RAW({{?clientId}})"
clientSecret: "RAW({{?clientSecret}})"
delegate: "RAW({{?delegate}})"
range: "{{?range}}"
diff --git a/kamelets/google-sheets-source.kamelet.yaml
b/kamelets/google-sheets-source.kamelet.yaml
index 648fbbbda..b7ee02c8a 100644
--- a/kamelets/google-sheets-source.kamelet.yaml
+++ b/kamelets/google-sheets-source.kamelet.yaml
@@ -214,7 +214,7 @@ spec:
- "camel:google-sheets"
template:
from:
- uri:
"google-sheets-stream://{{spreadsheetId}}?accessToken=RAW({{?accessToken}})&applicationName={{?applicationName}}&clientId={{?clientId}}&clientSecret=RAW({{?clientSecret}})&delay={{delay}}&delegate=RAW({{?delegate}})&majorDimension={{majorDimension}}&maxResults={{?maxResults}}&range={{?range}}&refreshToken=RAW({{?refreshToken}})&repeatCount={{?repeatCount}}&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})&splitResults={{splitResults}}&valueRenderOption={{?valueR
[...]
+ uri:
"google-sheets-stream://{{spreadsheetId}}?accessToken=RAW({{?accessToken}})&applicationName={{?applicationName}}&clientId=RAW({{?clientId}})&clientSecret=RAW({{?clientSecret}})&delay={{delay}}&delegate=RAW({{?delegate}})&majorDimension={{majorDimension}}&maxResults={{?maxResults}}&range={{?range}}&refreshToken=RAW({{?refreshToken}})&repeatCount={{?repeatCount}}&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})&splitResults={{splitResults}}&valueRenderOption={{?v
[...]
steps:
- marshal:
json: {}
diff --git a/kamelets/google-storage-event-based-source.kamelet.yaml
b/kamelets/google-storage-event-based-source.kamelet.yaml
index 369743a0e..54d9b1004 100644
--- a/kamelets/google-storage-event-based-source.kamelet.yaml
+++ b/kamelets/google-storage-event-based-source.kamelet.yaml
@@ -135,7 +135,7 @@ spec:
- "camel:jackson3"
template:
from:
- uri:
"google-pubsub://{{projectId}}:{{subscriptionName}}?ackMode={{?ackMode}}&concurrentConsumers={{concurrentConsumers}}&maxDeliveryAttempts={{?maxDeliveryAttempts}}&maxMessagesPerPoll={{maxMessagesPerPoll}}&serviceAccountKey=base64:{{serviceAccountKey}}&synchronousPull={{synchronousPull}}"
+ uri:
"google-pubsub://{{projectId}}:{{subscriptionName}}?ackMode={{?ackMode}}&concurrentConsumers={{concurrentConsumers}}&maxDeliveryAttempts={{?maxDeliveryAttempts}}&maxMessagesPerPoll={{maxMessagesPerPoll}}&serviceAccountKey=RAW(base64:{{serviceAccountKey}})&synchronousPull={{synchronousPull}}"
steps:
- choice:
precondition: true
@@ -171,6 +171,6 @@ spec:
bucketName: "{{bucketNameOrArn}}"
objectName:
"${exchangeProperty.google-storage-object-id}"
operation: getObject
- serviceAccountKey:
"base64:{{serviceAccountKey}}"
+ serviceAccountKey:
"RAW(base64:{{serviceAccountKey}})"
- to:
uri: kamelet:sink
diff --git a/kamelets/google-storage-sink.kamelet.yaml
b/kamelets/google-storage-sink.kamelet.yaml
index 562c68726..95f38e989 100644
--- a/kamelets/google-storage-sink.kamelet.yaml
+++ b/kamelets/google-storage-sink.kamelet.yaml
@@ -142,4 +142,4 @@ spec:
simple:
expression: "${exchangeId}"
- to:
- uri:
"google-storage://{{bucketNameOrArn}}?autoCreateBucket={{autoCreateBucket}}&impersonatedServiceAccount={{?impersonatedServiceAccount}}&objectName=RAW({{?objectName}})&serviceAccountKey=base64:{{?serviceAccountKey}}&storageLocation={{?storageLocation}}&useWorkloadIdentityFederation={{?useWorkloadIdentityFederation}}&workloadIdentityConfig={{?workloadIdentityConfig}}"
+ uri:
"google-storage://{{bucketNameOrArn}}?autoCreateBucket={{autoCreateBucket}}&impersonatedServiceAccount={{?impersonatedServiceAccount}}&objectName=RAW({{?objectName}})&serviceAccountKey=RAW(base64:{{?serviceAccountKey}})&storageLocation={{?storageLocation}}&useWorkloadIdentityFederation={{?useWorkloadIdentityFederation}}&workloadIdentityConfig={{?workloadIdentityConfig}}"
diff --git a/kamelets/google-storage-source.kamelet.yaml
b/kamelets/google-storage-source.kamelet.yaml
index ee483fe1a..8aacdd551 100644
--- a/kamelets/google-storage-source.kamelet.yaml
+++ b/kamelets/google-storage-source.kamelet.yaml
@@ -170,7 +170,7 @@ spec:
- "camel:jackson3"
template:
from:
- uri:
"google-storage://{{bucketNameOrArn}}?autoCreateBucket={{autoCreateBucket}}&delay={{?delay}}&deleteAfterRead={{deleteAfterRead}}&destinationBucket={{?destinationBucket}}&filter={{?filter}}&impersonatedServiceAccount={{?impersonatedServiceAccount}}&includeBody={{?includeBody}}&includeFolders={{?includeFolders}}&moveAfterRead={{?moveAfterRead}}&prefix={{?prefix}}&serviceAccountKey=base64:{{?serviceAccountKey}}&useWorkloadIdentityFederation={{?useWorkloadIdentityFederation}}&work
[...]
+ uri:
"google-storage://{{bucketNameOrArn}}?autoCreateBucket={{autoCreateBucket}}&delay={{?delay}}&deleteAfterRead={{deleteAfterRead}}&destinationBucket={{?destinationBucket}}&filter={{?filter}}&impersonatedServiceAccount={{?impersonatedServiceAccount}}&includeBody={{?includeBody}}&includeFolders={{?includeFolders}}&moveAfterRead={{?moveAfterRead}}&prefix={{?prefix}}&serviceAccountKey=RAW(base64:{{?serviceAccountKey}})&useWorkloadIdentityFederation={{?useWorkloadIdentityFederation}}
[...]
steps:
- choice:
precondition: true
diff --git a/kamelets/google-vertexai-sink.kamelet.yaml
b/kamelets/google-vertexai-sink.kamelet.yaml
index 468ba1252..22f6f896b 100644
--- a/kamelets/google-vertexai-sink.kamelet.yaml
+++ b/kamelets/google-vertexai-sink.kamelet.yaml
@@ -157,7 +157,7 @@ spec:
maxOutputTokens: "{{?maxOutputTokens}}"
operation: "{{operation}}"
publisher: "{{?publisher}}"
- serviceAccountKey: "{{?serviceAccountKey}}"
+ serviceAccountKey: "RAW({{?serviceAccountKey}})"
temperature: "{{?temperature}}"
topK: "{{?topK}}"
topP: "{{?topP}}"
diff --git a/kamelets/http-sink.kamelet.yaml b/kamelets/http-sink.kamelet.yaml
index 284396787..2305fc9d5 100644
--- a/kamelets/http-sink.kamelet.yaml
+++ b/kamelets/http-sink.kamelet.yaml
@@ -182,10 +182,10 @@ spec:
proxyAuthPassword: "RAW({{?proxyPassword}})"
authMethod: "{{?authMethod}}"
authUsername: "{{?authUsername}}"
- authPassword: "{{?authPassword}}"
+ authPassword: "RAW({{?authPassword}})"
authBearerToken: "RAW({{?authBearerToken}})"
- oauth2ClientId: "{{?oauth2ClientId}}"
- oauth2ClientSecret: "{{?oauth2ClientSecret}}"
+ oauth2ClientId: "RAW({{?oauth2ClientId}})"
+ oauth2ClientSecret: "RAW({{?oauth2ClientSecret}})"
oauth2Scope: "{{?oauth2Scope}}"
oauth2TokenEndpoint: "{{?oauth2TokenEndpoint}}"
authenticationPreemptive: "{{authenticationPreemptive}}"
diff --git a/kamelets/http-source.kamelet.yaml
b/kamelets/http-source.kamelet.yaml
index 7b3431a56..3c8f05197 100644
--- a/kamelets/http-source.kamelet.yaml
+++ b/kamelets/http-source.kamelet.yaml
@@ -196,10 +196,10 @@ spec:
proxyAuthPassword: "RAW({{?proxyPassword}})"
authMethod: "{{?authMethod}}"
authUsername: "{{?authUsername}}"
- authPassword: "{{?authPassword}}"
+ authPassword: "RAW({{?authPassword}})"
authBearerToken: "RAW({{?authBearerToken}})"
- oauth2ClientId: "{{?oauth2ClientId}}"
- oauth2ClientSecret: "{{?oauth2ClientSecret}}"
+ oauth2ClientId: "RAW({{?oauth2ClientId}})"
+ oauth2ClientSecret: "RAW({{?oauth2ClientSecret}})"
oauth2Scope: "{{?oauth2Scope}}"
oauth2TokenEndpoint: "{{?oauth2TokenEndpoint}}"
authenticationPreemptive: "{{authenticationPreemptive}}"
diff --git a/kamelets/infinispan-sink.kamelet.yaml
b/kamelets/infinispan-sink.kamelet.yaml
index e6b2b74ba..fc2420ef5 100644
--- a/kamelets/infinispan-sink.kamelet.yaml
+++ b/kamelets/infinispan-sink.kamelet.yaml
@@ -238,4 +238,4 @@ spec:
simple:
expression: "{{maxIdleTimeUnit}}"
- to:
- uri:
"{{local-infinispan}}:{{cacheName}}?hosts={{hosts}}&secure={{secure}}&username={{username}}&password={{password}}&saslMechanism={{saslMechanism}}&securityRealm={{securityRealm}}&securityServerName={{securityServerName}}&operation={{?operation}}&configurationProperties[trust_store_file_name]={{?sslTruststoreLocation}}&configurationProperties[trust_store_password]=RAW({{?sslTruststorePassword}})&configurationProperties[sni_host_name]={{?sslSniHostName}}"
+ uri:
"{{local-infinispan}}:{{cacheName}}?hosts={{hosts}}&secure={{secure}}&username={{username}}&password=RAW({{password}})&saslMechanism={{saslMechanism}}&securityRealm={{securityRealm}}&securityServerName={{securityServerName}}&operation={{?operation}}&configurationProperties[trust_store_file_name]={{?sslTruststoreLocation}}&configurationProperties[trust_store_password]=RAW({{?sslTruststorePassword}})&configurationProperties[sni_host_name]={{?sslSniHostName}}"
diff --git a/kamelets/infinispan-source.kamelet.yaml
b/kamelets/infinispan-source.kamelet.yaml
index b963f70e3..fac8fda10 100644
--- a/kamelets/infinispan-source.kamelet.yaml
+++ b/kamelets/infinispan-source.kamelet.yaml
@@ -142,7 +142,7 @@ spec:
- name: local-infinispan
type:
"#class:org.apache.camel.component.infinispan.remote.InfinispanRemoteComponent"
from:
- uri:
"{{local-infinispan}}:{{cacheName}}?hosts={{hosts}}&secure={{secure}}&username={{username}}&password={{password}}&saslMechanism={{saslMechanism}}&securityRealm={{securityRealm}}&securityServerName={{securityServerName}}&eventTypes={{eventTypes}}&configurationProperties[trust_store_file_name]={{?sslTruststoreLocation}}&configurationProperties[trust_store_password]=RAW({{?sslTruststorePassword}})&configurationProperties[sni_host_name]={{?sslSniHostName}}"
+ uri:
"{{local-infinispan}}:{{cacheName}}?hosts={{hosts}}&secure={{secure}}&username={{username}}&password=RAW({{password}})&saslMechanism={{saslMechanism}}&securityRealm={{securityRealm}}&securityServerName={{securityServerName}}&eventTypes={{eventTypes}}&configurationProperties[trust_store_file_name]={{?sslTruststoreLocation}}&configurationProperties[trust_store_password]=RAW({{?sslTruststorePassword}})&configurationProperties[sni_host_name]={{?sslSniHostName}}"
steps:
- setHeader:
name: infinispan-cache-name
diff --git a/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
b/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
index b96815125..f721a10e5 100644
--- a/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
+++ b/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
@@ -196,8 +196,8 @@ spec:
parameters:
topic: "{{topic}}"
additionalProperties.apicurio.auth.client.id:
"{{apicurioAuthClientId}}"
- additionalProperties.apicurio.auth.client.secret:
"{{apicurioAuthClientSecret}}"
- additionalProperties.apicurio.auth.password: "{{apicurioAuthPassword}}"
+ additionalProperties.apicurio.auth.client.secret:
"RAW({{apicurioAuthClientSecret}})"
+ additionalProperties.apicurio.auth.password:
"RAW({{apicurioAuthPassword}})"
additionalProperties.apicurio.auth.realm: "{{apicurioAuthRealm}}"
additionalProperties.apicurio.auth.service.url:
"{{apicurioAuthServiceUrl}}"
additionalProperties.apicurio.auth.username: "{{apicurioAuthUsername}}"
diff --git
a/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
b/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
index ef5426e4e..637176db1 100644
--- a/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
+++ b/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
@@ -197,8 +197,8 @@ spec:
parameters:
topic: "{{topic}}"
additionalProperties.apicurio.auth.client.id:
"{{apicurioAuthClientId}}"
- additionalProperties.apicurio.auth.client.secret:
"{{apicurioAuthClientSecret}}"
- additionalProperties.apicurio.auth.password: "{{apicurioAuthPassword}}"
+ additionalProperties.apicurio.auth.client.secret:
"RAW({{apicurioAuthClientSecret}})"
+ additionalProperties.apicurio.auth.password:
"RAW({{apicurioAuthPassword}})"
additionalProperties.apicurio.auth.realm: "{{apicurioAuthRealm}}"
additionalProperties.apicurio.auth.service.url:
"{{apicurioAuthServiceUrl}}"
additionalProperties.apicurio.auth.username: "{{apicurioAuthUsername}}"
diff --git a/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml
b/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml
index a3cc8ef1c..d8acdba28 100644
--- a/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml
+++ b/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml
@@ -181,8 +181,8 @@ spec:
parameters:
topic: "{{topic}}"
additionalProperties.apicurio.auth.client.id:
"{{apicurioAuthClientId}}"
- additionalProperties.apicurio.auth.client.secret:
"{{apicurioAuthClientSecret}}"
- additionalProperties.apicurio.auth.password:
"{{apicurioAuthPassword}}"
+ additionalProperties.apicurio.auth.client.secret:
"RAW({{apicurioAuthClientSecret}})"
+ additionalProperties.apicurio.auth.password:
"RAW({{apicurioAuthPassword}})"
additionalProperties.apicurio.auth.realm: "{{apicurioAuthRealm}}"
additionalProperties.apicurio.auth.service.url:
"{{apicurioAuthServiceUrl}}"
additionalProperties.apicurio.auth.username:
"{{apicurioAuthUsername}}"
diff --git a/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
b/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
index 6be88a031..c5eb3f96e 100644
--- a/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
+++ b/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
@@ -202,8 +202,8 @@ spec:
parameters:
topic: "{{topic}}"
additionalProperties.apicurio.auth.client.id:
"{{apicurioAuthClientId}}"
- additionalProperties.apicurio.auth.client.secret:
"{{apicurioAuthClientSecret}}"
- additionalProperties.apicurio.auth.password: "{{apicurioAuthPassword}}"
+ additionalProperties.apicurio.auth.client.secret:
"RAW({{apicurioAuthClientSecret}})"
+ additionalProperties.apicurio.auth.password:
"RAW({{apicurioAuthPassword}})"
additionalProperties.apicurio.auth.realm: "{{apicurioAuthRealm}}"
additionalProperties.apicurio.auth.service.url:
"{{apicurioAuthServiceUrl}}"
additionalProperties.apicurio.auth.username: "{{apicurioAuthUsername}}"
diff --git a/kamelets/mail-sink.kamelet.yaml b/kamelets/mail-sink.kamelet.yaml
index 33696c430..3a03289ad 100644
--- a/kamelets/mail-sink.kamelet.yaml
+++ b/kamelets/mail-sink.kamelet.yaml
@@ -260,7 +260,7 @@ spec:
- removeHeaders:
pattern: ce-*
- to:
- uri:
"{{protocol}}:{{connectionHost}}:{{connectionPort}}?subject={{?subject}}&from={{?from}}&to={{?to}}&username={{username}}&password={{password}}&useHeaderSubject=true&useHeaderFrom=true&useHeaderRecipients=true&mail.smtp.starttls.enable={{?startTls}}&mail.smtp.starttls.required={{?startTls}}&replyTo=RAW({{?replyTo}})&contentType=RAW({{?contentType}})"
+ uri:
"{{protocol}}:{{connectionHost}}:{{connectionPort}}?subject={{?subject}}&from={{?from}}&to={{?to}}&username={{username}}&password=RAW({{password}})&useHeaderSubject=true&useHeaderFrom=true&useHeaderRecipients=true&mail.smtp.starttls.enable={{?startTls}}&mail.smtp.starttls.required={{?startTls}}&replyTo=RAW({{?replyTo}})&contentType=RAW({{?contentType}})"
# camel-mail ignores the Subject / From / To / Cc headers unless
# these are enabled; without them the ce-* mappings above are
# dead code. Reply-To stays disabled - it is not part of the
diff --git a/kamelets/nats-sink.kamelet.yaml b/kamelets/nats-sink.kamelet.yaml
index c56c5c6ec..3275336b6 100644
--- a/kamelets/nats-sink.kamelet.yaml
+++ b/kamelets/nats-sink.kamelet.yaml
@@ -98,6 +98,6 @@ spec:
jetstreamAsync: "{{?jetstreamAsync}}"
jetstreamEnabled: "{{?jetstreamEnabled}}"
jetstreamName: "{{?jetstreamName}}"
- servers: "{{servers}}"
+ servers: "RAW({{servers}})"
secure: "{{?secure}}"
credentialsFilePath: "{{?credentialsFilePath}}"
diff --git a/kamelets/nats-source.kamelet.yaml
b/kamelets/nats-source.kamelet.yaml
index d58427c23..0f6ef34e8 100644
--- a/kamelets/nats-source.kamelet.yaml
+++ b/kamelets/nats-source.kamelet.yaml
@@ -129,7 +129,7 @@ spec:
jetstreamAsync: "{{?jetstreamAsync}}"
jetstreamEnabled: "{{?jetstreamEnabled}}"
jetstreamName: "{{?jetstreamName}}"
- servers: "{{servers}}"
+ servers: "RAW({{servers}})"
secure: "{{?secure}}"
credentialsFilePath: "{{?credentialsFilePath}}"
queueName: "{{?queueName}}"
diff --git a/kamelets/slack-sink.kamelet.yaml b/kamelets/slack-sink.kamelet.yaml
index b091b229b..4166aa7ec 100644
--- a/kamelets/slack-sink.kamelet.yaml
+++ b/kamelets/slack-sink.kamelet.yaml
@@ -72,4 +72,4 @@ spec:
uri: slack
parameters:
channel: "{{channel}}"
- webhookUrl: "{{webhookUrl}}"
+ webhookUrl: "RAW({{webhookUrl}})"
diff --git a/library/camel-kamelets-catalog/pom.xml
b/library/camel-kamelets-catalog/pom.xml
index 548c1d4c0..f2d8ca5ae 100644
--- a/library/camel-kamelets-catalog/pom.xml
+++ b/library/camel-kamelets-catalog/pom.xml
@@ -149,6 +149,13 @@
<version>${camel.version}</version>
<scope>test</scope>
</dependency>
+ <!-- HttpSinkSecretTest: runs http-sink against a local server -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ <version>${camel.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tooling-model</artifactId>
diff --git
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/HttpSinkSecretTest.java
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/HttpSinkSecretTest.java
new file mode 100644
index 000000000..40b7cc3e2
--- /dev/null
+++
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/HttpSinkSecretTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kamelets.catalog;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import com.sun.net.httpserver.HttpServer;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.kamelet.KameletComponent;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Runs http-sink against a local server with a password that has characters
with a meaning in an address, to check
+ * that the whole password is used for the login and nothing of it ends up in
the address of the request.
+ */
+public class HttpSinkSecretTest {
+
+ // the source files, not the catalog jar
+ private static final Path KAMELETS = Path.of("../../kamelets");
+ private static final String PASSWORD = "p&ss+w=rd";
+
+ private final BlockingQueue<String> requests = new LinkedBlockingQueue<>();
+ private HttpServer server;
+ private CamelContext context;
+
+ @BeforeEach
+ void start() throws Exception {
+ server = HttpServer.create(new
InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
+ server.createContext("/", http -> {
+ requests.add(http.getRequestURI().getPath() + " query=" +
http.getRequestURI().getRawQuery()
+ + " authorization=" +
http.getRequestHeaders().getFirst("Authorization"));
+ http.getRequestBody().readAllBytes();
+ http.sendResponseHeaders(200, -1);
+ http.close();
+ });
+ server.start();
+ context = new DefaultCamelContext();
+ context.getComponent("kamelet", KameletComponent.class)
+ .setLocation("file:" + KAMELETS.toAbsolutePath().normalize());
+ context.start();
+ }
+
+ @AfterEach
+ void stop() {
+ if (context != null) {
+ context.stop();
+ }
+ server.stop(0);
+ }
+
+ @Test
+ void passwordWithSpecialCharactersIsSentWhole() {
+ String url = "http://" +
InetAddress.getLoopbackAddress().getHostAddress() + ":" +
server.getAddress().getPort()
+ + "/secure";
+
+ context.createProducerTemplate().sendBody("kamelet:http-sink?url=" +
url
+ +
"&authMethod=Basic&authUsername=user&authPassword=RAW(" + PASSWORD
+ +
")&authenticationPreemptive=true",
+ "hello");
+
+ String basic = Base64.getEncoder().encodeToString(("user:" +
PASSWORD).getBytes(StandardCharsets.UTF_8));
+ assertEquals("/secure query=null authorization=Basic " + basic,
requests.poll());
+ }
+}
diff --git
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsSecretsRawTest.java
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsSecretsRawTest.java
new file mode 100644
index 000000000..17212b085
--- /dev/null
+++
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsSecretsRawTest.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kamelets.catalog;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * A secret (an option with format password) that goes into the address of an
endpoint must be wrapped in RAW(), or a
+ * secret with a character such as & or + is cut into another parameter, or
changed, by the parsing of the address.
+ */
+public class KameletsSecretsRawTest {
+
+ // the source files, not the catalog jar
+ private static final Path KAMELETS = Path.of("../../kamelets");
+ private static final ObjectMapper YAML = new ObjectMapper(new
YAMLFactory());
+
+ @Test
+ void secretsInEndpointAddressesAreRaw() throws IOException {
+ List<String> problems = new ArrayList<>();
+ try (Stream<Path> files = Files.list(KAMELETS)) {
+ for (Path file : files.filter(f ->
f.toString().endsWith(".kamelet.yaml")).sorted().toList()) {
+ JsonNode spec = YAML.readTree(file.toFile()).path("spec");
+ List<String> secrets = new ArrayList<>();
+ for (Map.Entry<String, JsonNode> p :
spec.path("definition").path("properties").properties()) {
+ if
("password".equals(p.getValue().path("format").asText())) {
+ secrets.add(p.getKey());
+ }
+ }
+ if (!secrets.isEmpty()) {
+ String kamelet =
file.getFileName().toString().replace(".kamelet.yaml", "");
+ check(kamelet, spec.path("template"), secrets, problems);
+ }
+ }
+ }
+
+ assertEquals(List.of(), problems, "secrets in an endpoint address
without RAW()");
+ }
+
+ private static void check(String kamelet, JsonNode node, List<String>
secrets, List<String> problems) {
+ if (node.isArray()) {
+ node.forEach(n -> check(kamelet, n, secrets, problems));
+ } else if (node.isObject()) {
+ for (Map.Entry<String, JsonNode> e : node.properties()) {
+ String key = e.getKey();
+ JsonNode value = e.getValue();
+ if ("beans".equals(key)) {
+ // a secret set as a bean property is not parsed as part
of an address
+ continue;
+ }
+ if (("uri".equals(key) || "to".equals(key) ||
"toD".equals(key)) && value.isTextual()) {
+ String uri = value.asText();
+ int query = uri.indexOf('?');
+ checkValue(kamelet, key, query < 0 ? uri :
uri.substring(0, query), secrets, problems);
+ if (query >= 0) {
+ for (String param : uri.substring(query +
1).split("&")) {
+ int eq = param.indexOf('=');
+ checkValue(kamelet, param.substring(0,
Math.max(eq, 0)), param.substring(eq + 1), secrets,
+ problems);
+ }
+ }
+ } else if ("parameters".equals(key) && value.isObject()) {
+ for (Map.Entry<String, JsonNode> p : value.properties()) {
+ checkValue(kamelet, p.getKey(), p.getValue().asText(),
secrets, problems);
+ }
+ } else {
+ check(kamelet, value, secrets, problems);
+ }
+ }
+ }
+ }
+
+ private static void checkValue(String kamelet, String name, String value,
List<String> secrets, List<String> problems) {
+ for (String secret : secrets) {
+ boolean uses = value.contains("{{" + secret + "}}") ||
value.contains("{{?" + secret + "}}");
+ if (uses && !(value.startsWith("RAW(") && value.endsWith(")"))) {
+ problems.add(kamelet + ": " + name + "=" + value);
+ }
+ }
+ }
+}
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-functions-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-functions-sink.kamelet.yaml
index d3e96ad0c..0676c4e19 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-functions-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-functions-sink.kamelet.yaml
@@ -105,4 +105,4 @@ spec:
uri: vertx-http
parameters:
httpUri: "{{url}}"
- code: "{{?key}}"
+ code: "RAW({{?key}})"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
index a5495ed79..e3aa66019 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-append-sink.kamelet.yaml
@@ -146,4 +146,4 @@ spec:
simple:
expression: "${exchangeId}"
- to:
- uri:
"azure-storage-blob://{{accountName}}/{{containerName}}?accessKey=RAW({{?accessKey}})&azureClientId=RAW({{?clientId}})&azureClientSecret=RAW({{?clientSecret}})&azureTenantId={{?tenantId}}&blobType=appendBlob&credentialType={{credentialType}}&operation=commitAppendBlob&sasToken=RAW({{?sasToken}})"
+ uri:
"azure-storage-blob://{{accountName}}/{{containerName}}?accessKey=RAW({{?accessKey}})&azureClientId=RAW({{?clientId}})&azureClientSecret=RAW({{?clientSecret}})&azureTenantId=RAW({{?tenantId}})&blobType=appendBlob&credentialType={{credentialType}}&operation=commitAppendBlob&sasToken=RAW({{?sasToken}})"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml
index af6572759..955794e5f 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml
@@ -146,4 +146,4 @@ spec:
simple:
expression: "${exchangeId}"
- to:
- uri:
"azure-storage-blob://{{accountName}}/{{containerName}}?accessKey=RAW({{?accessKey}})&azureClientId=RAW({{?clientId}})&azureClientSecret=RAW({{?clientSecret}})&azureTenantId={{?tenantId}}&credentialType={{credentialType}}&operation=uploadBlockBlob&sasToken=RAW({{?sasToken}})"
+ uri:
"azure-storage-blob://{{accountName}}/{{containerName}}?accessKey=RAW({{?accessKey}})&azureClientId=RAW({{?clientId}})&azureClientSecret=RAW({{?clientSecret}})&azureTenantId=RAW({{?tenantId}})&credentialType={{credentialType}}&operation=uploadBlockBlob&sasToken=RAW({{?sasToken}})"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
index 93bb1aca5..b9b9b1b49 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
@@ -208,7 +208,7 @@ spec:
accessKey: "RAW({{?accessKey}})"
azureClientId: "RAW({{?clientId}})"
azureClientSecret: "RAW({{?clientSecret}})"
- azureTenantId: "{{?tenantId}}"
+ azureTenantId: "RAW({{?tenantId}})"
credentialType: "{{credentialType}}"
sasToken: "RAW({{?sasToken}})"
delay: "{{delay}}"
@@ -234,7 +234,7 @@ spec:
accessKey: "RAW({{?accessKey}})"
azureClientId: "RAW({{?clientId}})"
azureClientSecret: "RAW({{?clientSecret}})"
- azureTenantId: "{{?tenantId}}"
+ azureTenantId: "RAW({{?tenantId}})"
credentialType: "{{credentialType}}"
sasToken: "RAW({{?sasToken}})"
operation: deleteBlob
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
index f8ac04f61..6b59ae091 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
@@ -168,10 +168,10 @@ spec:
parameters:
accountName: "{{accountName}}"
fileSystemName: "{{fileSystemName}}"
- clientId: "{{?clientId}}"
+ clientId: "RAW({{?clientId}})"
clientSecret: "RAW({{?clientSecret}})"
credentialType: "{{credentialType}}"
operation: upload
- tenantId: "{{?tenantId}}"
+ tenantId: "RAW({{?tenantId}})"
accountKey: "RAW({{?accountKey}})"
sasSignature: "RAW({{?sasSignature}})"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
index b1935c270..717348a9b 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
@@ -272,11 +272,11 @@ spec:
parameters:
accountName: "{{accountName}}"
fileSystemName: "{{fileSystemName}}"
- clientId: "{{?clientId}}"
+ clientId: "RAW({{?clientId}})"
clientSecret: "RAW({{?clientSecret}})"
credentialType: "{{credentialType}}"
delay: "{{delay}}"
- tenantId: "{{?tenantId}}"
+ tenantId: "RAW({{?tenantId}})"
accountKey: "RAW({{?accountKey}})"
sasSignature: "RAW({{?sasSignature}})"
path: "RAW({{?directoryName}})"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
index 7f102791a..98754f3fc 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/cassandra-sink.kamelet.yaml
@@ -135,4 +135,4 @@ spec:
- removeHeader:
name: CamelCqlQuery
- to:
- uri:
"{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password={{?password}}&datacenter={{?datacenter}}&prepareStatements={{prepareStatements}}&consistencyLevel={{consistencyLevel}}&cql=RAW({{query}})&extraTypeCodecs={{?extraTypeCodecs}}"
+ uri:
"{{local-sql-cassandraql-sink}}://{{connectionHost}}:{{connectionPort}}/{{keyspace}}?username={{?username}}&password=RAW({{?password}})&datacenter={{?datacenter}}&prepareStatements={{prepareStatements}}&consistencyLevel={{consistencyLevel}}&cql=RAW({{query}})&extraTypeCodecs={{?extraTypeCodecs}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/ceph-event-based-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/ceph-event-based-source.kamelet.yaml
index 29c851c79..fdf20828c 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/ceph-event-based-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/ceph-event-based-source.kamelet.yaml
@@ -229,6 +229,6 @@ spec:
jsonpath:
expression: "$.Records[0].s3.bucket.name"
- toD:
- uri:
"aws2-s3:${exchangeProperty.ceph-bucket-name}?accessKey={{accessKey}}&secretKey={{secretKey}}®ion={{zoneGroup}}&operation=getObject&keyName=${exchangeProperty.ceph-object-key}&uriEndpointOverride={{cephUrl}}&overrideEndpoint=true"
+ uri:
"aws2-s3:${exchangeProperty.ceph-bucket-name}?accessKey=RAW({{accessKey}})&secretKey=RAW({{secretKey}})®ion={{zoneGroup}}&operation=getObject&keyName=${exchangeProperty.ceph-object-key}&uriEndpointOverride={{cephUrl}}&overrideEndpoint=true"
- to:
uri: kamelet:sink
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-bigquery-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-bigquery-sink.kamelet.yaml
index 2cc6932e4..39bfbd2d7 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-bigquery-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-bigquery-sink.kamelet.yaml
@@ -94,5 +94,5 @@ spec:
projectId: "{{projectId}}"
datasetId: "{{dataset}}"
tableId: "{{table}}"
- serviceAccountKey: "base64:{{serviceAccountKey}}"
+ serviceAccountKey: "RAW(base64:{{serviceAccountKey}})"
useAsInsertId: "{{?useAsInsertId}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-calendar-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-calendar-source.kamelet.yaml
index 0673a7533..26a4a9b16 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-calendar-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-calendar-source.kamelet.yaml
@@ -183,7 +183,7 @@ spec:
- "camel:kamelet"
template:
from:
- uri:
"google-calendar-stream://{{index}}?accessToken=RAW({{?accessToken}})&applicationName={{applicationName}}&calendarId={{calendarId}}&clientId={{?clientId}}&clientSecret=RAW({{?clientSecret}})&considerLastUpdate={{?considerLastUpdate}}&consumeFromNow={{consumeFromNow}}&delay={{delay}}&delegate=RAW({{?delegate}})&maxResults={{?maxResults}}&query=RAW({{?query}})&refreshToken=RAW({{?refreshToken}})&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})&syncFlow={{syncFlow}}"
+ uri:
"google-calendar-stream://{{index}}?accessToken=RAW({{?accessToken}})&applicationName={{applicationName}}&calendarId={{calendarId}}&clientId=RAW({{?clientId}})&clientSecret=RAW({{?clientSecret}})&considerLastUpdate={{?considerLastUpdate}}&consumeFromNow={{consumeFromNow}}&delay={{delay}}&delegate=RAW({{?delegate}})&maxResults={{?maxResults}}&query=RAW({{?query}})&refreshToken=RAW({{?refreshToken}})&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})&syncFlow={{syn
[...]
steps:
- marshal:
json: {}
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-mail-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-mail-source.kamelet.yaml
index 633714da2..974db5f28 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-mail-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-mail-source.kamelet.yaml
@@ -197,7 +197,7 @@ spec:
- "camel:google-mail"
template:
from:
- uri:
"google-mail-stream://{{index}}?accessToken=RAW({{?accessToken}})&applicationName={{applicationName}}&clientId={{?clientId}}&clientSecret=RAW({{?clientSecret}})&delay={{delay}}&delegate=RAW({{?delegate}})&labels={{?labels}}&markAsRead={{markAsRead}}&maxResults={{?maxResults}}&query={{query}}&raw={{?raw}}&refreshToken=RAW({{?refreshToken}})&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})"
+ uri:
"google-mail-stream://{{index}}?accessToken=RAW({{?accessToken}})&applicationName={{applicationName}}&clientId=RAW({{?clientId}})&clientSecret=RAW({{?clientSecret}})&delay={{delay}}&delegate=RAW({{?delegate}})&labels={{?labels}}&markAsRead={{markAsRead}}&maxResults={{?maxResults}}&query={{query}}&raw={{?raw}}&refreshToken=RAW({{?refreshToken}})&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})"
steps:
- marshal:
json: {}
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml
index d3cf209fc..f9d408787 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml
@@ -94,4 +94,4 @@ spec:
uri: kamelet:source
steps:
- to:
- uri:
"google-pubsub://{{projectId}}:{{destinationName}}?messageOrderingEnabled={{?messageOrderingEnabled}}&pubsubEndpoint={{?pubsubEndpoint}}&serviceAccountKey=base64:{{?serviceAccountKey}}"
+ uri:
"google-pubsub://{{projectId}}:{{destinationName}}?messageOrderingEnabled={{?messageOrderingEnabled}}&pubsubEndpoint={{?pubsubEndpoint}}&serviceAccountKey=RAW(base64:{{?serviceAccountKey}})"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-pubsub-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-pubsub-source.kamelet.yaml
index e7e26b6cc..72894305e 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-pubsub-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-pubsub-source.kamelet.yaml
@@ -119,7 +119,7 @@ spec:
- "camel:jackson3"
template:
from:
- uri:
"google-pubsub://{{projectId}}:{{subscriptionName}}?ackMode={{?ackMode}}&concurrentConsumers={{concurrentConsumers}}&maxAckExtensionPeriod={{?maxAckExtensionPeriod}}&maxDeliveryAttempts={{?maxDeliveryAttempts}}&maxMessagesPerPoll={{maxMessagesPerPoll}}&serviceAccountKey=base64:{{?serviceAccountKey}}&synchronousPull={{synchronousPull}}"
+ uri:
"google-pubsub://{{projectId}}:{{subscriptionName}}?ackMode={{?ackMode}}&concurrentConsumers={{concurrentConsumers}}&maxAckExtensionPeriod={{?maxAckExtensionPeriod}}&maxDeliveryAttempts={{?maxDeliveryAttempts}}&maxMessagesPerPoll={{maxMessagesPerPoll}}&serviceAccountKey=RAW(base64:{{?serviceAccountKey}})&synchronousPull={{synchronousPull}}"
steps:
- to:
uri: kamelet:sink
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
index acd60e298..786d2d7a0 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
@@ -210,7 +210,7 @@ spec:
methodName: "{{operation}}"
accessToken: "RAW({{?accessToken}})"
applicationName: "{{?applicationName}}"
- clientId: "{{?clientId}}"
+ clientId: "RAW({{?clientId}})"
clientSecret: "RAW({{?clientSecret}})"
delegate: "RAW({{?delegate}})"
range: "{{?range}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
index 648fbbbda..b7ee02c8a 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-sheets-source.kamelet.yaml
@@ -214,7 +214,7 @@ spec:
- "camel:google-sheets"
template:
from:
- uri:
"google-sheets-stream://{{spreadsheetId}}?accessToken=RAW({{?accessToken}})&applicationName={{?applicationName}}&clientId={{?clientId}}&clientSecret=RAW({{?clientSecret}})&delay={{delay}}&delegate=RAW({{?delegate}})&majorDimension={{majorDimension}}&maxResults={{?maxResults}}&range={{?range}}&refreshToken=RAW({{?refreshToken}})&repeatCount={{?repeatCount}}&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})&splitResults={{splitResults}}&valueRenderOption={{?valueR
[...]
+ uri:
"google-sheets-stream://{{spreadsheetId}}?accessToken=RAW({{?accessToken}})&applicationName={{?applicationName}}&clientId=RAW({{?clientId}})&clientSecret=RAW({{?clientSecret}})&delay={{delay}}&delegate=RAW({{?delegate}})&majorDimension={{majorDimension}}&maxResults={{?maxResults}}&range={{?range}}&refreshToken=RAW({{?refreshToken}})&repeatCount={{?repeatCount}}&scopes={{?scopes}}&serviceAccountKey=RAW({{?serviceAccountKey}})&splitResults={{splitResults}}&valueRenderOption={{?v
[...]
steps:
- marshal:
json: {}
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-storage-event-based-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-storage-event-based-source.kamelet.yaml
index 369743a0e..54d9b1004 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-storage-event-based-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-storage-event-based-source.kamelet.yaml
@@ -135,7 +135,7 @@ spec:
- "camel:jackson3"
template:
from:
- uri:
"google-pubsub://{{projectId}}:{{subscriptionName}}?ackMode={{?ackMode}}&concurrentConsumers={{concurrentConsumers}}&maxDeliveryAttempts={{?maxDeliveryAttempts}}&maxMessagesPerPoll={{maxMessagesPerPoll}}&serviceAccountKey=base64:{{serviceAccountKey}}&synchronousPull={{synchronousPull}}"
+ uri:
"google-pubsub://{{projectId}}:{{subscriptionName}}?ackMode={{?ackMode}}&concurrentConsumers={{concurrentConsumers}}&maxDeliveryAttempts={{?maxDeliveryAttempts}}&maxMessagesPerPoll={{maxMessagesPerPoll}}&serviceAccountKey=RAW(base64:{{serviceAccountKey}})&synchronousPull={{synchronousPull}}"
steps:
- choice:
precondition: true
@@ -171,6 +171,6 @@ spec:
bucketName: "{{bucketNameOrArn}}"
objectName:
"${exchangeProperty.google-storage-object-id}"
operation: getObject
- serviceAccountKey:
"base64:{{serviceAccountKey}}"
+ serviceAccountKey:
"RAW(base64:{{serviceAccountKey}})"
- to:
uri: kamelet:sink
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-storage-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-storage-sink.kamelet.yaml
index 562c68726..95f38e989 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-storage-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-storage-sink.kamelet.yaml
@@ -142,4 +142,4 @@ spec:
simple:
expression: "${exchangeId}"
- to:
- uri:
"google-storage://{{bucketNameOrArn}}?autoCreateBucket={{autoCreateBucket}}&impersonatedServiceAccount={{?impersonatedServiceAccount}}&objectName=RAW({{?objectName}})&serviceAccountKey=base64:{{?serviceAccountKey}}&storageLocation={{?storageLocation}}&useWorkloadIdentityFederation={{?useWorkloadIdentityFederation}}&workloadIdentityConfig={{?workloadIdentityConfig}}"
+ uri:
"google-storage://{{bucketNameOrArn}}?autoCreateBucket={{autoCreateBucket}}&impersonatedServiceAccount={{?impersonatedServiceAccount}}&objectName=RAW({{?objectName}})&serviceAccountKey=RAW(base64:{{?serviceAccountKey}})&storageLocation={{?storageLocation}}&useWorkloadIdentityFederation={{?useWorkloadIdentityFederation}}&workloadIdentityConfig={{?workloadIdentityConfig}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-storage-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-storage-source.kamelet.yaml
index ee483fe1a..8aacdd551 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-storage-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-storage-source.kamelet.yaml
@@ -170,7 +170,7 @@ spec:
- "camel:jackson3"
template:
from:
- uri:
"google-storage://{{bucketNameOrArn}}?autoCreateBucket={{autoCreateBucket}}&delay={{?delay}}&deleteAfterRead={{deleteAfterRead}}&destinationBucket={{?destinationBucket}}&filter={{?filter}}&impersonatedServiceAccount={{?impersonatedServiceAccount}}&includeBody={{?includeBody}}&includeFolders={{?includeFolders}}&moveAfterRead={{?moveAfterRead}}&prefix={{?prefix}}&serviceAccountKey=base64:{{?serviceAccountKey}}&useWorkloadIdentityFederation={{?useWorkloadIdentityFederation}}&work
[...]
+ uri:
"google-storage://{{bucketNameOrArn}}?autoCreateBucket={{autoCreateBucket}}&delay={{?delay}}&deleteAfterRead={{deleteAfterRead}}&destinationBucket={{?destinationBucket}}&filter={{?filter}}&impersonatedServiceAccount={{?impersonatedServiceAccount}}&includeBody={{?includeBody}}&includeFolders={{?includeFolders}}&moveAfterRead={{?moveAfterRead}}&prefix={{?prefix}}&serviceAccountKey=RAW(base64:{{?serviceAccountKey}})&useWorkloadIdentityFederation={{?useWorkloadIdentityFederation}}
[...]
steps:
- choice:
precondition: true
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/google-vertexai-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/google-vertexai-sink.kamelet.yaml
index 468ba1252..22f6f896b 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/google-vertexai-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/google-vertexai-sink.kamelet.yaml
@@ -157,7 +157,7 @@ spec:
maxOutputTokens: "{{?maxOutputTokens}}"
operation: "{{operation}}"
publisher: "{{?publisher}}"
- serviceAccountKey: "{{?serviceAccountKey}}"
+ serviceAccountKey: "RAW({{?serviceAccountKey}})"
temperature: "{{?temperature}}"
topK: "{{?topK}}"
topP: "{{?topP}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/http-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/http-sink.kamelet.yaml
index 284396787..2305fc9d5 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/http-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/http-sink.kamelet.yaml
@@ -182,10 +182,10 @@ spec:
proxyAuthPassword: "RAW({{?proxyPassword}})"
authMethod: "{{?authMethod}}"
authUsername: "{{?authUsername}}"
- authPassword: "{{?authPassword}}"
+ authPassword: "RAW({{?authPassword}})"
authBearerToken: "RAW({{?authBearerToken}})"
- oauth2ClientId: "{{?oauth2ClientId}}"
- oauth2ClientSecret: "{{?oauth2ClientSecret}}"
+ oauth2ClientId: "RAW({{?oauth2ClientId}})"
+ oauth2ClientSecret: "RAW({{?oauth2ClientSecret}})"
oauth2Scope: "{{?oauth2Scope}}"
oauth2TokenEndpoint: "{{?oauth2TokenEndpoint}}"
authenticationPreemptive: "{{authenticationPreemptive}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/http-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/http-source.kamelet.yaml
index 7b3431a56..3c8f05197 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/http-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/http-source.kamelet.yaml
@@ -196,10 +196,10 @@ spec:
proxyAuthPassword: "RAW({{?proxyPassword}})"
authMethod: "{{?authMethod}}"
authUsername: "{{?authUsername}}"
- authPassword: "{{?authPassword}}"
+ authPassword: "RAW({{?authPassword}})"
authBearerToken: "RAW({{?authBearerToken}})"
- oauth2ClientId: "{{?oauth2ClientId}}"
- oauth2ClientSecret: "{{?oauth2ClientSecret}}"
+ oauth2ClientId: "RAW({{?oauth2ClientId}})"
+ oauth2ClientSecret: "RAW({{?oauth2ClientSecret}})"
oauth2Scope: "{{?oauth2Scope}}"
oauth2TokenEndpoint: "{{?oauth2TokenEndpoint}}"
authenticationPreemptive: "{{authenticationPreemptive}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/infinispan-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/infinispan-sink.kamelet.yaml
index e6b2b74ba..fc2420ef5 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/infinispan-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/infinispan-sink.kamelet.yaml
@@ -238,4 +238,4 @@ spec:
simple:
expression: "{{maxIdleTimeUnit}}"
- to:
- uri:
"{{local-infinispan}}:{{cacheName}}?hosts={{hosts}}&secure={{secure}}&username={{username}}&password={{password}}&saslMechanism={{saslMechanism}}&securityRealm={{securityRealm}}&securityServerName={{securityServerName}}&operation={{?operation}}&configurationProperties[trust_store_file_name]={{?sslTruststoreLocation}}&configurationProperties[trust_store_password]=RAW({{?sslTruststorePassword}})&configurationProperties[sni_host_name]={{?sslSniHostName}}"
+ uri:
"{{local-infinispan}}:{{cacheName}}?hosts={{hosts}}&secure={{secure}}&username={{username}}&password=RAW({{password}})&saslMechanism={{saslMechanism}}&securityRealm={{securityRealm}}&securityServerName={{securityServerName}}&operation={{?operation}}&configurationProperties[trust_store_file_name]={{?sslTruststoreLocation}}&configurationProperties[trust_store_password]=RAW({{?sslTruststorePassword}})&configurationProperties[sni_host_name]={{?sslSniHostName}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/infinispan-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/infinispan-source.kamelet.yaml
index b963f70e3..fac8fda10 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/infinispan-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/infinispan-source.kamelet.yaml
@@ -142,7 +142,7 @@ spec:
- name: local-infinispan
type:
"#class:org.apache.camel.component.infinispan.remote.InfinispanRemoteComponent"
from:
- uri:
"{{local-infinispan}}:{{cacheName}}?hosts={{hosts}}&secure={{secure}}&username={{username}}&password={{password}}&saslMechanism={{saslMechanism}}&securityRealm={{securityRealm}}&securityServerName={{securityServerName}}&eventTypes={{eventTypes}}&configurationProperties[trust_store_file_name]={{?sslTruststoreLocation}}&configurationProperties[trust_store_password]=RAW({{?sslTruststorePassword}})&configurationProperties[sni_host_name]={{?sslSniHostName}}"
+ uri:
"{{local-infinispan}}:{{cacheName}}?hosts={{hosts}}&secure={{secure}}&username={{username}}&password=RAW({{password}})&saslMechanism={{saslMechanism}}&securityRealm={{securityRealm}}&securityServerName={{securityServerName}}&eventTypes={{eventTypes}}&configurationProperties[trust_store_file_name]={{?sslTruststoreLocation}}&configurationProperties[trust_store_password]=RAW({{?sslTruststorePassword}})&configurationProperties[sni_host_name]={{?sslSniHostName}}"
steps:
- setHeader:
name: infinispan-cache-name
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
index b96815125..f721a10e5 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
@@ -196,8 +196,8 @@ spec:
parameters:
topic: "{{topic}}"
additionalProperties.apicurio.auth.client.id:
"{{apicurioAuthClientId}}"
- additionalProperties.apicurio.auth.client.secret:
"{{apicurioAuthClientSecret}}"
- additionalProperties.apicurio.auth.password: "{{apicurioAuthPassword}}"
+ additionalProperties.apicurio.auth.client.secret:
"RAW({{apicurioAuthClientSecret}})"
+ additionalProperties.apicurio.auth.password:
"RAW({{apicurioAuthPassword}})"
additionalProperties.apicurio.auth.realm: "{{apicurioAuthRealm}}"
additionalProperties.apicurio.auth.service.url:
"{{apicurioAuthServiceUrl}}"
additionalProperties.apicurio.auth.username: "{{apicurioAuthUsername}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
index ef5426e4e..637176db1 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
@@ -197,8 +197,8 @@ spec:
parameters:
topic: "{{topic}}"
additionalProperties.apicurio.auth.client.id:
"{{apicurioAuthClientId}}"
- additionalProperties.apicurio.auth.client.secret:
"{{apicurioAuthClientSecret}}"
- additionalProperties.apicurio.auth.password: "{{apicurioAuthPassword}}"
+ additionalProperties.apicurio.auth.client.secret:
"RAW({{apicurioAuthClientSecret}})"
+ additionalProperties.apicurio.auth.password:
"RAW({{apicurioAuthPassword}})"
additionalProperties.apicurio.auth.realm: "{{apicurioAuthRealm}}"
additionalProperties.apicurio.auth.service.url:
"{{apicurioAuthServiceUrl}}"
additionalProperties.apicurio.auth.username: "{{apicurioAuthUsername}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml
index a3cc8ef1c..d8acdba28 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml
@@ -181,8 +181,8 @@ spec:
parameters:
topic: "{{topic}}"
additionalProperties.apicurio.auth.client.id:
"{{apicurioAuthClientId}}"
- additionalProperties.apicurio.auth.client.secret:
"{{apicurioAuthClientSecret}}"
- additionalProperties.apicurio.auth.password:
"{{apicurioAuthPassword}}"
+ additionalProperties.apicurio.auth.client.secret:
"RAW({{apicurioAuthClientSecret}})"
+ additionalProperties.apicurio.auth.password:
"RAW({{apicurioAuthPassword}})"
additionalProperties.apicurio.auth.realm: "{{apicurioAuthRealm}}"
additionalProperties.apicurio.auth.service.url:
"{{apicurioAuthServiceUrl}}"
additionalProperties.apicurio.auth.username:
"{{apicurioAuthUsername}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
index 6be88a031..c5eb3f96e 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
@@ -202,8 +202,8 @@ spec:
parameters:
topic: "{{topic}}"
additionalProperties.apicurio.auth.client.id:
"{{apicurioAuthClientId}}"
- additionalProperties.apicurio.auth.client.secret:
"{{apicurioAuthClientSecret}}"
- additionalProperties.apicurio.auth.password: "{{apicurioAuthPassword}}"
+ additionalProperties.apicurio.auth.client.secret:
"RAW({{apicurioAuthClientSecret}})"
+ additionalProperties.apicurio.auth.password:
"RAW({{apicurioAuthPassword}})"
additionalProperties.apicurio.auth.realm: "{{apicurioAuthRealm}}"
additionalProperties.apicurio.auth.service.url:
"{{apicurioAuthServiceUrl}}"
additionalProperties.apicurio.auth.username: "{{apicurioAuthUsername}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/mail-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/mail-sink.kamelet.yaml
index 33696c430..3a03289ad 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/mail-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/mail-sink.kamelet.yaml
@@ -260,7 +260,7 @@ spec:
- removeHeaders:
pattern: ce-*
- to:
- uri:
"{{protocol}}:{{connectionHost}}:{{connectionPort}}?subject={{?subject}}&from={{?from}}&to={{?to}}&username={{username}}&password={{password}}&useHeaderSubject=true&useHeaderFrom=true&useHeaderRecipients=true&mail.smtp.starttls.enable={{?startTls}}&mail.smtp.starttls.required={{?startTls}}&replyTo=RAW({{?replyTo}})&contentType=RAW({{?contentType}})"
+ uri:
"{{protocol}}:{{connectionHost}}:{{connectionPort}}?subject={{?subject}}&from={{?from}}&to={{?to}}&username={{username}}&password=RAW({{password}})&useHeaderSubject=true&useHeaderFrom=true&useHeaderRecipients=true&mail.smtp.starttls.enable={{?startTls}}&mail.smtp.starttls.required={{?startTls}}&replyTo=RAW({{?replyTo}})&contentType=RAW({{?contentType}})"
# camel-mail ignores the Subject / From / To / Cc headers unless
# these are enabled; without them the ce-* mappings above are
# dead code. Reply-To stays disabled - it is not part of the
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/nats-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/nats-sink.kamelet.yaml
index c56c5c6ec..3275336b6 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/nats-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/nats-sink.kamelet.yaml
@@ -98,6 +98,6 @@ spec:
jetstreamAsync: "{{?jetstreamAsync}}"
jetstreamEnabled: "{{?jetstreamEnabled}}"
jetstreamName: "{{?jetstreamName}}"
- servers: "{{servers}}"
+ servers: "RAW({{servers}})"
secure: "{{?secure}}"
credentialsFilePath: "{{?credentialsFilePath}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/nats-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/nats-source.kamelet.yaml
index d58427c23..0f6ef34e8 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/nats-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/nats-source.kamelet.yaml
@@ -129,7 +129,7 @@ spec:
jetstreamAsync: "{{?jetstreamAsync}}"
jetstreamEnabled: "{{?jetstreamEnabled}}"
jetstreamName: "{{?jetstreamName}}"
- servers: "{{servers}}"
+ servers: "RAW({{servers}})"
secure: "{{?secure}}"
credentialsFilePath: "{{?credentialsFilePath}}"
queueName: "{{?queueName}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/slack-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/slack-sink.kamelet.yaml
index b091b229b..4166aa7ec 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/slack-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/slack-sink.kamelet.yaml
@@ -72,4 +72,4 @@ spec:
uri: slack
parameters:
channel: "{{channel}}"
- webhookUrl: "{{webhookUrl}}"
+ webhookUrl: "RAW({{webhookUrl}})"