Merge pull request #832 from shy1132/master

fix oldtwitter on old-ish firefox versions
dimdenGD · Jun 8, 2024 · 7cc5d6b · 7cc5d6b
2 parents da6174f + 48d8a5c
commit 7cc5d6b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/scripts/background_v2.js b/scripts/background_v2.js
@@ -59,7 +59,31 @@ chrome.webRequest.onBeforeSendHeaders.addListener(
     },
     ["blocking", "requestHeaders"]
 );
-
+chrome.webRequest.onBeforeSendHeaders.addListener(
+    function(details) {
+        for (let i = 0; i < details.requestHeaders.length; i++) {
+            if (details.requestHeaders[i].name.toLowerCase() === 'user-agent') {
+                if (details.requestHeaders[i].value.toLowerCase().includes('firefox')) {
+                    let rvRegex = /rv:(\d+\.\d+)/;
+                    let rvMatch = details.requestHeaders[i].value.match(rvRegex);
+                    if (rvMatch) {
+                        let rv = parseFloat(rvMatch[1]);
+                        if (rv < 110) {
+                            details.requestHeaders[i].value = details.requestHeaders[i].value.replace(rvRegex, 'rv:110.0'); //twitter serves client-web-legacy if rv is less than 110, which breaks request signing
+                        }
+                    }
+                }
+                break;
+            }
+        }
+        return {
+            requestHeaders: details.requestHeaders
+        };
+    }, {
+        urls: ["*://x.com/", "*://twitter.com/"]
+    },
+    ["blocking", "requestHeaders"]
+);
 chrome.runtime.onMessage.addListener(async (request, sender, sendResponse) => {
     if(request.action === "inject") {
         console.log(request, sender.tab.id);

diff --git a/scripts/twchallenge.js b/scripts/twchallenge.js
@@ -1,5 +1,7 @@
 let solveId = 0;
 let solveCallbacks = {};
+let solveQueue = []
+let solverReady = false;
 let solverErrored = false;
 
 let solverIframe = document.createElement('iframe');
@@ -26,16 +28,16 @@ function solveChallenge(path, method) {
         }
         let id = solveId++;
         solveCallbacks[id] = { resolve, reject, time: Date.now() };
-        if(solverIframe && solverIframe.contentWindow) {
+        if(!solverIframe || !solverIframe.contentWindow || !solverReady) {
+            solveQueue.push({ id, path, method })
+        } else {
             solverIframe.contentWindow.postMessage({ action: 'solve', id, path, method }, '*');
             // setTimeout(() => {
             //     if(solveCallbacks[id]) {
             //         solveCallbacks[id].reject('Solver timed out');
             //         delete solveCallbacks[id];
             //     }
             // }, 1750);
-        } else {
-            reject('Solver iframe not ready');
         }
     });
 }
@@ -64,6 +66,11 @@ window.addEventListener('message', e => {
         alert(`There was an error in initializing security header generator: ${data.error}. OldTwitter doesn't allow unsigned requests anymore for your account security. Currently it's unknown what causes this to happen, try reloading the page.`);
         console.error('Error initializing solver:');
         console.error(data.error);
+    } else if(data.action === 'ready') {
+        solverReady = true;
+        for (let task of solveQueue) {
+            solverIframe.contentWindow.postMessage({ action: 'solve', id: task.id, path: task.path, method: task.method }, '*')
+        }
     }
 });