Test zend_mark_function_parameter_as_sensitive in ext/zend_test

Author: TimWolla

ext/zend_test/test.c

@@ -327,6 +327,17 @@ static ZEND_FUNCTION(zend_test_parameter_with_attribute)
 	RETURN_LONG(1);
 }
 
+static ZEND_FUNCTION(zend_test_sensitive_parameter)
+{
+	zend_string *parameter;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(parameter)
+	ZEND_PARSE_PARAMETERS_END();
+
+	zend_throw_error(NULL, "Dummy");
+}
+
 static zend_object *zend_test_class_new(zend_class_entry *class_type)
 {
 	zend_object *obj = zend_objects_new(class_type);
@@ -600,6 +611,8 @@ PHP_MINIT_FUNCTION(zend_test)
 	zend_test_observer_init(INIT_FUNC_ARGS_PASSTHRU);
 	zend_test_fiber_init();
 
+	zend_mark_function_parameter_as_sensitive(CG(function_table), "zend_test_sensitive_parameter", 0 /* $parameter */);
+
 	return SUCCESS;
 }
 

ext/zend_test/test.stub.php

@@ -109,6 +109,8 @@ function zend_weakmap_dump(): array {}
     function zend_get_unit_enum(): ZendTestUnitEnum {}
 
     function zend_test_parameter_with_attribute(string $parameter): int {}
+
+    function zend_test_sensitive_parameter(string $parameter): void {}
 }
 
 namespace ZendTestNS {

ext/zend_test/test_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: bf10c37919483ac04bc1f788ac6e59b5edab295e */
+ * Stub hash: e88157c8f56b0ef8466f7bb56cb0965bd00e0490 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -75,6 +75,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_parameter_with_attribu
 	ZEND_ARG_TYPE_INFO(0, parameter, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_sensitive_parameter, 0, 1, IS_VOID, 0)
+	ZEND_ARG_TYPE_INFO(0, parameter, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ZendTestNS2_ZendSubNS_namespaced_func, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
@@ -131,6 +135,7 @@ static ZEND_FUNCTION(zend_weakmap_remove);
 static ZEND_FUNCTION(zend_weakmap_dump);
 static ZEND_FUNCTION(zend_get_unit_enum);
 static ZEND_FUNCTION(zend_test_parameter_with_attribute);
+static ZEND_FUNCTION(zend_test_sensitive_parameter);
 static ZEND_FUNCTION(namespaced_func);
 static ZEND_METHOD(_ZendTestClass, is_object);
 static ZEND_METHOD(_ZendTestClass, __toString);
@@ -167,6 +172,7 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(zend_weakmap_dump, arginfo_zend_weakmap_dump)
 	ZEND_FE(zend_get_unit_enum, arginfo_zend_get_unit_enum)
 	ZEND_FE(zend_test_parameter_with_attribute, arginfo_zend_test_parameter_with_attribute)
+	ZEND_FE(zend_test_sensitive_parameter, arginfo_zend_test_sensitive_parameter)
 	ZEND_NS_FE("ZendTestNS2\\ZendSubNS", namespaced_func, arginfo_ZendTestNS2_ZendSubNS_namespaced_func)
 	ZEND_FE_END
 };

ext/zend_test/tests/sensitive_parameter.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Test that zend_mark_function_parameter_as_sensitive works.
+--FILE--
+<?php
+zend_test_sensitive_parameter("foo");
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Dummy in %ssensitive_parameter.php:2
+Stack trace:
+#0 %ssensitive_parameter.php(2): zend_test_sensitive_parameter(Object(SensitiveParameterValue))
+#1 {main}
+  thrown in %ssensitive_parameter.php on line 2

ext/zend_test/tests/sensitive_parameter_disable_functions.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Test that zend_mark_function_parameter_as_sensitive works with disable_functions.
+--INI--
+disable_functions=zend_test_sensitive_parameter
+--FILE--
+<?php
+zend_test_sensitive_parameter("foo");
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Call to undefined function zend_test_sensitive_parameter() in %ssensitive_parameter_disable_functions.php:2
+Stack trace:
+#0 {main}
+  thrown in %ssensitive_parameter_disable_functions.php on line 2