mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moved the array_reduce to fix large search case 

also added some additional comments and renamed some vars to make it intuitive whats in them

Signed-off-by: Tobias Perschon <tobias@perschon.at>
This commit is contained in:
Tobias Perschon 2020-11-27 03:02:43 +01:00 committed by backportbot[bot]
parent d818975d84
commit 250c7535cd
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/user_ldap/lib/Group_LDAP.php
View File

@ -146,7 +146,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
case 'memberuid': case 'memberuid':
case 'zimbramailforwardingaddress': case 'zimbramailforwardingaddress':
$requestAttributes = $this->access->userManager->getAttributes(true); $requestAttributes = $this->access->userManager->getAttributes(true);
$dns = []; $users = [];
$filterParts = []; $filterParts = [];
$bytes = 0; $bytes = 0;
foreach ($members as $mid) { foreach ($members as $mid) {
@ -160,24 +160,31 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
if ($bytes >= 9000000) { if ($bytes >= 9000000) {
// AD has a default input buffer of 10 MB, we do not want // AD has a default input buffer of 10 MB, we do not want
// to take even the chance to exceed it // to take even the chance to exceed it
// so we fetch results with the filterParts we collected so far
$filter = $this->access->combineFilterWithOr($filterParts); $filter = $this->access->combineFilterWithOr($filterParts);
$users = $this->access->fetchListOfUsers($filter, $requestAttributes, count($filterParts)); $search = $this->access->fetchListOfUsers($filter, $requestAttributes, count($filterParts));
$bytes = 0; $bytes = 0;
$filterParts = []; $filterParts = [];
$dns = array_merge($dns, $users); $users = array_merge($users, $search);
} }
} }
if (count($filterParts) > 0) { if (count($filterParts) > 0) {
// if there are filterParts left we need to add their result
$filter = $this->access->combineFilterWithOr($filterParts); $filter = $this->access->combineFilterWithOr($filterParts);
$users = $this->access->fetchListOfUsers($filter, $requestAttributes, count($filterParts)); $search = $this->access->fetchListOfUsers($filter, $requestAttributes, count($filterParts));
$dns = array_reduce($users, function (array $carry, array $record) { $users = array_merge($users, $search);
if (!in_array($carry, $record['dn'][0])) {
$carry[$record['dn'][0]] = 1;
}
return $carry;
}, $dns);
} }
// now we cleanup the users array to get only dns
$dns = array_reduce($users, function (array $carry, array $record) {
if (!in_array($carry, $record['dn'][0])) {
$carry[$record['dn'][0]] = 1;
}
return $carry;
}, []);
$members = array_keys($dns); $members = array_keys($dns);
break; break;
} }