From 82c59b4b6eeb629dfafb424970ad24f6dd14e147 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sun, 22 Oct 2023 18:19:18 -0400
Subject: [PATCH] Add `domain` vararg to `trusted-set-cookie`

Related issue:
https://github.com/uBlockOrigin/uBlock-issues/issues/2893
---
 assets/resources/scriptlets.js | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/assets/resources/scriptlets.js b/assets/resources/scriptlets.js
index 62984aa38..407dce41c 100644
--- a/assets/resources/scriptlets.js
+++ b/assets/resources/scriptlets.js
@@ -738,10 +738,11 @@ function objectPruneFn(
 /******************************************************************************/
 
 builtinScriptlets.push({
-    name: 'set-cookie-helper.fn',
-    fn: setCookieHelper,
+    name: 'set-cookie.fn',
+    fn: setCookieFn,
 });
-function setCookieHelper(
+function setCookieFn(
+    trusted = false,
     name = '',
     value = '',
     expires = '',
@@ -772,7 +773,18 @@ function setCookieHelper(
     if ( path === '/' ) {
         cookieParts.push('; path=/');
     }
-    document.cookie = cookieParts.join('');
+
+    if ( trusted ) {
+        if ( options.domain ) {
+            cookieParts.push(`; domain=${options.domain}`);
+        }
+        cookieParts.push('; Secure');
+    }
+
+    try {
+        document.cookie = cookieParts.join('');
+    } catch(_) {
+    }
 
     if ( options.reload && getCookieValue(name) === value ) {
         window.location.reload();
@@ -3336,7 +3348,7 @@ builtinScriptlets.push({
     world: 'ISOLATED',
     dependencies: [
         'safe-self.fn',
-        'set-cookie-helper.fn',
+        'set-cookie.fn',
     ],
 });
 function setCookie(
@@ -3362,7 +3374,8 @@ function setCookie(
     }
     value = encodeURIComponent(value);
 
-    setCookieHelper(
+    setCookieFn(
+        false,
         name,
         value,
         '',
@@ -3721,7 +3734,7 @@ builtinScriptlets.push({
     world: 'ISOLATED',
     dependencies: [
         'safe-self.fn',
-        'set-cookie-helper.fn',
+        'set-cookie.fn',
     ],
 });
 function trustedSetCookie(
@@ -3753,7 +3766,8 @@ function trustedSetCookie(
         expires = time.toUTCString();
     }
 
-    setCookieHelper(
+    setCookieFn(
+        true,
         name,
         value,
         expires,