Fix DNRPolicy matching for entries including explicit protocol.

hackademix · hackademix · commit a2f6bcb92542 · 2024-11-23T22:55:49.000+01:00
diff --git a/src/bg/DNRPolicy.js b/src/bg/DNRPolicy.js
@@ -75,8 +75,9 @@
     if (Sites.isSecureDomainKey(siteKey)) {
       return `||${Sites.toggleSecureDomainKey(siteKey,false)}^`
     }
-    let urlFilter = `||${siteKey}`;
-    if (!urlFilter.replace(/^[\w-]+:\/+/, "").includes("/")) {
+    const schemeLess = siteKey.replace(/^[\w-]+:\/+/, "");
+    let urlFilter = `${siteKey == schemeLess ? "||" : "|"}${siteKey}`;
+    if (!schemeLess.includes('/')) {
       urlFilter += '^';
     }
     return urlFilter;

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,9 @@`
`75`	`75`	`if (Sites.isSecureDomainKey(siteKey)) {`
`76`	`76`	return `\|\|${Sites.toggleSecureDomainKey(siteKey,false)}^`
`77`	`77`	`}`
`78`		- let urlFilter = `\|\|${siteKey}`;
`79`		`- if (!urlFilter.replace(/^[\w-]+:\/+/, "").includes("/")) {`
	`78`	`+ const schemeLess = siteKey.replace(/^[\w-]+:\/+/, "");`
	`79`	+ let urlFilter = `${siteKey == schemeLess ? "\|\|" : "\|"}${siteKey}`;
	`80`	`+ if (!schemeLess.includes('/')) {`
`80`	`81`	`urlFilter += '^';`
`81`	`82`	`}`
`82`	`83`	`return urlFilter;`