upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #39058 from nextcloud/fix/fix-ldap-filters-for-empty-search

Browse source 
Avoid adding (attribute=) part to filter which will confuse LDAP servers
This commit is contained in:
Côme Chilliet 2023-08-08 09:21:20 +02:00 committed by GitHub
commit b155f87a84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/user_ldap/lib/Access.php
View file

@ -1545,12 +1545,16 @@ class Access extends LDAPUtility {
return '';
}
// wildcards don't work with some attributes
$filter[] = $fallbackAttribute . '=' . $originalSearch;
if ($originalSearch !== '') {
$filter[] = $fallbackAttribute . '=' . $originalSearch;
}
$filter[] = $fallbackAttribute . '=' . $search;
} else {
foreach ($searchAttributes as $attribute) {
// wildcards don't work with some attributes
$filter[] = $attribute . '=' . $originalSearch;
if ($originalSearch !== '') {
$filter[] = $attribute . '=' . $originalSearch;
}
$filter[] = $attribute . '=' . $search;
}
}