Bug 1972830 - [marionette] Add support to interact with CHIPS cookies - r=anti-tracking-reviewers,webdriver-reviewers,timhuang,Sasha

marco-c · marco-c · commit 50e9b2cd63e9 · 2025-07-01T02:15:54.000Z
Differential Revision: https://phabricator.services.mozilla.com/D254249 UltraBlame original commit: 38d3dab5d8c8f0b3adfea3cc94a8cf7567da2071
diff --git a/remote/marionette/cookie.sys.mjs b/remote/marionette/cookie.sys.mjs
@@ -1735,6 +1735,36 @@ for
 *
 param
 {
+BrowsingContext
+=
+}
+[
+browsingContext
+=
+undefined
+]
+browsingContext
+*
+The
+BrowsingContext
+that
+is
+reading
+these
+cookies
+.
+*
+Used
+to
+get
+the
+correct
+partitioned
+cookies
+.
+*
+param
+{
 string
 =
 }
@@ -1793,6 +1823,9 @@ function
 *
 (
 host
+browsingContext
+=
+undefined
 currentPath
 =
 "
@@ -1875,6 +1908,52 @@ host
 }
 )
 ;
+if
+(
+browsingContext
+)
+{
+let
+partitionedOriginAttributes
+=
+{
+partitionKey
+:
+browsingContext
+.
+currentWindowGlobal
+?
+.
+cookieJarSettings
+?
+.
+partitionKey
+}
+;
+let
+cookiesPartitioned
+=
+cookie
+.
+manager
+.
+getCookiesFromHost
+(
+host
+partitionedOriginAttributes
+)
+;
+cookies
+.
+push
+(
+.
+.
+.
+cookiesPartitioned
+)
+;
+}
 for
 (
 let
diff --git a/remote/marionette/driver.sys.mjs b/remote/marionette/driver.sys.mjs
@@ -16718,6 +16718,11 @@ cookie
 iter
 (
 hostname
+this
+.
+getBrowsingContext
+(
+)
 pathname
 )
 ]
@@ -16851,6 +16856,11 @@ cookie
 iter
 (
 hostname
+this
+.
+getBrowsingContext
+(
+)
 pathname
 )
 )
@@ -17026,6 +17036,11 @@ cookie
 iter
 (
 hostname
+this
+.
+getBrowsingContext
+(
+)
 pathname
 )
 )
diff --git a/testing/web-platform/meta/cookies/partitioned-cookies/partitioned-cookies-samesite-attribute.https.html.ini b/testing/web-platform/meta/cookies/partitioned-cookies/partitioned-cookies-samesite-attribute.https.html.ini
@@ -13,54 +13,6 @@ html
 ]
 [
 In
-top
--
-level
-contexts
-partitioned
-cookies
-default
-to
-the
-same
-SameSite
-attribute
-as
-unpartitioned
-cookies
-.
-]
-expected
-:
-if
-nightly_build
-:
-FAIL
-[
-In
-top
--
-level
-contexts
-partitioned
-cookies
-can
-be
-set
-with
-all
-SameSite
-attributes
-.
-]
-expected
-:
-if
-nightly_build
-:
-FAIL
-[
-In
 embedded
 cross
 -
diff --git a/testing/web-platform/meta/infrastructure/testdriver/get_all_cookies.sub.https.html.ini b/testing/web-platform/meta/infrastructure/testdriver/get_all_cookies.sub.https.html.ini
diff --git a/testing/web-platform/meta/infrastructure/testdriver/get_named_cookie.sub.https.html.ini b/testing/web-platform/meta/infrastructure/testdriver/get_named_cookie.sub.https.html.ini
@@ -25,15 +25,3 @@ fission
 OK
 TIMEOUT
 ]
-[
-Get
-Named
-HTTPS
-cookie
-]
-expected
-:
-if
-nightly_build
-:
-FAIL

Original file line number	Diff line number	Diff line change
`@@ -16718,6 +16718,11 @@ cookie`
`16718`	`16718`	`iter`
`16719`	`16719`	`(`
`16720`	`16720`	`hostname`
	`16721`	`+this`
	`16722`	`+.`
	`16723`	`+getBrowsingContext`
	`16724`	`+(`
	`16725`	`+)`
`16721`	`16726`	`pathname`
`16722`	`16727`	`)`
`16723`	`16728`	`]`
`@@ -16851,6 +16856,11 @@ cookie`
`16851`	`16856`	`iter`
`16852`	`16857`	`(`
`16853`	`16858`	`hostname`
	`16859`	`+this`
	`16860`	`+.`
	`16861`	`+getBrowsingContext`
	`16862`	`+(`
	`16863`	`+)`
`16854`	`16864`	`pathname`
`16855`	`16865`	`)`
`16856`	`16866`	`)`
`@@ -17026,6 +17036,11 @@ cookie`
`17026`	`17036`	`iter`
`17027`	`17037`	`(`
`17028`	`17038`	`hostname`
	`17039`	`+this`
	`17040`	`+.`
	`17041`	`+getBrowsingContext`
	`17042`	`+(`
	`17043`	`+)`
`17029`	`17044`	`pathname`
`17030`	`17045`	`)`
`17031`	`17046`	`)`