From 8f94ab0307b7eb8d8bd050aca858939e7fe0b9c0 Mon Sep 17 00:00:00 2001 From: tatankat Date: Mon, 30 Jan 2023 14:15:37 +0100 Subject: [PATCH] [4.x] Fix LDAP debugging functionality (#38388) * Restore broken ldap debugging functionality * Fix composer.lock * Remove unnecessary change * More recent symfony/ldap to include https://github.com/symfony/symfony/pull/47547 * fix hash in composer.lock * Update composer.lock --------- --- composer.json | 2 +- composer.lock | 2 +- plugins/authentication/ldap/src/Extension/Ldap.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 06400b10c9c..7687c4edda6 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,7 @@ "psr/link": "~1.0", "symfony/console": "~5.0", "symfony/error-handler": "^5.2", - "symfony/ldap": "~5.0", + "symfony/ldap": "^5.4.13", "symfony/options-resolver": "~5.0", "symfony/polyfill-mbstring": "^1.27", "symfony/polyfill-php73": "^1.10", diff --git a/composer.lock b/composer.lock index 007734672d9..e6f29d74c42 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "71f099696f92e248e54a0d93c60e82c7", + "content-hash": "e29fb961f2b568d70f3a02932a5208b6", "packages": [ { "name": "algo26-matthias/idna-convert", diff --git a/plugins/authentication/ldap/src/Extension/Ldap.php b/plugins/authentication/ldap/src/Extension/Ldap.php index 706db886e50..c761091540b 100644 --- a/plugins/authentication/ldap/src/Extension/Ldap.php +++ b/plugins/authentication/ldap/src/Extension/Ldap.php @@ -122,6 +122,7 @@ final class Ldap extends CMSPlugin 'version' => $this->params->get('use_ldapV3', '1') == '1' ? 3 : 2, 'referrals' => (bool) $this->params->get('no_referrals', '0'), 'encryption' => $this->params->get('encryption', 'none'), + 'debug' => (bool) $this->params->get('ldap_debug', '0'), 'options' => [ 'x_tls_require_cert' => $ignore_reqcert_tls ? LDAP_OPT_X_TLS_NEVER : LDAP_OPT_X_TLS_DEMAND, ],