Browse Source
Merge pull request #39058 from nextcloud/fix/fix-ldap-filters-for-empty-search
Avoid adding (attribute=) part to filter which will confuse LDAP servers
pull/39752/head
Côme Chilliet
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
2 deletions
-
apps/user_ldap/lib/Access.php
|
|
|
@ -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; |
|
|
|
} |
|
|
|
} |
|
|
|
|
