Merge pull request #32499 from nextcloud/enh/noid/ldap-search-entryuu…

…id-no-wildcard Fix Ldap search for attributes with no substr matching rule
nextcloud · Apr 13, 2023 · 79013ba · 79013ba
2 parents eecd460 + f3cd559
commit 79013ba
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
@@ -1537,14 +1537,19 @@ private function getFilterPartForSearch(string $search, $searchAttributes, strin
 			}
 		}
 
+		$originalSearch = $search;
 		$search = $this->prepareSearchTerm($search);
 		if (!is_array($searchAttributes) || count($searchAttributes) === 0) {
 			if ($fallbackAttribute === '') {
 				return '';
 			}
+			// wildcards don't work with some attributes
+			$filter[] = $fallbackAttribute . '=' . $originalSearch;
 			$filter[] = $fallbackAttribute . '=' . $search;
 		} else {
 			foreach ($searchAttributes as $attribute) {
+				// wildcards don't work with some attributes
+				$filter[] = $attribute . '=' . $originalSearch;
 				$filter[] = $attribute . '=' . $search;
 			}
 		}