mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21419 from nextcloud/backport/21408/stable19 

[stable19] Avoid duplicate matches in wide and exact results
This commit is contained in:
blizzz 2020-06-15 23:55:32 +02:00 committed by GitHub
parent 08a03b65ae 21bc4b3cad
commit 5c467fccd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/private/Collaboration/Collaborators/UserPlugin.php
View File

@ -71,7 +71,6 @@ class UserPlugin implements ISearchPlugin {
public function search($search, $limit, $offset, ISearchResult $searchResult) {
$result = ['wide' => [], 'exact' => []];
$users = [];
$autoCompleteUsers = [];
$hasMoreResults = false;
$userGroups = [];
@ -91,28 +90,6 @@ class UserPlugin implements ISearchPlugin {
foreach ($usersTmp as $user) {
if ($user->isEnabled()) { // Don't keep deactivated users
$users[$user->getUID()] = $user;
$addToWideResults = false;
if ($this->shareeEnumeration && !$this->shareeEnumerationInGroupOnly) {
$addToWideResults = true;
}
if ($this->shareeEnumerationInGroupOnly) {
$commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
if (!empty($commonGroups)) {
$addToWideResults = true;
}
}
if ($addToWideResults) {
$autoCompleteUsers[] = [
'label' => $user->getDisplayName(),
'value' => [
'shareType' => IShare::TYPE_USER,
'shareWith' => (string)$user->getUID(),
],
];
}
}
}
}
@ -145,15 +122,29 @@ class UserPlugin implements ISearchPlugin {
],
];
} else {
$addToWideResults = false;
if ($this->shareeEnumeration && !$this->shareeEnumerationInGroupOnly) {
$addToWideResults = true;
}
if ($this->shareeEnumerationInGroupOnly) {
$commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
if (!empty($commonGroups)) {
$addToWideResults = true;
}
}
if ($addToWideResults) {
$result['wide'][] = [
'label' => $userDisplayName,
'value' => [
'shareType' => Share::SHARE_TYPE_USER,
'shareType' => IShare::TYPE_USER,
'shareWith' => $uid,
],
];
}
}
}
if ($offset === 0 && !$foundUserById) {
// On page one we try if the search result has a direct hit on the
@ -183,10 +174,7 @@ class UserPlugin implements ISearchPlugin {
}
}
// overwrite wide matches if they are limited
if (!$this->shareeEnumeration || $this->shareeEnumerationInGroupOnly) {
$result['wide'] = $autoCompleteUsers;
}
$type = new SearchResultType('users');
$searchResult->addResultSet($type, $result['wide'], $result['exact']);

41
tests/lib/Collaboration/Collaborators/UserPluginTest.php
View File

@ -522,7 +522,16 @@ class UserPluginTest extends TestCase {
['uid' => 'test1', 'groups' => ['groupA']],
['uid' => 'test2', 'groups' => ['groupB']],
],
['test1'],
['exact' => [], 'wide' => ['test1']],
],
[
'test1',
['groupA'],
[
['uid' => 'test1', 'groups' => ['groupA']],
['uid' => 'test2', 'groups' => ['groupB']],
],
['exact' => ['test1'], 'wide' => []],
],
[
'test',
@ -531,7 +540,7 @@ class UserPluginTest extends TestCase {
['uid' => 'test1', 'groups' => ['groupA']],
['uid' => 'test2', 'groups' => ['groupB', 'groupA']],
],
['test1', 'test2'],
['exact' => [], 'wide' => ['test1', 'test2']],
],
[
'test',
@ -540,7 +549,7 @@ class UserPluginTest extends TestCase {
['uid' => 'test1', 'groups' => ['groupA', 'groupC']],
['uid' => 'test2', 'groups' => ['groupB', 'groupA']],
],
['test1', 'test2'],
['exact' => [], 'wide' => ['test1', 'test2']],
],
[
'test',
@ -549,7 +558,7 @@ class UserPluginTest extends TestCase {
['uid' => 'test1', 'groups' => ['groupA', 'groupC']],
['uid' => 'test2', 'groups' => ['groupB', 'groupA']],
],
['test1', 'test2'],
['exact' => [], 'wide' => ['test1', 'test2']],
],
[
'test',
@ -558,7 +567,7 @@ class UserPluginTest extends TestCase {
['uid' => 'test1', 'groups' => ['groupA']],
['uid' => 'test2', 'groups' => ['groupB', 'groupA']],
],
[],
['exact' => [], 'wide' => []],
],
[
'test',
@ -567,7 +576,16 @@ class UserPluginTest extends TestCase {
['uid' => 'test1', 'groups' => []],
['uid' => 'test2', 'groups' => []],
],
[],
['exact' => [], 'wide' => []],
],
[
'test',
['groupC', 'groupB'],
[
['uid' => 'test1', 'groups' => []],
['uid' => 'test2', 'groups' => []],
],
['exact' => [], 'wide' => []],
],
];
}
@ -582,9 +600,12 @@ class UserPluginTest extends TestCase {
return $this->getUserMock($user['uid'], $user['uid']);
}, $matchingUsers);
$mappedResult = array_map(function ($user) {
$mappedResultExact = array_map(function ($user) {
return ['label' => $user, 'value' => ['shareType' => 0, 'shareWith' => $user]];
}, $result);
}, $result['exact']);
$mappedResultWide = array_map(function ($user) {
return ['label' => $user, 'value' => ['shareType' => 0, 'shareWith' => $user]];
}, $result['wide']);
$this->userManager->expects($this->once())
->method('searchDisplayName')
@ -615,7 +636,7 @@ class UserPluginTest extends TestCase {
$this->plugin->search($search, $this->limit, $this->offset, $this->searchResult);
$result = $this->searchResult->asArray();
$this->assertEquals([], $result['exact']['users']);
$this->assertEquals($mappedResult, $result['users']);
$this->assertEquals($mappedResultExact, $result['exact']['users']);
$this->assertEquals($mappedResultWide, $result['users']);
}
}