This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.18.x by this push:
new d6eab8b1ecf7 CAMEL-24085: Apply header filter strategy to IronMQ
message envelope headers (4.18.x backport)
d6eab8b1ecf7 is described below
commit d6eab8b1ecf79736051e7d1c41abcf83c55e5c0f
Author: Andrea Cosentino <[email protected]>
AuthorDate: Sun Jul 19 19:54:04 2026 +0200
CAMEL-24085: Apply header filter strategy to IronMQ message envelope
headers (4.18.x backport)
Backport of #24828 from main. The IronMQ consumer deserialized a JSON
envelope
and copied embedded header entries onto the Camel message without applying a
HeaderFilterStrategy. This allows Camel* headers from untrusted senders to
be
injected. Route envelope headers through a HeaderFilterStrategy so Camel*
headers are filtered case-insensitively, consistent with other consumers.
On camel-4.18.x the strategy explicitly sets setInFilterStartsWith since
DefaultHeaderFilterStrategy does not filter Camel* inbound by default on
this branch.
Closes #24905
Co-Authored-By: Claude Fable 5 <[email protected]>
---
.../apache/camel/component/ironmq/GsonUtil.java | 17 ++++-
.../ironmq/IronMQConsumerHeaderFilterTest.java | 80 ++++++++++++++++++++++
2 files changed, 96 insertions(+), 1 deletion(-)
diff --git
a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/GsonUtil.java
b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/GsonUtil.java
index bd287a39439e..e3d071dfbea3 100644
---
a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/GsonUtil.java
+++
b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/GsonUtil.java
@@ -20,13 +20,27 @@ import java.util.Map;
import com.google.gson.Gson;
import org.apache.camel.Message;
+import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.support.DefaultHeaderFilterStrategy;
public final class GsonUtil {
private static final Gson GSON = new Gson();
+ // Filters internal Camel headers (Camel*/camel*) embedded in the IronMQ
message envelope, consistent with how
+ // other consumers apply a HeaderFilterStrategy to externally supplied
headers. On this branch the in-direction
+ // Camel* filter must be set explicitly, since DefaultHeaderFilterStrategy
does not filter Camel* inbound by
+ // default.
+ private static final HeaderFilterStrategy HEADER_FILTER_STRATEGY =
createHeaderFilterStrategy();
+
private GsonUtil() {
}
+ private static HeaderFilterStrategy createHeaderFilterStrategy() {
+ DefaultHeaderFilterStrategy strategy = new
DefaultHeaderFilterStrategy();
+
strategy.setInFilterStartsWith(DefaultHeaderFilterStrategy.CAMEL_FILTER_STARTS_WITH);
+ return strategy;
+ }
+
static class IronMqMessage {
private Map<String, Object> headers;
private final String body;
@@ -57,7 +71,8 @@ public final class GsonUtil {
for (Map.Entry<String, Object> entry :
ironMqMessage.getHeaders().entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
- if (target.getHeader(key) == null) {
+ if (target.getHeader(key) == null
+ &&
!HEADER_FILTER_STRATEGY.applyFilterToExternalHeaders(key, value,
target.getExchange())) {
target.setHeader(key, value);
}
}
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQConsumerHeaderFilterTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQConsumerHeaderFilterTest.java
new file mode 100644
index 000000000000..a143bcb64484
--- /dev/null
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQConsumerHeaderFilterTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.component.ironmq;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Message;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class IronMQConsumerHeaderFilterTest extends CamelTestSupport {
+
+ private IronMQEndpoint endpoint;
+ private IronMQClientMock clientMock;
+
+ @EndpointInject("mock:result")
+ private MockEndpoint result;
+
+ @Test
+ public void testCamelHeadersInMessageEnvelopeAreFiltered() throws
Exception {
+ result.expectedMessageCount(1);
+ result.expectedBodiesReceived("some payload");
+ // a regular header embedded in the envelope must still be mapped onto
the message
+ result.expectedHeaderReceived("MyHeader", "HeaderValue");
+
+ // message envelope as crafted by a sender: internal Camel headers
embedded in the envelope must not be
+ // mapped onto the Camel message (matched case-insensitively)
+ String envelope =
"{\"headers\":{\"MyHeader\":\"HeaderValue\",\"CamelFileName\":\"injected.txt\","
+ +
"\"camelExecCommandExecutable\":\"injected\"},\"body\":\"some payload\"}";
+ clientMock.queue("TestQueue").push(envelope, 0);
+
+ MockEndpoint.assertIsSatisfied(context);
+
+ Message received = result.getExchanges().get(0).getIn();
+ assertNull(received.getHeader("CamelFileName"));
+ assertNull(received.getHeader("camelExecCommandExecutable"));
+ assertNotNull(received.getHeader(IronMQConstants.MESSAGE_ID));
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ IronMQComponent component = new IronMQComponent(context);
+ component.init();
+ endpoint = (IronMQEndpoint) component
+
.createEndpoint("ironmq://TestQueue?projectId=xxx&token=yyy&preserveHeaders=true");
+ clientMock = new IronMQClientMock("dummy", "dummy");
+ endpoint.setClient(clientMock);
+ context.addComponent("ironmq", component);
+ return context;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from(endpoint).to("mock:result");
+ }
+ };
+ }
+}
