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.git
The following commit(s) were added to refs/heads/main by this push:
new 735e7e49dc37 CAMEL-23803: block unsafe polymorphic base types by
default in camel-jackson-avro and camel-jackson-protobuf (#24195)
735e7e49dc37 is described below
commit 735e7e49dc377314d3de73a1b52f1a15bcf12eb5
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Jun 24 09:29:07 2026 +0200
CAMEL-23803: block unsafe polymorphic base types by default in
camel-jackson-avro and camel-jackson-protobuf (#24195)
The camel-jackson-avro and camel-jackson-protobuf data formats now create
their
default AvroMapper / ProtobufMapper with
MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES
enabled, mirroring the hardening already applied to camel-jackson
(CAMEL-23786) and
camel-jacksonxml (CAMEL-23787) and to their respective transform/ mappers.
This is
defense-in-depth against gadget-chain deserialization: when polymorphic /
default
typing is enabled, Jackson refuses unsafe base types (Object, Serializable,
Comparable).
Signed-off-by: Andrea Cosentino <[email protected]>
Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]>
---
.../jackson/avro/JacksonAvroDataFormat.java | 8 +++-
...ksonAvroDataFormatPolymorphicHardeningTest.java | 48 ++++++++++++++++++++++
.../protobuf/JacksonProtobufDataFormat.java | 8 +++-
...ProtobufDataFormatPolymorphicHardeningTest.java | 48 ++++++++++++++++++++++
.../ROOT/pages/camel-4x-upgrade-guide-4_14.adoc | 12 ++++++
.../ROOT/pages/camel-4x-upgrade-guide-4_18.adoc | 12 ++++++
.../ROOT/pages/camel-4x-upgrade-guide-4_21.adoc | 12 ++++++
7 files changed, 146 insertions(+), 2 deletions(-)
diff --git
a/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java
b/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java
index 54bb52cba360..4270f1d935a8 100644
---
a/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java
+++
b/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jackson.avro;
+import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.avro.AvroMapper;
import org.apache.camel.component.jackson.AbstractJacksonDataFormat;
@@ -87,7 +88,12 @@ public class JacksonAvroDataFormat extends
AbstractJacksonDataFormat {
@Override
protected AvroMapper createNewObjectMapper() {
- return new AvroMapper();
+ // Enable BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES by default as
defense-in-depth against gadget-chain
+ // deserialization when polymorphic typing is enabled, consistent with
camel-jackson (CAMEL-23786)
+ // and the transform/Avro.java mapper.
+ return AvroMapper.builder()
+ .enable(MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES)
+ .build();
}
@Override
diff --git
a/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormatPolymorphicHardeningTest.java
b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormatPolymorphicHardeningTest.java
new file mode 100644
index 000000000000..97be889c050f
--- /dev/null
+++
b/components/camel-jackson-avro/src/test/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormatPolymorphicHardeningTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.jackson.avro;
+
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Verifies that the AvroMapper created by {@link JacksonAvroDataFormat}
enables
+ * {@link MapperFeature#BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES} by default — the
Jackson mechanism that refuses unsafe
+ * polymorphic base types (e.g. Object/Serializable) when polymorphic/default
typing is enabled, as defense-in-depth
+ * against gadget-chain deserialization.
+ */
+public class JacksonAvroDataFormatPolymorphicHardeningTest {
+
+ @Test
+ void blockUnsafePolymorphicBaseTypesEnabledByDefault() throws Exception {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
+ context.start();
+ JacksonAvroDataFormat df = new JacksonAvroDataFormat();
+ df.setCamelContext(context);
+ df.start();
+ ObjectMapper mapper = df.getObjectMapper();
+ assertNotNull(mapper);
+
assertTrue(mapper.isEnabled(MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES),
+ "camel-jackson-avro data format must enable
BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES by default");
+ }
+ }
+}
diff --git
a/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java
b/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java
index c44b5ee97dab..1878e3ab5ad4 100644
---
a/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java
+++
b/components/camel-jackson-protobuf/src/main/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormat.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jackson.protobuf;
+import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
import org.apache.camel.component.jackson.JacksonDataFormat;
@@ -88,7 +89,12 @@ public class JacksonProtobufDataFormat extends
JacksonDataFormat {
@Override
protected ProtobufMapper createNewObjectMapper() {
- return new ProtobufMapper();
+ // Enable BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES by default as
defense-in-depth against gadget-chain
+ // deserialization when polymorphic typing is enabled, consistent with
camel-jackson (CAMEL-23786)
+ // and the transform/Protobuf.java mapper.
+ return ProtobufMapper.builder()
+ .enable(MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES)
+ .build();
}
@Override
diff --git
a/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormatPolymorphicHardeningTest.java
b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormatPolymorphicHardeningTest.java
new file mode 100644
index 000000000000..a16b69ac6eda
--- /dev/null
+++
b/components/camel-jackson-protobuf/src/test/java/org/apache/camel/component/jackson/protobuf/JacksonProtobufDataFormatPolymorphicHardeningTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.jackson.protobuf;
+
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Verifies that the ProtobufMapper created by {@link
JacksonProtobufDataFormat} enables
+ * {@link MapperFeature#BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES} by default — the
Jackson mechanism that refuses unsafe
+ * polymorphic base types (e.g. Object/Serializable) when polymorphic/default
typing is enabled, as defense-in-depth
+ * against gadget-chain deserialization.
+ */
+public class JacksonProtobufDataFormatPolymorphicHardeningTest {
+
+ @Test
+ void blockUnsafePolymorphicBaseTypesEnabledByDefault() throws Exception {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
+ context.start();
+ JacksonProtobufDataFormat df = new JacksonProtobufDataFormat();
+ df.setCamelContext(context);
+ df.start();
+ ObjectMapper mapper = df.getObjectMapper();
+ assertNotNull(mapper);
+
assertTrue(mapper.isEnabled(MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES),
+ "camel-jackson-protobuf data format must enable
BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES by default");
+ }
+ }
+}
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_14.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_14.adoc
index e11c7c4b5b0e..238d0ee1a3c7 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_14.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_14.adoc
@@ -36,6 +36,18 @@ This only affects routes that enable polymorphic / default
typing on an unsafe b
marshalling and unmarshalling are unchanged. If you rely on that behaviour,
supply your own `XmlMapper`
(via the `xmlMapper` option) configured without this feature.
+=== camel-jackson-avro and camel-jackson-protobuf - potential breaking change
+
+The `camel-jackson-avro` and `camel-jackson-protobuf` data formats now create
their default `AvroMapper` /
+`ProtobufMapper` with `MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES`
enabled, mirroring the same hardening
+applied to `camel-jackson` and `camel-jacksonxml`. This is defense-in-depth
against gadget-chain deserialization:
+when polymorphic / default typing is enabled, Jackson refuses unsafe base
types (such as `Object`, `Serializable`
+or `Comparable`).
+
+This only affects routes that enable polymorphic / default typing on an unsafe
base type; ordinary
+marshalling and unmarshalling are unchanged. If you rely on that behaviour,
supply your own mapper
+(via the `objectMapper` option) configured without this feature.
+
=== camel-oauth
`UserProfile` token verification now fails closed when no JWK set is
available: a signed token can no
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
index 6b73180ce563..b2c88fbabf99 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
@@ -36,6 +36,18 @@ This only affects routes that enable polymorphic / default
typing on an unsafe b
marshalling and unmarshalling are unchanged. If you rely on that behaviour,
supply your own `XmlMapper`
(via the `xmlMapper` option) configured without this feature.
+=== camel-jackson-avro and camel-jackson-protobuf - potential breaking change
+
+The `camel-jackson-avro` and `camel-jackson-protobuf` data formats now create
their default `AvroMapper` /
+`ProtobufMapper` with `MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES`
enabled, mirroring the same hardening
+applied to `camel-jackson` and `camel-jacksonxml`. This is defense-in-depth
against gadget-chain deserialization:
+when polymorphic / default typing is enabled, Jackson refuses unsafe base
types (such as `Object`, `Serializable`
+or `Comparable`).
+
+This only affects routes that enable polymorphic / default typing on an unsafe
base type; ordinary
+marshalling and unmarshalling are unchanged. If you rely on that behaviour,
supply your own mapper
+(via the `objectMapper` option) configured without this feature.
+
=== camel-oauth
`UserProfile` token verification now fails closed when no JWK set is
available: a signed token can no
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
index d737759d820c..72c5aa69a742 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
@@ -2593,6 +2593,18 @@ This only affects routes that enable polymorphic /
default typing on an unsafe b
marshalling and unmarshalling are unchanged. If you rely on that behaviour,
supply your own `XmlMapper`
(via the `xmlMapper` option) configured without this feature.
+=== camel-jackson-avro and camel-jackson-protobuf - potential breaking change
+
+The `camel-jackson-avro` and `camel-jackson-protobuf` data formats now create
their default `AvroMapper` /
+`ProtobufMapper` with `MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES`
enabled, mirroring the same hardening
+applied to `camel-jackson` and `camel-jacksonxml`. This is defense-in-depth
against gadget-chain deserialization:
+when polymorphic / default typing is enabled, Jackson refuses unsafe base
types (such as `Object`, `Serializable`
+or `Comparable`).
+
+This only affects routes that enable polymorphic / default typing on an unsafe
base type; ordinary
+marshalling and unmarshalling are unchanged. If you rely on that behaviour,
supply your own mapper
+(via the `objectMapper` option) configured without this feature.
+
=== camel-diagram: Embeddable web component
A new `<camel-route-diagram>` web component is now bundled inside
`camel-diagram.jar`
