Skip to content

[stable19] fix s3 doesDirectoryExist check for empty directories #22776

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
rullzer merged 2 commits into from
Sep 11, 2020
Merged

[stable19] fix s3 doesDirectoryExist check for empty directories #22776

rullzer merged 2 commits into from
Sep 11, 2020

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Sep 10, 2020

backport of #22747

icewind1991 and others added 2 commits September 10, 2020 13:14
@icewind1991 @backportbot
fix s3 doesDirectoryExist check for empty directories
30ea77c 
if a directory is empty, only the 'marker' object `/` exists.

since not all s3 implementations return just the prefix when listing objects by prefix,
when listing objects by the folder prefix, nothing will be returned if the directory is empty.
by not including the trailing slash in the prefix, the folder marked will always be returned if it exists

Signed-off-by: Robin Appelman <[email protected]>
@juliusknorr @backportbot
Set delimiter so that the CommonPrefixes response can properly be det…
b946d2c 
…ermined

Signed-off-by: Julius Härtl <[email protected]>
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 19.0.4 milestone Sep 10, 2020
MorrisJobke
MorrisJobke approved these changes Sep 10, 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.

🐘

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews bug labels Sep 10, 2020
@faily-bot
Copy link

faily-bot bot commented Sep 10, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 32960: failure

acceptance-header

  • tests/acceptance/features/header.feature:31
Show full log 
  Scenario: users from other groups are not seen in the contacts menu when autocompletion is restricted within the same group # /drone/src/tests/acceptance/features/header.feature:31
    Given I am logged in as the admin                                                                                         # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I visit the settings page                                                                                             # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Sharing" section of the "Administration" group                                                            # AppNavigationContext::iOpenTheSectionOf()
    And I enable restricting username autocompletion to groups                                                                # SettingsContext::iEnableRestrictingUsernameAutocompletionToGroups()
    And I see that username autocompletion is restricted to groups                                                            # SettingsContext::iSeeThatUsernameAutocompletionIsRestrictedToGroups()
    When I open the Contacts menu                                                                                             # ContactsMenuContext::iOpenTheContactsMenu()
    Then I see that the Contacts menu is shown                                                                                # ContactsMenuContext::iSeeThatTheContactsMenuIsShown()
    And I see that the contact "user0" in the Contacts menu is not shown                                                      # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsNotShown()
      Failed asserting that true is false.
    And I see that the contact "admin" in the Contacts menu is not shown                                                      # ContactsMenuContext::iSeeThatTheContactInTheContactsMenuIsNotShown()

@rullzer rullzer merged commit b9ef2a5 into stable19 Sep 11, 2020
@rullzer rullzer deleted the backport/22747/stable19 branch September 11, 2020 06:45
@rullzer rullzer mentioned this pull request Sep 28, 2020
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

@juliusknorr juliusknorr juliusknorr approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@kesselb kesselb Awaiting requested review from kesselb

@rullzer rullzer Awaiting requested review from rullzer

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug

Projects

None yet

Milestone

Nextcloud 19.0.4

Development

Successfully merging this pull request may close these issues.

5 participants

@MorrisJobke @juliusknorr @rullzer @icewind1991