1 files changed, 39 insertions, 0 deletions
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/EaafObjectInputStream.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/EaafObjectInputStream.java
new file mode 100644
index 00000000..e15c7a37
--- /dev/null
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/EaafObjectInputStream.java
@@ -0,0 +1,39 @@
+package at.gv.egiz.eaaf.core.impl.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidClassException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
+public class EaafObjectInputStream extends ObjectInputStream {
+
+  private List<String> allowedClassNames;
+  
+  /**
+   * Object input-stream with internal class validation.
+   * 
+   * @param is Inputstream to deserialize.
+   * @param classNames Whitelisted classnames 
+   * @throws IOException In case of an error
+   */ 
+  public EaafObjectInputStream(@Nonnull InputStream is, @Nonnull List<String> classNames) throws IOException {
+    super(is);
+    this.allowedClassNames = classNames;
+    
+  }
+
+  //Only deserialize instances of our expected class
+  @Override
+  protected Class<?> resolveClass(ObjectStreamClass desc)
+      throws IOException, ClassNotFoundException {
+    if (!allowedClassNames.contains(desc.getName())) {
+      throw new InvalidClassException("Unauthorized deserialization attempt: {}",desc.getName());
+      
+    }
+    return super.resolveClass(desc);
+  }
+}