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

ext/ldap: ldap_read/ldap_list/ldap_search update. #17426

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

ext/ldap: ldap_read/ldap_list/ldap_search update. #17426

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
c202e80
ext/ldap: ldap_read/ldap_list/ldap_search update.
devnexen Jan 9, 2025
108c468
adding test cases
devnexen Jan 10, 2025
8623c73
changes from review
devnexen Feb 4, 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
46 changes: 21 additions & 25 deletions ext/ldap/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,16 +1448,16 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
zend_string *base_dn_str = NULL;
HashTable *filter_ht = NULL;
zend_string *filter_str = NULL;
zend_long attrsonly, sizelimit, timelimit, deref;
zend_long sizelimit = -1, timelimit = -1, deref = LDAP_DEREF_NEVER;
zend_long attrsonly = 0;
HashTable *server_controls_ht = NULL;
char **ldap_attrs = NULL;
ldap_linkdata *ld = NULL;
ldap_resultdata *result;
LDAPMessage *ldap_res = NULL;
LDAPControl **lserverctrls = NULL;
int ldap_attrsonly = 0, ldap_sizelimit = -1, ldap_timelimit = -1, ldap_deref = -1;
int old_ldap_sizelimit = -1, old_ldap_timelimit = -1, old_ldap_deref = -1;
int ret = 1, ldap_errno, argcount = ZEND_NUM_ARGS();
int ret = 1, ldap_errno;

ZEND_PARSE_PARAMETERS_START(3, 9)
Z_PARAM_ZVAL(link)
Expand All @@ -1472,23 +1472,19 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
Z_PARAM_ARRAY_HT_EX(server_controls_ht, 1, 1)
ZEND_PARSE_PARAMETERS_END();

/* Reverse -> fall through */
switch (argcount) {
case 9:
case 8:
ldap_deref = deref;
ZEND_FALLTHROUGH;
case 7:
ldap_timelimit = timelimit;
ZEND_FALLTHROUGH;
case 6:
ldap_sizelimit = sizelimit;
ZEND_FALLTHROUGH;
case 5:
ldap_attrsonly = attrsonly;
ZEND_FALLTHROUGH;
default:
break;
if (sizelimit < -1 || sizelimit > INT_MAX) {
zend_argument_value_error(6, "must be between -1 and %d", INT_MAX);
RETURN_THROWS();
}

if (timelimit < -1 || timelimit > INT_MAX) {
zend_argument_value_error(7, "must be between -1 and %d", INT_MAX);
RETURN_THROWS();
}

if (deref < LDAP_DEREF_NEVER || deref > LDAP_DEREF_ALWAYS) {
zend_argument_value_error(8, "must be one of the LDAP_DEREF_* constants");
RETURN_THROWS();
}

if (attrs) {
Expand Down Expand Up @@ -1653,10 +1649,10 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
}
}

php_set_opts(current_ld->link, ldap_sizelimit, ldap_timelimit, ldap_deref, &old_ldap_sizelimit, &old_ldap_timelimit, &old_ldap_deref);
php_set_opts(current_ld->link, (int)sizelimit, (int)timelimit, (int)deref, &old_ldap_sizelimit, &old_ldap_timelimit, &old_ldap_deref);

/* Run the actual search */
ldap_search_ext(current_ld->link, ZSTR_VAL(ldap_base_dn), scope, ZSTR_VAL(ldap_filter), ldap_attrs, ldap_attrsonly, lserverctrls, NULL, NULL, ldap_sizelimit, &rcs[ldap_link_index]);
ldap_search_ext(current_ld->link, ZSTR_VAL(ldap_base_dn), scope, ZSTR_VAL(ldap_filter), ldap_attrs, (int)attrsonly, lserverctrls, NULL, NULL, (int)sizelimit, &rcs[ldap_link_index]);
lds[ldap_link_index] = current_ld;

// TODO Reset the options of the link?
Expand Down Expand Up @@ -1711,10 +1707,10 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
}
}

php_set_opts(ld->link, ldap_sizelimit, ldap_timelimit, ldap_deref, &old_ldap_sizelimit, &old_ldap_timelimit, &old_ldap_deref);
php_set_opts(ld->link, (int)sizelimit, (int)timelimit, (int)deref, &old_ldap_sizelimit, &old_ldap_timelimit, &old_ldap_deref);

/* Run the actual search */
ldap_errno = ldap_search_ext_s(ld->link, ZSTR_VAL(base_dn_str), scope, ZSTR_VAL(filter_str), ldap_attrs, ldap_attrsonly, lserverctrls, NULL, NULL, ldap_sizelimit, &ldap_res);
ldap_errno = ldap_search_ext_s(ld->link, ZSTR_VAL(base_dn_str), scope, ZSTR_VAL(filter_str), ldap_attrs, (int)attrsonly, lserverctrls, NULL, NULL, (int)sizelimit, &ldap_res);

if (ldap_errno != LDAP_SUCCESS
&& ldap_errno != LDAP_SIZELIMIT_EXCEEDED
Expand Down Expand Up @@ -1752,7 +1748,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
cleanup:
if (ld) {
/* Restoring previous options */
php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit, old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref);
php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit, old_ldap_deref, (int *)&sizelimit, (int *)&timelimit, (int *)&deref);
Comment on lines -1755 to +1751
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, didn't notice this earlier. These casts won't properly work for big-endian architectures, but on the other hand, we're not using the variables afterwards, so might be okay. A follow-up PR could add support for passing NULL values to php_set_opts() (which then would not assign the out parameters).

}
if (ldap_attrs != NULL) {
efree(ldap_attrs);
Expand Down
21 changes: 21 additions & 0 deletions ext/ldap/tests/ldap_search_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,24 @@ try {
echo $exception->getMessage() . "\n";
}

try {
ldap_search($link, $dn, $filter, array('option'), false, PHP_INT_MIN);
} catch (ValueError $exception) {
echo $exception->getMessage() . "\n";
}

try {
ldap_search($link, $dn, $filter, array('option'), false, -1, PHP_INT_MIN);
} catch (ValueError $exception) {
echo $exception->getMessage() . "\n";
}

try {
ldap_search($link, $dn, $filter, array('option'), false, -1, -1, -1);
} catch (ValueError $exception) {
echo $exception->getMessage() . "\n";
}

try {
ldap_search(array(), $dn, $filter, array('top'));
} catch (ValueError $exception) {
Expand Down Expand Up @@ -61,6 +79,9 @@ try {
Warning: ldap_search(): Search: No such object in %s on line %d
bool(false)
ldap_search(): Argument #4 ($attributes) must be an array with numeric keys
ldap_search(): Argument #6 ($sizelimit) must be between -1 and %d
ldap_search(): Argument #7 ($timelimit) must be between -1 and %d
ldap_search(): Argument #8 ($deref) must be one of the LDAP_DEREF_* constants
ldap_search(): Argument #1 ($ldap) must not be empty
ldap_search(): Argument #2 ($base) must be the same size as argument #1
ldap_search(): Argument #3 ($filter) must be the same size as argument #1
Expand Down