Extract caldav sharing stuff from publishing stuff by tcitworld · Pull Request #34873 · nextcloud/server

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 <[email protected]>

Fixes: 45eefc2 Related: #34372 Author-Change-Id: IB#1126264 Signed-off-by: Pawel Boguslawski <[email protected]>

So that it's still there when we disable the PublishPlugin Signed-off-by: Thomas Citharel <[email protected]>

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! :)

SebastianKrupinski · 2025-01-23T19:19:46Z

@tcitworld any chance you want to rebase this to the current version? This PR is a year old.

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 review from ChristophWurst and miaulalala as code owners 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 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 <[email protected]>

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 <[email protected]>

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 removed this from the Nextcloud 27 milestone May 23, 2023

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

pboguslawski mentioned this pull request Jan 23, 2025

[Bug]: Sharing calendars with link is not disabled when sharing with link is disabled #50358

Closed

8 tasks

tcitworld restored the extract-caldav-sharing-plugin branch January 23, 2025 18:08

tcitworld reopened this Jan 23, 2025

tcitworld requested review from SebastianKrupinski and st3iny as code owners January 23, 2025 18:08

tcitworld mentioned this pull request Jan 23, 2025

Disabling sharing via link not honored nextcloud/calendar#4399

Open

susnux added this to the Nextcloud 32 milestone Mar 2, 2025

This was referenced Aug 22, 2025

32.0.0 beta 2 #54581

Merged

32.0.0 beta 3 #54606

Merged

32.0.0 beta 4 #54688

Merged

This was referenced Sep 2, 2025

32.0.0 beta 5 #54796

Merged

[stable32] 32.0.0 RC1 #54864

Merged

nextcloud-bot mentioned this pull request Sep 10, 2025

[stable32] 32.0.0 RC2 #55000

Merged

nextcloud-bot mentioned this pull request Sep 18, 2025

[stable32] 32.0.0 RC3 #55162

Merged

This was referenced Sep 25, 2025

[stable32] 32.0.0 RC4 #55298

Merged

[stable32] 32.0.0 #55354

Merged

skjnldsv modified the milestones: Nextcloud 32, Nextcloud 33 Sep 28, 2025

This was referenced Jan 7, 2026

33.0.0 beta 2 #57398

Merged

33.0.0 beta 3 #57441

Merged

This was referenced Jan 14, 2026

33.0.0 beta 4 #57545

Merged

33.0.0 beta 5 #57651

Merged

nextcloud-bot mentioned this pull request Jan 22, 2026

[stable33] 33.0.0 RC1 #57724

Merged

This was referenced Jan 29, 2026

[stable33] 33.0.0 RC2 #57899

Merged

[stable33] 33.0.0 RC3 #58047

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Extract caldav sharing stuff from publishing stuff#34873

Extract caldav sharing stuff from publishing stuff#34873
tcitworld wants to merge 3 commits intomasterfrom
extract-caldav-sharing-plugin

tcitworld commented Oct 28, 2022

Uh oh!

Check notice

Check notice

Check notice

Check notice

pboguslawski commented Oct 29, 2022

Uh oh!

miaulalala left a comment

Uh oh!

Uh oh!

ChristophWurst commented Jan 20, 2023

Uh oh!

ChristophWurst left a comment

Uh oh!

tcitworld commented Jan 20, 2023 •

edited

Loading

Uh oh!

pboguslawski commented Jan 30, 2023 •

edited

Loading

Uh oh!

szaimen commented Apr 17, 2023

Uh oh!

SebastianKrupinski commented Jan 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

tcitworld commented Oct 28, 2022

Uh oh!

Check notice

Check notice

Check notice

Check notice

pboguslawski commented Oct 29, 2022

Uh oh!

miaulalala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ChristophWurst commented Jan 20, 2023

Uh oh!

ChristophWurst left a comment

Choose a reason for hiding this comment

Uh oh!

tcitworld commented Jan 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pboguslawski commented Jan 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

szaimen commented Apr 17, 2023

Uh oh!

SebastianKrupinski commented Jan 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

tcitworld commented Jan 20, 2023 •

edited

Loading

pboguslawski commented Jan 30, 2023 •

edited

Loading