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

* LDAP/AD: fix duplicate key account_lid error on import caused by mixed case in account-names not treated equal

Browse Source
This commit is contained in:
ralf 2023-08-07 10:52:28 +02:00
parent c8c7c9eec2
commit aceb73eb53
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api/src/Accounts/Import.php
View File

@ -505,8 +505,8 @@ class Import
// we need to convert the account_id's of memberships, in case we use different ones in SQL // we need to convert the account_id's of memberships, in case we use different ones in SQL
$this->accounts_sql->set_memberships(array_merge(array_filter(array_map(static function($account_lid) use ($groups) $this->accounts_sql->set_memberships(array_merge(array_filter(array_map(static function($account_lid) use ($groups)
{ {
return array_search($account_lid, $groups); return array_search(self::strtolower($account_lid), $groups);
}, $account['memberships'])), $local_memberships), $account_id); }, $account['memberships'] ?: [])), $local_memberships), $account_id);
} }
// if only users are synced add new users to default group(s) as configured for auto-created accounts // if only users are synced add new users to default group(s) as configured for auto-created accounts
elseif ($new && $default_memberships) elseif ($new && $default_memberships)
@ -650,7 +650,7 @@ class Import
$sql_groups = $groups = $set_members = []; $sql_groups = $groups = $set_members = [];
foreach($GLOBALS['egw']->db->select(Sql::TABLE, 'account_id,account_lid', ['account_type' => 'g'], __LINE__, __FILE__) as $row) foreach($GLOBALS['egw']->db->select(Sql::TABLE, 'account_id,account_lid', ['account_type' => 'g'], __LINE__, __FILE__) as $row)
{ {
$sql_groups[-$row['account_id']] = $row['account_lid']; $sql_groups[-$row['account_id']] = self::strtolower($row['account_lid']);
} }
// fill groups with existing ones, for incremental sync, as we need to return all groups // fill groups with existing ones, for incremental sync, as we need to return all groups
if (!empty($modified)) if (!empty($modified))
@ -663,7 +663,7 @@ class Import
{ {
$this->logger(++$num.'. Group: '.json_encode($group, JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES), 'debug'); $this->logger(++$num.'. Group: '.json_encode($group, JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES), 'debug');
if (!($sql_id = array_search($group['account_lid'], $sql_groups))) if (!($sql_id = array_search(self::strtolower($group['account_lid']), $sql_groups)))
{ {
if ($this->accounts_sql->name2id($group['account_lid']) > 0) if ($this->accounts_sql->name2id($group['account_lid']) > 0)
{ {
@ -745,7 +745,7 @@ class Import
// unset the updated groups, so we can delete the ones not returned from LDAP // unset the updated groups, so we can delete the ones not returned from LDAP
unset($sql_groups[$sql_id]); unset($sql_groups[$sql_id]);
} }
$groups[$sql_id] = $group['account_lid']; $groups[$sql_id] = self::strtolower($group['account_lid']);
// we need to record and return the id's to update members, AFTER users are created/updated // we need to record and return the id's to update members, AFTER users are created/updated
// only for incremental run, initial run set's memberships with the user anyway (more efficient for LDAP!) // only for incremental run, initial run set's memberships with the user anyway (more efficient for LDAP!)
@ -1054,4 +1054,20 @@ class Import
'errors' => $errors, 'errors' => $errors,
]; ];
} }
/**
* Lowercase a string using mb_strtolower, if available
*
* @param string $str
* @return string
*/
static protected function strtolower($str)
{
static $strtolower = null;
if (!isset($strtolower))
{
$strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower';
}
return $strtolower($str);
}
} }