PHPC-208: Restrict ODS to "__pclass" fieldnames

bjori · bjori · commit 86d3a8f7985e · 2015-04-03T15:17:59.000-07:00
diff --git a/src/bson.c b/src/bson.c
@@ -57,6 +57,7 @@
 #undef MONGOC_LOG_DOMAIN
 #define MONGOC_LOG_DOMAIN "PHONGO-BSON"
 
+#define PHONGO_ODM_FIELD_NAME "__pclass"
 
 PHP_MINIT_FUNCTION(bson)
 {
@@ -207,7 +208,7 @@ bool php_phongo_bson_visit_binary(const bson_iter_t *iter ARG_UNUSED, const char
 	zval *zchild = NULL;
 	TSRMLS_FETCH();
 
-	if (v_subtype == 0x80) {
+	if (v_subtype == 0x80 && strcmp(key, PHONGO_ODM_FIELD_NAME) ==0) {
 		((php_phongo_bson_state *)data)->odm = zend_fetch_class((char *)v_binary, v_binary_len, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
 		if (((php_phongo_bson_state *)data)->odm) {
 			return false;
@@ -596,7 +597,7 @@ void object_to_bson(zval *object, const char *key, long key_len, bson_t *bson TS
 
 				bson_append_array_begin(bson, key, key_len, &child);
 				if (instanceof_function(Z_OBJCE_P(object), php_phongo_persistable_ce TSRMLS_CC)) {
-					bson_append_binary(&child, "__", -1, 0x80, (const uint8_t *)Z_OBJCE_P(object)->name, strlen(Z_OBJCE_P(object)->name));
+					bson_append_binary(&child, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(object)->name, strlen(Z_OBJCE_P(object)->name));
 				}
 				zval_to_bson(retval, PHONGO_BSON_NONE, &child, NULL TSRMLS_CC);
 				bson_append_array_end(bson, &child);
@@ -738,7 +739,7 @@ PHONGO_API void zval_to_bson(zval *data, phongo_bson_flags_t flags, bson_t *bson
 				if (instanceof_function(Z_OBJCE_P(data), php_phongo_persistable_ce TSRMLS_CC)) {
 					zval *retval;
 
-					bson_append_binary(bson, "__", -1, 0x80, (const uint8_t *)Z_OBJCE_P(data)->name, strlen(Z_OBJCE_P(data)->name));
+					bson_append_binary(bson, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(data)->name, strlen(Z_OBJCE_P(data)->name));
 
 					zend_call_method_with_0_params(&data, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &retval);
 					if(retval) {
diff --git a/tests/bson/bson-encode-003.phpt b/tests/bson/bson-encode-003.phpt
@@ -46,10 +46,11 @@ foreach($tests as $n => $test) {
 <?php exit(0); ?>
 --EXPECT--
 Test#0 { "stuff" : [ { "$type" : "80", "$binary" : "TXlDbGFzcw==" }, "class", "data" ] }
-     0 : 3f 00 00 00 04 73 74 75 66 66 00 33 00 00 00 05  [?....stuff.3....]
-    10 : 5f 5f 00 07 00 00 00 80 4d 79 43 6c 61 73 73 02  [__......MyClass.]
-    20 : 72 61 6e 64 6f 6d 00 06 00 00 00 63 6c 61 73 73  [random.....class]
-    30 : 00 02 30 00 05 00 00 00 64 61 74 61 00 00 00     [..0.....data...]
+     0 : 45 00 00 00 04 73 74 75 66 66 00 39 00 00 00 05  [E....stuff.9....]
+    10 : 5f 5f 70 63 6c 61 73 73 00 07 00 00 00 80 4d 79  [__pclass......My]
+    20 : 43 6c 61 73 73 02 72 61 6e 64 6f 6d 00 06 00 00  [Class.random....]
+    30 : 00 63 6c 61 73 73 00 02 30 00 05 00 00 00 64 61  [.class..0.....da]
+    40 : 74 61 00 00 00                                   [ta...]
 array(1) {
   ["stuff"]=>
   object(MyClass)#6 (1) {
@@ -63,10 +64,10 @@ array(1) {
   }
 }
 Test#1 { "stuff" : [ { "$type" : "80", "$binary" : "TXlDbGFzczI=" }, 1, 2, 3 ] }
-     0 : 37 00 00 00 04 73 74 75 66 66 00 2b 00 00 00 05  [7....stuff.+....]
-    10 : 5f 5f 00 08 00 00 00 80 4d 79 43 6c 61 73 73 32  [__......MyClass2]
-    20 : 10 30 00 01 00 00 00 10 31 00 02 00 00 00 10 32  [.0......1......2]
-    30 : 00 03 00 00 00 00 00                             [.......]
+     0 : 3d 00 00 00 04 73 74 75 66 66 00 31 00 00 00 05  [=....stuff.1....]
+    10 : 5f 5f 70 63 6c 61 73 73 00 08 00 00 00 80 4d 79  [__pclass......My]
+    20 : 43 6c 61 73 73 32 10 30 00 01 00 00 00 10 31 00  [Class2.0......1.]
+    30 : 02 00 00 00 10 32 00 03 00 00 00 00 00           [.....2.......]
 array(1) {
   ["stuff"]=>
   object(MyClass2)#7 (1) {
@@ -82,14 +83,15 @@ array(1) {
   }
 }
 Test#2 { "stuff" : [ [ { "$type" : "80", "$binary" : "TXlDbGFzcw==" }, "class", "data" ], [ { "$type" : "80", "$binary" : "TXlDbGFzczI=" }, 1, 2, 3 ] ] }
-     0 : 75 00 00 00 04 73 74 75 66 66 00 69 00 00 00 04  [u....stuff.i....]
-    10 : 30 00 33 00 00 00 05 5f 5f 00 07 00 00 00 80 4d  [0.3....__......M]
-    20 : 79 43 6c 61 73 73 02 72 61 6e 64 6f 6d 00 06 00  [yClass.random...]
-    30 : 00 00 63 6c 61 73 73 00 02 30 00 05 00 00 00 64  [..class..0.....d]
-    40 : 61 74 61 00 00 04 31 00 2b 00 00 00 05 5f 5f 00  [ata...1.+....__.]
-    50 : 08 00 00 00 80 4d 79 43 6c 61 73 73 32 10 30 00  [.....MyClass2.0.]
-    60 : 01 00 00 00 10 31 00 02 00 00 00 10 32 00 03 00  [.....1......2...]
-    70 : 00 00 00 00 00                                   [.....]
+     0 : 81 00 00 00 04 73 74 75 66 66 00 75 00 00 00 04  [.....stuff.u....]
+    10 : 30 00 39 00 00 00 05 5f 5f 70 63 6c 61 73 73 00  [0.9....__pclass.]
+    20 : 07 00 00 00 80 4d 79 43 6c 61 73 73 02 72 61 6e  [.....MyClass.ran]
+    30 : 64 6f 6d 00 06 00 00 00 63 6c 61 73 73 00 02 30  [dom.....class..0]
+    40 : 00 05 00 00 00 64 61 74 61 00 00 04 31 00 31 00  [.....data...1.1.]
+    50 : 00 00 05 5f 5f 70 63 6c 61 73 73 00 08 00 00 00  [...__pclass.....]
+    60 : 80 4d 79 43 6c 61 73 73 32 10 30 00 01 00 00 00  [.MyClass2.0.....]
+    70 : 10 31 00 02 00 00 00 10 32 00 03 00 00 00 00 00  [.1......2.......]
+    80 : 00                                               [.]
 array(1) {
   ["stuff"]=>
   array(2) {
diff --git a/tests/bson/bson-encode-004.phpt b/tests/bson/bson-encode-004.phpt
@@ -73,23 +73,24 @@ object(Person)#%d (5) {
   string(24) "Hannes confidential info"
 }
 Test { "0" : [ { "$type" : "80", "$binary" : "UGVyc29u" }, "Hannes", 42, [ [ { "$type" : "80", "$binary" : "QWRkcmVzcw==" }, 94086, "USA" ], [ { "$type" : "80", "$binary" : "QWRkcmVzcw==" }, 200, "Iceland" ] ], [ [ { "$type" : "80", "$binary" : "UGVyc29u" }, "Jeremy", 21, {  }, {  } ] ] ] }
-     0 : 07 01 00 00 04 30 00 ff 00 00 00 05 5f 5f 00 06  [.....0......__..]
-    10 : 00 00 00 80 50 65 72 73 6f 6e 02 6e 61 6d 65 00  [....Person.name.]
-    20 : 07 00 00 00 48 61 6e 6e 65 73 00 10 61 67 65 00  [....Hannes..age.]
-    30 : 2a 00 00 00 04 61 64 64 72 65 73 73 00 6d 00 00  [*....address.m..]
-    40 : 00 04 30 00 2f 00 00 00 05 5f 5f 00 07 00 00 00  [..0./....__.....]
-    50 : 80 41 64 64 72 65 73 73 10 7a 69 70 00 86 6f 01  [.Address.zip..o.]
-    60 : 00 02 63 6f 75 6e 74 72 79 00 04 00 00 00 55 53  [..country.....US]
-    70 : 41 00 00 04 31 00 33 00 00 00 05 5f 5f 00 07 00  [A...1.3....__...]
-    80 : 00 00 80 41 64 64 72 65 73 73 10 7a 69 70 00 c8  [...Address.zip..]
-    90 : 00 00 00 02 63 6f 75 6e 74 72 79 00 08 00 00 00  [....country.....]
-    A0 : 49 63 65 6c 61 6e 64 00 00 00 04 66 72 69 65 6e  [Iceland....frien]
-    B0 : 64 73 00 52 00 00 00 04 30 00 4a 00 00 00 05 5f  [ds.R....0.J...._]
-    C0 : 5f 00 06 00 00 00 80 50 65 72 73 6f 6e 02 6e 61  [_......Person.na]
-    D0 : 6d 65 00 07 00 00 00 4a 65 72 65 6d 79 00 10 61  [me.....Jeremy..a]
-    E0 : 67 65 00 15 00 00 00 03 61 64 64 72 65 73 73 00  [ge......address.]
-    F0 : 05 00 00 00 00 03 66 72 69 65 6e 64 73 00 05 00  [......friends...]
-   100 : 00 00 00 00 00 00 00                             [.......]
+     0 : 1f 01 00 00 04 30 00 17 01 00 00 05 5f 5f 70 63  [.....0......__pc]
+    10 : 6c 61 73 73 00 06 00 00 00 80 50 65 72 73 6f 6e  [lass......Person]
+    20 : 02 6e 61 6d 65 00 07 00 00 00 48 61 6e 6e 65 73  [.name.....Hannes]
+    30 : 00 10 61 67 65 00 2a 00 00 00 04 61 64 64 72 65  [..age.*....addre]
+    40 : 73 73 00 79 00 00 00 04 30 00 35 00 00 00 05 5f  [ss.y....0.5...._]
+    50 : 5f 70 63 6c 61 73 73 00 07 00 00 00 80 41 64 64  [_pclass......Add]
+    60 : 72 65 73 73 10 7a 69 70 00 86 6f 01 00 02 63 6f  [ress.zip..o...co]
+    70 : 75 6e 74 72 79 00 04 00 00 00 55 53 41 00 00 04  [untry.....USA...]
+    80 : 31 00 39 00 00 00 05 5f 5f 70 63 6c 61 73 73 00  [1.9....__pclass.]
+    90 : 07 00 00 00 80 41 64 64 72 65 73 73 10 7a 69 70  [.....Address.zip]
+    A0 : 00 c8 00 00 00 02 63 6f 75 6e 74 72 79 00 08 00  [......country...]
+    B0 : 00 00 49 63 65 6c 61 6e 64 00 00 00 04 66 72 69  [..Iceland....fri]
+    C0 : 65 6e 64 73 00 58 00 00 00 04 30 00 50 00 00 00  [ends.X....0.P...]
+    D0 : 05 5f 5f 70 63 6c 61 73 73 00 06 00 00 00 80 50  [.__pclass......P]
+    E0 : 65 72 73 6f 6e 02 6e 61 6d 65 00 07 00 00 00 4a  [erson.name.....J]
+    F0 : 65 72 65 6d 79 00 10 61 67 65 00 15 00 00 00 03  [eremy..age......]
+   100 : 61 64 64 72 65 73 73 00 05 00 00 00 00 03 66 72  [address.......fr]
+   110 : 69 65 6e 64 73 00 05 00 00 00 00 00 00 00 00     [iends..........]
 array(1) {
   [0]=>
   object(Person)#%d2 (5) {
