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

Merge pull request #25844 from nextcloud/backport/25757/stable20 

[stable20] fix detecting cyclic group memberships
This commit is contained in:
blizzz 2021-03-03 10:43:21 +01:00 committed by GitHub
parent ff5491bf69 ce6d64b122
commit 6ee39e204f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,9 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
private function _groupMembers(string $dnGroup, ?array &$seen = null): array { private function _groupMembers(string $dnGroup, ?array &$seen = null): array {
if ($seen === null) { if ($seen === null) {
$seen = []; $seen = [];
// the root entry has to be marked as processed to avoind infinit loops,
// but not included in the results laters on
$excludeFromResult = $dnGroup;
} }
$allMembers = []; $allMembers = [];
if (array_key_exists($dnGroup, $seen)) { if (array_key_exists($dnGroup, $seen)) {
@ -290,13 +293,19 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
$seen[$dnGroup] = 1; $seen[$dnGroup] = 1;
$members = $this->access->readAttribute($dnGroup, $this->access->connection->ldapGroupMemberAssocAttr); $members = $this->access->readAttribute($dnGroup, $this->access->connection->ldapGroupMemberAssocAttr);
if (is_array($members)) { if (is_array($members)) {
$fetcher = function ($memberDN, &$seen) { $fetcher = function ($memberDN) use (&$seen) {
return $this->_groupMembers($memberDN, $seen); return $this->_groupMembers($memberDN, $seen);
}; };
$allMembers = $this->walkNestedGroups($dnGroup, $fetcher, $members); $allMembers = $this->walkNestedGroups($dnGroup, $fetcher, $members, $seen);
} }
$allMembers += $this->getDynamicGroupMembers($dnGroup); $allMembers += $this->getDynamicGroupMembers($dnGroup);
if (isset($excludeFromResult)) {
$index = array_search($excludeFromResult, $allMembers, true);
if ($index !== false) {
unset($allMembers[$index]);
}
}
$this->access->connection->writeToCache($cacheKey, $allMembers); $this->access->connection->writeToCache($cacheKey, $allMembers);
if (isset($attemptedLdapMatchingRuleInChain) if (isset($attemptedLdapMatchingRuleInChain)
@ -335,7 +344,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
return $this->filterValidGroups($groups); return $this->filterValidGroups($groups);
} }
private function walkNestedGroups(string $dn, Closure $fetcher, array $list): array { private function walkNestedGroups(string $dn, Closure $fetcher, array $list, array &$seen = []): array {
$nesting = (int)$this->access->connection->ldapNestedGroups; $nesting = (int)$this->access->connection->ldapNestedGroups;
// depending on the input, we either have a list of DNs or a list of LDAP records // depending on the input, we either have a list of DNs or a list of LDAP records
// also, the output expects either DNs or records. Testing the first element should suffice. // also, the output expects either DNs or records. Testing the first element should suffice.
@ -354,19 +363,21 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
return $list; return $list;
} }
$seen = [];
while ($record = array_shift($list)) { while ($record = array_shift($list)) {
$recordDN = $recordMode ? $record['dn'][0] : $record; $recordDN = $record['dn'][0] ?? $record;
if ($recordDN === $dn || array_key_exists($recordDN, $seen)) { if ($recordDN === $dn || array_key_exists($recordDN, $seen)) {
// Prevent loops // Prevent loops
continue; continue;
} }
$fetched = $fetcher($record, $seen); $fetched = $fetcher($record);
$list = array_merge($list, $fetched); $list = array_merge($list, $fetched);
if (!isset($seen[$recordDN]) || is_bool($seen[$recordDN]) && is_array($record)) {
$seen[$recordDN] = $record; $seen[$recordDN] = $record;
} }
}
return $recordMode ? $seen : array_keys($seen); // on record mode, filter out intermediate state
return $recordMode ? array_filter($seen, 'is_array') : array_keys($seen);
} }
/** /**
@ -841,7 +852,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
$groups = $this->access->fetchListOfGroups($filter, $groups = $this->access->fetchListOfGroups($filter,
[strtolower($this->access->connection->ldapGroupMemberAssocAttr), $this->access->connection->ldapGroupDisplayName, 'dn']); [strtolower($this->access->connection->ldapGroupMemberAssocAttr), $this->access->connection->ldapGroupDisplayName, 'dn']);
if (is_array($groups)) { if (is_array($groups)) {
$fetcher = function ($dn, &$seen) { $fetcher = function ($dn) use (&$seen) {
if (is_array($dn) && isset($dn['dn'][0])) { if (is_array($dn) && isset($dn['dn'][0])) {
$dn = $dn['dn'][0]; $dn = $dn['dn'][0];
} }
@ -852,7 +863,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
$dn = ""; $dn = "";
} }
$allGroups = $this->walkNestedGroups($dn, $fetcher, $groups); $allGroups = $this->walkNestedGroups($dn, $fetcher, $groups, $seen);
} }
$visibleGroups = $this->filterValidGroups($allGroups); $visibleGroups = $this->filterValidGroups($allGroups);
return array_intersect_key($allGroups, $visibleGroups); return array_intersect_key($allGroups, $visibleGroups);