Properly search for users when limittogroups is enabled

[rullzer]

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]

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

[nickvergessen]

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

[rullzer]

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

1. It doesn't search in displaynames (despite the method names)
2. 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]

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

[rullzer]

/backport to stable19

[MorrisJobke]

Underlying code was changed with #21452

[MorrisJobke]

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]

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]

Seems that this came in via another PR.

[faily-bot]

🤖 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]

Seems that this came in via another PR.

It isn't on master :/

[MorrisJobke]

@kesselb Any idea?

[kesselb]

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

[MorrisJobke]

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

Unfortunately this doesn't show up locally :/

[MorrisJobke]

Actually it was fixed in master -> merging then.

[backportbot-nextcloud]

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