extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ActiveDirectory: fix not working ldaps connection on a non-standard port

Browse Source
This commit is contained in:
ralf 2023-08-17 12:22:45 +02:00
parent f0b4517624
commit 556117f14a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/src/Accounts/Ads.php
View File

@ -196,24 +196,27 @@ class Ads
} }
$base_dn = implode(',', $base_dn_parts); $base_dn = implode(',', $base_dn_parts);
// check if a port is specified as host[:port] and pass it correctly to adLDAP
$matches = null;
if (preg_match('/:(\d+)/', $host=$config['ads_host'], $matches))
{
$port = $matches[1];
$host = preg_replace('/:(\d+)/', '', $config['ads_host']);
}
$options = array( $options = array(
'domain_controllers' => preg_split('/[ ,]+/', $host), // always return an uri (incl. port), but no use_ssl or ad_port
'base_dn' => $base_dn ? $base_dn : null, 'domain_controllers' => array_map(static function($uri_host_port) use ($config)
{
if (!preg_match('#^(ldaps?://)?([^:]+)(:\d+)?$#', $uri_host_port, $matches))
{
throw new \Exception("Invalid value for AD controller '$uri_host_port' in '$config[ads_host]'");
}
if ($matches[1] === 'ldaps://' || $config['ads_connection'] === 'ssl')
{
return 'ldaps://'.$matches[2].($matches[3] ?? '');
}
return 'ldap://'.$matches[2].($matches[3] ?? '');
}, preg_split('/[ ,]+/', trim($config['ads_host']))),
'base_dn' => $base_dn ?: null,
'account_suffix' => '@'.$config['ads_domain'], 'account_suffix' => '@'.$config['ads_domain'],
'admin_username' => $config['ads_admin_user'], 'admin_username' => $config['ads_admin_user'],
'admin_password' => $config['ads_admin_passwd'], 'admin_password' => $config['ads_admin_passwd'],
'use_tls' => $config['ads_connection'] == 'tls', 'use_tls' => $config['ads_connection'] == 'tls',
'use_ssl' => $config['ads_connection'] == 'ssl',
'charset' => Api\Translation::charset(), 'charset' => Api\Translation::charset(),
); );
if (isset($port)) $options['ad_port'] = $port;
$adldap[$config['ads_domain']] = new adLDAP($options); $adldap[$config['ads_domain']] = new adLDAP($options);
if (self::$debug) error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace()); if (self::$debug) error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());