Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -87,7 +88,12 @@ protected String getDefaultContentType() {

@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
Expand Down
Original file line number Diff line number Diff line change
@@ -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);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: the sibling test in PR #24134 (camel-jackson) calls df.setUseDefaultObjectMapper(false) before df.start() to guarantee that createNewObjectMapper() is exercised rather than picking up a mapper from the registry. This test relies on the DefaultCamelContext having no ObjectMapper registered, which is true today but fragile. Consider adding df.setUseDefaultObjectMapper(false) for consistency with the sibling.

Claude Code on behalf of Guillaume Nodet

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");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -88,7 +89,12 @@ protected String getDefaultContentType() {

@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
Expand Down
Original file line number Diff line number Diff line change
@@ -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");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2580,6 +2580,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`
Expand Down
Loading