Skip to content

allow ldap_get_option to retrieve global option #18561

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

Closed
wants to merge 2 commits into from
Closed

allow ldap_get_option to retrieve global option #18561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b9a5b7
allow ldap_get_option to retrieve global option
remicollet May 15, 2025
fdc945b
add more ldaps/tls tests with TLS_CACERTFILE
remicollet May 15, 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
28 changes: 17 additions & 11 deletions ext/ldap/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2984,16 +2984,22 @@ PHP_FUNCTION(ldap_compare)
/* {{{ Get the current value of various session-wide parameters */
PHP_FUNCTION(ldap_get_option)
{
zval *link, *retval;
zval *link = NULL, *retval;
ldap_linkdata *ld;
zend_long option;
LDAP *ldap;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olz", &link, ldap_link_ce, &option, &retval) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O!lz", &link, ldap_link_ce, &option, &retval) != SUCCESS) {
RETURN_THROWS();
}

ld = Z_LDAP_LINK_P(link);
VERIFY_LDAP_LINK_CONNECTED(ld);
if (!link) {
ldap = NULL;
} else {
ld = Z_LDAP_LINK_P(link);
VERIFY_LDAP_LINK_CONNECTED(ld);
ldap = ld->link;
}

switch (option) {
/* options with int value */
Expand Down Expand Up @@ -3029,7 +3035,7 @@ PHP_FUNCTION(ldap_get_option)
{
int val;

if (ldap_get_option(ld->link, option, &val)) {
if (ldap_get_option(ldap, option, &val)) {
RETURN_FALSE;
}
ZEND_TRY_ASSIGN_REF_LONG(retval, val);
Expand All @@ -3039,7 +3045,7 @@ PHP_FUNCTION(ldap_get_option)
{
struct timeval *timeout = NULL;

if (ldap_get_option(ld->link, LDAP_OPT_NETWORK_TIMEOUT, (void *) &timeout)) {
if (ldap_get_option(ldap, LDAP_OPT_NETWORK_TIMEOUT, (void *) &timeout)) {
if (timeout) {
ldap_memfree(timeout);
}
Expand All @@ -3056,7 +3062,7 @@ PHP_FUNCTION(ldap_get_option)
{
int timeout;

if (ldap_get_option(ld->link, LDAP_X_OPT_CONNECT_TIMEOUT, &timeout)) {
if (ldap_get_option(ldap, LDAP_X_OPT_CONNECT_TIMEOUT, &timeout)) {
RETURN_FALSE;
}
ZEND_TRY_ASSIGN_REF_LONG(retval, (timeout / 1000));
Expand All @@ -3067,7 +3073,7 @@ PHP_FUNCTION(ldap_get_option)
{
struct timeval *timeout = NULL;

if (ldap_get_option(ld->link, LDAP_OPT_TIMEOUT, (void *) &timeout)) {
if (ldap_get_option(ldap, LDAP_OPT_TIMEOUT, (void *) &timeout)) {
if (timeout) {
ldap_memfree(timeout);
}
Expand Down Expand Up @@ -3117,7 +3123,7 @@ PHP_FUNCTION(ldap_get_option)
{
char *val = NULL;

if (ldap_get_option(ld->link, option, &val) || val == NULL || *val == '\0') {
if (ldap_get_option(ldap, option, &val) || val == NULL || *val == '\0') {
if (val) {
ldap_memfree(val);
}
Expand All @@ -3131,13 +3137,13 @@ PHP_FUNCTION(ldap_get_option)
{
LDAPControl **ctrls = NULL;

if (ldap_get_option(ld->link, option, &ctrls) || ctrls == NULL) {
if (ldap_get_option(ldap, option, &ctrls) || ctrls == NULL) {
if (ctrls) {
ldap_memfree(ctrls);
}
RETURN_FALSE;
}
_php_ldap_controls_to_array(ld->link, ctrls, retval, 1);
_php_ldap_controls_to_array(ldap, ctrls, retval, 1);
} break;
/* options not implemented
case LDAP_OPT_API_INFO:
Expand Down
2 changes: 1 addition & 1 deletion ext/ldap/ldap.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ function ldap_rename(LDAP\Connection $ldap, string $dn, string $new_rdn, string
function ldap_rename_ext(LDAP\Connection $ldap, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, ?array $controls = null): LDAP\Result|false {}

/** @param array|string|int $value */
function ldap_get_option(LDAP\Connection $ldap, int $option, &$value = null): bool {}
function ldap_get_option(?LDAP\Connection $ldap, int $option, &$value = null): bool {}

/** @param array|string|int|bool $value */
function ldap_set_option(?LDAP\Connection $ldap, int $option, $value): bool {}
Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/ldap_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions ext/ldap/tests/ldap_get_option_package_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ ldap
--FILE--
<?php
require "connect.inc";

$result = ldap_get_option(NULL, LDAP_OPT_X_TLS_PACKAGE, $optionval);
var_dump(in_array($optionval, ['GnuTLS', 'OpenSSL', 'MozNSS']));

$link = ldap_connect($uri);

$result = ldap_get_option($link, LDAP_OPT_X_TLS_PACKAGE, $optionval);
Expand All @@ -15,3 +19,4 @@ var_dump(in_array($optionval, ['GnuTLS', 'OpenSSL', 'MozNSS']));
?>
--EXPECT--
bool(true)
bool(true)
36 changes: 36 additions & 0 deletions ext/ldap/tests/ldap_start_tls_basic2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
ldap_start_tls() - Basic ldap_start_tls test with TLS_CACERTFILE
--EXTENSIONS--
ldap
--SKIPIF--
<?php
require_once __DIR__ .'/skipifbindfailure.inc';
if (!ldap_get_option(NULL, LDAP_OPT_X_TLS_CACERTFILE, $val)) die('skip missing TLS_CACERTFILE');
?>
--FILE--
<?php
require_once "connect.inc";

// CI uses self signed certificate

// No cert option
$link = ldap_connect($uri);
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
var_dump(@ldap_start_tls($link));

// No cert check
$link = ldap_connect($uri);
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
ldap_set_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
var_dump(@ldap_start_tls($link));

// With cert check
$link = ldap_connect($uri);
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
ldap_set_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_DEMAND);
var_dump(@ldap_start_tls($link));
?>
--EXPECT--
bool(true)
bool(true)
bool(true)
56 changes: 56 additions & 0 deletions ext/ldap/tests/ldaps_basic2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
--TEST--
ldap_connect() - Basic ldaps test with TLS_CACERTFILE
--EXTENSIONS--
ldap
--SKIPIF--
<?php
require_once __DIR__ .'/skipifbindfailure.inc';
if (!ldap_get_option(NULL, LDAP_OPT_X_TLS_CACERTFILE, $val)) die('skip missing TLS_CACERTFILE');
?>
--FILE--
<?php
require_once "connect.inc";

$uri = "ldaps://$host:636";

// CI uses self signed certificate

// No cert option
$link = ldap_connect($uri);
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
var_dump(@ldap_bind($link, $user, $passwd));
ldap_unbind($link);

// No cert check
ldap_set_option(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_ALLOW);
$link = ldap_connect($uri);
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
var_dump(@ldap_bind($link, $user, $passwd));
ldap_unbind($link);

// No change to TLS options
$link = ldap_connect($uri);
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
var_dump(@ldap_bind($link, $user, $passwd));
ldap_unbind($link);

// With cert check
ldap_set_option(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_DEMAND);
$link = ldap_connect($uri);
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
var_dump(@ldap_bind($link, $user, $passwd));
ldap_unbind($link);

// No change to TLS options
$link = ldap_connect($uri);
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
var_dump(@ldap_bind($link, $user, $passwd));
ldap_unbind($link);

?>
--EXPECT--
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)