From 343d1e5d09e835b086d3038e6bc7a468f671753c Mon Sep 17 00:00:00 2001
From: hackademix <giorgio@maone.net>
Date: Thu, 8 Sep 2022 23:32:17 +0200
Subject: [PATCH] Avoid using fallback origins for main_frame loads.

---
 src/bg/RequestGuard.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/bg/RequestGuard.js b/src/bg/RequestGuard.js
index 21599f9..194146d 100644
--- a/src/bg/RequestGuard.js
+++ b/src/bg/RequestGuard.js
@@ -357,11 +357,14 @@ var RequestGuard = (() => {
 
   let normalizeRequest = request => {
 
-    function fakeOriginFromTab({tabId} = request) {
-      let tab = tabId !== -1 && TabCache.get(tabId);
-      if (tab) {
-        return request.initiator = request.originUrl = request.documentUrl = tab.url;
+    function fakeOriginFromTab({tabId, type} = request) {
+      if (type !== "main_frame") {
+        let tab = tabId !== -1 && TabCache.get(tabId);
+        if (tab) {
+          return request.initiator = request.originUrl = request.documentUrl = tab.url;
+        }
       }
+      return request.initiator || request.originUrl;
     }
 
     if ("initiator" in request && !("originUrl" in request)) {