You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2026/04/14 09:12:49 UTC
(camel) branch camel-4.18.x updated: CAMEL-23322: Add deserialization filtering to camel-infinispan remote aggregation repository (#22600)
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 377972ed37a2 CAMEL-23322: Add deserialization filtering to camel-infinispan remote aggregation repository (#22600)
377972ed37a2 is described below
commit 377972ed37a276e04d7ee49d9214c6b6c79d8a37
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 14 11:12:42 2026 +0200
CAMEL-23322: Add deserialization filtering to camel-infinispan remote aggregation repository (#22600)
DefaultExchangeHolderUtils.deserialize() now resolves a deserialization
filter before readObject(): the JVM-wide filter (jdk.serialFilter) is used
when set, otherwise a default Camel allowlist
"java.**;javax.**;org.apache.camel.**;!*" is applied.
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../protostream/DefaultExchangeHolderUtils.java | 19 +++++++
.../example/external/NotAllowedSerializable.java | 37 +++++++++++++
.../DefaultExchangeHolderUtilsTest.java | 63 ++++++++++++++++++++++
3 files changed, 119 insertions(+)
diff --git a/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/protostream/DefaultExchangeHolderUtils.java b/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/protostream/DefaultExchangeHolderUtils.java
index b439ed623014..62d46e67f5c3 100644
--- a/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/protostream/DefaultExchangeHolderUtils.java
+++ b/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/protostream/DefaultExchangeHolderUtils.java
@@ -19,17 +19,28 @@ package org.apache.camel.component.infinispan.remote.protostream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.ObjectInputFilter;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.apache.camel.support.DefaultExchangeHolder;
import org.apache.camel.util.ClassLoadingAwareObjectInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utilities for {@link DefaultExchangeHolder} and the Infinispan Protostream marshaller.
*/
final class DefaultExchangeHolderUtils {
+ /**
+ * Default deserialization filter that restricts which classes can be deserialized. Allows standard Java types and
+ * Apache Camel types. Can be overridden via the JVM system property {@code jdk.serialFilter}.
+ */
+ static final String DEFAULT_DESERIALIZATION_FILTER = "java.**;javax.**;org.apache.camel.**;!*";
+
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultExchangeHolderUtils.class);
+
private DefaultExchangeHolderUtils() {
// Utility class
}
@@ -46,6 +57,14 @@ final class DefaultExchangeHolderUtils {
static DefaultExchangeHolder deserialize(byte[] bytes) {
try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
ObjectInputStream ois = new ClassLoadingAwareObjectInputStream(bais)) {
+ ObjectInputFilter jvmFilter = ObjectInputFilter.Config.getSerialFilter();
+ if (jvmFilter != null) {
+ ois.setObjectInputFilter(jvmFilter);
+ } else {
+ LOG.debug("No JVM-wide deserialization filter set, applying default Camel filter: {}",
+ DEFAULT_DESERIALIZATION_FILTER);
+ ois.setObjectInputFilter(ObjectInputFilter.Config.createFilter(DEFAULT_DESERIALIZATION_FILTER));
+ }
return (DefaultExchangeHolder) ois.readObject();
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/com/example/external/NotAllowedSerializable.java b/components/camel-infinispan/camel-infinispan/src/test/java/com/example/external/NotAllowedSerializable.java
new file mode 100644
index 000000000000..204d84216745
--- /dev/null
+++ b/components/camel-infinispan/camel-infinispan/src/test/java/com/example/external/NotAllowedSerializable.java
@@ -0,0 +1,37 @@
+/*
+ * 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 com.example.external;
+
+import java.io.Serializable;
+
+/**
+ * Serializable type living outside the {@code java.**}, {@code javax.**} and {@code org.apache.camel.**} packages, used
+ * to verify that the default deserialization allowlist rejects unknown classes.
+ */
+public final class NotAllowedSerializable implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public NotAllowedSerializable(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+}
diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/protostream/DefaultExchangeHolderUtilsTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/protostream/DefaultExchangeHolderUtilsTest.java
new file mode 100644
index 000000000000..1b18b3a7fd93
--- /dev/null
+++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/protostream/DefaultExchangeHolderUtilsTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.infinispan.remote.protostream;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+
+import com.example.external.NotAllowedSerializable;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.support.DefaultExchange;
+import org.apache.camel.support.DefaultExchangeHolder;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class DefaultExchangeHolderUtilsTest {
+
+ @Test
+ public void testDeserializeAcceptsDefaultExchangeHolder() {
+ DefaultCamelContext context = new DefaultCamelContext();
+ DefaultExchange exchange = new DefaultExchange(context);
+ exchange.getIn().setBody("hello");
+
+ DefaultExchangeHolder holder = DefaultExchangeHolder.marshal(exchange, true);
+ byte[] bytes = DefaultExchangeHolderUtils.serialize(holder);
+
+ DefaultExchangeHolder roundTripped = DefaultExchangeHolderUtils.deserialize(bytes);
+ assertNotNull(roundTripped);
+
+ DefaultExchange restored = new DefaultExchange(context);
+ DefaultExchangeHolder.unmarshal(restored, roundTripped);
+ assertEquals("hello", restored.getIn().getBody());
+ }
+
+ @Test
+ public void testDeserializeRejectsUnlistedType() throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+ oos.writeObject(new NotAllowedSerializable("blocked"));
+ }
+
+ RuntimeException thrown = assertThrows(RuntimeException.class,
+ () -> DefaultExchangeHolderUtils.deserialize(baos.toByteArray()));
+ Throwable cause = thrown.getCause();
+ assertNotNull(cause);
+ }
+}