Skip to content

Commit 85bb828

Browse files
authored
Cleanup SafeSerializationUtils to remove unused Guava classes (#958)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent 641ecda commit 85bb828

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

src/main/java/org/opensearch/commons/authuser/util/Base64Helper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.io.IOException;
1313
import java.io.InputStream;
1414
import java.io.InvalidClassException;
15+
import java.io.ObjectInputFilter;
1516
import java.io.ObjectInputStream;
1617
import java.io.ObjectOutputStream;
1718
import java.io.ObjectStreamClass;
@@ -79,6 +80,7 @@ public static Serializable deserializeObject(final String string) {
7980
private final static class SafeObjectInputStream extends ObjectInputStream {
8081
public SafeObjectInputStream(InputStream in) throws IOException {
8182
super(in);
83+
setObjectInputFilter(ObjectInputFilter.Config.createFilter("maxdepth=10"));
8284
}
8385

8486
@Override

src/main/java/org/opensearch/commons/authuser/util/SafeSerializationUtils.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@ public final class SafeSerializationUtils {
2828
private static final Set<Class<?>> SAFE_ASSIGNABLE_FROM_CLASSES = Set
2929
.of(InetAddress.class, Number.class, Collection.class, Map.class, Enum.class);
3030

31-
private static final Set<String> SAFE_CLASS_NAMES = Set
32-
.of(
33-
"org.ldaptive.LdapAttribute$LdapAttributeValues",
34-
"com.google.common.collect.ImmutableMap$SerializedForm",
35-
"com.google.common.collect.ImmutableBiMap$SerializedForm"
36-
);
31+
private static final Set<String> SAFE_CLASS_NAMES = Set.of("org.ldaptive.LdapAttribute$LdapAttributeValues");
3732
static final Map<Class<?>, Boolean> safeClassCache = new ConcurrentHashMap<>();
3833

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

0 commit comments

Comments
 (0)