fixup! Implement the "Redacting parameters in back traces" RFC

Author: TimWolla

Zend/tests/function_arguments/sensitive_parameter_value.phpt

@@ -6,6 +6,7 @@ The SensitiveParameterValue behaves as expected.
 $v = new SensitiveParameterValue('secret');
 
 var_dump($v);
+var_dump((array)$v);
 var_dump(serialize($v));
 var_dump(json_encode($v));
 var_dump($v->getValue());
@@ -14,6 +15,8 @@ var_dump($v->getValue());
 --EXPECTF--
 object(SensitiveParameterValue)#%d (0) {
 }
+array(0) {
+}
 string(35) "O:23:"SensitiveParameterValue":0:{}"
 string(2) "{}"
 string(6) "secret"

Zend/zend_attributes.c

@@ -30,6 +30,12 @@ ZEND_API zend_class_entry *zend_ce_allow_dynamic_properties;
 ZEND_API zend_class_entry *zend_ce_sensitive_parameter;
 ZEND_API zend_class_entry *zend_ce_sensitive_parameter_value;
 
+typedef struct {
+	zend_object std;
+} attributes_sensitive_parameter_value;
+
+static zend_object_handlers attributes_object_handlers_sensitive_parameter_value;
+
 static HashTable internal_attributes;
 
 void validate_attribute(zend_attribute *attr, uint32_t target, zend_class_entry *scope)
@@ -147,6 +153,38 @@ ZEND_METHOD(SensitiveParameterValue, __unserialize)
 	RETURN_THROWS();
 } /* }}} */
 
+static zend_object *attributes_sensitive_parameter_value_new(zend_class_entry *ce)
+{
+	attributes_sensitive_parameter_value *intern = zend_object_alloc(sizeof(attributes_sensitive_parameter_value), ce);
+	memset(intern, 0, sizeof(attributes_sensitive_parameter_value) - sizeof(zend_object));
+
+	zend_object_std_init(&intern->std, ce);
+	object_properties_init(&intern->std, ce);
+	intern->std.handlers = &attributes_object_handlers_sensitive_parameter_value;
+
+	return &intern->std;
+}
+
+static inline attributes_sensitive_parameter_value *attributes_sensitive_parameter_value_from_obj(zend_object *obj) {
+	return (attributes_sensitive_parameter_value *)((char *)(obj) - XtOffsetOf(attributes_sensitive_parameter_value, std));
+}
+
+static void attributes_sensitive_parameter_value_free_obj(zend_object *object)
+{
+	attributes_sensitive_parameter_value *v = attributes_sensitive_parameter_value_from_obj(object);
+
+	zend_object_std_dtor(&v->std);
+}
+
+static HashTable *attributes_sensitive_parameter_value_get_properties_for(zend_object *zobj, zend_prop_purpose purpose)
+{
+	if (purpose == ZEND_PROP_PURPOSE_ARRAY_CAST) {
+		return NULL;
+	} else {
+		return zend_std_get_properties_for(zobj, purpose);
+	}
+}
+
 static zend_attribute *get_attribute(HashTable *attributes, zend_string *lcname, uint32_t offset)
 {
 	if (attributes) {
@@ -372,6 +410,11 @@ void zend_register_attribute_ce(void)
 
 	/* This is not an attribute, thus the register call is missing. */
 	zend_ce_sensitive_parameter_value = register_class_SensitiveParameterValue();
+	zend_ce_sensitive_parameter_value->create_object = attributes_sensitive_parameter_value_new;
+	memcpy(&attributes_object_handlers_sensitive_parameter_value, &std_object_handlers, sizeof(zend_object_handlers));
+	attributes_object_handlers_sensitive_parameter_value.offset = XtOffsetOf(attributes_sensitive_parameter_value, std);
+	attributes_object_handlers_sensitive_parameter_value.free_obj = attributes_sensitive_parameter_value_free_obj;
+	attributes_object_handlers_sensitive_parameter_value.get_properties_for = attributes_sensitive_parameter_value_get_properties_for;
 }
 
 void zend_attributes_shutdown(void)