Skip to content

Commit 3bb8342

Browse files
authored
Cleanup SafeSerializationUtils to remove unused Guava classes (opensearch-project#6152)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent 3c51d00 commit 3bb8342

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

src/main/java/org/opensearch/security/support/Base64Helper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.io.IOException;
3232
import java.io.InputStream;
3333
import java.io.InvalidClassException;
34+
import java.io.ObjectInputFilter;
3435
import java.io.ObjectInputStream;
3536
import java.io.ObjectOutputStream;
3637
import java.io.ObjectStreamClass;
@@ -103,6 +104,7 @@ public static Serializable deserializeObject(final String string) {
103104
private final static class SafeObjectInputStream extends ObjectInputStream {
104105
public SafeObjectInputStream(InputStream in) throws IOException {
105106
super(in);
107+
setObjectInputFilter(ObjectInputFilter.Config.createFilter("maxdepth=10"));
106108
}
107109

108110
@Override

src/main/java/org/opensearch/security/support/SafeSerializationUtils.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.concurrent.ConcurrentHashMap;
2222
import java.util.regex.Pattern;
2323

24-
import com.google.common.collect.ImmutableMap;
2524
import com.google.common.collect.ImmutableSet;
2625

2726
import com.amazon.dlic.auth.ldap.LdapUser;
@@ -58,15 +57,10 @@ public final class SafeSerializationUtils {
5857
Number.class,
5958
Collection.class,
6059
Map.class,
61-
Enum.class,
62-
ImmutableMap.class
60+
Enum.class
6361
);
6462

65-
private static final Set<String> SAFE_CLASS_NAMES = Set.of(
66-
"org.ldaptive.LdapAttribute$LdapAttributeValues",
67-
"com.google.common.collect.ImmutableBiMap$SerializedForm",
68-
"com.google.common.collect.ImmutableMap$SerializedForm"
69-
);
63+
private static final Set<String> SAFE_CLASS_NAMES = Set.of("org.ldaptive.LdapAttribute$LdapAttributeValues");
7064
static final Map<Class<?>, Boolean> safeClassCache = new ConcurrentHashMap<>();
7165

7266
static boolean isSafeClass(Class<?> cls) {

0 commit comments

Comments
 (0)