Skip to content
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

Handle hooks on trampoline fake closures #2925

Merged
merged 1 commit into from
Nov 7, 2024
Merged

Handle hooks on trampoline fake closures #2925

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
24 changes: 18 additions & 6 deletions ext/hook/uhook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ static void dd_uhook_dtor(void *data) {
#define _error_code error_code
#endif

/* {{{ proto int DDTrace\install_hook(string|Closure|Generator target, ?Closure begin = null, ?Closure end = null) */
/* {{{ proto int DDTrace\install_hook(string|Closure|Generator target, ?Closure begin = null, ?Closure end = null, int flags = 0) */
PHP_FUNCTION(DDTrace_install_hook) {
zend_string *name = NULL;
zend_function *resolved = NULL;
Expand Down Expand Up @@ -583,17 +583,29 @@ PHP_FUNCTION(DDTrace_install_hook) {
def->function = NULL;

// Fetch the base function for fake closures: we need to do fake closure operations on the proper original function:
// - inheritance handling requires having an op_array which stays alive for the whole remainder of the rquest
// - inheritance handling requires having an op_array which stays alive for the whole remainder of the request
// - internal functions are referenced by their zend_internal_function, not the closure copy
if ((resolved->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) && !(flags & HOOK_INSTANCE)) {
HashTable *baseTable = resolved->common.scope ? &resolved->common.scope->function_table : EG(function_table);
zend_class_entry *resolved_ce = resolved->common.scope;
HashTable *baseTable = resolved_ce ? &resolved_ce->function_table : EG(function_table);
zend_function *original = zend_hash_find_ptr(baseTable, resolved->common.function_name);
if (!ZEND_USER_CODE(resolved->type)) {
if (original && original->type != resolved->type /* check for trampoline */) {
original = NULL; // this may happen with e.g. __call() where the function is defined as private
}
if (!original && resolved_ce) {
// Assume it's a __call or __callStatic trampoline
// Execute logic from zend_closure_call_magic here.
original = (resolved->common.fn_flags & ZEND_ACC_STATIC) ? resolved_ce->__callstatic : resolved_ce->__call;
}
}
if (!original) {
LOG(ERROR,
"Could not find original function for fake closure ",
LOG(WARN,
"Could not find original function for fake closure %s%s%s at %s:%d",
resolved->common.scope ? ZSTR_VAL(resolved->common.scope->name) : "",
resolved->common.scope ? "::" : "",
ZSTR_VAL(resolved->common.function_name));
ZSTR_VAL(resolved->common.function_name),
zend_get_executed_filename(), zend_get_executed_lineno());
goto error;
}
resolved = original;
Expand Down
39 changes: 39 additions & 0 deletions tests/ext/sandbox-regression/trampoline_install_fake_closure_hook.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--TEST--
Test installing hook on trampoline fake closure
--SKIPIF--
<?php if (PHP_VERSION_ID < 80100) die("skip: The ... operator is a PHP 8.1+ feature"); ?>
--FILE--
<?php

class A {
private function shadow() {
print "Shadowed!\n";
}

function __call($a, $b) {
print "Invoked $a\n";
}
}

$x = (new A)->test(...);
DDTrace\install_hook($x, function($hook) {
echo "Hooked\n";
});

$x();
(new A)->test();

DDTrace\install_hook((new A)->shadow(...), function($hook) {
echo "Shadow hooked\n";
});
(new A)->shadow();

?>
--EXPECT--
Hooked
Invoked test
Hooked
Invoked test
Hooked
Shadow hooked
Invoked shadow
Loading