Skip to content

Fix insecure deserialization in ZookeeperDistributedQueue (CWE-502) #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devin-ai-integration wants to merge 2 commits into
base: develop-7.0.x
Choose a base branch
from
+9 −0
Open

Fix insecure deserialization in ZookeeperDistributedQueue (CWE-502) #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5615ca
Fix insecure deserialization in ZookeeperDistributedQueue (CWE-502)
devin-ai-integration[bot] Apr 29, 2026
55a63a5
Add org.apache.solr.** to deserialization allowlist
devin-ai-integration[bot] Apr 29, 2026
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
9 changes: 9 additions & 0 deletions ...mework/src/main/java/org/broadleafcommerce/core/util/queue/ZookeeperDistributedQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
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 java.io.Serializable;
Expand Down Expand Up @@ -79,6 +80,13 @@ public class ZookeeperDistributedQueue<T extends Serializable> implements Distri
private static final Log LOG = LogFactory.getLog(ZookeeperDistributedQueue.class);
private static final String QUEUE_ENTRY_NAME = "dz-queue-entry";

/**
* Filter that restricts deserialization to known safe classes to prevent RCE via CWE-502.
*/
private static final ObjectInputFilter DESERIALIZATION_FILTER = ObjectInputFilter.Config.createFilter(
"org.broadleafcommerce.**;org.apache.solr.**;java.lang.*;java.util.*;java.io.Serializable;java.math.*;java.time.*;!*"
);
Comment thread
devin-ai-integration[bot] marked this conversation as resolved.

protected final Object QUEUE_MONITOR = new Object();
private final String queueFolderPath;
private final ZooKeeper zk;
Expand Down Expand Up @@ -832,6 +840,7 @@ protected Object deserialize(byte[] bytes) {
ObjectInputStream ois = null;
try {
ois = new ObjectInputStream(bais);
ois.setObjectInputFilter(DESERIALIZATION_FILTER);
return ois.readObject();
} catch (IOException | ClassNotFoundException e) {
throw new DistributedQueueException("Unable to deserialze an element from the Zookeeper queue.", e);
Expand Down