fix cookies/browser

Author: LukasOgunfeitimi

OpacityCore/src/main/assets/extension/background.js

@@ -1,8 +1,8 @@
 browser.webRequest.onHeadersReceived.addListener(
   function (details) {
     let url = details.url;
-
-    let domain = new URL(url).hostname;
+    let request_domain = new URL(url).hostname;
+    let cookie_domain;
 
     let cookiesHeaders = details.responseHeaders.filter(
       (header) => header.name.toLowerCase() === "set-cookie"
@@ -24,17 +24,39 @@ browser.webRequest.onHeadersReceived.addListener(
     // Parse cookies
     let cookieDict = {};
     cookies.split("\n").forEach((cookie) => {
-      let cookieParts = cookie.split(";")[0].split("=");
-      let cookieName = cookieParts[0].trim();
-      let cookieValue = cookieParts[1].trim();
-      cookieDict[cookieName] = cookieValue;
+      console.log("Cookie: " + cookie);
+          browser.runtime.sendNativeMessage("gecko", {
+      event: "test",
+      domain: cookie,
     });
+      let parts = cookie.split(";").map(p => p.trim());
+
+      let [name, value] = parts[0].split("=");
+
+      cookieDict[name] = value;
+
+      parts.slice(1).forEach(attr => {
+        let [key, val] = attr.split("=");
+        if (key.toLowerCase() === "domain") {
+          /** RFC 6265
+           * If the first character of the attribute-value string is %x2E ("."):
+            Let cookie-domain be the attribute-value without the leading %x2E
+            (".") character.
+           */
+          if (val.startsWith(".")) {
+            val = val.substring(1);
+          }
+          cookie_domain = val;
+        }
+      });
+    });
+
 
     // Send cookies back to the app (GeckoView) via messaging
     browser.runtime.sendNativeMessage("gecko", {
       event: "cookies",
       cookies: cookieDict,
-      domain: domain,
+      domain: cookie_domain || request_domain,
     });
   },
   { urls: ["<all_urls>"] }, // Intercept all URLs

OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/InAppBrowserActivity.kt

@@ -20,6 +20,7 @@ import org.mozilla.geckoview.AllowOrDeny
 import org.mozilla.geckoview.GeckoResult
 import org.mozilla.geckoview.GeckoSession
 import org.mozilla.geckoview.GeckoSession.ContentDelegate
+import org.mozilla.geckoview.GeckoSessionSettings
 import org.mozilla.geckoview.GeckoView
 import org.mozilla.geckoview.WebExtension
 
@@ -40,8 +41,18 @@ class InAppBrowserActivity : AppCompatActivity() {
                 ) {
                     val receiver = intent.getParcelableExtra<CookieResultReceiver>("receiver")
                     val domain = java.net.URL(currentUrl).host
-                    val browserCookies = cookies[domain] ?: JSONObject()
-                    receiver?.onReceiveResult(browserCookies)
+                    val matchedCookies = JSONObject()
+                    for ((cookieDomain, cookieObject) in cookies) {
+                        val cleanDomain = cookieDomain.trimStart('.')
+                        if (domain == cleanDomain || domain.endsWith(".$cleanDomain")) {
+                            val keys = cookieObject.keys()
+                            while (keys.hasNext()) {
+                                val key = keys.next()
+                                matchedCookies.put(key, cookieObject.get(key))
+                            }
+                        }
+                    }
+                    receiver?.onReceiveResult(matchedCookies)
                 }
             }
         }
@@ -151,8 +162,8 @@ class InAppBrowserActivity : AppCompatActivity() {
                                     cookies[domain] =
                                         cookies[domain]?.let { existingCookies ->
                                             JsonUtils.mergeJsonObjects(
-                                                receivedCookies,
-                                                existingCookies
+                                                existingCookies,
+                                                receivedCookies
                                             )
                                         }
                                             ?: receivedCookies
@@ -169,8 +180,15 @@ class InAppBrowserActivity : AppCompatActivity() {
                     "gecko"
                 )
 
+                val settings = GeckoSessionSettings.Builder()
+                    .usePrivateMode(true)
+                    .useTrackingProtection(true)
+                    .allowJavascript(true)
+                    .build()
+
+
                 geckoSession =
-                    GeckoSession().apply {
+                    GeckoSession(settings).apply {
                         setContentDelegate(object : ContentDelegate {})
                         open(OpacityCore.getRuntime())
                     }