Skip to content

CalDAV: Add ability to limit sharing to owner - #22236

Merged
MorrisJobke merged 1 commit into
masterfrom
bugfix/noid/dav_sharing_backend_canWrite_isOwner
Aug 18, 2020
Merged

CalDAV: Add ability to limit sharing to owner#22236
MorrisJobke merged 1 commit into
masterfrom
bugfix/noid/dav_sharing_backend_canWrite_isOwner

Conversation

@georgehrke

@georgehrkegeorgehrke commented Aug 13, 2020

Copy link
Copy Markdown
Member
UserBeforeAfter
Owner700E4FDB-DB30-45DF-981D-FF18FDA23132700E4FDB-DB30-45DF-981D-FF18FDA23132
ShareeD25015FC-F299-443F-B465-CD7BCBC5C08AA0062825-CC7F-4828-AFAA-51C89B72C134

@georgehrkegeorgehrke changed the title Add ability to limit sharing to ownerCalDAV: Add ability to limit sharing to ownerAug 13, 2020
@georgehrke
georgehrkeforce-pushed the bugfix/noid/dav_sharing_backend_canWrite_isOwner branch from 38b69a3 to 8d9b920CompareAugust 18, 2020 09:34
@georgehrkegeorgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 18, 2020
@georgehrke
georgehrke marked this pull request as ready for review August 18, 2020 11:16
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
georgehrkeforce-pushed the bugfix/noid/dav_sharing_backend_canWrite_isOwner branch from 0638c55 to 14755d8CompareAugust 18, 2020 11:18
@georgehrke

Copy link
Copy Markdown
MemberAuthor

Rebased and squashed

@faily-bot

faily-botBot commented Aug 18, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31911: failure

mariadb10.4-php7.3

Show full log
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
--
There was 1 failure:
1) Test\Share20\DefaultShareProviderTest::testDeleteUser with data set #3 (0, 'a', 'b', 'c', 'd', false)
Failed asserting that actual size 0 matches expected size 1.
/drone/src/tests/lib/Share20/DefaultShareProviderTest.php:2255

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()

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Didn't test but looks good

@MorrisJobke
MorrisJobke merged commit 05df385 into masterAug 18, 2020
@MorrisJobke
MorrisJobke deleted the bugfix/noid/dav_sharing_backend_canWrite_isOwner branch August 18, 2020 14:48
MorrisJobke added a commit that referenced this pull request Aug 18, 2020
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

Copy link
Copy Markdown
Member

This fixed some psalm warnings: #22287

@MorrisJobkeMorrisJobke added this to the Nextcloud 20 milestone Aug 18, 2020
MorrisJobke added a commit that referenced this pull request Aug 18, 2020
@georgehrke

Copy link
Copy Markdown
MemberAuthor

@MorrisJobke@rullzer Would you mind if we backport this? It's only needed on 19

@MorrisJobke

Copy link
Copy Markdown
Member

Fine with me

@rullzer

Copy link
Copy Markdown
Member

/backport to stable19

kesselb pushed a commit that referenced this pull request Aug 31, 2020
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsfeature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@georgehrke@MorrisJobke@rullzer