mirror of
https://github.com/nextcloud/server.git
synced 2026-06-22 07:00:02 -04:00
Merge pull request #61320 from nextcloud/fix/escape-ldap-members-in-filter
fix(user_ldap): Escape filter part when searching for group members
This commit is contained in:
commit
eccffd03e8
1 changed files with 3 additions and 3 deletions
|
|
@ -120,7 +120,7 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis
|
|||
$parts = explode('@', $mid); //making sure we get only the uid
|
||||
$mid = $parts[0];
|
||||
}
|
||||
$filter = str_replace('%uid', $mid, $this->access->connection->ldapLoginFilter);
|
||||
$filter = str_replace('%uid', $this->access->escapeFilterPart($mid), $this->access->connection->ldapLoginFilter);
|
||||
$filterParts[] = $filter;
|
||||
$bytes += strlen($filter);
|
||||
if ($bytes >= 9000000) {
|
||||
|
|
@ -921,7 +921,7 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis
|
|||
case 'memberuid':
|
||||
//we got uids, need to get their DNs to 'translate' them to user names
|
||||
$filter = $this->access->combineFilterWithAnd([
|
||||
str_replace('%uid', trim($member), $this->access->connection->ldapLoginFilter),
|
||||
str_replace('%uid', $this->access->escapeFilterPart($member), $this->access->connection->ldapLoginFilter),
|
||||
$this->access->combineFilterWithAnd([
|
||||
$this->access->getFilterPartForUserSearch($search),
|
||||
$this->access->connection->ldapUserFilter
|
||||
|
|
@ -1044,7 +1044,7 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis
|
|||
}
|
||||
//we got uids, need to get their DNs to 'translate' them to user names
|
||||
$filter = $this->access->combineFilterWithAnd([
|
||||
str_replace('%uid', $member, $this->access->connection->ldapLoginFilter),
|
||||
str_replace('%uid', $this->access->escapeFilterPart($member), $this->access->connection->ldapLoginFilter),
|
||||
$this->access->getFilterPartForUserSearch($search)
|
||||
]);
|
||||
$ldap_users = $this->access->fetchListOfUsers($filter, ['dn'], 1);
|
||||
|
|
|
|||
Loading…
Reference in a new issue