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

Merge pull request #21538 from nextcloud/backport/21452/stable19 

[stable19] Fix autocomplete for LDAP with `shareapi_only_share_with_group_members` on
This commit is contained in:
Joas Schilling 2020-07-01 10:13:19 +02:00 committed by GitHub
parent c0b3cd90a6 d1df66f7af
commit 9e9e74736d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/integration/sharees_features/sharees.feature
View File

@ -72,6 +72,23 @@ Feature: sharees
And "exact remotes" sharees returned is empty And "exact remotes" sharees returned is empty
And "remotes" sharees returned is empty And "remotes" sharees returned is empty
Scenario: Search only with group members - allowed with exact match
Given As an "test"
And parameter "shareapi_only_share_with_group_members" of app "core" is set to "yes"
And user "Sharee1" belongs to group "ShareeGroup"
When getting sharees for
| search | Sharee1 |
| itemType | file |
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And "exact users" sharees returned are
| Sharee1 | 0 | Sharee1 |
And "users" sharees returned is empty
And "exact groups" sharees returned is empty
And "groups" sharees returned is empty
And "exact remotes" sharees returned is empty
And "remotes" sharees returned is empty
Scenario: Search only with group members - no group as non-member Scenario: Search only with group members - no group as non-member
Given As an "Sharee1" Given As an "Sharee1"
And parameter "shareapi_only_share_with_group_members" of app "core" is set to "yes" And parameter "shareapi_only_share_with_group_members" of app "core" is set to "yes"

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

@ -33,7 +33,6 @@ use OCP\Collaboration\Collaborators\ISearchPlugin;
use OCP\Collaboration\Collaborators\ISearchResult; use OCP\Collaboration\Collaborators\ISearchResult;
use OCP\Collaboration\Collaborators\SearchResultType; use OCP\Collaboration\Collaborators\SearchResultType;
use OCP\IConfig; use OCP\IConfig;
use OCP\IGroup;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IUser; use OCP\IUser;
use OCP\IUserManager; use OCP\IUserManager;
@ -73,20 +72,19 @@ class UserPlugin implements ISearchPlugin {
$users = []; $users = [];
$hasMoreResults = false; $hasMoreResults = false;
$userGroups = []; $currentUserGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
if ($this->shareWithGroupOnly) { if ($this->shareWithGroupOnly) {
// Search in all the groups this user is part of // Search in all the groups this user is part of
$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser()); foreach ($currentUserGroups as $userGroupId) {
foreach ($userGroups as $userGroup) { $usersInGroup = $this->groupManager->displayNamesInGroup($userGroupId, $search, $limit, $offset);
$usersInGroup = $userGroup->searchDisplayName($search, $limit, $offset); foreach ($usersInGroup as $userId => $displayName) {
foreach ($usersInGroup as $user) { $userId = (string) $userId;
$users[$user->getUID()] = $user; $users[$userId] = $this->userManager->get($userId);
} }
} }
} else { } else {
// Search in all users // Search in all users
$usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset); $usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);
$currentUserGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
foreach ($usersTmp as $user) { foreach ($usersTmp as $user) {
if ($user->isEnabled()) { // Don't keep deactivated users if ($user->isEnabled()) { // Don't keep deactivated users
$users[$user->getUID()] = $user; $users[$user->getUID()] = $user;
@ -155,10 +153,7 @@ class UserPlugin implements ISearchPlugin {
if ($this->shareWithGroupOnly) { if ($this->shareWithGroupOnly) {
// Only add, if we have a common group // Only add, if we have a common group
$userGroupIds = array_map(function (IGroup $group) { $commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
return $group->getGID();
}, $userGroups);
$commonGroups = array_intersect($userGroupIds, $this->groupManager->getUserGroupIds($user));
$addUser = !empty($commonGroups); $addUser = !empty($commonGroups);
} }

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

@ -275,7 +275,7 @@ class UserPluginTest extends TestCase {
true, true,
['abc', 'xyz'], ['abc', 'xyz'],
[ [
['abc', 'test', 2, 0, [$this->getUserMock('test1', 'Test One')]], ['abc', 'test', 2, 0, ['test1' => 'Test One']],
['xyz', 'test', 2, 0, []], ['xyz', 'test', 2, 0, []],
], ],
[], [],
@ -284,6 +284,7 @@ class UserPluginTest extends TestCase {
], ],
true, true,
false, false,
[['test1', $this->getUserMock('test1', 'Test One')]],
], ],
[ [
'test', 'test',
@ -291,13 +292,14 @@ class UserPluginTest extends TestCase {
false, false,
['abc', 'xyz'], ['abc', 'xyz'],
[ [
['abc', 'test', 2, 0, [$this->getUserMock('test1', 'Test One')]], ['abc', 'test', 2, 0, ['test1' => 'Test One']],
['xyz', 'test', 2, 0, []], ['xyz', 'test', 2, 0, []],
], ],
[], [],
[], [],
true, true,
false, false,
[['test1', $this->getUserMock('test1', 'Test One')]],
], ],
[ [
'test', 'test',
@ -306,12 +308,12 @@ class UserPluginTest extends TestCase {
['abc', 'xyz'], ['abc', 'xyz'],
[ [
['abc', 'test', 2, 0, [ ['abc', 'test', 2, 0, [
$this->getUserMock('test1', 'Test One'), 'test1' => 'Test One',
$this->getUserMock('test2', 'Test Two'), 'test2' => 'Test Two',
]], ]],
['xyz', 'test', 2, 0, [ ['xyz', 'test', 2, 0, [
$this->getUserMock('test1', 'Test One'), 'test1' => 'Test One',
$this->getUserMock('test2', 'Test Two'), 'test2' => 'Test Two',
]], ]],
], ],
[], [],
@ -321,6 +323,10 @@ class UserPluginTest extends TestCase {
], ],
false, false,
false, false,
[
['test1', $this->getUserMock('test1', 'Test One')],
['test2', $this->getUserMock('test2', 'Test Two')],
],
], ],
[ [
'test', 'test',
@ -329,18 +335,22 @@ class UserPluginTest extends TestCase {
['abc', 'xyz'], ['abc', 'xyz'],
[ [
['abc', 'test', 2, 0, [ ['abc', 'test', 2, 0, [
$this->getUserMock('test1', 'Test One'), 'test1' => 'Test One',
$this->getUserMock('test2', 'Test Two'), 'test2' => 'Test Two',
]], ]],
['xyz', 'test', 2, 0, [ ['xyz', 'test', 2, 0, [
$this->getUserMock('test1', 'Test One'), 'test1' => 'Test One',
$this->getUserMock('test2', 'Test Two'), 'test2' => 'Test Two',
]], ]],
], ],
[], [],
[], [],
true, true,
false, false,
[
['test1', $this->getUserMock('test1', 'Test One')],
['test2', $this->getUserMock('test2', 'Test Two')],
],
], ],
[ [
'test', 'test',
@ -349,10 +359,10 @@ class UserPluginTest extends TestCase {
['abc', 'xyz'], ['abc', 'xyz'],
[ [
['abc', 'test', 2, 0, [ ['abc', 'test', 2, 0, [
$this->getUserMock('test', 'Test One'), 'test' => 'Test One',
]], ]],
['xyz', 'test', 2, 0, [ ['xyz', 'test', 2, 0, [
$this->getUserMock('test2', 'Test Two'), 'test2' => 'Test Two',
]], ]],
], ],
[ [
@ -363,6 +373,10 @@ class UserPluginTest extends TestCase {
], ],
false, false,
false, false,
[
['test', $this->getUserMock('test', 'Test One')],
['test2', $this->getUserMock('test2', 'Test Two')],
],
], ],
[ [
'test', 'test',
@ -371,10 +385,10 @@ class UserPluginTest extends TestCase {
['abc', 'xyz'], ['abc', 'xyz'],
[ [
['abc', 'test', 2, 0, [ ['abc', 'test', 2, 0, [
$this->getUserMock('test', 'Test One'), 'test' => 'Test One',
]], ]],
['xyz', 'test', 2, 0, [ ['xyz', 'test', 2, 0, [
$this->getUserMock('test2', 'Test Two'), 'test2' => 'Test Two',
]], ]],
], ],
[ [
@ -383,6 +397,10 @@ class UserPluginTest extends TestCase {
[], [],
true, true,
false, false,
[
['test', $this->getUserMock('test', 'Test One')],
['test2', $this->getUserMock('test2', 'Test Two')],
],
], ],
]; ];
} }
@ -399,6 +417,7 @@ class UserPluginTest extends TestCase {
* @param array $expected * @param array $expected
* @param bool $reachedEnd * @param bool $reachedEnd
* @param bool|IUser $singleUser * @param bool|IUser $singleUser
* @param array $users
*/ */
public function testSearch( public function testSearch(
$searchTerm, $searchTerm,
@ -409,7 +428,8 @@ class UserPluginTest extends TestCase {
array $exactExpected, array $exactExpected,
array $expected, array $expected,
$reachedEnd, $reachedEnd,
$singleUser $singleUser,
array $users = []
) { ) {
$this->mockConfig($shareWithGroupOnly, $shareeEnumeration, false); $this->mockConfig($shareWithGroupOnly, $shareeEnumeration, false);
$this->instantiatePlugin(); $this->instantiatePlugin();
@ -424,39 +444,29 @@ class UserPluginTest extends TestCase {
->with($searchTerm, $this->limit, $this->offset) ->with($searchTerm, $this->limit, $this->offset)
->willReturn($userResponse); ->willReturn($userResponse);
} else { } else {
$groups = array_combine($groupResponse, array_map(function ($gid) { $this->groupManager->method('getUserGroupIds')
return $this->getGroupMock($gid); ->with($this->user)
}, $groupResponse)); ->willReturn($groupResponse);
if ($singleUser !== false) {
$this->groupManager->method('getUserGroups')
->with($this->user)
->willReturn($groups);
if ($singleUser !== false) {
$this->groupManager->method('getUserGroupIds') $this->groupManager->method('getUserGroupIds')
->with($singleUser) ->with($singleUser)
->willReturn($groupResponse); ->willReturn($groupResponse);
} else {
$this->groupManager->expects($this->once())
->method('getUserGroups')
->with($this->user)
->willReturn($groups);
} }
foreach ($userResponse as $groupDefinition) { $this->groupManager->method('displayNamesInGroup')
[$gid, $search, $limit, $offset, $users] = $groupDefinition; ->willReturnMap($userResponse);
$groups[$gid]->method('searchDisplayName')
->with($search, $limit, $offset)
->willReturn($users);
}
} }
if ($singleUser !== false) { if ($singleUser !== false) {
$this->userManager->expects($this->once()) $users[] = [$searchTerm, $singleUser];
->method('get')
->with($searchTerm)
->willReturn($singleUser);
} }
if (!empty($users)) {
$this->userManager->expects($this->atLeastOnce())
->method('get')
->willReturnMap($users);
}
$moreResults = $this->plugin->search($searchTerm, $this->limit, $this->offset, $this->searchResult); $moreResults = $this->plugin->search($searchTerm, $this->limit, $this->offset, $this->searchResult);
$result = $this->searchResult->asArray(); $result = $this->searchResult->asArray();