From 357a43858f8aa9c875a16658dfd9863e01d15437 Mon Sep 17 00:00:00 2001 From: Lily Chen Date: Mon, 26 Jul 2021 16:53:05 +0000 Subject: [PATCH] Remove legacy-samesite Web Platform Tests SameSite-Lax-by-default and SameSite=None-requires-Secure have been standardized ([1], [2]) and launched in Chromium [3] as well as Firefox [4]. The WPTs testing "legacy" behavior are no longer needed, and they are also failing on wpt.fyi [5]. This change removes the legacy-samesite virtual test suite, as well as the ?legacy-samesite variant of the tests in wpt/cookie/samesite/. The test for SameSite=None-requires-Secure also loses its "tentative" designation. Chromium will soon no longer support the configuration used in the virtual test suite, so there would be no way to run these tests anyway. [1] https://github.com/httpwg/http-extensions/pull/1325 [2] https://github.com/httpwg/http-extensions/pull/1323 [3] https://crrev.com/c/2231445 [4] https://hacks.mozilla.org/2020/08/changes-to-samesite-cookie-behavior/ [5] https://wpt.fyi/results/cookies/samesite?run_id=5099687737556992&run_id=5641857632567296&run_id=5678463840157696&run_id=5638004375814144 Bug: 961439, 1211388 Change-Id: Idb3c835908bcd61dde3593b4fb4f9349e738031f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3047679 Reviewed-by: Steven Bingler Commit-Queue: Lily Chen Cr-Commit-Position: refs/heads/master@{#905289} NOKEYCHECK=True GitOrigin-RevId: a11b13cf0fb388ee424f03814c955052856331ad --- blink/web_tests/NeverFixTests | 46 ------------- blink/web_tests/TestExpectations | 5 -- blink/web_tests/VirtualTestSuites | 6 -- .../web_tests/android/WebviewWPTExpectations | 8 --- .../cookies/resources/cookie-helper.sub.js | 64 ++----------------- ...ithout-samesite-must-be-secure.https.html} | 0 .../wpt/cookies/samesite/fetch.https.html | 4 +- .../samesite/form-get-blank-reload.https.html | 4 +- .../samesite/form-get-blank.https.html | 4 +- .../form-post-blank-reload.https.html | 4 +- .../samesite/form-post-blank.https.html | 4 +- .../cookies/samesite/iframe-reload.https.html | 4 +- .../wpt/cookies/samesite/iframe.https.html | 4 +- .../wpt/cookies/samesite/img.https.html | 13 +--- .../multiple-samesite-attributes.https.html | 37 ++++------- .../cookies/samesite/setcookie-lax.https.html | 4 +- .../samesite/setcookie-navigation.https.html | 5 +- .../samesite/window-open-reload.https.html | 4 +- .../cookies/samesite/window-open.https.html | 4 +- .../virtual/legacy-samesite/README.md | 3 - .../external/wpt/cookies/samesite/README.txt | 3 - 21 files changed, 32 insertions(+), 198 deletions(-) rename blink/web_tests/external/wpt/cookies/samesite-none-secure/{cookies-without-samesite-must-be-secure.https.tentative.html => cookies-without-samesite-must-be-secure.https.html} (100%) delete mode 100644 blink/web_tests/virtual/legacy-samesite/README.md delete mode 100644 blink/web_tests/virtual/legacy-samesite/external/wpt/cookies/samesite/README.txt diff --git a/blink/web_tests/NeverFixTests b/blink/web_tests/NeverFixTests index 1df84ef53256..19dcfac944e8 100644 --- a/blink/web_tests/NeverFixTests +++ b/blink/web_tests/NeverFixTests @@ -1724,52 +1724,6 @@ crbug.com/1085129 virtual/force-eager/external/wpt/measure-memory/idlharness.win crbug.com/1207146 virtual/force-eager/external/wpt/measure-memory/service-worker.https.any.serviceworker.html [ Skip ] crbug.com/1207146 virtual/force-eager/external/wpt/measure-memory/shared-worker.https.any.sharedworker.html [ Skip ] -# Legacy SameSite cookie tests do not apply when non-legacy behavior is in effect. -crbug.com/961439 external/wpt/cookies/samesite/fetch.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/form-get-blank-reload.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/form-get-blank.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/form-post-blank-reload.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/form-post-blank.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/iframe-reload.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/iframe.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/img.https.html?legacy-samesite [ Skip ] -crbug.com/1161591 external/wpt/cookies/samesite/multiple-samesite-attributes.https.html?legacy-samesite [ Skip ] -crbug.com/1161591 virtual/schemeful-same-site/external/wpt/cookies/samesite/multiple-samesite-attributes.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/setcookie-lax.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/setcookie-navigation.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/window-open-reload.https.html?legacy-samesite [ Skip ] -crbug.com/961439 external/wpt/cookies/samesite/window-open.https.html?legacy-samesite [ Skip ] - -# Unskip the above tests for virtual/legacy-samesite. -virtual/legacy-samesite/external/wpt/cookies/samesite/fetch.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/form-get-blank-reload.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/form-get-blank.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/form-post-blank-reload.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/form-post-blank.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/iframe-reload.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/iframe.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/img.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/multiple-samesite-attributes.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/setcookie-lax.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/setcookie-navigation.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/window-open-reload.https.html?legacy-samesite [ Pass ] -virtual/legacy-samesite/external/wpt/cookies/samesite/window-open.https.html?legacy-samesite [ Pass ] - -# Non-legacy SameSite cookie tests do not apply when legacy SameSite behavior is in effect. -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/fetch.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/form-get-blank-reload.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/form-get-blank.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/form-post-blank-reload.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/form-post-blank.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/iframe-reload.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/iframe.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/img.https.html [ Skip ] -crbug.com/1161591 virtual/legacy-samesite/external/wpt/cookies/samesite/multiple-samesite-attributes.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/setcookie-lax.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/setcookie-navigation.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/window-open-reload.https.html [ Skip ] -crbug.com/961439 virtual/legacy-samesite/external/wpt/cookies/samesite/window-open.https.html [ Skip ] - # AppCache tests that need to run only in a virtual test suite # But have to live under non-virtual http/ to get http/ behavior crbug.com/582750 http/tests/appcache/* [ Skip ] diff --git a/blink/web_tests/TestExpectations b/blink/web_tests/TestExpectations index 1f425e2530a5..fa07fc5f19cf 100644 --- a/blink/web_tests/TestExpectations +++ b/blink/web_tests/TestExpectations @@ -4582,9 +4582,6 @@ crbug.com/827231 [ Win ] external/wpt/cookie-store/change_eventhandler_for_docum crbug.com/843945 external/wpt/cookies/samesite/form-get-blank-reload.https.html [ Failure ] crbug.com/843945 external/wpt/cookies/samesite/form-post-blank-reload.https.html [ Failure ] crbug.com/843945 external/wpt/cookies/samesite/window-open-reload.https.html [ Failure ] -crbug.com/961745 virtual/legacy-samesite/external/wpt/cookies/samesite/form-get-blank-reload.https.html?legacy-samesite [ Failure ] -crbug.com/961745 virtual/legacy-samesite/external/wpt/cookies/samesite/form-post-blank-reload.https.html?legacy-samesite [ Failure ] -crbug.com/961745 virtual/legacy-samesite/external/wpt/cookies/samesite/window-open-reload.https.html?legacy-samesite [ Failure ] # When SameSiteByDefaultCookies is enabled (which is the case by default since # it's one of the experimental-web-platform-features, the Lax-allow-unsafe @@ -4595,8 +4592,6 @@ crbug.com/990439 http/tests/cookies/same-site/popup-cross-site-post.https.html [ # Temporarily disable some tests that produce non-deterministic outputs. crbug.com/1074441 external/wpt/cookies/samesite/iframe-reload.https.html [ Skip ] crbug.com/1074441 external/wpt/cookies/samesite/iframe.https.html [ Skip ] -crbug.com/1074441 virtual/legacy-samesite/external/wpt/cookies/samesite/iframe-reload.https.html?legacy-samesite [ Skip ] -crbug.com/1074441 virtual/legacy-samesite/external/wpt/cookies/samesite/iframe.https.html?legacy-samesite [ Skip ] # Flaky Windows-only content_shell crash crbug.com/1162205 [ Win ] virtual/schemeful-same-site/external/wpt/cookies/attributes/path-redirect.html [ Crash Pass ] crbug.com/1162205 [ Win ] external/wpt/cookies/attributes/path-redirect.html [ Crash Pass ] diff --git a/blink/web_tests/VirtualTestSuites b/blink/web_tests/VirtualTestSuites index 174e75610e3a..0106a5a46141 100644 --- a/blink/web_tests/VirtualTestSuites +++ b/blink/web_tests/VirtualTestSuites @@ -692,12 +692,6 @@ "bases": ["fast/forms/color-scheme/select"], "args": ["--enable-features=UseCommonSelectPopup"] }, - { - "prefix": "legacy-samesite", - "bases": ["external/wpt/cookies/samesite"], - "args": ["--disable-features=SameSiteByDefaultCookies", - "--disable-features=CookiesWithoutSameSiteMustBeSecure"] - }, { "prefix": "forced-high-contrast-colors", "bases": ["external/wpt/forced-colors-mode", diff --git a/blink/web_tests/android/WebviewWPTExpectations b/blink/web_tests/android/WebviewWPTExpectations index f9186c00316a..044297b41dd7 100644 --- a/blink/web_tests/android/WebviewWPTExpectations +++ b/blink/web_tests/android/WebviewWPTExpectations @@ -707,25 +707,17 @@ crbug.com/1050754 external/wpt/cookies/samesite-none-secure/cookies-without-same crbug.com/1050754 external/wpt/cookies/samesite/about-blank-subresource.https.html [ Failure Timeout ] crbug.com/1050754 external/wpt/cookies/samesite/about-blank-toplevel.https.html [ Failure Pass Timeout ] crbug.com/1050754 external/wpt/cookies/samesite/fetch.https.html [ Failure ] -crbug.com/1050754 external/wpt/cookies/samesite/fetch.https.html?legacy-samesite [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/form-get-blank-reload.https.html [ Failure ] -crbug.com/1050754 external/wpt/cookies/samesite/form-get-blank-reload.https.html?legacy-samesite [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/form-post-blank-reload.https.html [ Failure ] -crbug.com/1050754 external/wpt/cookies/samesite/form-post-blank-reload.https.html?legacy-samesite [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/form-post-blank.https.html [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/iframe-reload.https.html [ Failure ] -crbug.com/1050754 external/wpt/cookies/samesite/iframe-reload.https.html?legacy-samesite [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/iframe.document.https.html [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/iframe.https.html [ Failure ] -crbug.com/1050754 external/wpt/cookies/samesite/iframe.https.html?legacy-samesite [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/img.https.html [ Failure ] -crbug.com/1050754 external/wpt/cookies/samesite/img.https.html?legacy-samesite [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/sandbox-iframe-nested.https.html [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/sandbox-iframe-subresource.https.html [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/setcookie-lax.https.html [ Failure ] -crbug.com/1050754 external/wpt/cookies/samesite/setcookie-lax.https.html?legacy-samesite [ Failure ] crbug.com/1050754 external/wpt/cookies/samesite/window-open-reload.https.html [ Failure ] -crbug.com/1050754 external/wpt/cookies/samesite/window-open-reload.https.html?legacy-samesite [ Failure ] crbug.com/1050754 external/wpt/cookies/schemeful-same-site/schemeful-iframe-subresource.tentative.html [ Failure ] crbug.com/1050754 external/wpt/cookies/schemeful-same-site/schemeful-navigation.tentative.html [ Failure ] crbug.com/1050754 external/wpt/cookies/schemeful-same-site/schemeful-subresource.tentative.html [ Failure ] diff --git a/blink/web_tests/external/wpt/cookies/resources/cookie-helper.sub.js b/blink/web_tests/external/wpt/cookies/resources/cookie-helper.sub.js index 789d38d1eb40..1420779e0d5a 100644 --- a/blink/web_tests/external/wpt/cookies/resources/cookie-helper.sub.js +++ b/blink/web_tests/external/wpt/cookies/resources/cookie-helper.sub.js @@ -167,32 +167,9 @@ async function resetSameSiteCookies(origin, value) { } } -// Given an |expectedStatus| and |expectedValue|, assert the |cookies| contains the -// proper set of cookie names and values, according to the legacy behavior where -// unspecified SameSite attribute defaults to SameSite=None behavior. -function verifySameSiteCookieStateLegacy(expectedStatus, expectedValue, cookies, domCookieStatus) { - assert_equals(cookies["samesite_none"], expectedValue, "SameSite=None cookies are always sent."); - assert_equals(cookies["samesite_unspecified"], expectedValue, "Unspecified-SameSite cookies are always sent."); - if (expectedStatus == SameSiteStatus.CROSS_SITE) { - assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not sent with cross-site requests."); - assert_not_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are not sent with cross-site requests."); - } else if (expectedStatus == SameSiteStatus.LAX) { - assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not sent with lax requests."); - assert_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are sent with lax requests."); - } else if (expectedStatus == SameSiteStatus.STRICT) { - assert_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are sent with strict requests."); - assert_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are sent with strict requests."); - } - - if (cookies["domcookies"]) { - verifyDocumentCookieLegacy(domCookieStatus, expectedValue, cookies["domcookies"]); - } -} - -// Same as above except this expects samesite_unspecified to act the same as -// samesite_lax (which is the behavior expected when SameSiteByDefault is -// enabled). -function verifySameSiteCookieStateWithSameSiteByDefault(expectedStatus, expectedValue, cookies, domCookieStatus) { +// Given an |expectedStatus| and |expectedValue|, assert the |cookies| contains +// the proper set of cookie names and values. Expects SameSite-Lax-by-default. +function verifySameSiteCookieState(expectedStatus, expectedValue, cookies, domCookieStatus) { assert_equals(cookies["samesite_none"], expectedValue, "SameSite=None cookies are always sent."); if (expectedStatus == SameSiteStatus.CROSS_SITE) { assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not sent with cross-site requests."); @@ -209,32 +186,11 @@ function verifySameSiteCookieStateWithSameSiteByDefault(expectedStatus, expected } if (cookies["domcookies"]) { - verifyDocumentCookieWithSameSiteByDefault(domCookieStatus, expectedValue, cookies["domcookies"]); - } -} - -function verifyDocumentCookieLegacy(expectedStatus, expectedValue, domcookies) { - const cookies = domcookies.split(";") - .map(cookie => cookie.trim().split("=")) - .reduce((obj, cookie) => { - obj[cookie[0]] = cookie[1]; - return obj; - }, {}); - - if (expectedStatus == DomSameSiteStatus.SAME_SITE) { - assert_equals(cookies["samesite_none"], expectedValue, "SameSite=None cookies are always included in document.cookie."); - assert_equals(cookies["samesite_unspecified"], expectedValue, "Unspecified-SameSite cookies are always included in document.cookie."); - assert_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are always included in document.cookie."); - assert_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are always included in document.cookie."); - } else if (expectedStatus == DomSameSiteStatus.CROSS_SITE) { - assert_equals(cookies["samesite_none"], expectedValue, "SameSite=None cookies are always included in document.cookie."); - assert_equals(cookies["samesite_unspecified"], expectedValue, "Unspecified-SameSite cookies are always included in document.cookie."); - assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not included in document.cookie when cross-site."); - assert_not_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are not included in document.cookie when cross-site."); + verifyDocumentCookieSameSite(domCookieStatus, expectedValue, cookies['domcookies']); } } -function verifyDocumentCookieWithSameSiteByDefault(expectedStatus, expectedValue, domcookies) { +function verifyDocumentCookieSameSite(expectedStatus, expectedValue, domcookies) { const cookies = domcookies.split(";") .map(cookie => cookie.trim().split("=")) .reduce((obj, cookie) => { @@ -255,16 +211,6 @@ function verifyDocumentCookieWithSameSiteByDefault(expectedStatus, expectedValue } } -function isLegacySameSite() { - return location.search === "?legacy-samesite"; -} - -// Get the proper verifier based on the test's variant type. -function getSameSiteVerifier() { - return isLegacySameSite() ? - verifySameSiteCookieStateLegacy : verifySameSiteCookieStateWithSameSiteByDefault; -} - // // LeaveSecureCookiesAlone-specific test helpers: // diff --git a/blink/web_tests/external/wpt/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.tentative.html b/blink/web_tests/external/wpt/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.html similarity index 100% rename from blink/web_tests/external/wpt/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.tentative.html rename to blink/web_tests/external/wpt/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.html diff --git a/blink/web_tests/external/wpt/cookies/samesite/fetch.https.html b/blink/web_tests/external/wpt/cookies/samesite/fetch.https.html index 934fc06765c4..79e49009fb8f 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/fetch.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/fetch.https.html @@ -1,8 +1,6 @@ - - @@ -15,7 +13,7 @@ return credFetch(target + "/cookies/resources/list.py") .then(r => r.json()) - .then(cookies => getSameSiteVerifier()(expectedStatus, value, cookies, DomSameSiteStatus.SAME_SITE)); + .then(cookies => verifySameSiteCookieState(expectedStatus, value, cookies, DomSameSiteStatus.SAME_SITE)); }); }, title); } diff --git a/blink/web_tests/external/wpt/cookies/samesite/form-get-blank-reload.https.html b/blink/web_tests/external/wpt/cookies/samesite/form-get-blank-reload.https.html index 611255f7374d..ff39899f0433 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/form-get-blank-reload.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/form-get-blank-reload.https.html @@ -1,7 +1,5 @@ - - @@ -30,7 +28,7 @@ var reloaded = false; var msgHandler = e => { try { - getSameSiteVerifier()(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); + verifySameSiteCookieState(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); } catch (e) { reject(e); } diff --git a/blink/web_tests/external/wpt/cookies/samesite/form-get-blank.https.html b/blink/web_tests/external/wpt/cookies/samesite/form-get-blank.https.html index 3b059174d0b9..e0f6799e99f3 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/form-get-blank.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/form-get-blank.https.html @@ -1,8 +1,6 @@ - - @@ -33,7 +31,7 @@ window.removeEventListener("message", msgHandler); e.source.close(); try { - getSameSiteVerifier()(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); + verifySameSiteCookieState(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); resolve("Popup received the cookie."); } catch (e) { reject(e); diff --git a/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html b/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html index fedb0a03c5a9..9d1ef2ea47d9 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html @@ -1,7 +1,5 @@ - - @@ -20,7 +18,7 @@ var reloaded = false; var msgHandler = e => { try { - getSameSiteVerifier()(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); + verifySameSiteCookieState(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); } catch (e) { reject(e); } diff --git a/blink/web_tests/external/wpt/cookies/samesite/form-post-blank.https.html b/blink/web_tests/external/wpt/cookies/samesite/form-post-blank.https.html index cc37f08dd1fa..9c795b18bc60 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/form-post-blank.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/form-post-blank.https.html @@ -1,8 +1,6 @@ - - @@ -22,7 +20,7 @@ window.removeEventListener("message", msgHandler); e.source.close(); try { - getSameSiteVerifier()(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); + verifySameSiteCookieState(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); resolve("Popup received the cookie."); } catch (e) { reject(e); diff --git a/blink/web_tests/external/wpt/cookies/samesite/iframe-reload.https.html b/blink/web_tests/external/wpt/cookies/samesite/iframe-reload.https.html index a33c4dd4eb2a..ab572f8ba1e6 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/iframe-reload.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/iframe-reload.https.html @@ -1,8 +1,6 @@ - - @@ -21,7 +19,7 @@ var reloaded = false; var msgHandler = e => { try { - getSameSiteVerifier()(expectedStatus, value, e.data, expectedDomStatus); + verifySameSiteCookieState(expectedStatus, value, e.data, expectedDomStatus); } catch (e) { reject(e); } diff --git a/blink/web_tests/external/wpt/cookies/samesite/iframe.https.html b/blink/web_tests/external/wpt/cookies/samesite/iframe.https.html index 3c7b638810e2..cad523c4a60b 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/iframe.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/iframe.https.html @@ -1,8 +1,6 @@ - - @@ -24,7 +22,7 @@ document.body.removeChild(iframe); window.removeEventListener("message", msgHandler); try { - getSameSiteVerifier()(expectedStatus, value, e.data, expectedDomStatus); + verifySameSiteCookieState(expectedStatus, value, e.data, expectedDomStatus); resolve(); } catch(e) { reject(e); diff --git a/blink/web_tests/external/wpt/cookies/samesite/img.https.html b/blink/web_tests/external/wpt/cookies/samesite/img.https.html index 68603fd39d9c..1ddc8d99adfa 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/img.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/img.https.html @@ -1,8 +1,6 @@ - - @@ -46,15 +44,10 @@ assert_cookie_absent(target, "samesite_strict", value), expectedStatus == SameSiteStatus.CROSS_SITE ? assert_cookie_absent(target, "samesite_lax", value) : - assert_cookie_present(target, "samesite_lax", value)]; - if (isLegacySameSite()) { - // Legacy behavior: unspecified SameSite acts like SameSite=None. - asserts.push(assert_cookie_present(target, "samesite_unspecified", value)); - } else { - asserts.push(expectedStatus == SameSiteStatus.CROSS_SITE ? + assert_cookie_present(target, "samesite_lax", value), + expectedStatus == SameSiteStatus.CROSS_SITE ? assert_cookie_absent(target, "samesite_unspecified", value) : - assert_cookie_present(target, "samesite_unspecified", value)); - } + assert_cookie_present(target, "samesite_unspecified", value)]; return Promise.all(asserts); }); }, title); diff --git a/blink/web_tests/external/wpt/cookies/samesite/multiple-samesite-attributes.https.html b/blink/web_tests/external/wpt/cookies/samesite/multiple-samesite-attributes.https.html index f1e52a3aea3b..d32a39639d16 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/multiple-samesite-attributes.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/multiple-samesite-attributes.https.html @@ -1,8 +1,6 @@ - - @@ -54,28 +52,19 @@ assert_cookie_present(target, "samesite_unsupported_lax", value), expectedStatus == SameSiteStatus.CROSS_SITE ? assert_cookie_absent(target, "samesite_strict_lax", value) : - assert_cookie_present(target, "samesite_strict_lax", value) - ]; - if (isLegacySameSite()) { - // Legacy behavior: unsupported SameSite value acts like SameSite=None. - asserts.push(assert_cookie_present(target, "samesite_none_unsupported", value)); - asserts.push(assert_cookie_present(target, "samesite_lax_unsupported", value)); - asserts.push(assert_cookie_present(target, "samesite_strict_unsupported", value)); - asserts.push(assert_cookie_present(target, "samesite_unsupported", value)); - } else { - asserts.push(expectedStatus == SameSiteStatus.CROSS_SITE ? - assert_cookie_absent(target, "samesite_none_unsupported", value) : - assert_cookie_present(target, "samesite_none_unsupported", value)); - asserts.push(expectedStatus == SameSiteStatus.CROSS_SITE ? - assert_cookie_absent(target, "samesite_lax_unsupported", value) : - assert_cookie_present(target, "samesite_lax_unsupported", value)); - asserts.push(expectedStatus == SameSiteStatus.CROSS_SITE ? - assert_cookie_absent(target, "samesite_strict_unsupported", value) : - assert_cookie_present(target, "samesite_strict_unsupported", value)); - asserts.push(expectedStatus == SameSiteStatus.CROSS_SITE ? - assert_cookie_absent(target, "samesite_unsupported", value) : - assert_cookie_present(target, "samesite_unsupported", value)); - } + assert_cookie_present(target, "samesite_strict_lax", value), + expectedStatus == SameSiteStatus.CROSS_SITE ? + assert_cookie_absent(target, "samesite_none_unsupported", value) : + assert_cookie_present(target, "samesite_none_unsupported", value), + expectedStatus == SameSiteStatus.CROSS_SITE ? + assert_cookie_absent(target, "samesite_lax_unsupported", value) : + assert_cookie_present(target, "samesite_lax_unsupported", value), + expectedStatus == SameSiteStatus.CROSS_SITE ? + assert_cookie_absent(target, "samesite_strict_unsupported", value) : + assert_cookie_present(target, "samesite_strict_unsupported", value), + expectedStatus == SameSiteStatus.CROSS_SITE ? + assert_cookie_absent(target, "samesite_unsupported", value) : + assert_cookie_present(target, "samesite_unsupported", value)]; return Promise.all(asserts); }); }, title); diff --git a/blink/web_tests/external/wpt/cookies/samesite/setcookie-lax.https.html b/blink/web_tests/external/wpt/cookies/samesite/setcookie-lax.https.html index 0c09577373fd..f2094af693d6 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/setcookie-lax.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/setcookie-lax.https.html @@ -1,7 +1,5 @@ - - @@ -28,7 +26,7 @@ assert_dom_cookie("samesite_strict", e.data.value, false); assert_dom_cookie("samesite_lax", e.data.value, false); assert_dom_cookie("samesite_none", e.data.value, true); - assert_dom_cookie("samesite_unspecified", e.data.value, isLegacySameSite()); + assert_dom_cookie("samesite_unspecified", e.data.value, false); w.close(); }, "Cross-site window shouldn't be able to set `SameSite=Lax` or `SameSite=Strict` cookies."); diff --git a/blink/web_tests/external/wpt/cookies/samesite/setcookie-navigation.https.html b/blink/web_tests/external/wpt/cookies/samesite/setcookie-navigation.https.html index 06f9a73a7b4d..2dbc5526bcca 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/setcookie-navigation.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/setcookie-navigation.https.html @@ -1,8 +1,6 @@ - - @@ -64,8 +62,7 @@ let message = await wait_for_message('FRAME_COOKIES_SET', SECURE_ORIGIN); // Check for the proper cookies. let samesite_none_cookies = ['samesite_none']; - let samesite_cookies = ['samesite_strict', 'samesite_lax']; - (isLegacySameSite() ? samesite_none_cookies : samesite_cookies).push('samesite_unspecified'); + let samesite_cookies = ['samesite_strict', 'samesite_lax', 'samesite_unspecified']; assert_cookies_present(message.data.cookies, value, samesite_none_cookies, true); assert_cookies_present(message.data.cookies, value, samesite_cookies, !cross_site); w.close(); diff --git a/blink/web_tests/external/wpt/cookies/samesite/window-open-reload.https.html b/blink/web_tests/external/wpt/cookies/samesite/window-open-reload.https.html index f21b6a77de5c..dc800f853bdb 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/window-open-reload.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/window-open-reload.https.html @@ -1,7 +1,5 @@ - - @@ -17,7 +15,7 @@ var reloaded = false; var msgHandler = e => { try { - getSameSiteVerifier()(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); + verifySameSiteCookieState(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); } catch (e) { reject(e); } diff --git a/blink/web_tests/external/wpt/cookies/samesite/window-open.https.html b/blink/web_tests/external/wpt/cookies/samesite/window-open.https.html index 7ee3ef43abea..b460e1a597b2 100644 --- a/blink/web_tests/external/wpt/cookies/samesite/window-open.https.html +++ b/blink/web_tests/external/wpt/cookies/samesite/window-open.https.html @@ -1,8 +1,6 @@ - - @@ -19,7 +17,7 @@ window.removeEventListener("message", msgHandler); w.close(); try { - getSameSiteVerifier()(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); + verifySameSiteCookieState(expectedStatus, value, e.data, DomSameSiteStatus.SAME_SITE); resolve("Popup received the cookie."); } catch (e) { reject(e); diff --git a/blink/web_tests/virtual/legacy-samesite/README.md b/blink/web_tests/virtual/legacy-samesite/README.md deleted file mode 100644 index 175f0a1f3bf0..000000000000 --- a/blink/web_tests/virtual/legacy-samesite/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This virtual test suite is for testing the legacy cookie SameSite behavior: -- Cookies that don't specify SameSite default to behaving like SameSite=None. -- SameSite=None cookies are not required to also be Secure. diff --git a/blink/web_tests/virtual/legacy-samesite/external/wpt/cookies/samesite/README.txt b/blink/web_tests/virtual/legacy-samesite/external/wpt/cookies/samesite/README.txt deleted file mode 100644 index 175f0a1f3bf0..000000000000 --- a/blink/web_tests/virtual/legacy-samesite/external/wpt/cookies/samesite/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This virtual test suite is for testing the legacy cookie SameSite behavior: -- Cookies that don't specify SameSite default to behaving like SameSite=None. -- SameSite=None cookies are not required to also be Secure.