From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Tue, 9 Jul 2019 12:44:10 +0000 (+0200)
Subject: Don't send executionContexts for Clear-Site-Data
X-Git-Tag: v16.0.5RC1~7^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=48b746443d55dcbb176f373c50713eab4079f469;p=nextcloud-server.git

Don't send executionContexts for Clear-Site-Data

There are plans to remove executionContexts from the spec: https://github.com/w3c/webappsec-clear-site-data/issues/59

Firefox already removed it https://bugzilla.mozilla.org/show_bug.cgi?id=1548034

Chromium implementation is not finish: https://bugs.chromium.org/p/chromium/issues/detail?id=898503&q=clear-site-data&sort=-modified&colspec=ID%20Pri%20M%20Stars%20ReleaseBlock%20Component%20Status%20Owner%20Summary%20OS%20Modified

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---

diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 85d3b6b837f..c0c0b1a064b 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -137,7 +137,7 @@ class LoginController extends Controller {
 
 		$this->session->set('clearingExecutionContexts', '1');
 		$this->session->close();
-		$response->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
+		$response->addHeader('Clear-Site-Data', '"cache", "storage"');
 		return $response;
 	}
 
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index bb21903b653..934ae71dc37 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -117,7 +117,7 @@ class LoginControllerTest extends TestCase {
 			->willReturn('/login');
 
 		$expected = new RedirectResponse('/login');
-		$expected->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
+		$expected->addHeader('Clear-Site-Data', '"cache", "storage"');
 		$this->assertEquals($expected, $this->loginController->logout());
 	}
 
@@ -147,7 +147,7 @@ class LoginControllerTest extends TestCase {
 			->willReturn('/login');
 
 		$expected = new RedirectResponse('/login');
-		$expected->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
+		$expected->addHeader('Clear-Site-Data', '"cache", "storage"');
 		$this->assertEquals($expected, $this->loginController->logout());
 	}