Properly search for users when limittogroups is enabled #20772

rullzer · 2020-05-01T14:39:11Z

Searching just for the uid is not enough.
This makes sure this done properly again now.

Actually fixes a valid failure in the integrationtests...

rullzer · 2020-05-04T07:51:44Z

To test

limit users to share only in their own groups
create a group TestGroup
create a user TestUser that belongs to TestGroup
create a user TestUser2 that belongs as well to TestGroup

Now as TestUser search the sharee endpoint for 'test'

Before:

see the group but not the user

After:

see both

lib/private/Collaboration/Collaborators/UserPlugin.php

nickvergessen · 2020-05-04T10:01:28Z

I can not reproduce the failure before the patch so unwilling to approve the fix, but at least it is not breaking something.

rullzer · 2020-05-04T10:46:43Z

Ok let me try to explain. Basically it does boom because of:

server/lib/private/Group/Group.php

Line 310 in 5bf3d1b

$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);

Which goes to:

server/lib/private/Group/Database.php

Line 333 in 5bf3d1b

public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {

Now there are 2 issues here

It doesn't search in displaynames (despite the method names)
it does a regular like. Which is case sensitive.

The new way will actually search displaynames as well. Which is what you want.

skjnldsv

Smarter!

MorrisJobke

Tested and works 👍

rullzer · 2020-05-06T19:08:10Z

Ok it seems I just don't get the tests...
@MorrisJobke @nickvergessen could one of you have a look and try?

rullzer · 2020-05-06T20:06:40Z

/backport to stable19

MorrisJobke · 2020-08-20T13:43:10Z

Underlying code was changed with #21452

MorrisJobke · 2020-08-20T13:51:15Z

I merged the changes from this PR with the enhancements from #21452 to also filter out disabled users properly.

Ready for review.

MorrisJobke

Tested and works 👍

MorrisJobke · 2020-08-20T16:28:12Z

What?

/github/workspace/apps/user_status/lib/Db/UserStatusMapper.php:84:41:error - ImplicitToStringCast: Argument 2 of OCP\DB\QueryBuilder\IExpressionBuilder::notIn expects array<array-key, mixed>|string, OCP\DB\QueryBuilder\IParameter provided with a __toString method

MorrisJobke · 2020-08-20T16:28:23Z

Seems that this came in via another PR.

faily-bot · 2020-08-20T18:28:53Z

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 32117: failure

sqlite

Show full log

There was 1 error:

1) OCA\Files_Sharing\Tests\SharedMountTest::testPermissionMovedGroupShare with data set #20 ('folder', 1, 11)
Error: Call to a member function getMountPoint() on null

/drone/src/lib/private/Share20/Manager.php:304
/drone/src/lib/private/Share20/Manager.php:705
/drone/src/apps/files_sharing/tests/TestCase.php:255
/drone/src/apps/files_sharing/tests/SharedMountTest.php:355

--

There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

mysql8.0-php7.2

cancelled - typically means that the tests took longer than the drone CI allows them to run

acceptance-app-files

tests/acceptance/features/app-files.feature:262

Show full log

  Scenario: unmarking a file as favorite causes the file list to be sorted again                          # /drone/src/tests/acceptance/features/app-files.feature:262
    Given I am logged in                                                                                  # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "A name alphabetically lower than welcome.txt"                        # FileListContext::iCreateANewFolderNamed()
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    And I close the details view                                                                          # FilesAppContext::iCloseTheDetailsView()
    And I see that the details view is closed                                                             # FilesAppContext::iSeeThatTheDetailsViewIsClosed()
    And I mark "welcome.txt" as favorite                                                                  # FileListContext::iMarkAsFavorite()
    And I see that "welcome.txt" is marked as favorite                                                    # FileListContext::iSeeThatIsMarkedAsFavorite()
    And I see that "welcome.txt" precedes "A name alphabetically lower than welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    When I unmark "welcome.txt" as favorite                                                               # FileListContext::iUnmarkAsFavorite()
    Then I see that "welcome.txt" is not marked as favorite                                               # FileListContext::iSeeThatIsNotMarkedAsFavorite()
      Not favorited state icon for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()

MorrisJobke · 2020-08-20T19:22:26Z

Seems that this came in via another PR.

It isn't on master :/

MorrisJobke · 2020-08-20T19:22:39Z

@kesselb Any idea?

kesselb · 2020-08-20T19:27:13Z

@MorrisJobke similar to #22257. But warning is unrelated to this pr.

MorrisJobke · 2020-08-21T10:58:50Z

@MorrisJobke similar to #22257. But warning is unrelated to this pr.

Unfortunately this doesn't show up locally :/

Searching just for the uid is not enough. This makes sure this done properly again now. Signed-off-by: Roeland Jago Douma <[email protected]>

…ed to contain more results Signed-off-by: Morris Jobke <[email protected]>

MorrisJobke · 2020-08-21T11:18:43Z

Actually it was fixed in master -> merging then.

backportbot-nextcloud · 2020-08-21T11:20:54Z

The backport to test failed. Please do this backport manually.

rullzer added bug 3. to review Waiting for reviews labels May 1, 2020

rullzer added this to the Nextcloud 19 milestone May 1, 2020

rullzer requested review from danxuliu, juliusknorr and nickvergessen May 1, 2020 14:39

skjnldsv approved these changes May 1, 2020

View reviewed changes

rullzer mentioned this pull request May 2, 2020

19 beta 7 #20754

Merged

2 tasks

nickvergessen reviewed May 4, 2020

View reviewed changes

lib/private/Collaboration/Collaborators/UserPlugin.php Outdated Show resolved Hide resolved

nickvergessen force-pushed the fix/sharee-integration-test branch from 550657d to c9e4e27 Compare May 4, 2020 09:56

skjnldsv approved these changes May 4, 2020

View reviewed changes

rullzer mentioned this pull request May 4, 2020

19 RC1 #20823

Merged

3 tasks

MorrisJobke approved these changes May 6, 2020

View reviewed changes

This comment has been minimized.

Sign in to view

rullzer modified the milestones: Nextcloud 19, Nextcloud 20 May 6, 2020

backportbot-nextcloud bot added the backport-request label May 6, 2020

MorrisJobke mentioned this pull request Aug 11, 2020

20.0.0 Beta 1 #22188

Merged

57 tasks

MorrisJobke force-pushed the fix/sharee-integration-test branch from c9e4e27 to 4054c47 Compare August 20, 2020 13:50

MorrisJobke approved these changes Aug 20, 2020

View reviewed changes

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 20, 2020

MorrisJobke mentioned this pull request Aug 20, 2020

Fix psalm warnings #22342

Merged

rullzer mentioned this pull request Aug 21, 2020

20 Beta 2 #22352

Merged

19 tasks

rullzer and others added 2 commits August 21, 2020 13:14

Properly search for users when limittogroups is enabled

51922ca

Searching just for the uid is not enough. This makes sure this done properly again now. Signed-off-by: Roeland Jago Douma <[email protected]>

In case the group backend returns $limit or more results it is expect…

a0cbf16

…ed to contain more results Signed-off-by: Morris Jobke <[email protected]>

MorrisJobke force-pushed the fix/sharee-integration-test branch 2 times, most recently from 4c9e8d5 to a0cbf16 Compare August 21, 2020 11:18

MorrisJobke merged commit 8261d7e into master Aug 21, 2020

MorrisJobke deleted the fix/sharee-integration-test branch August 21, 2020 11:18

backportbot-nextcloud bot mentioned this pull request Aug 21, 2020

[stable19] Properly search for users when limittogroups is enabled #22355

Merged

MorrisJobke removed the backport-request label Sep 7, 2020

Uh oh!

Properly search for users when limittogroups is enabled #20772

Properly search for users when limittogroups is enabled #20772

Uh oh!

Conversation

rullzer commented May 1, 2020

Uh oh!

rullzer commented May 4, 2020

Uh oh!

Uh oh!

nickvergessen commented May 4, 2020

Uh oh!

rullzer commented May 4, 2020

Uh oh!

skjnldsv left a comment

Choose a reason for hiding this comment

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

rullzer commented May 6, 2020

Uh oh!

rullzer commented May 6, 2020

Uh oh!

MorrisJobke commented Aug 20, 2020

Uh oh!

MorrisJobke commented Aug 20, 2020

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Aug 20, 2020

Uh oh!

MorrisJobke commented Aug 20, 2020

Uh oh!

faily-bot bot commented Aug 20, 2020

Status of 32117: failure

sqlite

mysql8.0-php7.2

acceptance-app-files

Uh oh!

MorrisJobke commented Aug 20, 2020

Uh oh!

MorrisJobke commented Aug 20, 2020

Uh oh!

kesselb commented Aug 20, 2020

Uh oh!

MorrisJobke commented Aug 21, 2020

Uh oh!

MorrisJobke commented Aug 21, 2020

Uh oh!

backportbot-nextcloud bot commented Aug 21, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants