PHPC-166: Disable (un)serializing of phongo objects

bjori · bjori · commit 633af554df4e · 2015-02-27T13:53:59.000-08:00
diff --git a/php_phongo.h b/php_phongo.h
@@ -134,6 +134,13 @@ void php_phongo_new_regex_from_regex_and_options(zval *object, const char *patte
 
 void php_phongo_result_free(php_phongo_result_t *result);
 
+#define PHONGO_CE_INIT(ce) do {                     \
+	ce->ce_flags    |= ZEND_ACC_FINAL_CLASS;        \
+	ce->serialize    = zend_class_serialize_deny;   \
+	ce->unserialize  = zend_class_unserialize_deny; \
+} while(0);
+
+
 #ifdef PHP_DEBUG
 void _phongo_debug_bson(bson_t *bson);
 #else
diff --git a/src/MongoDB/BulkWrite.c b/src/MongoDB/BulkWrite.c
@@ -356,7 +356,7 @@ PHP_MINIT_FUNCTION(BulkWrite)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "BulkWrite", php_phongo_bulkwrite_me);
 	php_phongo_bulkwrite_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_bulkwrite_ce->create_object = php_phongo_bulkwrite_create_object;
-	php_phongo_bulkwrite_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_bulkwrite_ce);
 
 	memcpy(&php_phongo_handler_bulkwrite, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_bulkwrite.get_debug_info = php_phongo_bulkwrite_get_debug_info;
diff --git a/src/MongoDB/Command.c b/src/MongoDB/Command.c
@@ -156,7 +156,7 @@ PHP_MINIT_FUNCTION(Command)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Command", php_phongo_command_me);
 	php_phongo_command_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_command_ce->create_object = php_phongo_command_create_object;
-	php_phongo_command_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_command_ce);
 
 	memcpy(&php_phongo_handler_command, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_command.get_debug_info = php_phongo_command_get_debug_info;
diff --git a/src/MongoDB/ConnectionTimeoutException.c b/src/MongoDB/ConnectionTimeoutException.c
@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(ConnectionTimeoutException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ConnectionTimeoutException", php_phongo_connectiontimeoutexception_me);
 	php_phongo_connectiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
-	php_phongo_connectiontimeoutexception_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_connectiontimeoutexception_ce);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/CursorId.c b/src/MongoDB/CursorId.c
@@ -168,7 +168,7 @@ PHP_MINIT_FUNCTION(CursorId)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "CursorId", php_phongo_cursorid_me);
 	php_phongo_cursorid_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_cursorid_ce->create_object = php_phongo_cursorid_create_object;
-	php_phongo_cursorid_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_cursorid_ce);
 
 	memcpy(&php_phongo_handler_cursorid, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_cursorid.get_debug_info = php_phongo_cursorid_get_debug_info;
diff --git a/src/MongoDB/DuplicateKeyException.c b/src/MongoDB/DuplicateKeyException.c
@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(DuplicateKeyException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "DuplicateKeyException", php_phongo_duplicatekeyexception_me);
 	php_phongo_duplicatekeyexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);
-	php_phongo_duplicatekeyexception_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_duplicatekeyexception_ce);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/ExecutionTimeoutException.c b/src/MongoDB/ExecutionTimeoutException.c
@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(ExecutionTimeoutException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ExecutionTimeoutException", php_phongo_executiontimeoutexception_me);
 	php_phongo_executiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
-	php_phongo_executiontimeoutexception_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_executiontimeoutexception_ce);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -572,7 +572,7 @@ PHP_MINIT_FUNCTION(Manager)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Manager", php_phongo_manager_me);
 	php_phongo_manager_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_manager_ce->create_object = php_phongo_manager_create_object;
-	php_phongo_manager_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_manager_ce);
 
 	memcpy(&php_phongo_handler_manager, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_manager.get_debug_info = php_phongo_manager_get_debug_info;
diff --git a/src/MongoDB/Query.c b/src/MongoDB/Query.c
@@ -171,7 +171,7 @@ PHP_MINIT_FUNCTION(Query)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Query", php_phongo_query_me);
 	php_phongo_query_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_query_ce->create_object = php_phongo_query_create_object;
-	php_phongo_query_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_query_ce);
 
 	memcpy(&php_phongo_handler_query, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_query.get_debug_info = php_phongo_query_get_debug_info;
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -167,7 +167,7 @@ PHP_MINIT_FUNCTION(ReadPreference)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ReadPreference", php_phongo_readpreference_me);
 	php_phongo_readpreference_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_readpreference_ce->create_object = php_phongo_readpreference_create_object;
-	php_phongo_readpreference_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_readpreference_ce);
 
 	memcpy(&php_phongo_handler_readpreference, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_readpreference.get_debug_info = php_phongo_readpreference_get_debug_info;
diff --git a/src/MongoDB/Result.c b/src/MongoDB/Result.c
@@ -311,7 +311,7 @@ PHP_MINIT_FUNCTION(Result)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Result", php_phongo_result_me);
 	php_phongo_result_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_result_ce->create_object = php_phongo_result_create_object;
-	php_phongo_result_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_result_ce);
 	php_phongo_result_ce->get_iterator = phongo_result_get_iterator;
 
 	memcpy(&php_phongo_handler_result, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
diff --git a/src/MongoDB/SSLConnectionException.c b/src/MongoDB/SSLConnectionException.c
@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(SSLConnectionException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "SSLConnectionException", php_phongo_sslconnectionexception_me);
 	php_phongo_sslconnectionexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
-	php_phongo_sslconnectionexception_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_sslconnectionexception_ce);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/Server.c b/src/MongoDB/Server.c
@@ -488,7 +488,7 @@ PHP_MINIT_FUNCTION(Server)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Server", php_phongo_server_me);
 	php_phongo_server_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_server_ce->create_object = php_phongo_server_create_object;
-	php_phongo_server_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_server_ce);
 
 	memcpy(&php_phongo_handler_server, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_server.compare_objects = php_phongo_server_compare_objects;
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -176,7 +176,7 @@ PHP_MINIT_FUNCTION(WriteConcern)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteConcern", php_phongo_writeconcern_me);
 	php_phongo_writeconcern_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_writeconcern_ce->create_object = php_phongo_writeconcern_create_object;
-	php_phongo_writeconcern_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_writeconcern_ce);
 
 	memcpy(&php_phongo_handler_writeconcern, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_writeconcern.get_debug_info = php_phongo_writeconcern_get_debug_info;
diff --git a/src/MongoDB/WriteConcernError.c b/src/MongoDB/WriteConcernError.c
@@ -201,7 +201,7 @@ PHP_MINIT_FUNCTION(WriteConcernError)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteConcernError", php_phongo_writeconcernerror_me);
 	php_phongo_writeconcernerror_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_writeconcernerror_ce->create_object = php_phongo_writeconcernerror_create_object;
-	php_phongo_writeconcernerror_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_writeconcernerror_ce);
 
 	memcpy(&php_phongo_handler_writeconcernerror, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_writeconcernerror.get_debug_info = php_phongo_writeconcernerror_get_debug_info;
diff --git a/src/MongoDB/WriteError.c b/src/MongoDB/WriteError.c
@@ -224,7 +224,7 @@ PHP_MINIT_FUNCTION(WriteError)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteError", php_phongo_writeerror_me);
 	php_phongo_writeerror_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_writeerror_ce->create_object = php_phongo_writeerror_create_object;
-	php_phongo_writeerror_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_writeerror_ce);
 
 	memcpy(&php_phongo_handler_writeerror, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_writeerror.get_debug_info = php_phongo_writeerror_get_debug_info;
diff --git a/src/MongoDB/WriteResult.c b/src/MongoDB/WriteResult.c
@@ -448,7 +448,7 @@ PHP_MINIT_FUNCTION(WriteResult)
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteResult", php_phongo_writeresult_me);
 	php_phongo_writeresult_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_writeresult_ce->create_object = php_phongo_writeresult_create_object;
-	php_phongo_writeresult_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	PHONGO_CE_INIT(php_phongo_writeresult_ce);
 
 	memcpy(&php_phongo_handler_writeresult, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_writeresult.get_debug_info = php_phongo_writeresult_get_debug_info;
diff --git a/tests/standalone/bug0166.phpt b/tests/standalone/bug0166.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Disable serialization of objects
+--SKIPIF--
+<?php require "tests/utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once "tests/utils/basic.inc";
+
+$str = 'O:22:"MongoDB\Driver\Manager":0:{}';
+$v = @unserialize($str);
+var_dump($v);
+
+throws(function() {
+    $manager = new MongoDB\Driver\Manager("mongodb://localhost");
+    serialize($manager);
+}, "Exception", "serialize");
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+bool(false)
+OK: Got Exception thrown from serialize
+===DONE===

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(ConnectionTimeoutException)`
`63`	`63`
`64`	`64`	`INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ConnectionTimeoutException", php_phongo_connectiontimeoutexception_me);`
`65`	`65`	`php_phongo_connectiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);`
`66`		`- php_phongo_connectiontimeoutexception_ce->ce_flags \|= ZEND_ACC_FINAL_CLASS;`
	`66`	`+ PHONGO_CE_INIT(php_phongo_connectiontimeoutexception_ce);`
`67`	`67`
`68`	`68`	`return SUCCESS;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(DuplicateKeyException)`
`63`	`63`
`64`	`64`	`INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "DuplicateKeyException", php_phongo_duplicatekeyexception_me);`
`65`	`65`	`php_phongo_duplicatekeyexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);`
`66`		`- php_phongo_duplicatekeyexception_ce->ce_flags \|= ZEND_ACC_FINAL_CLASS;`
	`66`	`+ PHONGO_CE_INIT(php_phongo_duplicatekeyexception_ce);`
`67`	`67`
`68`	`68`	`return SUCCESS;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(ExecutionTimeoutException)`
`63`	`63`
`64`	`64`	`INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ExecutionTimeoutException", php_phongo_executiontimeoutexception_me);`
`65`	`65`	`php_phongo_executiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);`
`66`		`- php_phongo_executiontimeoutexception_ce->ce_flags \|= ZEND_ACC_FINAL_CLASS;`
	`66`	`+ PHONGO_CE_INIT(php_phongo_executiontimeoutexception_ce);`
`67`	`67`
`68`	`68`	`return SUCCESS;`
`69`	`69`	`}`