From 6235a66aac8d330c0d9ce8d9c918c7ec9c69a6e5 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Tue, 9 Jul 2019 14:44:10 +0200
Subject: [PATCH] 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>
---
 core/Controller/LoginController.php           | 2 +-
 tests/Core/Controller/LoginControllerTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 62670f61021..5d5ae666ca1 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -128,7 +128,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 44a39cc3b27..df1b12b9709 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -138,7 +138,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());
 	}
 
@@ -168,7 +168,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());
 	}
 
-- 
GitLab