open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #58853 from nextcloud/bugfix/noid/remove-wildcard-csp

Browse Source 
fix(videoverification): Remove CSP wildcard for video verification
pull/58870/head
Joas Schilling 5 months ago committed by GitHub
parent f0f38fd04c dc529fa86d
commit 78cfe3742a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 31
      apps/files_sharing/lib/Controller/ShareController.php

31
apps/files_sharing/lib/Controller/ShareController.php
Unescape View File

@ -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');
}
/**

Write Preview
Loading…
Cancel
Save