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

* AD/LDAP: fix periodic incremental import was loosing memberships to local groups for modified users

Browse Source
This commit is contained in:
ralf 2023-08-18 11:47:32 +02:00
parent ba4b3149b2
commit 809855eaa9
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -499,6 +499,10 @@ class Import
{ {
$local_groups[$gid] = $this->accounts_sql->members($gid); $local_groups[$gid] = $this->accounts_sql->members($gid);
} }
if ($local_groups)
{
$this->logger("Preserving members of local groups: ".implode(', ', array_diff($sql_groups, $groups)), 'detail');
}
} }
$local_memberships = array_keys(array_filter($local_groups, static function($members) use ($account_id) $local_memberships = array_keys(array_filter($local_groups, static function($members) use ($account_id)
{ {
@ -648,6 +652,7 @@ class Import
{ {
// to delete no longer existing groups, we have to query all groups! // to delete no longer existing groups, we have to query all groups!
if ($modified) $delete = 'no'; if ($modified) $delete = 'no';
$local_groups = in_array('local', explode('+', $GLOBALS['egw_info']['server']['account_import_type']));
// query all groups in SQL // query all groups in SQL
$sql_groups = $groups = $set_members = []; $sql_groups = $groups = $set_members = [];
@ -655,15 +660,24 @@ class Import
{ {
$sql_groups[-$row['account_id']] = self::strtolower($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, but only if we have NO local groups, otherwise we need to query them all
if (!empty($modified)) $filter = ['type' => 'groups'];
if ($modified && !$local_groups)
{ {
$groups = $sql_groups; $groups = $sql_groups;
$filter['modified'] = $modified;
} }
$created = $updated = $uptodate = $errors = $deleted = $num = 0; $created = $updated = $uptodate = $errors = $deleted = $num = 0;
foreach($this->accounts->search(['type' => 'groups', 'modified' => $modified]) as $account_id => $group) foreach($this->accounts->search($filter) as $account_id => $group)
{ {
// for local-groups, we always have to read all groups (to be able to determine which ones are local and preserve their memberships)
if ($modified && $local_groups && $group['account_modified'] < $modified &&
($sql_id = $this->accounts_sql->name2id($group['account_lid'])))
{
$groups[$sql_id] = self::strtolower($group['account_lid']);
continue; // not logging them as changed, just had to get them (efficient in one query)
}
$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(self::strtolower($group['account_lid']), $sql_groups))) if (!($sql_id = array_search(self::strtolower($group['account_lid']), $sql_groups)))