Skip to content

Add defensive class validation during deserialization#85

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
yannaingtun wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Add defensive class validation during deserialization #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions sql12/core/src/net/sourceforge/squirrel_sql/fw/util/Utilities.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InvalidClassException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
Expand DownExpand Up@@ -296,13 +297,25 @@ public static <T> T cloneObject(T toClone, final ClassLoader classLoader)
oOut.close();
ByteArrayInputStream bIn = new ByteArrayInputStream(bOut.toByteArray());
bOut.close();
ObjectInputStream oIn = new ObjectInputStream(bIn)
{
protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException
{
return Class.forName(desc.getName(), false, classLoader);
ObjectInputStream oIn = new ObjectInputStream(bIn) {
@Override
protected Class<?> resolveClass(ObjectStreamClass desc)
throws IOException, ClassNotFoundException {

Class<?> clazz = Class.forName(desc.getName(), false, classLoader);

if (!clazz.isAssignableFrom(toClone.getClass())
&& !toClone.getClass().isAssignableFrom(clazz)) {
throw new InvalidClassException(
"Unauthorized deserialization attempt",
desc.getName()
);
}

return clazz;
}
};

bIn.close();
Object copy = oIn.readObject();
oIn.close();
Expand Down