diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-04-16 16:43:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-16 16:43:32 +0200 |
| commit | 29d78eaf803957ab8df232e435d9d0ad1fc2741a (patch) | |
| tree | 15f48602b108ca3cb9c3c70386188a22b7869eb4 /tests | |
| parent | 34aa51f126bba2425a1c9b71525a093f25e2b08e (diff) | |
| parent | 7276735eb423ed126333923bb921d9d4bef16f07 (diff) | |
| download | nextcloud-server-29d78eaf803957ab8df232e435d9d0ad1fc2741a.tar.gz nextcloud-server-29d78eaf803957ab8df232e435d9d0ad1fc2741a.zip | |
Merge pull request #14952 from nextcloud/enh/14179/api_csp
Set empty CSP by default
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/AppFramework/Controller/ControllerTest.php | 2 | ||||
| -rw-r--r-- | tests/lib/AppFramework/Http/DataResponseTest.php | 2 | ||||
| -rw-r--r-- | tests/lib/AppFramework/Http/ResponseTest.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php index 3d1d7e66e84..c37a2a3456c 100644 --- a/tests/lib/AppFramework/Controller/ControllerTest.php +++ b/tests/lib/AppFramework/Controller/ControllerTest.php @@ -116,7 +116,7 @@ class ControllerTest extends \Test\TestCase { 'test' => 'something', 'Cache-Control' => 'no-cache, no-store, must-revalidate', 'Content-Type' => 'application/json; charset=utf-8', - 'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self'", + 'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self'", ]; $response = $this->controller->customDataResponse(array('hi')); diff --git a/tests/lib/AppFramework/Http/DataResponseTest.php b/tests/lib/AppFramework/Http/DataResponseTest.php index 67ffdde8669..e0eca83f6e9 100644 --- a/tests/lib/AppFramework/Http/DataResponseTest.php +++ b/tests/lib/AppFramework/Http/DataResponseTest.php @@ -68,7 +68,7 @@ class DataResponseTest extends \Test\TestCase { $expectedHeaders = [ 'Cache-Control' => 'no-cache, no-store, must-revalidate', - 'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self'", + 'Content-Security-Policy' => "default-src 'none';base-uri 'none';manifest-src 'self'", ]; $expectedHeaders = array_merge($expectedHeaders, $headers); diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php index 18a9a398f72..e840111db19 100644 --- a/tests/lib/AppFramework/Http/ResponseTest.php +++ b/tests/lib/AppFramework/Http/ResponseTest.php @@ -59,7 +59,7 @@ class ResponseTest extends \Test\TestCase { $this->childResponse->setHeaders($expected); $headers = $this->childResponse->getHeaders(); - $expected['Content-Security-Policy'] = "default-src 'none';base-uri 'none';manifest-src 'self';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' data:;connect-src 'self';media-src 'self';frame-ancestors 'self'"; + $expected['Content-Security-Policy'] = "default-src 'none';base-uri 'none';manifest-src 'self'"; $this->assertEquals($expected, $headers); } @@ -86,7 +86,7 @@ class ResponseTest extends \Test\TestCase { } public function testGetCspEmpty() { - $this->assertNull($this->childResponse->getContentSecurityPolicy()); + $this->assertEquals(new Http\EmptyContentSecurityPolicy(), $this->childResponse->getContentSecurityPolicy()); } public function testAddHeaderValueNullDeletesIt(){ |