Skip to content

Cleanup SafeSerializationUtils to remove unused Guava classes #6152

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

Merged
finnegancarroll merged 2 commits into from
May 20, 2026
Merged

Cleanup SafeSerializationUtils to remove unused Guava classes #6152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5653975
Cleanup SafeSerializationUtils to remove unused Guava classes
cwperks May 6, 2026
28d728c
Merge branch 'main' into filter-safe
cwperks May 6, 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
2 changes: 2 additions & 0 deletions src/main/java/org/opensearch/security/support/Base64Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InvalidClassException;
import java.io.ObjectInputFilter;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
Expand Down Expand Up @@ -103,6 +104,7 @@ public static Serializable deserializeObject(final String string) {
private final static class SafeObjectInputStream extends ObjectInputStream {
public SafeObjectInputStream(InputStream in) throws IOException {
super(in);
setObjectInputFilter(ObjectInputFilter.Config.createFilter("maxdepth=10"));
}

@Override
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/org/opensearch/security/support/SafeSerializationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;

import com.amazon.dlic.auth.ldap.LdapUser;
Expand Down Expand Up @@ -58,15 +57,10 @@ public final class SafeSerializationUtils {
Number.class,
Collection.class,
Map.class,
Enum.class,
ImmutableMap.class
Enum.class
);

private static final Set<String> SAFE_CLASS_NAMES = Set.of(
"org.ldaptive.LdapAttribute$LdapAttributeValues",
"com.google.common.collect.ImmutableBiMap$SerializedForm",
"com.google.common.collect.ImmutableMap$SerializedForm"
);
private static final Set<String> SAFE_CLASS_NAMES = Set.of("org.ldaptive.LdapAttribute$LdapAttributeValues");
static final Map<Class<?>, Boolean> safeClassCache = new ConcurrentHashMap<>();

static boolean isSafeClass(Class<?> cls) {
Expand Down
Loading