Thanks to visit codestin.com
Credit goes to github.com

Skip to content

LDAP: when nesting is not enabled, the group filter can be applied right away#23566

Merged
blizzz merged 2 commits intomasterfrom
fix/noid/groupsbymember-apply-group-filter-early-if-possible
Oct 19, 2020
Merged

LDAP: when nesting is not enabled, the group filter can be applied right away#23566
blizzz merged 2 commits intomasterfrom
fix/noid/groupsbymember-apply-group-filter-early-if-possible

Conversation

@blizzz
Copy link
Member

@blizzz blizzz commented Oct 19, 2020

When fetcher user groups, we may take groups into account that do not match the filter. This is necessary when using nesting and have intermediate groups, which members still ought to be pulled in. When nesting is not enabled, though, we can save the overhead.

  • helps performance, but skipping unnecessary entries
  • reduces reoccuring info-level log output against groups that do not
    qualify ("no or empty name")

@blizzz blizzz added this to the Nextcloud 21 milestone Oct 19, 2020
@blizzz blizzz force-pushed the fix/noid/groupsbymember-apply-group-filter-early-if-possible branch from 44db54f to 9e6ef0b Compare October 19, 2020 11:37
blizzz added 2 commits October 19, 2020 13:44
@blizzz
when nesting is not enabled, the group filter can be applied right away
d741c5a 
- helps performance, but skipping unnecessary entries
- reduces reoccuring info-level log output against groups that do not
  qualify ("no or empty name")

Signed-off-by: Arthur Schiwon <[email protected]>
@blizzz
tame psalm. why does it ignore '@Property'?
2ee26b6 
Signed-off-by: Arthur Schiwon <[email protected]>
@blizzz blizzz force-pushed the fix/noid/groupsbymember-apply-group-filter-early-if-possible branch from 9e6ef0b to 2ee26b6 Compare October 19, 2020 11:44
MorrisJobke
MorrisJobke approved these changes Oct 19, 2020
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good 👍

@blizzz blizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 19, 2020
@blizzz
Copy link
Member Author

blizzz commented Oct 19, 2020

/backport to stable20

@blizzz
Copy link
Member Author

blizzz commented Oct 19, 2020

/backport to stable19

@faily-bot
Copy link

faily-bot bot commented Oct 19, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 34347: failure

acceptance-app-files-sharing

  • tests/acceptance/features/app-files-sharing.feature:338
Show full log 
  Scenario: sharee can revoke create permission from reshare after the sharer disabled it # /drone/src/tests/acceptance/features/app-files-sharing.feature:338
    Given I act as John                                                                   # ActorContext::iActAs()
    And I am logged in as the admin                                                       # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I act as Jane                                                                     # ActorContext::iActAs()
    And I am logged in                                                                    # LoginPageContext::iAmLoggedIn()
    And I act as Jim                                                                      # ActorContext::iActAs()
    And I am logged in as "user1"                                                         # LoginPageContext::iAmLoggedInAs()
    And I act as John                                                                     # ActorContext::iActAs()
    And I create a new folder named "Shared folder"                                       # FileListContext::iCreateANewFolderNamed()
    And I see that the file list contains a file named "Shared folder"                    # FileListContext::iSeeThatTheFileListContainsAFileNamed()
    And I share "Shared folder" with "user0"                                              # FilesAppSharingContext::iShareWith()
    And I see that the file is shared with "user0"                                        # FilesAppSharingContext::iSeeThatTheFileIsSharedWith()
    And I act as Jane                                                                     # ActorContext::iActAs()
    And I open the Files app                                                              # FilesAppContext::iOpenTheFilesApp()
    And I share "Shared folder" with "user1"                                              # FilesAppSharingContext::iShareWith()
    And I see that the file is shared with "user1"                                        # FilesAppSharingContext::iSeeThatTheFileIsSharedWith()
    And I act as John                                                                     # ActorContext::iActAs()
    And I set the share with "user0" as not creatable                                     # FilesAppSharingContext::iSetTheShareWithAsNotCreatable()
    And I see that "user0" can not create in the share                                    # FilesAppSharingContext::iSeeThatCanNotCreateInTheShare()
    And I act as Jim                                                                      # ActorContext::iActAs()
    And I open the Files app                                                              # FilesAppContext::iOpenTheFilesApp()
    And I enter in the folder named "Shared folder"                                       # FileListContext::iEnterInTheFolderNamed()
    And I create a new folder named "Subfolder"                                           # FileListContext::iCreateANewFolderNamed()
    And I see that the file list contains a file named "Subfolder"                        # FileListContext::iSeeThatTheFileListContainsAFileNamed()
    When I act as Jane                                                                    # ActorContext::iActAs()
    And I open the Files app                                                              # FilesAppContext::iOpenTheFilesApp()
    And I open the details view for "Shared folder"                                       # FileListContext::iOpenTheDetailsViewFor()
    And I see that the details view is open                                               # FilesAppContext::iSeeThatTheDetailsViewIsOpen()
    And I open the "Sharing" tab in the details view                                      # FilesAppContext::iOpenTheTabInTheDetailsView()
    And I see that the "Sharing" tab in the details view is eventually loaded             # FilesAppContext::iSeeThatTheTabInTheDetailsViewIsEventuallyLoaded()
    And I set the share with "user1" as not creatable                                     # FilesAppSharingContext::iSetTheShareWithAsNotCreatable()
    Then I see that "user1" can not create in the share                                   # FilesAppSharingContext::iSeeThatCanNotCreateInTheShare()
    And I see that "user1" can not be allowed to create in the share                      # FilesAppSharingContext::iSeeThatCanNotBeAllowedToCreateInTheShare()
    And I act as Jim                                                                      # ActorContext::iActAs()
    And I open the Files app                                                              # FilesAppContext::iOpenTheFilesApp()
    And I enter in the folder named "Shared folder"                                       # FileListContext::iEnterInTheFolderNamed()
    And I see that it is not possible to create new files                                 # FileListContext::iSeeThatItIsNotPossibleToCreateNewFiles()
      Failed asserting that true is false.

@blizzz blizzz merged commit 6d2471d into master Oct 19, 2020
@blizzz blizzz deleted the fix/noid/groupsbymember-apply-group-filter-early-if-possible branch October 19, 2020 13:34
This was referenced Oct 19, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@tofuSCHNITZEL tofuSCHNITZEL Awaiting requested review from tofuSCHNITZEL

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish bug feature: ldap

Projects

None yet

Milestone

Nextcloud 21

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz @MorrisJobke @skjnldsv