Skip to content

[stable19] shortcut in reading nested group members when IN_CHAIN is available #22203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
blizzz merged 3 commits into from
Aug 12, 2020
Merged

[stable19] shortcut in reading nested group members when IN_CHAIN is available #22203

blizzz merged 3 commits into from
Aug 12, 2020

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Aug 11, 2020 •
edited by blizzz
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #21559

@blizzz @backportbot
LDAP: shortcut in reading nested group members when IN_CHAIN is avail…
74bde3e 
…able

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 19.0.2 milestone Aug 11, 2020
@blizzz
do not flip available state to unavailable, allow empty results
ebb565f 
- the detection relies that the first, requested result is not empty
- it might be empty though – groups without members
- protect switching from available to unavailable
  - switching the other way around was also not envisaged either

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz blizzz force-pushed the backport/21559/stable19 branch from 223cd33 to ebb565f Compare August 11, 2020 22:34
@blizzz
adapt tests for nc19
8fd5755 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
skjnldsv
skjnldsv approved these changes Aug 12, 2020
View reviewed changes
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

🐘

@blizzz blizzz added the 4. to release Ready to be released and/or waiting for tests to finish label Aug 12, 2020
@faily-bot
Copy link

faily-bot bot commented Aug 12, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31679: failure

integration-provisioning-v2

  • build/integration/features/provisioning-v2.feature:22
Show full log 
  Scenario: Searching by displayname in groups                                                    # /drone/src/build/integration/features/provisioning-v2.feature:22
    Given As an "admin"                                                                           # FeatureContext::asAn()
[Wed Aug 12 08:47:41 2020] 127.0.0.1:53982 [404]: /ocs/v2.php/cloud/users/user-in-group
[Wed Aug 12 08:47:42 2020] 127.0.0.1:54010 [200]: /ocs/v2.php/cloud/users
[Wed Aug 12 08:47:43 2020] 127.0.0.1:54094 [200]: /ocs/v2.php/cloud/users/user-in-group
[Wed Aug 12 08:47:43 2020] 127.0.0.1:54138 [200]: /ocs/v2.php/cloud/users/user-in-group
    And user "user-in-group" with displayname "specific-name" exists                              # FeatureContext::assureUserWithDisplaynameExists()
[Wed Aug 12 08:47:43 2020] 127.0.0.1:54160 [404]: /ocs/v2.php/cloud/users/user-in-group2
[Wed Aug 12 08:47:44 2020] 127.0.0.1:54178 [200]: /ocs/v2.php/cloud/users
[Wed Aug 12 08:47:44 2020] 127.0.0.1:54234 [200]: /ocs/v2.php/cloud/users/user-in-group2
[Wed Aug 12 08:47:44 2020] 127.0.0.1:54264 [200]: /ocs/v2.php/cloud/users/user-in-group2
    And user "user-in-group2" with displayname "another-name" exists                              # FeatureContext::assureUserWithDisplaynameExists()
[Wed Aug 12 08:47:45 2020] 127.0.0.1:54286 [404]: /ocs/v2.php/cloud/users/user-not-in-group
[Wed Aug 12 08:47:45 2020] 127.0.0.1:54310 [200]: /ocs/v2.php/cloud/users
[Wed Aug 12 08:47:46 2020] 127.0.0.1:54354 [200]: /ocs/v2.php/cloud/users/user-not-in-group
[Wed Aug 12 08:47:46 2020] 127.0.0.1:54378 [200]: /ocs/v2.php/cloud/users/user-not-in-group
    And user "user-not-in-group" with displayname "specific-name" exists                          # FeatureContext::assureUserWithDisplaynameExists()
[Wed Aug 12 08:47:46 2020] 127.0.0.1:54400 [404]: /ocs/v2.php/cloud/users/user-not-in-group2
[Wed Aug 12 08:47:47 2020] 127.0.0.1:54424 [200]: /ocs/v2.php/cloud/users
[Wed Aug 12 08:47:47 2020] 127.0.0.1:54466 [200]: /ocs/v2.php/cloud/users/user-not-in-group2
[Wed Aug 12 08:47:48 2020] 127.0.0.1:54482 [200]: /ocs/v2.php/cloud/users/user-not-in-group2
    And user "user-not-in-group2" with displayname "another-name" exists                          # FeatureContext::assureUserWithDisplaynameExists()
[Wed Aug 12 08:47:48 2020] 127.0.0.1:54504 [404]: /ocs/v2.php/cloud/groups/group-search
[Wed Aug 12 08:47:48 2020] 127.0.0.1:54518 [200]: /ocs/v2.php/cloud/groups
[Wed Aug 12 08:47:49 2020] 127.0.0.1:54536 [200]: /ocs/v2.php/cloud/groups/group-search
    And group "group-search" exists                                                               # FeatureContext::assureGroupExists()
[Wed Aug 12 08:47:49 2020] 127.0.0.1:54554 [200]: /ocs/v2.php/cloud/users/user-in-group/groups
[Wed Aug 12 08:47:49 2020] 127.0.0.1:54564 [200]: /ocs/v2.php/cloud/users/user-in-group/groups
[Wed Aug 12 08:47:49 2020] 127.0.0.1:54578 [200]: /ocs/v2.php/cloud/users/user-in-group/groups
    And user "user-in-group" belongs to group "group-search"                                      # FeatureContext::assureUserBelongsToGroup()
[Wed Aug 12 08:47:50 2020] 127.0.0.1:54592 [200]: /ocs/v2.php/cloud/users/user-in-group2/groups
[Wed Aug 12 08:47:50 2020] 127.0.0.1:54606 [200]: /ocs/v2.php/cloud/users/user-in-group2/groups
[Wed Aug 12 08:47:50 2020] 127.0.0.1:54622 [200]: /ocs/v2.php/cloud/users/user-in-group2/groups
    And user "user-in-group2" belongs to group "group-search"                                     # FeatureContext::assureUserBelongsToGroup()
[Wed Aug 12 08:47:50 2020] 127.0.0.1:54640 [200]: /ocs/v2.php/cloud/groups/group-search/users/details?offset=0&limit=25&search=ifi
    When sending "GET" to "/cloud/groups/group-search/users/details?offset=0&limit=25&search=ifi" # FeatureContext::sendingTo()
    Then the OCS status code should be "200"                                                      # FeatureContext::theOCSStatusCodeShouldBe()
    And the HTTP status code should be "200"                                                      # FeatureContext::theHTTPStatusCodeShouldBe()
    And detailed users returned are                                                               # FeatureContext::theDetailedUsersShouldBe()
      | user-in-group |
      Failed asserting that two arrays are equal.
      --- Expected
      +++ Actual
      @@ @@
       Array (
      -    0 => 'user-in-group'
[Wed Aug 12 08:47:51 2020] 127.0.0.1:54656 [200]: /ocs/v2.php/cloud/users/user-in-group
[Wed Aug 12 08:47:51 2020] 127.0.0.1:54698 [404]: /ocs/v2.php/cloud/users/user-in-group
[Wed Aug 12 08:47:52 2020] 127.0.0.1:54718 [200]: /ocs/v2.php/cloud/users/user-in-group2
[Wed Aug 12 08:47:52 2020] 127.0.0.1:54764 [404]: /ocs/v2.php/cloud/users/user-in-group2
[Wed Aug 12 08:47:52 2020] 127.0.0.1:54784 [200]: /ocs/v2.php/cloud/users/user-not-in-group
[Wed Aug 12 08:47:53 2020] 127.0.0.1:54826 [404]: /ocs/v2.php/cloud/users/user-not-in-group
[Wed Aug 12 08:47:53 2020] 127.0.0.1:54844 [200]: /ocs/v2.php/cloud/users/user-not-in-group2
[Wed Aug 12 08:47:53 2020] 127.0.0.1:54884 [404]: /ocs/v2.php/cloud/users/user-not-in-group2
[Wed Aug 12 08:47:53 2020] 127.0.0.1:54908 [200]: /ocs/v2.php/cloud/groups/group-search
[Wed Aug 12 08:47:54 2020] 127.0.0.1:54932 [404]: /ocs/v2.php/cloud/groups/group-search
[Wed Aug 12 08:47:54 2020] Login failed: 'user0' (Remote IP: '127.0.0.1')
[Wed Aug 12 08:47:54 2020] 127.0.0.1:54952 [401]: /remote.php/webdav/myFileToComment.txt
[Wed Aug 12 08:47:55 2020] 127.0.0.1:54960 [207]: /remote.php/dav/systemtags/
[Wed Aug 12 08:47:55 2020] Login failed: 'user0' (Remote IP: '127.0.0.1')
[Wed Aug 12 08:47:55 2020] 127.0.0.1:55028 [401]: /remote.php/webdav/myFileToTag.txt
[Wed Aug 12 08:47:55 2020] 127.0.0.1:55032 [404]: /remote.php/dav/addressbooks/users/admin/MyAddressbook
[Wed Aug 12 08:47:55 2020] 127.0.0.1:55050 [404]: /remote.php/dav/calendars/admin/MyCalendar

@blizzz blizzz merged commit 33db8a9 into stable19 Aug 12, 2020
@blizzz blizzz deleted the backport/21559/stable19 branch August 12, 2020 13:42
@rullzer rullzer mentioned this pull request Aug 13, 2020
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blizzz blizzz blizzz approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@jasonbayton jasonbayton Awaiting requested review from jasonbayton

@JSoko JSoko Awaiting requested review from JSoko

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

@rullzer rullzer Awaiting requested review from rullzer

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

Nextcloud 19.0.2

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz @skjnldsv