fix a conditional statement that may effect Cloudflare token issuing

privacypass · Jan 30, 2022 · 84ea20b · 84ea20b
1 parent 3e39527
commit 84ea20b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "privacy-pass",
-    "version": "3.6.3",
+    "version": "3.6.4",
     "private": true,
     "contributors": [
         "Suphanat Chunhapanya <[email protected]>",

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_appName__",
     "description": "__MSG_appDescription__",
-    "version": "3.6.3",
+    "version": "3.6.4",
     "manifest_version": 2,
     "default_locale": "en",
     "icons": {

diff --git a/src/background/providers/cloudflare.ts b/src/background/providers/cloudflare.ts
@@ -203,7 +203,10 @@ export class CloudflareProvider extends Provider {
         details: chrome.webRequest.WebRequestHeadersDetails,
     ): chrome.webRequest.BlockingResponse | void {
 
-        if (this.issueInfo !== null) {
+        if (
+            (this.issueInfo           !== null) &&
+            (this.issueInfo.requestId === details.requestId)
+        ) {
             if (this.matchesIssuingHeadersCriteria(details)) {
                 const issueInfo: IssueInfo = { ...this.issueInfo };
 
@@ -232,7 +235,10 @@ export class CloudflareProvider extends Provider {
     private redeemToken(
         details: chrome.webRequest.WebRequestHeadersDetails,
     ): chrome.webRequest.BlockingResponse | void {
-        if (this.redeemInfo === null || details.requestId !== this.redeemInfo.requestId) {
+        if (
+            (this.redeemInfo === null) ||
+            (this.redeemInfo.requestId !== details.requestId)
+        ) {
             return;
         }
 
@@ -267,7 +273,12 @@ export class CloudflareProvider extends Provider {
         let href: string;
         let url:  URL;
 
-        if (this.issueInfo === null) return false;
+        if (
+            (this.issueInfo === null) ||
+            (this.issueInfo.requestId !== details.requestId)
+        ) {
+            return false;
+        }
 
         href = this.issueInfo.url;
         url  = new URL(href);