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

Rename to allowEval

remotes/origin/log-external-deletes
Lukas Reschke 2015-02-16 12:30:21 +07:00
parent b20174bdad
commit a9d1a01440
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/public/appframework/http/contentsecuritypolicy.php
Unescape Escape View File

@ -81,7 +81,7 @@ class ContentSecurityPolicy {
* @param bool $state
* @return $this
*/
public function evalScriptState($state = true) {
public function allowEvalScript($state = true) {
$this->evalScriptAllowed= $state;
return $this;
}

4
tests/lib/appframework/http/ContentSecurityPolicyTest.php
Unescape Escape View File

@ -66,7 +66,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
$expectedPolicy = "default-src 'none';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self';font-src 'self';connect-src 'self';media-src 'self'";
$this->contentSecurityPolicy->allowInlineScript(false);
$this->contentSecurityPolicy->evalScriptState(false);
$this->contentSecurityPolicy->allowEvalScript(false);
$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
}
@ -201,7 +201,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
$expectedPolicy = "default-src 'none';script-src 'self' script.owncloud.org;style-src 'self' style.owncloud.org;img-src 'self' img.owncloud.org;font-src 'self' font.owncloud.org;connect-src 'self' connect.owncloud.org;media-src 'self' media.owncloud.org;object-src objects.owncloud.org;frame-src frame.owncloud.org";
$this->contentSecurityPolicy->allowInlineStyle(false)
->evalScriptState(false)
->allowEvalScript(false)
->addAllowedScriptDomain('script.owncloud.org')
->addAllowedStyleDomain('style.owncloud.org')
->addAllowedFontDomain('font.owncloud.org')