Extract caldav sharing stuff from publishing stuff #34873

tcitworld · 2022-10-28T18:10:30Z

Based on and replaces #34372 by @pboguslawski

The publishing plugin handled both doing the actual publishing/unpublishing as well as exposing the supported sharing features.

Now we have one for each use and publishing can be properly disabled. The CalDAVSharingPlugin will probably be useful for most of the issues in #20096 anyway.

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

-	 * @var IConfig
-	 */
-	protected $config;
+	protected Server $server;


apps/dav/lib/CalDAV/SharingPlugin.php

+class SharingPlugin extends ServerPlugin {
+	public const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+	protected Server $server;


apps/dav/lib/CalDAV/SharingPlugin.php

+	 *
+	 * @param Server $server
+	 */
+	public function initialize(Server $server) {


apps/dav/lib/CalDAV/SharingPlugin.php

+		$this->server->on('propFind', [$this, 'propFind']);
+	}
+
+	public function propFind(PropFind $propFind, INode $node) {


pboguslawski · 2022-10-29T09:23:34Z

Didn't notice any problems after applying this patch on 24.0.5. Thank you!

miaulalala

no value set - public share links work and is an option in calendar
value set to yes - public share link works and is an option in calendar
value set to no - public share link does not work and there is not an option to create a public share link in calendar but sharing with users and groups still works

apps/dav/composer/autoload.php

This mod disallows sharing calendars via link when `shareapi_allow_links` is disabled. Related: nextcloud/calendar#525 Related: nextcloud/calendar#4399 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>

Fixes: 45eefc2 Related: #34372 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>

So that it's still there when we disable the PublishPlugin Signed-off-by: Thomas Citharel <tcit@tcit.fr>

ChristophWurst · 2023-01-20T14:29:44Z

Now we have one for each use and publishing can be properly disabled. The CalDAVSharingPlugin will probably be useful for most of the issues in #20096 anyway.

🙌 🙌

ChristophWurst

Should we add tests?

tcitworld · 2023-01-20T15:24:06Z

Due to the callbacks, Sabre patterns are hard to test, there would be low value for added tests here. Not sure if it's impossible, but it's never been done before in all other plugins.

pboguslawski · 2023-01-30T13:11:30Z

After upgrading to server 25.0.3 with this mod applied + calendar 4.2.1, when shareapi_allow_links is disabled...

# /usr/bin/php /var/www/nextcloud/occ config:app:set core shareapi_allow_links --value='no'
Config value shareapi_allow_links for app core set to no

# /usr/bin/php /var/www/nextcloud/occ config:app:get core shareapi_allow_links
no

...then Edit calendar dialog still contains Share link with + but clicking + displays popup with An error occurred, unable to publish calendar. (POST with 501 Not Implemented in browser dev tools).

After enabling...

# /usr/bin/php /var/www/nextcloud/occ config:app:set core shareapi_allow_links --value='yes'
Config value shareapi_allow_links for app core set to yes

# /usr/bin/php /var/www/nextcloud/occ config:app:get core shareapi_allow_links
yes

...clicking + works ok.

Seems that server blocks sharing via link correctly but calendar app after upgrade should have Share link removed in Edit calendar when shareapi_allow_links is disabled.

szaimen · 2023-04-17T14:27:38Z

@tcitworld can you please fix the conflicts and the tests? Thanks in advance! :)

Related: nextcloud/server#34873 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>

pboguslawski · 2024-01-10T12:16:14Z

nextcloud/calendar#5679 fixes Share link option problem described above for us (tested with this PR merged also).

tcitworld added 3. to review Waiting for reviews feature: caldav Related to CalDAV internals labels Oct 28, 2022

tcitworld added this to the Nextcloud 26 milestone Oct 28, 2022

tcitworld requested a review from ChristophWurst as a code owner October 28, 2022 18:10

tcitworld requested a review from miaulalala as a code owner October 28, 2022 18:10

tcitworld mentioned this pull request Oct 28, 2022

Disable sharing calendars via link when sharing via link is disabled #34372

Closed

github-advanced-security bot found potential problems Oct 28, 2022

View reviewed changes

miaulalala approved these changes Nov 2, 2022

View reviewed changes

apps/dav/composer/autoload.php Outdated Show resolved Hide resolved

pboguslawski and others added 3 commits January 20, 2023 15:10

Disable sharing calendars via link adjusted

bbaf2af

Fixes: 45eefc2 Related: #34372 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>

Extract cs:allowed-sharing-modes into it's own plugin

7f87ac8

So that it's still there when we disable the PublishPlugin Signed-off-by: Thomas Citharel <tcit@tcit.fr>

tcitworld force-pushed the extract-caldav-sharing-plugin branch from 4fd3cba to 7f87ac8 Compare January 20, 2023 14:12

ChristophWurst approved these changes Jan 20, 2023

View reviewed changes

blizzz mentioned this pull request Feb 1, 2023

26.0.0 beta 2 #36484

Merged

skjnldsv mentioned this pull request Feb 23, 2023

26.0.0 beta 5 #36834

Merged

blizzz mentioned this pull request Mar 7, 2023

26.0.0 RC2 #37078

Merged

blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 9, 2023

szaimen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Apr 17, 2023

This was referenced May 3, 2023

27.0.0 beta 1 #38038

Merged

27.0.0 beta 2 #38137

Closed

27.0.0 beta 2 #38139

Merged

blizzz mentioned this pull request May 17, 2023

27.0.0 RC1 #38341

Merged

blizzz modified the milestones: Nextcloud 27, Nextcloud 28 May 23, 2023

skjnldsv mentioned this pull request Nov 1, 2023

chore: 28.0.0 beta 1 #41228

Merged

This was referenced Nov 6, 2023

28.0.0 beta 2 #41314

Merged

28.0.0 beta 3 #41379

Merged

This was referenced Nov 14, 2023

28.0.0 beta 4 #41477

Merged

28.0.0 RC1 #41621

Merged

blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023

pboguslawski added a commit to ibpl/calendar that referenced this pull request Jan 10, 2024

Remove publish link is calendar publishing is disabled

4a9f810

Related: nextcloud/server#34873 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>

pboguslawski mentioned this pull request Jan 10, 2024

Remove Share link action if calendar publishing is disabled nextcloud/calendar#5679

Merged

This was referenced Mar 12, 2024

29.0.0 beta 2 #44152

Merged

29.0.0 beta 3 #44186

Merged

29.0.0 beta 4 #44275

Merged

This was referenced Mar 20, 2024

29.0.0 beta 5 #44361

Merged

29.0.0 beta 6 #44449

Merged

skjnldsv mentioned this pull request Mar 28, 2024

29.0.0 RC1 #44552

Merged

81 tasks

skjnldsv modified the milestones: Nextcloud 29, Nextcloud 30 Mar 28, 2024

This was referenced Jul 30, 2024

30.0.0 beta 2 #46870

Merged

30.0.0 beta 3 #46946

Merged

This was referenced Aug 5, 2024

30.0.0 beta 4 #47028

Merged

30.0.0 beta 5 #47100

Merged

skjnldsv mentioned this pull request Aug 13, 2024

30.0.0 RC1 #47190

Merged

skjnldsv closed this Aug 14, 2024

skjnldsv removed this from the Nextcloud 30 milestone Aug 14, 2024

skjnldsv deleted the extract-caldav-sharing-plugin branch August 30, 2024 07:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extract caldav sharing stuff from publishing stuff #34873

Extract caldav sharing stuff from publishing stuff #34873

tcitworld commented Oct 28, 2022

pboguslawski commented Oct 29, 2022

miaulalala left a comment

ChristophWurst commented Jan 20, 2023

ChristophWurst left a comment

tcitworld commented Jan 20, 2023 •

edited

Loading

pboguslawski commented Jan 30, 2023 •

edited

Loading

szaimen commented Apr 17, 2023

pboguslawski commented Jan 10, 2024

Extract caldav sharing stuff from publishing stuff #34873

Extract caldav sharing stuff from publishing stuff #34873

Conversation

tcitworld commented Oct 28, 2022

pboguslawski commented Oct 29, 2022

miaulalala left a comment

Choose a reason for hiding this comment

ChristophWurst commented Jan 20, 2023

ChristophWurst left a comment

Choose a reason for hiding this comment

tcitworld commented Jan 20, 2023 • edited Loading

pboguslawski commented Jan 30, 2023 • edited Loading

szaimen commented Apr 17, 2023

pboguslawski commented Jan 10, 2024

tcitworld commented Jan 20, 2023 •

edited

Loading

pboguslawski commented Jan 30, 2023 •

edited

Loading