Fix GH-21682: Add NOT_SERIALIZABLE to ZipArchive#21708
Open
iliaal wants to merge 2 commits intophp:masterfrom
Open
Fix GH-21682: Add NOT_SERIALIZABLE to ZipArchive#21708iliaal wants to merge 2 commits intophp:masterfrom
iliaal wants to merge 2 commits intophp:masterfrom
Conversation
ZipArchive allowed serialization, producing a string that unserializes into an empty object with no open file handle. Add the @not-serializable annotation so serialize() throws an exception. Closes phpGH-21682
bug72434.phpt tested a UAF via unserialize() of ZipArchive. With NOT_SERIALIZABLE, unserialize() rejects the class entirely, preventing the UAF by construction. Update the test to verify the rejection and move it to ext/zip/tests since it requires the zip extension.
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
1 participant
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.
Part of #21682, split from #21694 after review feedback.
ZipArchivewraps a libzip archive handle that can't survive serialization.serialize()produces a string, but unserializing it returns an object wherenumFilesreports 0 and the archive contents are gone.Adds
@not-serializablesoserialize()throws instead of producing a broken object.The UAF exploit test
bug72434.phptinstantiatedZipArchiveviaunserialize(). WithNOT_SERIALIZABLE,unserialize()rejects the class and closes the UAF vector. The test also moves toext/zip/tests/since it exercisesZipArchive.Per the discussion on #21694,
ZipArchive::closeString()(in flight as #21497) gives subclasses a way to capture archive state, so this decision is worth revisiting once that lands.