Skip to content

Fix system ini handling of invalid values in zai config #1982

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
bwoebi merged 1 commit into from
Mar 21, 2023
Merged

Fix system ini handling of invalid values in zai config #1982

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
21 changes: 15 additions & 6 deletions profiling/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,22 @@ unsafe extern "C" fn parse_level_filter(

let decoded_value = &mut *decoded_value;
match value.into_utf8() {
Ok(level) => match LevelFilter::from_str(level) {
Ok(filter) => {
decoded_value.value.lval = filter as zend_long;
decoded_value.u1.type_info = IS_LONG;
true
Ok(level) => {
// We need to accept the empty string here as datadog.profiling.log_level = off will be
// trivially interpreted as the empty string by the PHP ini parser.
let parsed_level = if level.is_empty() {
Ok(LevelFilter::Off)
} else {
LevelFilter::from_str(level)
};
match parsed_level {
Ok(filter) => {
decoded_value.value.lval = filter as zend_long;
decoded_value.u1.type_info = IS_LONG;
true
}
_ => false,
}
_ => false,
},
_ => false,
}
Expand Down
21 changes: 20 additions & 1 deletion zend_abstract_interface/config/config_ini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ int16_t zai_config_initialize_ini_value(zend_ini_entry **entries, int16_t ini_co
zai_string_view default_value, zai_config_id entry_id) {
if (!env_to_ini_name) return -1;

zai_config_memoized_entry *memoized = &zai_config_memoized_entries[entry_id];

#if ZTS
pthread_rwlock_wrlock(&lock_ini_init_rw);
#endif
Expand All @@ -50,6 +52,14 @@ int16_t zai_config_initialize_ini_value(zend_ini_entry **entries, int16_t ini_co
// Try working around ...
zend_string *ini_str = entries[i]->modified ? entries[i]->orig_value : entries[i]->value;
if (ZSTR_LEN(ini_str) != default_value.len || strcmp(ZSTR_VAL(ini_str), default_value.ptr) != 0) {
// validate
zval new_zv;
ZVAL_UNDEF(&new_zv);
if (!zai_config_decode_value(ZAI_STRING_FROM_ZSTR(ini_str), memoized->type, memoized->parser, &new_zv, true)) {
continue;
}
zai_config_dtor_pzval(&new_zv);

parsed_ini_value = zend_string_copy(ini_str);
name_index = i;
break;
Expand All @@ -66,12 +76,21 @@ int16_t zai_config_initialize_ini_value(zend_ini_entry **entries, int16_t ini_co
}
zval *inizv = cfg_get_entry(ZSTR_VAL(entries[i]->name), ZSTR_LEN(entries[i]->name));
if (inizv != NULL && !parsed_ini_value) {
// validate
zval new_zv;
ZVAL_UNDEF(&new_zv);
if (!zai_config_decode_value(ZAI_STRING_FROM_ZSTR(Z_STR_P(inizv)), memoized->type, memoized->parser, &new_zv, true)) {
continue;
}
zai_config_dtor_pzval(&new_zv);

parsed_ini_value = zend_string_copy(Z_STR_P(inizv));
name_index = i;
break;
}
}

if (!zai_config_memoized_entries[entry_id].original_on_modify) {
if (!memoized->original_on_modify) {
for (int16_t i = 0; i < ini_count; ++i) {
bool duplicate = false;
for (int j = i + 1; j < ini_count; ++j) {
Expand Down