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

Merge pull request #25366 from nextcloud/backport/25361/stable20 

[stable20] fix parameter provided as string not array
This commit is contained in:
Julius Härtl 2021-01-28 22:12:36 +01:00 committed by GitHub
parent 2c23dd4b51 71a762b3a7
commit e6fb478dbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,7 +222,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
$pos = strpos($memberURLs[0], '('); $pos = strpos($memberURLs[0], '(');
if ($pos !== false) { if ($pos !== false) {
$memberUrlFilter = substr($memberURLs[0], $pos); $memberUrlFilter = substr($memberURLs[0], $pos);
$foundMembers = $this->access->searchUsers($memberUrlFilter, 'dn'); $foundMembers = $this->access->searchUsers($memberUrlFilter, ['dn']);
$dynamicMembers = []; $dynamicMembers = [];
foreach ($foundMembers as $value) { foreach ($foundMembers as $value) {
$dynamicMembers[$value['dn'][0]] = 1; $dynamicMembers[$value['dn'][0]] = 1;
@ -915,6 +915,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
$attrs = $this->access->userManager->getAttributes(true); $attrs = $this->access->userManager->getAttributes(true);
foreach ($members as $member) { foreach ($members as $member) {
switch ($this->ldapGroupMemberAssocAttr) { switch ($this->ldapGroupMemberAssocAttr) {
/** @noinspection PhpMissingBreakStatementInspection */
case 'zimbramailforwardingaddress': case 'zimbramailforwardingaddress':
//we get email addresses and need to convert them to uids //we get email addresses and need to convert them to uids
$parts = explode('@', $member); $parts = explode('@', $member);
@ -1088,6 +1089,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I
if (!$this->enabled) { if (!$this->enabled) {
return []; return [];
} }
$search = $this->access->escapeFilterPart($search, true);
$cacheKey = 'getGroups-' . $search . '-' . $limit . '-' . $offset; $cacheKey = 'getGroups-' . $search . '-' . $limit . '-' . $offset;
//Check cache before driving unnecessary searches //Check cache before driving unnecessary searches