Skip to content

Make MessagePack and MessagePackUnpacker not serializable #190

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
nicolas-grekas wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −0
Open

Make MessagePack and MessagePackUnpacker not serializable #190

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions msgpack_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "php.h"
#include "zend_interfaces.h"

#include "php_msgpack.h"
#include "msgpack_pack.h"
Expand Down Expand Up @@ -515,6 +516,12 @@ void msgpack_init_class() /* {{{ */ {
INIT_CLASS_ENTRY(ce, "MessagePack", msgpack_base_methods);
msgpack_ce = zend_register_internal_class(&ce);
msgpack_ce->create_object = php_msgpack_base_new;
#if PHP_VERSION_ID >= 80100
msgpack_ce->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE;
#else
msgpack_ce->serialize = zend_class_serialize_deny;
msgpack_ce->unserialize = zend_class_unserialize_deny;
#endif
memcpy(&msgpack_handlers, zend_get_std_object_handlers(),sizeof msgpack_handlers);
msgpack_handlers.offset = offsetof(php_msgpack_base_t, object);
msgpack_handlers.free_obj = php_msgpack_base_free;
Expand All @@ -527,6 +534,12 @@ void msgpack_init_class() /* {{{ */ {
INIT_CLASS_ENTRY(ce, "MessagePackUnpacker", msgpack_unpacker_methods);
msgpack_unpacker_ce = zend_register_internal_class(&ce);
msgpack_unpacker_ce->create_object = php_msgpack_unpacker_new;
#if PHP_VERSION_ID >= 80100
msgpack_unpacker_ce->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE;
#else
msgpack_unpacker_ce->serialize = zend_class_serialize_deny;
msgpack_unpacker_ce->unserialize = zend_class_unserialize_deny;
#endif
memcpy(&msgpack_unpacker_handlers, zend_get_std_object_handlers(),sizeof msgpack_unpacker_handlers);
msgpack_unpacker_handlers.offset = offsetof(php_msgpack_unpacker_t, object);
msgpack_unpacker_handlers.free_obj = php_msgpack_unpacker_free;
Expand Down
39 changes: 39 additions & 0 deletions tests/144.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--TEST--
MessagePack and MessagePackUnpacker cannot be serialized
--FILE--
<?php
if(!extension_loaded('msgpack')) {
dl('msgpack.' . PHP_SHLIB_SUFFIX);
}

foreach ([new MessagePack(), new MessagePackUnpacker()] as $object) {
try {
serialize($object);
} catch (Exception $e) {
echo $e->getMessage(), PHP_EOL;
}
}

// Before PHP 8.1, only the C: format reaches the handler that throws
$format = PHP_VERSION_ID < 80100 ? 'C' : 'O';

foreach (['MessagePack', 'MessagePackUnpacker'] as $class) {
try {
unserialize($format . ':' . strlen($class) . ':"' . $class . '":0:{}');
} catch (Exception $e) {
echo $e->getMessage(), PHP_EOL;
}
}

try {
msgpack_pack(new MessagePack());
} catch (Exception $e) {
echo $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
Serialization of 'MessagePack' is not allowed
Serialization of 'MessagePackUnpacker' is not allowed
Unserialization of 'MessagePack' is not allowed
Unserialization of 'MessagePackUnpacker' is not allowed
Serialization of 'MessagePack' is not allowed