From dc529fa86d44e4aa1883cb52eab1cdd5413bb1a2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Mar 2026 22:27:16 +0100 Subject: [PATCH] fix(videoverification): Remove CSP wildcard for video verification spreed does it via AddContentSecurityPolicyEvent event by now Signed-off-by: Joas Schilling --- .../lib/Controller/ShareController.php | 31 ++----------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 0e0e98ef2d5..52facc04950 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -7,7 +7,6 @@ */ namespace OCA\Files_Sharing\Controller; -use OC\Security\CSP\ContentSecurityPolicy; use OC\ServerNotAvailableException; use OCA\DAV\Connector\Sabre\PublicAuth; use OCA\FederatedFileSharing\FederatedShareProvider; @@ -93,15 +92,7 @@ class ShareController extends AuthPublicShareController { $this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($this->share, BeforeTemplateRenderedEvent::SCOPE_PUBLIC_SHARE_AUTH)); - $response = new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest'); - if ($this->share->getSendPasswordByTalk()) { - $csp = new ContentSecurityPolicy(); - $csp->addAllowedConnectDomain('*'); - $csp->addAllowedMediaDomain('blob:'); - $response->setContentSecurityPolicy($csp); - } - - return $response; + return new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest'); } /** @@ -112,15 +103,7 @@ class ShareController extends AuthPublicShareController { $this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($this->share, BeforeTemplateRenderedEvent::SCOPE_PUBLIC_SHARE_AUTH)); - $response = new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest'); - if ($this->share->getSendPasswordByTalk()) { - $csp = new ContentSecurityPolicy(); - $csp->addAllowedConnectDomain('*'); - $csp->addAllowedMediaDomain('blob:'); - $response->setContentSecurityPolicy($csp); - } - - return $response; + return new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest'); } /** @@ -131,15 +114,7 @@ class ShareController extends AuthPublicShareController { $this->eventDispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($this->share, BeforeTemplateRenderedEvent::SCOPE_PUBLIC_SHARE_AUTH)); - $response = new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest'); - if ($this->share->getSendPasswordByTalk()) { - $csp = new ContentSecurityPolicy(); - $csp->addAllowedConnectDomain('*'); - $csp->addAllowedMediaDomain('blob:'); - $response->setContentSecurityPolicy($csp); - } - - return $response; + return new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest'); } /**