Add stricter CSPs
* Deprecate our default CSP * Add strict CSP that is always our strictest setting * Add strict eval CSP (disable unsafe-eval) * Add strict inline CSP (disables inline styles) This is just to move forward and have a incremental improvement of our CSP Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
cd87a40eb3
commit
b38fa573e1
|
@ -40,6 +40,9 @@ return array(
|
||||||
'OCP\\AppFramework\\Http\\RedirectResponse' => $baseDir . '/lib/public/AppFramework/Http/RedirectResponse.php',
|
'OCP\\AppFramework\\Http\\RedirectResponse' => $baseDir . '/lib/public/AppFramework/Http/RedirectResponse.php',
|
||||||
'OCP\\AppFramework\\Http\\Response' => $baseDir . '/lib/public/AppFramework/Http/Response.php',
|
'OCP\\AppFramework\\Http\\Response' => $baseDir . '/lib/public/AppFramework/Http/Response.php',
|
||||||
'OCP\\AppFramework\\Http\\StreamResponse' => $baseDir . '/lib/public/AppFramework/Http/StreamResponse.php',
|
'OCP\\AppFramework\\Http\\StreamResponse' => $baseDir . '/lib/public/AppFramework/Http/StreamResponse.php',
|
||||||
|
'OCP\\AppFramework\\Http\\StrictContentSecurityPolicy' => $baseDir . '/lib/public/AppFramework/Http/StrictContentSecurityPolicy.php',
|
||||||
|
'OCP\\AppFramework\\Http\\StrictEvalContentSecurityPolicy' => $baseDir . '/lib/public/AppFramework/Http/StrictEvalContentSecurityPolicy.php',
|
||||||
|
'OCP\\AppFramework\\Http\\StrictInlineContentSecurityPolicy' => $baseDir . '/lib/public/AppFramework/Http/StrictInlineContentSecurityPolicy.php',
|
||||||
'OCP\\AppFramework\\Http\\TemplateResponse' => $baseDir . '/lib/public/AppFramework/Http/TemplateResponse.php',
|
'OCP\\AppFramework\\Http\\TemplateResponse' => $baseDir . '/lib/public/AppFramework/Http/TemplateResponse.php',
|
||||||
'OCP\\AppFramework\\Http\\Template\\ExternalShareMenuAction' => $baseDir . '/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php',
|
'OCP\\AppFramework\\Http\\Template\\ExternalShareMenuAction' => $baseDir . '/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php',
|
||||||
'OCP\\AppFramework\\Http\\Template\\IMenuAction' => $baseDir . '/lib/public/AppFramework/Http/Template/IMenuAction.php',
|
'OCP\\AppFramework\\Http\\Template\\IMenuAction' => $baseDir . '/lib/public/AppFramework/Http/Template/IMenuAction.php',
|
||||||
|
|
|
@ -70,6 +70,9 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
|
||||||
'OCP\\AppFramework\\Http\\RedirectResponse' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/RedirectResponse.php',
|
'OCP\\AppFramework\\Http\\RedirectResponse' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/RedirectResponse.php',
|
||||||
'OCP\\AppFramework\\Http\\Response' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Response.php',
|
'OCP\\AppFramework\\Http\\Response' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Response.php',
|
||||||
'OCP\\AppFramework\\Http\\StreamResponse' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/StreamResponse.php',
|
'OCP\\AppFramework\\Http\\StreamResponse' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/StreamResponse.php',
|
||||||
|
'OCP\\AppFramework\\Http\\StrictContentSecurityPolicy' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/StrictContentSecurityPolicy.php',
|
||||||
|
'OCP\\AppFramework\\Http\\StrictEvalContentSecurityPolicy' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/StrictEvalContentSecurityPolicy.php',
|
||||||
|
'OCP\\AppFramework\\Http\\StrictInlineContentSecurityPolicy' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/StrictInlineContentSecurityPolicy.php',
|
||||||
'OCP\\AppFramework\\Http\\TemplateResponse' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/TemplateResponse.php',
|
'OCP\\AppFramework\\Http\\TemplateResponse' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/TemplateResponse.php',
|
||||||
'OCP\\AppFramework\\Http\\Template\\ExternalShareMenuAction' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php',
|
'OCP\\AppFramework\\Http\\Template\\ExternalShareMenuAction' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php',
|
||||||
'OCP\\AppFramework\\Http\\Template\\IMenuAction' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Template/IMenuAction.php',
|
'OCP\\AppFramework\\Http\\Template\\IMenuAction' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Template/IMenuAction.php',
|
||||||
|
|
|
@ -27,16 +27,19 @@ namespace OCP\AppFramework\Http;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class ContentSecurityPolicy is a simple helper which allows applications to
|
* Class ContentSecurityPolicy is a simple helper which allows applications to
|
||||||
* modify the Content-Security-Policy sent by ownCloud. Per default only JavaScript,
|
* modify the Content-Security-Policy sent by Nextcloud. Per default only JavaScript,
|
||||||
* stylesheets, images, fonts, media and connections from the same domain
|
* stylesheets, images, fonts, media and connections from the same domain
|
||||||
* ('self') are allowed.
|
* ('self') are allowed.
|
||||||
*
|
*
|
||||||
* Even if a value gets modified above defaults will still get appended. Please
|
* Even if a value gets modified above defaults will still get appended. Please
|
||||||
* notice that ownCloud ships already with sensible defaults and those policies
|
* notice that Nextcloud ships already with sensible defaults and those policies
|
||||||
* should require no modification at all for most use-cases.
|
* should require no modification at all for most use-cases.
|
||||||
*
|
*
|
||||||
|
* This class allows unsafe-eval of javascript and unsafe-inline of CSS.
|
||||||
|
*
|
||||||
* @package OCP\AppFramework\Http
|
* @package OCP\AppFramework\Http
|
||||||
* @since 8.1.0
|
* @since 8.1.0
|
||||||
|
* @deprecated 14.0.0 Use one of our stricter CSP policies
|
||||||
*/
|
*/
|
||||||
class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
|
class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
|
||||||
/** @var bool Whether inline JS snippets are allowed */
|
/** @var bool Whether inline JS snippets are allowed */
|
||||||
|
|
|
@ -0,0 +1,85 @@
|
||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
/**
|
||||||
|
* @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\AppFramework\Http;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class StrictContentSecurityPolicy is a simple helper which allows applications to
|
||||||
|
* modify the Content-Security-Policy sent by Nextcloud. Per default only JavaScript,
|
||||||
|
* stylesheets, images, fonts, media and connections from the same domain
|
||||||
|
* ('self') are allowed.
|
||||||
|
*
|
||||||
|
* Even if a value gets modified above defaults will still get appended. Please
|
||||||
|
* notice that Nextcloud ships already with sensible defaults and those policies
|
||||||
|
* should require no modification at all for most use-cases.
|
||||||
|
*
|
||||||
|
* This class represents out strictest defaults. They may get change from release
|
||||||
|
* to release if more strict CSP directives become available.
|
||||||
|
*
|
||||||
|
* @package OCP\AppFramework\Http
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class StrictContentSecurityPolicy extends EmptyContentSecurityPolicy {
|
||||||
|
/** @var bool Whether inline JS snippets are allowed */
|
||||||
|
protected $inlineScriptAllowed = false;
|
||||||
|
/** @var bool Whether eval in JS scripts is allowed */
|
||||||
|
protected $evalScriptAllowed = false;
|
||||||
|
/** @var array Domains from which scripts can get loaded */
|
||||||
|
protected $allowedScriptDomains = [
|
||||||
|
'\'self\'',
|
||||||
|
];
|
||||||
|
/** @var bool Whether inline CSS is allowed */
|
||||||
|
protected $inlineStyleAllowed = false;
|
||||||
|
/** @var array Domains from which CSS can get loaded */
|
||||||
|
protected $allowedStyleDomains = [
|
||||||
|
'\'self\'',
|
||||||
|
];
|
||||||
|
/** @var array Domains from which images can get loaded */
|
||||||
|
protected $allowedImageDomains = [
|
||||||
|
'\'self\'',
|
||||||
|
'data:',
|
||||||
|
'blob:',
|
||||||
|
];
|
||||||
|
/** @var array Domains to which connections can be done */
|
||||||
|
protected $allowedConnectDomains = [
|
||||||
|
'\'self\'',
|
||||||
|
];
|
||||||
|
/** @var array Domains from which media elements can be loaded */
|
||||||
|
protected $allowedMediaDomains = [
|
||||||
|
'\'self\'',
|
||||||
|
];
|
||||||
|
/** @var array Domains from which object elements can be loaded */
|
||||||
|
protected $allowedObjectDomains = [];
|
||||||
|
/** @var array Domains from which iframes can be loaded */
|
||||||
|
protected $allowedFrameDomains = [];
|
||||||
|
/** @var array Domains from which fonts can be loaded */
|
||||||
|
protected $allowedFontDomains = [
|
||||||
|
'\'self\'',
|
||||||
|
];
|
||||||
|
/** @var array Domains from which web-workers and nested browsing content can load elements */
|
||||||
|
protected $allowedChildSrcDomains = [];
|
||||||
|
|
||||||
|
/** @var array Domains which can embed this Nextcloud instance */
|
||||||
|
protected $allowedFrameAncestors = [];
|
||||||
|
}
|
|
@ -0,0 +1,51 @@
|
||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
/**
|
||||||
|
* @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\AppFramework\Http;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class StrictInlineContentSecurityPolicy is a simple helper which allows applications to
|
||||||
|
* modify the Content-Security-Policy sent by Nextcloud. Per default only JavaScript,
|
||||||
|
* stylesheets, images, fonts, media and connections from the same domain
|
||||||
|
* ('self') are allowed.
|
||||||
|
*
|
||||||
|
* Even if a value gets modified above defaults will still get appended. Please
|
||||||
|
* notice that Nextcloud ships already with sensible defaults and those policies
|
||||||
|
* should require no modification at all for most use-cases.
|
||||||
|
*
|
||||||
|
* This is a temp helper class from the default ContentSecurityPolicy to allow slow
|
||||||
|
* migration to a stricter CSP. This does not allow unsafe eval.
|
||||||
|
*
|
||||||
|
* @package OCP\AppFramework\Http
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class StrictEvalContentSecurityPolicy extends ContentSecurityPolicy {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function __construct() {
|
||||||
|
$this->inlineStyleAllowed = false;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,51 @@
|
||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
/**
|
||||||
|
* @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @author Roeland Jago Douma <roeland@famdouma.nl>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\AppFramework\Http;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class StrictInlineContentSecurityPolicy is a simple helper which allows applications to
|
||||||
|
* modify the Content-Security-Policy sent by Nextcloud. Per default only JavaScript,
|
||||||
|
* stylesheets, images, fonts, media and connections from the same domain
|
||||||
|
* ('self') are allowed.
|
||||||
|
*
|
||||||
|
* Even if a value gets modified above defaults will still get appended. Please
|
||||||
|
* notice that Nextcloud ships already with sensible defaults and those policies
|
||||||
|
* should require no modification at all for most use-cases.
|
||||||
|
*
|
||||||
|
* This is a temp helper class from the default ContentSecurityPolicy to allow slow
|
||||||
|
* migration to a stricter CSP. This does not allow inline styles.
|
||||||
|
*
|
||||||
|
* @package OCP\AppFramework\Http
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class StrictInlineContentSecurityPolicy extends ContentSecurityPolicy {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function __construct() {
|
||||||
|
$this->inlineStyleAllowed = false;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue