merge1.42.0

EasyG0ing1 · Sep 16, 2022 · 6e7fc8d · 6e7fc8d
2 parents 5b1d7ce + 0c7318d
commit 6e7fc8d
Show file tree

Hide file tree

Showing 102 changed files with 737 additions and 565 deletions.
diff --git a/assets/assets.json b/assets/assets.json
@@ -1,7 +1,7 @@
 {
 	"assets.json": {
 		"content": "internal",
-		"updateAfter": 7,
+		"updateAfter": 13,
 		"contentURL": [
 			"https://raw.githubusercontent.com/dhowe/AdNauseam/master/assets/assets.json",
 			"assets/assets.json"
@@ -55,32 +55,35 @@
 	},
 	"ublock-badlists": {
 		"content": "internal",
-		"updateAfter": 13,
+		"updateAfter": 29,
 		"contentURL": [
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badlists.txt",
+			"https://ublockorigin.github.io/uAssets/filters/badlists.txt",
 			"assets/ublock/badlists.txt"
 		],
 		"cdnURLs": [
-			"https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/badlists.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/badlists.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/badlists.txt",
-			"https://combinatronics.io/uBlockOrigin/uAssets/master/filters/badlists.txt"
+			"https://ublockorigin.github.io/uAssetsCDN/filters/badlists.txt",
+			"https://ublockorigin.pages.dev/filters/badlists.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/badlists.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/badlists.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/badlists.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/badlists.txt"
 		]
 	},
 	"ublock-filters": {
 		"content": "filters",
 		"group": "default",
 		"title": "uBlock filters",
 		"contentURL": [
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt",
+			"https://ublockorigin.github.io/uAssets/filters/filters.txt",
 			"assets/ublock/filters.txt"
 		],
 		"cdnURLs": [
-			"https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/filters.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/filters.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/filters.txt",
-			"https://combinatronics.io/uBlockOrigin/uAssets/master/filters/filters.txt",
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"
+			"https://ublockorigin.github.io/uAssetsCDN/filters/filters.txt",
+			"https://ublockorigin.pages.dev/filters/filters.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/filters.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/filters.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/filters.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/filters.txt"
 		],
 		"supportURL": "https://github.com/uBlockOrigin/uAssets/issues"
 	},
@@ -89,61 +92,88 @@
 		"group": "default",
 		"title": "uBlock filters – Badware risks",
 		"contentURL": [
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt",
+			"https://ublockorigin.github.io/uAssets/filters/badware.txt",
 			"assets/ublock/badware.txt"
 		],
 		"cdnURLs": [
-			"https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/badware.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/badware.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/badware.txt",
-			"https://combinatronics.io/uBlockOrigin/uAssets/master/filters/badware.txt"
+			"https://ublockorigin.github.io/uAssetsCDN/filters/badware.txt",
+			"https://ublockorigin.pages.dev/filters/badware.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/badware.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/badware.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/badware.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/badware.txt"
 		],
 		"supportURL": "https://github.com/gorhill/uBlock/wiki/Badware-risks",
 		"instructionURL": "https://github.com/gorhill/uBlock/wiki/Badware-risks"
 	},
 	"ublock-privacy": {
 		"content": "filters",
+		"updateAfter": 13,
 		"group": "default",
 		"title": "uBlock filters – Privacy",
 		"contentURL": [
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt",
+			"https://ublockorigin.github.io/uAssets/filters/privacy.txt",
 			"assets/ublock/privacy.txt"
 		],
 		"cdnURLs": [
-			"https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/privacy.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/privacy.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/privacy.txt",
-			"https://combinatronics.io/uBlockOrigin/uAssets/master/filters/privacy.txt"
+			"https://ublockorigin.github.io/uAssetsCDN/filters/privacy.txt",
+			"https://ublockorigin.pages.dev/filters/privacy.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/privacy.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/privacy.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/privacy.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/privacy.txt"
 		]
 	},
 	"ublock-abuse": {
 		"content": "filters",
+		"updateAfter": 13,
 		"group": "default",
 		"title": "uBlock filters – Resource abuse",
 		"contentURL": [
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt",
+			"https://ublockorigin.github.io/uAssets/filters/resource-abuse.txt",
 			"assets/ublock/resource-abuse.txt"
 		],
 		"cdnURLs": [
-			"https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/resource-abuse.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/resource-abuse.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/resource-abuse.txt",
-			"https://combinatronics.io/uBlockOrigin/uAssets/master/filters/resource-abuse.txt"
+			"https://ublockorigin.github.io/uAssetsCDN/filters/resource-abuse.txt",
+			"https://ublockorigin.pages.dev/filters/resource-abuse.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/resource-abuse.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/resource-abuse.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/resource-abuse.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/resource-abuse.txt"
 		]
 	},
 	"ublock-unbreak": {
 		"content": "filters",
 		"group": "default",
 		"title": "uBlock filters – Unbreak",
 		"contentURL": [
-			"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt",
+			"https://ublockorigin.github.io/uAssets/filters/unbreak.txt",
 			"assets/ublock/unbreak.txt"
 		],
 		"cdnURLs": [
-			"https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/unbreak.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/unbreak.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/unbreak.txt",
-			"https://combinatronics.io/uBlockOrigin/uAssets/master/filters/unbreak.txt"
+			"https://ublockorigin.github.io/uAssetsCDN/filters/unbreak.txt",
+			"https://ublockorigin.pages.dev/filters/unbreak.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/unbreak.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/unbreak.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/unbreak.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/unbreak.txt"
+		]
+	},
+	"ublock-quick-fixes": {
+		"content": "filters",
+		"updateAfter": 1,
+		"group": "default",
+		"title": "uBlock filters – Quick fixes",
+		"contentURL": [
+			"https://ublockorigin.github.io/uAssets/filters/quick-fixes.txt"
+		],
+		"cdnURLs": [
+			"https://ublockorigin.github.io/uAssetsCDN/filters/quick-fixes.txt",
+			"https://ublockorigin.pages.dev/filters/quick-fixes.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/quick-fixes.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/quick-fixes.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/quick-fixes.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/quick-fixes.txt"
 		]
 	},
 	"adguard-generic": {
@@ -200,12 +230,14 @@
 		"group": "privacy",
 		"off": true,
 		"title": "Block Outsider Intrusion into LAN",
-		"contentURL": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/lan-block.txt",
+		"contentURL": "https://ublockorigin.github.io/uAssets/filters/lan-block.txt",
 		"cdnURLs": [
-			"https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/lan-block.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/lan-block.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/lan-block.txt",
-			"https://combinatronics.io/uBlockOrigin/uAssets/master/filters/lan-block.txt"
+			"https://ublockorigin.github.io/uAssetsCDN/filters/lan-block.txt",
+			"https://ublockorigin.pages.dev/filters/lan-block.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/lan-block.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/lan-block.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/lan-block.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/lan-block.txt"
 		],
 		"supportURL": "https://github.com/uBlockOrigin/uAssets/issues"
 	},
@@ -232,8 +264,7 @@
 		"cdnURLs": [
 			"https://curbengh.github.io/malware-filter/urlhaus-filter-online.txt",
 			"https://curben.gitlab.io/urlhaus-filter/urlhaus-filter-online.txt",
-			"https://malware-filter.pages.dev/urlhaus-filter-online.txt",
-			"https://malware-filter.netlify.app/urlhaus-filter-online.txt"
+			"https://malware-filter.pages.dev/urlhaus-filter-online.txt"
 		],
 		"supportURL": "https://gitlab.com/curben/urlhaus-filter#malicious-url-blocklist"
 	},
@@ -246,8 +277,7 @@
 		"cdnURLs": [
 			"https://curbengh.github.io/phishing-filter/phishing-filter.txt",
 			"https://curben.gitlab.io/phishing-filter/phishing-filter.txt",
-			"https://phishing-filter.pages.dev/phishing-filter.txt",
-			"https://phishing-filter.netlify.app/phishing-filter.txt"
+			"https://phishing-filter.pages.dev/phishing-filter.txt"
 		],
 		"supportURL": "https://gitlab.com/curben/phishing-filter#phishing-url-blocklist"
 	},
@@ -260,8 +290,7 @@
 		"cdnURLs": [
 			"https://curbengh.github.io/pup-filter/pup-filter.txt",
 			"https://curben.gitlab.io/pup-filter/pup-filter.txt",
-			"https://pup-filter.pages.dev/pup-filter.txt",
-			"https://pup-filter.netlify.app/pup-filter.txt"
+			"https://pup-filter.pages.dev/pup-filter.txt"
 		],
 		"supportURL": "https://gitlab.com/curben/pup-filter#pup-domains-blocklist"
 	},
@@ -331,11 +360,14 @@
 		"group": "social",
 		"title": "uBlock filters – Annoyances",
 		"off": true,
-		"contentURL": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt",
+		"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances.txt",
 		"cdnURLs": [
-			"https://gitcdn.xyz/repo/uBlockOrigin/uAssets/master/filters/annoyances.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssets@master/filters/annoyances.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/annoyances.txt"
+			"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances.txt",
+			"https://ublockorigin.pages.dev/filters/annoyances.txt",
+			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/filters/annoyances.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances.txt",
+			"https://combinatronics.io/uBlockOrigin/uAssetsCDN/main/filters/annoyances.txt"
 		]
 	},
 	"dpollock-0": {
@@ -347,6 +379,7 @@
 		"contentURL": "https://someonewhocares.org/hosts/hosts",
 		"supportURL": "https://someonewhocares.org/hosts/"
 	},
+<<<<<<< HEAD
 	"mvps-0": {
 		"content": "filters",
 		"group": "multipurpose",
@@ -357,6 +390,8 @@
 		"contentURL": "http://winhelp2002.mvps.org/hosts.txt",
 		"supportURL": "http://winhelp2002.mvps.org/"
 	},
+=======
+>>>>>>> upstream1.42.0
 	"plowe-0": {
 		"content": "filters",
 		"group": "multipurpose",

diff --git a/dist/firefox/updates.json b/dist/firefox/updates.json
@@ -3,9 +3,9 @@
   "[email protected]": {
    "updates": [
     {
-     "version": "1.41.1.0",
+     "version": "1.41.9.103",
      "browser_specific_settings": { "gecko": { "strict_min_version": "60" } },
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.41.1b0/uBlock0_1.41.1b0.firefox.signed.xpi"
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.41.9rc3/uBlock0_1.41.9rc3.firefox.signed.xpi"
     }
    ]
   }

diff --git a/dist/version b/dist/version
@@ -1 +1 @@
-1.41.8
+1.42.0
diff --git a/docs/tests/static-filtering-parser-checklist.txt b/docs/tests/static-filtering-parser-checklist.txt
@@ -7,7 +7,7 @@
 ! invalid cases, by typically adding the list to uBO, disabling the list,
 ! and viewing it in uBO's asset viewer.
 !
-! Feel free to add more entries to more throughly validate the static
+! Feel free to add more entries to more thoroughly validate the static
 ! filtering parser, submit the changes in your fork of uBO by opening an
 ! issue at https://github.com/uBlockOrigin/uBlock-issues/issues
 

diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -27,6 +27,9 @@
     },
     "relax-blocking-mode": {
       "description": "__MSG_relaxBlockingMode__"
+    },
+    "toggle-cosmetic-filtering": {
+      "description": "__MSG_toggleCosmeticFiltering__"
     }
   },
   "content_scripts": [
@@ -51,7 +54,8 @@
         "https://filterlists.com/*",
         "https://forums.lanik.us/*",
         "https://github.com/*",
-        "https://*.github.io/*"
+        "https://*.github.io/*",
+        "https://*.letsblock.it/*"
       ],
       "js": [
         "/js/scriptlets/subscriber.js"

diff --git a/platform/common/vapi-background.js b/platform/common/vapi-background.js
@@ -45,13 +45,6 @@ if ( vAPI.canWASM === false ) {
 
 vAPI.supportsUserStylesheets = vAPI.webextFlavor.soup.has('user_stylesheet');
 
-// The real actual webextFlavor value may not be set in stone, so listen
-// for possible future changes.
-window.addEventListener('webextFlavor', function() {
-    vAPI.supportsUserStylesheets =
-        vAPI.webextFlavor.soup.has('user_stylesheet');
-}, { once: true });
-
 /******************************************************************************/
 
 vAPI.app = {

diff --git a/platform/common/vapi-common.js b/platform/common/vapi-common.js
@@ -83,12 +83,9 @@ vAPI.webextFlavor = {
     // Synchronous -- order of tests is important
     const match = /\bChrom(?:e|ium)\/([\d.]+)/.exec(ua);
     if ( match !== null ) {
-        soup.add('chromium');
+        soup.add('chromium')
+            .add('user_stylesheet');
         flavor.major = parseInt(match[1], 10) || 0;
-        // https://github.com/gorhill/uBlock/issues/3588
-        if ( flavor.major >= 66 ) {
-            soup.add('user_stylesheet');
-        }
     }
 
     // Don't starve potential listeners

diff --git a/platform/firefox/manifest.json b/platform/firefox/manifest.json
@@ -38,6 +38,9 @@
     },
     "relax-blocking-mode": {
       "description": "__MSG_relaxBlockingMode__"
+    },
+    "toggle-cosmetic-filtering": {
+      "description": "__MSG_toggleCosmeticFiltering__"
     }
   },
   "content_scripts": [
@@ -65,7 +68,8 @@
         "https://filterlists.com/*",
         "https://forums.lanik.us/*",
         "https://github.com/*",
-        "https://*.github.io/*"
+        "https://*.github.io/*",
+        "https://*.letsblock.it/*"
       ],
       "js": [
         "/js/scriptlets/subscriber.js"

diff --git a/platform/npm/package.json b/platform/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gorhill/ubo-core",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "To create a working instance of uBlock Origin's static network filtering engine",
   "type": "module",
   "main": "index.js",

diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json
@@ -35,6 +35,9 @@
     },
     "relax-blocking-mode": {
       "description": "__MSG_relaxBlockingMode__"
+    },
+    "toggle-cosmetic-filtering": {
+      "description": "__MSG_toggleCosmeticFiltering__"
     }
   },
   "content_scripts": [
@@ -61,7 +64,8 @@
         "https://filterlists.com/*",
         "https://forums.lanik.us/*",
         "https://github.com/*",
-        "https://*.github.io/*"
+        "https://*.github.io/*",
+        "https://*.letsblock.it/*"
       ],
       "js": [
         "/js/scriptlets/subscriber.js"

diff --git a/platform/thunderbird/manifest.json b/platform/thunderbird/manifest.json
@@ -41,7 +41,8 @@
         "https://filterlists.com/*",
         "https://forums.lanik.us/*",
         "https://github.com/*",
-        "https://*.github.io/*"
+        "https://*.github.io/*",
+        "https://*.letsblock.it/*"
       ],
       "js": [
         "/js/scriptlets/subscriber.js"