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

Differential Revision: https://phabricator.services.mozilla.com/D254249

Author: bvandersloot-mozilla

remote/marionette/cookie.sys.mjs

@@ -274,14 +274,17 @@ cookie.remove = function (toDelete) {
  *
  * @param {string} host
  *     Hostname to retrieve cookies for.
+ * @param {BrowsingContext=} [browsingContext=undefined] browsingContext
+ *     The BrowsingContext that is reading these cookies.
+ *     Used to get the correct partitioned cookies.
  * @param {string=} [currentPath="/"] currentPath
  *     Optionally filter the cookies for ``host`` for the specific path.
  *     Defaults to ``/``, meaning all cookies for ``host`` are included.
  *
  * @returns {Iterable.<Cookie>}
  *     Iterator.
  */
-cookie.iter = function* (host, currentPath = "/") {
+cookie.iter = function* (host, browsingContext = undefined, currentPath = "/") {
   lazy.assert.string(
     host,
     lazy.pprint`Expected "host" to be a string, got ${host}`
@@ -294,6 +297,17 @@ cookie.iter = function* (host, currentPath = "/") {
   const isForCurrentPath = path => currentPath.includes(path);
 
   let cookies = cookie.manager.getCookiesFromHost(host, {});
+  if (browsingContext) {
+    let partitionedOriginAttributes = {
+      partitionKey:
+        browsingContext.currentWindowGlobal?.cookieJarSettings?.partitionKey,
+    };
+    let cookiesPartitioned = cookie.manager.getCookiesFromHost(
+      host,
+      partitionedOriginAttributes
+    );
+    cookies.push(...cookiesPartitioned);
+  }
   for (let cookie of cookies) {
     // take the hostname and progressively shorten
     let hostname = host;

remote/marionette/driver.sys.mjs

@@ -2458,7 +2458,7 @@ GeckoDriver.prototype.getCookies = async function () {
   await this._handleUserPrompts();
 
   let { hostname, pathname } = this._getCurrentURL({ top: false });
-  return [...lazy.cookie.iter(hostname, pathname)];
+  return [...lazy.cookie.iter(hostname, this.getBrowsingContext(), pathname)];
 };
 
 /**
@@ -2477,7 +2477,11 @@ GeckoDriver.prototype.deleteAllCookies = async function () {
   await this._handleUserPrompts();
 
   let { hostname, pathname } = this._getCurrentURL({ top: false });
-  for (let toDelete of lazy.cookie.iter(hostname, pathname)) {
+  for (let toDelete of lazy.cookie.iter(
+    hostname,
+    this.getBrowsingContext(),
+    pathname
+  )) {
     lazy.cookie.remove(toDelete);
   }
 };
@@ -2502,7 +2506,11 @@ GeckoDriver.prototype.deleteCookie = async function (cmd) {
     cmd.parameters.name,
     lazy.pprint`Expected "name" to be a string, got ${cmd.parameters.name}`
   );
-  for (let c of lazy.cookie.iter(hostname, pathname)) {
+  for (let c of lazy.cookie.iter(
+    hostname,
+    this.getBrowsingContext(),
+    pathname
+  )) {
     if (c.name === name) {
       lazy.cookie.remove(c);
     }

testing/web-platform/meta/cookies/partitioned-cookies/partitioned-cookies-samesite-attribute.https.html.ini

@@ -1,11 +1,3 @@
 [partitioned-cookies-samesite-attribute.https.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-site contexts, partitioned cookies can only be set with explicit SameSite=None]
     expected: FAIL

testing/web-platform/meta/infrastructure/testdriver/get_all_cookies.sub.https.html.ini

@@ -1,6 +1,3 @@
 [get_named_cookie.sub.https.html]
   expected:
     if (os == "android") and fission: [OK, TIMEOUT]
-  [Get Named HTTPS cookie]
-    expected:
-      if nightly_build: FAIL