Skip to content

Commit d2773cf

Browse files
AndyScherzingerAndyScherzinger
authored
Merge pull request #51707 from nextcloud/fix/filter-empty-email
fix: filter out contacts with empty email addresses in sharee completion
2 parents 1560fc8 + 46f531a commit d2773cf

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ public function search($search, $limit, $offset, ISearchResult $searchResult): b
100100
$emailAddress = $emailAddressData['value'];
101101
$emailAddressType = $emailAddressData['type'];
102102
}
103+
104+
if (!filter_var($emailAddress, FILTER_VALIDATE_EMAIL)) {
105+
continue;
106+
}
107+
103108
if (isset($contact['FN'])) {
104109
$displayName = $contact['FN'] . ' (' . $emailAddress . ')';
105110
}

‎tests/lib/Collaboration/Collaborators/MailPluginTest.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ public function dataGetEmail() {
188188
'UID' => 'uid1',
189189
'FN' => 'User @ Localhost',
190190
'EMAIL' => [
191-
'username@localhost',
191+
'username@example.com',
192192
],
193193
],
194194
],
195195
true,
196-
['emails' => [['uuid' => 'uid1', 'name' => 'User @ Localhost', 'type' => '', 'label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exact' => ['emails' => []]],
196+
['emails' => [['uuid' => 'uid1', 'name' => 'User @ Localhost', 'type' => '', 'label' => 'User @ Localhost (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]], 'exact' => ['emails' => []]],
197197
false,
198198
false,
199199
false,
@@ -233,24 +233,24 @@ public function dataGetEmail() {
233233
[
234234
[
235235
'UID' => 'uid3',
236-
'FN' => 'User3 @ Localhost',
236+
'FN' => 'User3 @ example.com',
237237
],
238238
[
239239
'UID' => 'uid2',
240-
'FN' => 'User2 @ Localhost',
240+
'FN' => 'User2 @ example.com',
241241
'EMAIL' => [
242242
],
243243
],
244244
[
245245
'UID' => 'uid1',
246-
'FN' => 'User @ Localhost',
246+
'FN' => 'User @ example.com',
247247
'EMAIL' => [
248-
'username@localhost',
248+
'username@example.com',
249249
],
250250
],
251251
],
252252
true,
253-
['emails' => [['uuid' => 'uid1', 'name' => 'User @ Localhost', 'type' => '', 'label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exact' => ['emails' => [['label' => '[email protected]', 'uuid' => '[email protected]', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => '[email protected]']]]]],
253+
['emails' => [['uuid' => 'uid1', 'name' => 'User @ example.com', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]], 'exact' => ['emails' => [['label' => '[email protected]', 'uuid' => '[email protected]', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => '[email protected]']]]]],
254254
false,
255255
false,
256256
true,
@@ -286,56 +286,56 @@ public function dataGetEmail() {
286286
],
287287
// data set 9
288288
[
289-
'username@localhost',
289+
'username@example.com',
290290
[
291291
[
292292
'UID' => 'uid3',
293-
'FN' => 'User3 @ Localhost',
293+
'FN' => 'User3 @ example.com',
294294
],
295295
[
296296
'UID' => 'uid2',
297-
'FN' => 'User2 @ Localhost',
297+
'FN' => 'User2 @ example.com',
298298
'EMAIL' => [
299299
],
300300
],
301301
[
302302
'UID' => 'uid1',
303-
'FN' => 'User @ Localhost',
303+
'FN' => 'User @ example.com',
304304
'EMAIL' => [
305-
'username@localhost',
305+
'username@example.com',
306306
],
307307
],
308308
],
309309
true,
310-
['emails' => [], 'exact' => ['emails' => [['name' => 'User @ Localhost', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@localhost']]]]],
310+
['emails' => [], 'exact' => ['emails' => [['name' => 'User @ example.com', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]]]],
311311
true,
312312
false,
313313
false,
314314
],
315315
// data set 10
316316
[
317-
'username@localhost',
317+
'username@example.com',
318318
[
319319
[
320320
'UID' => 'uid1',
321-
'FN' => 'User3 @ Localhost',
321+
'FN' => 'User3 @ example.com',
322322
],
323323
[
324324
'UID' => 'uid2',
325-
'FN' => 'User2 @ Localhost',
325+
'FN' => 'User2 @ example.com',
326326
'EMAIL' => [
327327
],
328328
],
329329
[
330330
'UID' => 'uid1',
331-
'FN' => 'User @ Localhost',
331+
'FN' => 'User @ example.com',
332332
'EMAIL' => [
333-
'username@localhost',
333+
'username@example.com',
334334
],
335335
],
336336
],
337337
false,
338-
['emails' => [], 'exact' => ['emails' => [['name' => 'User @ Localhost', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@localhost']]]]],
338+
['emails' => [], 'exact' => ['emails' => [['name' => 'User @ example.com', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]]]],
339339
true,
340340
false,
341341
false,
@@ -364,8 +364,8 @@ public function dataGetEmail() {
364364
],
365365
],
366366
false,
367-
['emails' => [], 'exact' => ['emails' => [['name' => 'User Name @ Localhost', 'uuid' => 'uid1', 'type' => '', 'label' => 'User Name @ Localhost (user name@localhost)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'user name@localhost']]]]],
368-
true,
367+
['emails' => [], 'exact' => ['emails' => []]],
368+
false,
369369
false,
370370
false,
371371
],
@@ -538,16 +538,16 @@ public function dataGetEmail() {
538538
'UID' => 'uid1',
539539
'FN' => 'User Name',
540540
'EMAIL' => [
541-
['type' => 'HOME', 'value' => 'username@localhost'],
542-
['type' => 'WORK', 'value' => 'username@other'],
541+
['type' => 'HOME', 'value' => 'username@example.com'],
542+
['type' => 'WORK', 'value' => 'other@example.com'],
543543
],
544544
],
545545
],
546546
false,
547547
['emails' => [
548548
], 'exact' => ['emails' => [
549-
['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'HOME', 'label' => 'User Name (username@localhost)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@localhost']],
550-
['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'WORK', 'label' => 'User Name (username@other)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@other']]
549+
['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'HOME', 'label' => 'User Name (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']],
550+
['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'WORK', 'label' => 'User Name (other@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'other@example.com']]
551551
]]],
552552
false,
553553
false,

0 commit comments

Comments
 (0)