fix: gm_xhr默认不带上origin

scriptscat · Dec 7, 2021 · 70399b3 · 70399b3
1 parent c15913c
commit 70399b3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/apps/grant/background.ts b/src/apps/grant/background.ts
@@ -61,6 +61,8 @@ export class BackgroundGrant {
                 let setCookie = '';
                 let cookie = '';
                 let anonymous = false;
+                let origin = '';
+                let isScriptcat = false;
                 let requestHeaders: chrome.webRequest.HttpHeader[] = [];
                 let unsafeHeader: { [key: string]: string } = {};
                 data.requestHeaders?.forEach((val, key) => {
@@ -74,6 +76,10 @@ export class BackgroundGrant {
                             anonymous = true;
                             break;
                         }
+                        case "x-cat-" + this.rand + "-scriptcat": {
+                            isScriptcat = true;
+                            break;
+                        }
                         case "x-cat-" + this.rand + "-host":
                         case "x-cat-" + this.rand + "-user-agent":
                         case "x-cat-" + this.rand + "-referer":
@@ -87,9 +93,12 @@ export class BackgroundGrant {
                             cookie = val.value || '';
                             break;
                         }
+                        case "origin": {
+                            origin = val.value || '';
+                            break;
+                        }
                         case "user-agent":
                         case "host":
-                        case "origin":
                         case "referer":
                         case "accept-encoding":
                         case "connection":
@@ -102,6 +111,10 @@ export class BackgroundGrant {
                         }
                     }
                 });
+                // 不是脚本管理器,加上origin
+                if (!isScriptcat && origin) {
+                    unsafeHeader['Origin'] = origin;
+                }
                 if (anonymous) {
                     cookie = '';
                 }
@@ -491,6 +504,7 @@ export class BackgroundGrant {
                 grant.data = { type: 'ontimeout', data: "" };
                 post.postMessage(grant);
             }
+            xhr.setRequestHeader("X-Cat-" + this.rand + "-Scriptcat", "true");
             for (let key in config.headers) {
                 const val = config.headers[key];
                 // 处理unsafe的header

diff --git a/src/apps/grant/frontend.ts b/src/apps/grant/frontend.ts
@@ -135,6 +135,14 @@ export class FrontendGrant implements ScriptContext {
     @FrontendGrant.GMFunction({ depend: ['CAT_fetchBlob'] })
     public async GM_xmlhttpRequest(details: GM_Types.XHRDetails) {
         let u = new URL(details.url, window.location.href);
+        if (details.headers) {
+            for (const key in details.headers) {
+                if (key.toLowerCase() == 'cookie') {
+                    details.cookie = details.cookie || details.headers[key];
+                    delete details.headers[key];
+                }
+            }
+        }
         let param: GM_Types.XHRDetails = {
             method: details.method,
             timeout: details.timeout,

diff --git a/src/apps/script/manager.ts b/src/apps/script/manager.ts
@@ -765,7 +765,7 @@ export class ScriptManager extends Manager {
             AppEvent.trigger(TabRemove, tabId);
         });
         chrome.tabs.onUpdated.addListener((tabId, info) => {
-            if (info.status === undefined || info.status == "unloaded") {
+            if (info.status == "unloaded") {
                 runMenu.delete(tabId);
                 AppEvent.trigger(TabRemove, tabId);
                 return;