Skip to content

Commit 92744f3

Browse files
MichaIngMichaIng
authored
Merge pull request #30248 from nextcloud/backport/30245/stable21
[stable21] Only wildcard search if enumeration is allowed
2 parents c872f2a + 565da24 commit 92744f3

16 files changed

Lines changed: 114 additions & 22 deletions

File tree

‎apps/dav/lib/CardDAV/AddressBookImpl.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ public function getDisplayName() {
107107
* - 'escape_like_param' - If set to false wildcards _ and % are not escaped
108108
* - 'limit' - Set a numeric limit for the search results
109109
* - 'offset' - Set the offset for the limited search results
110+
* - 'wildcard' - Whether the search should use wildcards
111+
* @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
110112
* @return array an array of contacts which are arrays of key-value-pairs
111113
* example result:
112114
* [

‎apps/dav/lib/CardDAV/CardDavBackend.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,8 @@ public function updateShares(IShareable $shareable, $add, $remove) {
10041004
* - 'escape_like_param' - If set to false wildcards _ and % are not escaped, otherwise they are
10051005
* - 'limit' - Set a numeric limit for the search results
10061006
* - 'offset' - Set the offset for the limited search results
1007+
* - 'wildcard' - Whether the search should use wildcards
1008+
* @psalm-param array{escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
10071009
* @return array an array of contacts which are arrays of key-value-pairs
10081010
*/
10091011
public function search($addressBookId, $pattern, $searchProperties, $options = []): array {
@@ -1035,13 +1037,15 @@ public function searchPrincipalUri(string $principalUri,
10351037
* @param string $pattern
10361038
* @param array $searchProperties
10371039
* @param array $options
1040+
* @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
10381041
* @return array
10391042
*/
10401043
private function searchByAddressBookIds(array $addressBookIds,
10411044
string $pattern,
10421045
array $searchProperties,
10431046
array $options = []): array {
10441047
$escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
1048+
$useWildcards = !\array_key_exists('wildcard', $options) || $options['wildcard'] !== false;
10451049

10461050
$query2 = $this->db->getQueryBuilder();
10471051

@@ -1083,7 +1087,9 @@ private function searchByAddressBookIds(array $addressBookIds,
10831087

10841088
// No need for like when the pattern is empty
10851089
if ('' !== $pattern) {
1086-
if (!$escapePattern) {
1090+
if (!$useWildcards) {
1091+
$query2->andWhere($query2->expr()->eq('cp.value', $query2->createNamedParameter($pattern)));
1092+
} elseif (!$escapePattern) {
10871093
$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
10881094
} else {
10891095
$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));

‎apps/federatedfilesharing/lib/Notifier.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,12 @@ protected function getDisplayNameFromContact($federatedCloudId) {
255255
}
256256
}
257257

258-
$addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
258+
$addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD'], [
259+
'limit' => 1,
260+
'enumeration' => false,
261+
'fullmatch' => false,
262+
'strict_search' => true,
263+
]);
259264
foreach ($addressBookEntries as $entry) {
260265
if (isset($entry['CLOUD'])) {
261266
foreach ($entry['CLOUD'] as $cloudID) {

‎apps/files/lib/Activity/Provider.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,12 @@ protected function getDisplayNameFromAddressBook(string $search): string {
560560
return $this->displayNames[$search];
561561
}
562562

563-
$addressBookContacts = $this->contactsManager->search($search, ['CLOUD']);
563+
$addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
564+
'limit' => 1,
565+
'enumeration' => false,
566+
'fullmatch' => false,
567+
'strict_search' => true,
568+
]);
564569
foreach ($addressBookContacts as $contact) {
565570
if (isset($contact['isLocalSystemBook'])) {
566571
continue;

‎apps/files_sharing/lib/Activity/Providers/Base.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,12 @@ protected function getDisplayNameFromAddressBook(string $search): string {
204204
return $this->displayNames[$search];
205205
}
206206

207-
$addressBookContacts = $this->contactsManager->search($search, ['CLOUD']);
207+
$addressBookContacts = $this->contactsManager->search($search, ['CLOUD'], [
208+
'limit' => 1,
209+
'enumeration' => false,
210+
'fullmatch' => false,
211+
'strict_search' => true,
212+
]);
208213
foreach ($addressBookContacts as $contact) {
209214
if (isset($contact['isLocalSystemBook'])) {
210215
continue;

‎apps/files_sharing/lib/Controller/ShareAPIController.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,12 @@ protected function formatShare(IShare $share, Node $recipientNode = null): array
333333
* @return string
334334
*/
335335
private function getDisplayNameFromAddressBook(string $query, string $property): string {
336-
// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
337-
$result = \OC::$server->getContactsManager()->search($query, [$property]);
336+
// FIXME: If we inject the contacts manager it gets initialized before any address books are registered
337+
$result = \OC::$server->getContactsManager()->search($query, [$property], [
338+
'limit' => 1,
339+
'enumeration' => false,
340+
'strict_search' => true,
341+
]);
338342
foreach ($result as $r) {
339343
foreach ($r[$property] as $value) {
340344
if ($value === $query && $r['FN']) {

‎apps/files_sharing/tests/Controller/ShareAPIControllerTest.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4227,7 +4227,11 @@ public function testFormatShare(array $expects, \OCP\Share\IShare $share, array
42274227

42284228
$cm->method('search')
42294229
->willReturnMap([
4230-
['user@server.com', ['CLOUD'], [],
4230+
['user@server.com', ['CLOUD'], [
4231+
'limit' => 1,
4232+
'enumeration' => false,
4233+
'strict_search' => true,
4234+
],
42314235
[
42324236
[
42334237
'CLOUD' => [
@@ -4237,7 +4241,11 @@ public function testFormatShare(array $expects, \OCP\Share\IShare $share, array
42374241
],
42384242
],
42394243
],
4240-
['user@server.com', ['EMAIL'], [],
4244+
['user@server.com', ['EMAIL'], [
4245+
'limit' => 1,
4246+
'enumeration' => false,
4247+
'strict_search' => true,
4248+
],
42414249
[
42424250
[
42434251
'EMAIL' => [

‎apps/sharebymail/lib/Activity.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,12 @@ protected function generateUserParameter($uid) {
363363
* @return string
364364
*/
365365
protected function getContactName($email) {
366-
$addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
366+
$addressBookContacts = $this->contactsManager->search($email, ['EMAIL'], [
367+
'limit' => 1,
368+
'enumeration' => false,
369+
'fullmatch' => false,
370+
'strict_search' => true,
371+
]);
367372

368373
foreach ($addressBookContacts as $contact) {
369374
if (isset($contact['isLocalSystemBook'])) {

‎lib/private/Collaboration/Collaborators/MailPlugin.php‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,7 @@ public function __construct(IManager $contactsManager,
8787
}
8888

8989
/**
90-
* @param $search
91-
* @param $limit
92-
* @param $offset
93-
* @param ISearchResult $searchResult
94-
* @return bool
95-
* @since 13.0.0
90+
* {@inheritdoc}
9691
*/
9792
public function search($search, $limit, $offset, ISearchResult $searchResult) {
9893
$currentUserId = $this->userSession->getUser()->getUID();
@@ -102,7 +97,16 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
10297
$emailType = new SearchResultType('emails');
10398

10499
// Search in contacts
105-
$addressBookContacts = $this->contactsManager->search($search, ['EMAIL', 'FN'], ['limit' => $limit, 'offset' => $offset]);
100+
$addressBookContacts = $this->contactsManager->search(
101+
$search,
102+
['EMAIL', 'FN'],
103+
[
104+
'limit' => $limit,
105+
'offset' => $offset,
106+
'enumeration' => (bool) $this->shareeEnumeration,
107+
'fullmatch' => (bool) $this->shareeEnumerationFullMatch,
108+
]
109+
);
106110
$lowerSearch = strtolower($search);
107111
foreach ($addressBookContacts as $contact) {
108112
if (isset($contact['EMAIL'])) {

‎lib/private/Collaboration/Collaborators/RemotePlugin.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,12 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
6868
$resultType = new SearchResultType('remotes');
6969

7070
// Search in contacts
71-
$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN'], ['limit' => $limit, 'offset' => $offset]);
71+
$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN'], [
72+
'limit' => $limit,
73+
'offset' => $offset,
74+
'enumeration' => false,
75+
'fullmatch' => false,
76+
]);
7277
foreach ($addressBookContacts as $contact) {
7378
if (isset($contact['isLocalSystemBook'])) {
7479
continue;

0 commit comments

Comments
 (0)