Skip to content

feat(ldap): Allow to use global default_certificates_bundle_path for ldap #56866

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

Draft
szaimen wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat(ldap): Allow to use global default_certificates_bundle_path for ldap #56866

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: 21 additions & 0 deletions apps/user_ldap/lib/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use OCA\User_LDAP\Exceptions\ConfigurationIssueException;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\ICertificateManager;
use OCP\IL10N;
use OCP\Server;
use OCP\Util;
Expand Down Expand Up @@ -686,6 +687,26 @@ private function doConnect($host, $port): bool {
$this->ldap->setOption(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_DEMAND);
}

/** @var ICertificateManager $certManager */
$certManager = Server::get(ICertificateManager::class);
$defaultCertificatePath = $certManager->getDefaultCertificatesBundlePath();
// We check if default certificate path is actually set to a custom value.
// Otherwise this would be a breaking change and cannot be backported.
if (!empty($defaultCertificatePath) && $defaultCertificatePath !== \OC::$SERVERROOT . '/resources/config/ca-bundle.crt') {
$absoluteBundlePath = $certManager->getAbsoluteBundlePath();
if ($this->ldap->setOption(null, LDAP_OPT_X_TLS_CACERTFILE, $absoluteBundlePath)) {
$this->logger->debug(
'Adjusted the tls certificate file path to ' . $absoluteBundlePath,
['app' => 'user_ldap']
);
} else {
$this->logger->warning(
'Could not change the tls certificate file path.',
['app' => 'user_ldap']
);
}
}

$this->ldapConnectionRes = $this->ldap->connect($host, $port) ?: null;

if ($this->ldapConnectionRes === null) {
Expand Down
Loading