Skip to content

Fix allow non-serializable check #12267

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
AlbumenJ merged 5 commits into from
May 16, 2023
Merged

Fix allow non-serializable check #12267

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7203e0b
Fix allow non-serializable check
AlbumenJ May 9, 2023
13fc511
Merge branch '3.2' into 0509_serialize
songxiaosheng May 11, 2023
62b6ae5
opt code
AlbumenJ May 12, 2023
5e41ba4
opt code
AlbumenJ May 12, 2023
438db93
Merge branch '3.2' into 0509_serialize
AlbumenJ May 16, 2023
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
20 changes: 13 additions & 7 deletions ...2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ protected Serializer getDefaultSerializer(Class cl) {
// ignore
}

if (!Serializable.class.isAssignableFrom(cl)
&& (!isAllowNonSerializable() || defaultSerializeClassChecker.isCheckSerializable())) {
throw new IllegalStateException("Serialized class " + cl.getName() + " must implement java.io.Serializable");
}
checkSerializable(cl);

return new JavaSerializer(cl, getClassLoader());
}
Expand All @@ -68,11 +65,20 @@ protected Deserializer getDefaultDeserializer(Class cl) {
// ignore
}

checkSerializable(cl);

return new JavaDeserializer(cl);
}

private void checkSerializable(Class<?> cl) {
// If class is Serializable => ok
// If class has not implement Serializable
// If hessian check serializable => fail
// If dubbo class checker check serializable => fail
// If both hessian and dubbo class checker allow non-serializable => ok
if (!Serializable.class.isAssignableFrom(cl)
&& (!isAllowNonSerializable() || !defaultSerializeClassChecker.isCheckSerializable())) {
&& (!isAllowNonSerializable() || defaultSerializeClassChecker.isCheckSerializable())) {
throw new IllegalStateException("Serialized class " + cl.getName() + " must implement java.io.Serializable");
}

return new JavaDeserializer(cl);
}
}