enh(sharing): enable unsharing for sharees for DAV shares #43117

miaulalala · 2024-01-25T15:28:43Z

Allow unsharing for a sharee via "Unshare from me" in the calendar dialogue. AFAIK Contacts doesn't have an unshare from me button, maybe something for the frontend devs.

How to test

Scenario 1

Create a group BobsGroup and adds Bob and Eric.
User Alice creates a calendar "Workouts" and shares it with BobsGroup (with edit permission).
Bob unshares the calendar "Workouts" from himself

Expected results:

2 rows in oc_dav_shares like this:
Bob cannot see "Workouts" any more
Eric can still see workouts
Alice can see the groupshare

Scenario 2

Create a group BobsGroup and adds Bob and Eric.
User Alice creates a calendar "Workouts" and shares it with BobsGroup (with edit permission).
User Alice also shares the calendar "Workouts" with Bob directly:
Bob only sees one share and unshares the calendar "Workouts" from himself

Expected results:

2 rows in oc_dav_shares like this:
Bob cannot see "Workouts" any more
Eric can still see workouts
Alice can see the groupshare, but not the direct share

Ref #1653

apps/dav/lib/DAV/Sharing/Backend.php

apps/dav/lib/Connector/Sabre/DavAclPlugin.php

github-advanced-security

Psalm found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

apps/dav/lib/DAV/Sharing/SharingMapper.php

apps/dav/lib/DAV/Sharing/SharingService.php

apps/dav/lib/DAV/Sharing/Backend.php

apps/dav/lib/DAV/Sharing/SharingService.php

apps/dav/lib/Command/CreateCalendar.php

apps/dav/appinfo/v1/carddav.php

+$cardDavBackend = new CardDavBackend(
+	$db,
+	$principalBackend,
+	\OC::$server->getUserManager(),


apps/dav/lib/DAV/Sharing/Backend.php

apps/dav/lib/DAV/Sharing/SharingService.php

apps/dav/lib/DAV/Sharing/SharingMapper.php

apps/dav/lib/DAV/Sharing/Backend.php

st3iny

Tested and works.

apps/dav/lib/DAV/Sharing/Backend.php

-			return;
-		}
+			// Don't add share for owner
+			if($shareable->getOwner() !== null && strcasecmp($shareable->getOwner(), $principal) === 0) {


apps/dav/lib/DAV/Sharing/Backend.php

-			$access = $element['readOnly'] ? self::ACCESS_READ : self::ACCESS_READ_WRITE;
-		}
+			// Don't add unshare for owner
+			if($shareable->getOwner() !== null && strcasecmp($shareable->getOwner(), $principal) === 0) {


apps/dav/lib/CardDAV/CardDavBackend.php

apps/dav/lib/DAV/Sharing/SharingService.php

apps/dav/lib/CalDAV/CalDavBackend.php

apps/dav/lib/CardDAV/CardDavBackend.php

ChristophWurst

Tested & works

apps/dav/lib/CalDAV/CalDavBackend.php

apps/dav/lib/CalDAV/Calendar.php

apps/dav/lib/CalDAV/Sharing/Backend.php

apps/dav/lib/CalDAV/Sharing/Service.php

apps/dav/lib/CardDAV/Sharing/Backend.php

apps/dav/lib/CardDAV/Sharing/Service.php

apps/dav/lib/DAV/Sharing/SharingMapper.php

…ks and calendars) Signed-off-by: Anna Larch <[email protected]>

- Introduces a `unshare` method in `CalDavBackend` to handle user unshares. - Implements check to determine if unshare entry is needed based on group/circle membership. - Ensures `updateShares` is only used when the calendar owner manages shares. - Resolves issue where unsharing a calendar as owner created an unshare entry in `oc_dav_shares`. Related PRs: - #43117 - #47737 Signed-off-by: Daniel Kesselberg <[email protected]>

- Introduces a `unshare` method in `CalDavBackend` to handle user unshares. - Implements check to determine if unshare entry is needed based on group/circle membership. - Ensures `updateShares` is only used when the calendar owner manages shares. - Resolves issue where unsharing a calendar as owner created an unshare entry in `oc_dav_shares`. Related PRs: - nextcloud#43117 - nextcloud#47737 Signed-off-by: Daniel Kesselberg <[email protected]>

- Introduces a `unshare` method in `CalDavBackend` to handle user unshares. - Implements check to determine if unshare entry is needed based on group/circle membership. - Ensures `updateShares` is only used when the calendar owner manages shares. - Resolves issue where unsharing a calendar as owner created an unshare entry in `oc_dav_shares`. Related PRs: - #43117 - #47737 Signed-off-by: Daniel Kesselberg <[email protected]>

- Introduces a `unshare` method in `CalDavBackend` to handle user unshares. - Implements check to determine if unshare entry is needed based on group/circle membership. - Ensures `updateShares` is only used when the calendar owner manages shares. - Resolves issue where unsharing a calendar as owner created an unshare entry in `oc_dav_shares`. Related PRs: - nextcloud#43117 - nextcloud#47737 Signed-off-by: Daniel Kesselberg <[email protected]>

miaulalala added 2. developing Work in progress feature: dav labels Jan 25, 2024

miaulalala added this to the Nextcloud 29 milestone Jan 25, 2024

miaulalala self-assigned this Jan 25, 2024

github-advanced-security bot found potential problems Jan 25, 2024

View reviewed changes

apps/dav/lib/DAV/Sharing/Backend.php Fixed Show fixed Hide fixed

apps/dav/lib/DAV/Sharing/Backend.php Fixed Show fixed Hide fixed

apps/dav/lib/DAV/Sharing/Backend.php Fixed Show fixed Hide fixed

miaulalala force-pushed the enh/1653/enable-unsharing-for-dav-shares branch from 3131714 to cd7f2f7 Compare January 30, 2024 17:36

github-advanced-security bot found potential problems Jan 30, 2024

View reviewed changes

apps/dav/lib/DAV/Sharing/Backend.php Fixed Show fixed Hide fixed

apps/dav/lib/Connector/Sabre/DavAclPlugin.php Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Jan 31, 2024

View reviewed changes

github-advanced-security bot found potential problems Feb 1, 2024

View reviewed changes

github-advanced-security bot found potential problems Feb 6, 2024

View reviewed changes

apps/dav/lib/DAV/Sharing/Backend.php Fixed Show fixed Hide fixed

apps/dav/lib/DAV/Sharing/Backend.php Fixed Show fixed Hide fixed

apps/dav/lib/DAV/Sharing/Backend.php Fixed Show fixed Hide fixed

st3iny approved these changes Feb 13, 2024

View reviewed changes

github-advanced-security bot found potential problems Feb 13, 2024

View reviewed changes

github-advanced-security bot found potential problems Feb 14, 2024

View reviewed changes

apps/dav/lib/CardDAV/CardDavBackend.php Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Feb 14, 2024

View reviewed changes

apps/dav/lib/DAV/Sharing/SharingService.php Fixed Show fixed Hide fixed

apps/dav/lib/DAV/Sharing/SharingService.php Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Feb 15, 2024

View reviewed changes

apps/dav/lib/CalDAV/CalDavBackend.php Fixed Show fixed Hide fixed

apps/dav/lib/CardDAV/CardDavBackend.php Fixed Show fixed Hide fixed

miaulalala marked this pull request as ready for review February 15, 2024 13:48

miaulalala requested review from ChristophWurst and tcitworld as code owners February 15, 2024 13:48

miaulalala requested review from a team, ArtificialOwl, icewind1991 and sorbaugh and removed request for a team February 15, 2024 13:48

miaulalala added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 15, 2024

ChristophWurst reviewed Feb 15, 2024

View reviewed changes

ChristophWurst approved these changes Feb 15, 2024

View reviewed changes

apps/dav/lib/DAV/Sharing/SharingMapper.php Show resolved Hide resolved

enh(sharing): enable unsharing for sharees for DAV shares (addressboo…

dce6915

…ks and calendars) Signed-off-by: Anna Larch <[email protected]>

miaulalala mentioned this pull request Jun 11, 2024

Keep unshared calendars in trashbin to enable restoring them for group shares #45783

Open

tcitworld mentioned this pull request Jun 17, 2024

Support ignoring users who unshared from a calendar nextcloud/event_update_notification#100

Closed

Uh oh!

enh(sharing): enable unsharing for sharees for DAV shares #43117

enh(sharing): enable unsharing for sharees for DAV shares #43117

Uh oh!

Conversation

miaulalala commented Jan 25, 2024 • edited by ChristophWurst Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to test

Scenario 1

Expected results:

Scenario 2

Expected results:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-advanced-security bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check notice

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

st3iny left a comment

Choose a reason for hiding this comment

Uh oh!

Check notice

Check notice

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ChristophWurst left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

miaulalala commented Jan 25, 2024 •

edited by ChristophWurst

Loading