Skip to content

refactor(agent): improve drupal hook map error logging #1101

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

Merged
merged 3 commits into from
Aug 5, 2025
Merged

refactor(agent): improve drupal hook map error logging #1101

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a65d620
refactor(agent): improve drupal hook map error logging
bduranleau-nr Jul 11, 2025
726fb76
optimize conditionals, wrap key in safestr
bduranleau-nr Jul 11, 2025
b3531f5
review feedback
bduranleau-nr Jul 11, 2025
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
39 changes: 25 additions & 14 deletions agent/fw_drupal8.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,14 +605,23 @@ NR_PHP_WRAPPER_END
#endif // OAPI

static bool nr_is_invalid_key_val_arr(nr_php_string_hash_key_t* key,
zval* val) {
if (NULL == key || 0 == ZEND_STRING_LEN(key)
|| 0 == nr_php_is_zval_valid_array(val)
zval* val,
const char* key_ident) {
if (NULL == key || 0 == ZEND_STRING_LEN(key)) {
nrl_warning(NRL_FRAMEWORK, "hookImplementationsMap[%s]: invalid key",
key_ident);
return true;
}

if (0 == nr_php_is_zval_valid_array(val)
|| 0 == zend_hash_num_elements(Z_ARRVAL_P(val))) {
nrl_warning(NRL_FRAMEWORK,
"hookImplementationsMap[%s]: invalid value for key '%s'",
key_ident, NRSAFESTR(ZEND_STRING_VALUE(key)));
return true;
} else {
return false;
}

return false;
}

/*
Expand Down Expand Up @@ -646,25 +655,27 @@ static bool nr_drupal_hook_attribute_instrument(zval* module_handler) {

ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_implementation_map), hook_key,
hook_val) {
if (nr_is_invalid_key_val_arr(hook_key, hook_val)) {
nrl_warning(NRL_FRAMEWORK,
"hookImplementationsMap[hook]: invalid key or value");
if (nr_is_invalid_key_val_arr(hook_key, hook_val, "hook")) {
return false;
}

ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(hook_val), class_key, class_val) {
if (nr_is_invalid_key_val_arr(class_key, class_val)) {
nrl_warning(NRL_FRAMEWORK,
"hookImplementationsMap[class]: invalid key or value");
if (nr_is_invalid_key_val_arr(class_key, class_val, "class")) {
return false;
}

ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(class_val), method_key,
module_val) {
if (NULL == method_key
|| 0 == nr_php_is_zval_valid_string(module_val)) {
if (NULL == method_key) {
nrl_warning(NRL_FRAMEWORK,
"hookImplementationsMap[method]: invalid key or value");
"hookImplementationsMap[method]: invalid key");
return false;
}
if (0 == nr_php_is_zval_valid_string(module_val)) {
nrl_warning(
NRL_FRAMEWORK,
"hookImplementationsMap[method]: invalid value for key '%s'",
NRSAFESTR(ZEND_STRING_VALUE(method_key)));
return false;
}

Expand Down