Harden ASM structure model deserialization against unexpected serialized types#355
Open
jmestwa-coder wants to merge 1 commit into
Conversation
Contributor
|
Just in case you are wondering why sometimes I comment or run workflows on your behalf, but am not committing or merging anything: Please note my July 2024 message to the aspectj-users and aspectj-announce mailing lists regarding my situation as an AspectJ maintainer. Andy Clement has since returned to fixing issues and releasing updates, but he has very little time, so response times can be longer than you might expect. Nobody has yet offered to sponsor my work for this project, so I am still on hiatus until someone finally does. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Harden
AsmManager.readStructureModel(...)deserialization by replacing unrestrictedObjectInputStreamusage with a restricted deserialization boundary that only permits expected ASM structure model and required JDK container/value types.Changes
Added
StructureModelObjectInputStreamto validate serialized classes during deserializationReject unexpected serialized types before
readObject()callbacks can executePreserved existing deserialization flow and failure behavior
Switched stream handling to try-with-resources
Added compatibility coverage for realistic serialized graph container types:
LinkedHashMapArrays$ArrayListCollections$Unmodifiable*Tests
Added regression tests covering:
structure model round-trip restoration
raw
ObjectInputStreamcallback execution behaviorrejection of unexpected serialized types before callback execution
compatibility round-trips for:
Arrays.asList(...)Collections.unmodifiableList(...)LinkedHashMap