Fix GH-21682: reject ZipArchive serialization via __serialize()#21708
Conversation
DanielEScherzer
left a comment
There was a problem hiding this comment.
Marking as "request changes" so that this doesn't merge until we can evaluate the impact of #21497
2d9a1c1 to
0feac9f
Compare
@iliaal does this change things? Specifically, you should now be able to round-trip by serializing with closeString() and unserializing with openString() CC @tstarling |
|
Until ZipArchive actually implements serialization (and handles file-backed archives, which have no string export), the broken object and the UAF are real and the serialize/unserialize block is still needed. The flag and |
|
I think the change is still appropriate. ZipArchive holds uncommitted changes to the underlying file. If serialization was implemented then it would have to restore the state including uncommitted changes, as distinct from the archive file contents. For example |
|
My concern is that ZEND_ACC_NOT_SERIALIZABLE also blocks the serialization of any subclasses, e.g. https://3v4l.org/SVqho#v8.5.7 And, now that we have openString() and closeString(), it is possible to do a userland serialization with those: <?php
$orig;
class MyArchive extends ZipArchive {
public function __serialize(): array {
global $orig;
$orig = $this->closeString();
return [ 'data' => $orig ];
}
public function __unserialize(array $data): void {
$this->openString($data['data']);
}
}
$zip = new MyArchive();
$zip->openString();
$zip->addFromString('test1', 'abc123');
var_dump($zip);
$serialized = serialize($zip);
$roundtrip = unserialize($serialized);
var_dump($roundtrip);
$new = $roundtrip->closeString();
var_dump($orig, $new, $orig === $new); // they are indeed the sameMaybe instead add __serialize() and __unserialize() handlers that always throw, saying they need to be overridden? |
0feac9f to
a1028ff
Compare
|
Switched to throwing |
DanielEScherzer
left a comment
There was a problem hiding this comment.
Needs news, and PR title is no longer correct, but implementation looks good
please also add a test case for a subclass of ZipArchive that does not override the serialization functions
ZipArchive wraps a libzip handle that cannot survive serialization: serialize() produced a string that unserialized into an empty object with numFiles 0, and that unserialize path was the bug72434 use-after-free vector. Add __serialize() and __unserialize() that throw, so the base class rejects (un)serialization and the UAF is closed by construction, while a subclass can still override both to round-trip through closeString()/openString(). Move the bug72434 test to ext/zip/tests since it now requires the zip extension. Fixes phpGH-21682
a1028ff to
4e1edc7
Compare
|
Added the NEWS entry and a test for a non-overriding subclass (it inherits the base throw, with the subclass name in the message). Retitled and updated the description to match the __serialize()/__unserialize() approach. |
|
Looks good, though not sure if this should be in NEWS or UPGRADING (I didn't remember that this was for |
|
Since this is new capability I am inclined to say in belongs in NEWS as opposed to changing how something works per UPGRADING |
ZipArchive wraps a libzip handle that can't survive serialization: it holds uncommitted in-memory changes and may be file-backed, so the implicit serialize()/unserialize() returned a broken object (numFiles 0) and was the GH-72434 use-after-free vector.
This adds throwing __serialize()/__unserialize() on the base, rejecting both paths while letting a subclass override them to round-trip through closeString()/openString(). The bug72434 reproducer moves to ext/zip/tests/ and now asserts the unserialize() rejection.