Skip to content

Fix GH-21262: ldap_modify() too strict controls argument validation. #21263

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

Open
devnexen wants to merge 3 commits into
base: PHP-8.5
Choose a base branch
from
+58 −3
Open

Fix GH-21262: ldap_modify() too strict controls argument validation. #21263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6499b56
Fix GH-21262: ldap_modify() too strict controls argument validation.
devnexen Feb 20, 2026
0d915c5
fix need to apply to LDAP_MOD_ADD only
devnexen Feb 20, 2026
d0f0e0f
add test
devnexen Feb 20, 2026
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
11 changes: 8 additions & 3 deletions ext/ldap/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2339,9 +2339,14 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, bool ext)
SEPARATE_ARRAY(attribute_values);
uint32_t num_values = zend_hash_num_elements(Z_ARRVAL_P(attribute_values));
if (num_values == 0) {
zend_argument_value_error(3, "attribute \"%s\" must be a non-empty list of attribute values", ZSTR_VAL(attribute));
RETVAL_FALSE;
goto cleanup;
if (UNEXPECTED(oper == LDAP_MOD_ADD)) {
zend_argument_value_error(3, "attribute \"%s\" must be a non-empty list of attribute values", ZSTR_VAL(attribute));
RETVAL_FALSE;
goto cleanup;
}
/* When we modify, we mean we delete the attribute */
attribute_index++;
continue;
}
if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(attribute_values))) {
zend_argument_value_error(3, "attribute \"%s\" must be an array of attribute values with numeric keys", ZSTR_VAL(attribute));
Expand Down
50 changes: 50 additions & 0 deletions ext/ldap/tests/gh21262.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
--TEST--
GH-21262 (ldap_modify() too strict controls argument validation)
--EXTENSIONS--
ldap
--FILE--
<?php
/* We are assuming 3333 is not connectable */
$ldap = ldap_connect('ldap://127.0.0.1:3333');
$valid_dn = "cn=userA,something";

$entry_with_empty_array = [
'attribute1' => 'value',
'attribute2' => [],
];

// ldap_add() should still reject empty arrays
try {
ldap_add($ldap, $valid_dn, $entry_with_empty_array);
} catch (ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}

// ldap_mod_add() should still reject empty arrays
try {
ldap_mod_add($ldap, $valid_dn, $entry_with_empty_array);
} catch (ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}

// ldap_modify() should accept empty arrays (delete attribute)
try {
@ldap_modify($ldap, $valid_dn, $entry_with_empty_array);
echo "ldap_modify: no ValueError thrown", PHP_EOL;
} catch (ValueError $e) {
echo "ldap_modify: UNEXPECTED ValueError: ", $e->getMessage(), PHP_EOL;
}

// ldap_mod_del() should accept empty arrays (delete attribute)
try {
@ldap_mod_del($ldap, $valid_dn, $entry_with_empty_array);
echo "ldap_mod_del: no ValueError thrown", PHP_EOL;
} catch (ValueError $e) {
echo "ldap_mod_del: UNEXPECTED ValueError: ", $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
ldap_add(): Argument #3 ($entry) attribute "attribute2" must be a non-empty list of attribute values
ldap_mod_add(): Argument #3 ($entry) attribute "attribute2" must be a non-empty list of attribute values
ldap_modify: no ValueError thrown
ldap_mod_del: no ValueError thrown
Loading