Skip to content

[stable22] Only wildcard search if enumeration is allowed #30247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 7 commits into from
Dec 13, 2021
Merged

[stable22] Only wildcard search if enumeration is allowed #30247

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
631b5fc
Only wildcard search if enumeration is allowed
nickvergessen Dec 8, 2021
1d7971b
Only limit search in the system address book
nickvergessen Dec 8, 2021
3879c2e
Limit more contact searches
nickvergessen Dec 8, 2021
0b717bd
Convert strict_search to wildcard property and add psalm docs
nickvergessen Dec 8, 2021
76f5436
Fix docs to make Psalm happier
nickvergessen Dec 9, 2021
e552806
Make psalm more happy
nickvergessen Dec 9, 2021
6a1a948
Fix backport
artonge Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix backport 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge
artonge committed Dec 13, 2021
commit 6a1a9485cfea2916ce1daddc2e6bd2d4dedcc841
4 changes: 3 additions & 1 deletion lib/private/Contacts/ContactsMenu/ContactsStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,9 @@ public function findOne(IUser $user, $shareType, $shareWith) {
}

$userId = $user->getUID();
$allContacts = $this->contactsManager->search($shareWith, $filter);
$allContacts = $this->contactsManager->search($shareWith, $filter, [
'strict_search' => true,
]);
$contacts = array_filter($allContacts, function ($contact) use ($userId) {
return $contact['UID'] !== $userId;
});
Expand Down