Adblocker preprocessor support

extension-manifest-v2/package.json

@@ -37,8 +37,8 @@
   },
   "homepage": "https://github.com/ghostery/ghostery-extension#readme",
   "dependencies": {
-    "@cliqz/adblocker": "^1.26.12",
-    "@cliqz/adblocker-webextension": "^1.26.12",
+    "@cliqz/adblocker": "^1.27.0",
+    "@cliqz/adblocker-webextension": "^1.27.0",
     "@cliqz/url-parser": "^1.1.5",
     "@duckduckgo/autoconsent": "^10.3.2",
     "@ghostery/libs": "^1.0.0",

extension-manifest-v3/package.json

@@ -31,8 +31,8 @@
     "web-ext": "^7.11.0"
   },
   "dependencies": {
-    "@cliqz/adblocker": "^1.26.12",
-    "@cliqz/adblocker-webextension-cosmetics": "^1.26.12",
+    "@cliqz/adblocker": "^1.27.0",
+    "@cliqz/adblocker-webextension-cosmetics": "^1.27.0",
     "@duckduckgo/autoconsent": "^10.3.2",
     "@ghostery/libs": "^1.0.0",
     "@ghostery/trackers-preview": "^1.0.0",

extension-manifest-v3/src/utils/engines.js

@@ -22,6 +22,17 @@ import { registerDatabase } from '/utils/indexeddb.js';
 
 export const CUSTOM_ENGINE = 'custom-filters';
 
+const checkUserAgent = (pattern) => navigator.userAgent.indexOf(pattern) !== -1;
+
+const ENV = new Map([
+  ['ext_ghostery', true],
+  ['cap_html_filtering', true],
+  ['env_firefox', checkUserAgent('Firefox')],
+  ['env_chromium', checkUserAgent('Chrome')],
+  ['env_edge', checkUserAgent('Edg')],
+  ['env_mobile', checkUserAgent('Mobile')],
+]);
+
 const engines = new Map();
 
 function loadFromMemory(name) {
@@ -95,6 +106,7 @@ async function loadFromStorage(name) {
 
     if (engineBytes) {
       const engine = FiltersEngine.deserialize(engineBytes);
+      engine.updateEnv(ENV);
       shareExceptions(name, engine);
       saveToMemory(name, engine);
 
@@ -191,7 +203,7 @@ async function update(name) {
 
       const engineBytes = new Uint8Array(arrayBuffer);
       engine = FiltersEngine.deserialize(engineBytes);
-
+      engine.updateEnv(ENV);
       shareExceptions(name, engine);
       // Save the new engine to memory and storage
       saveToMemory(name, engine);
@@ -280,7 +292,7 @@ async function update(name) {
     // `engine.update` method will return `true` if anything was
     // updated and `false` otherwise.
     const cumulativeDiff = mergeDiffs(diffs);
-    let updated = engine.updateFromDiff(cumulativeDiff);
+    let updated = engine.updateFromDiff(cumulativeDiff, ENV);
 
     // Last but not least, check if resources.txt should be updated. This can be
     // done independently of filters as the data is stored in a separate object.
@@ -326,7 +338,7 @@ async function loadFromDisk(name) {
 
     const engineBytes = new Uint8Array(await response.arrayBuffer());
     const engine = FiltersEngine.deserialize(engineBytes);
-
+    engine.updateEnv(ENV);
     shareExceptions(name, engine);
     saveToMemory(name, engine);
     saveToStorage(name);

patches/ghostery-common+1.3.14.patch

@@ -0,0 +1,47 @@
+diff --git a/node_modules/ghostery-common/build/gbe/adblocker/manager.js b/node_modules/ghostery-common/build/gbe/adblocker/manager.js
+index d490618..e7e92ba 100644
+--- a/node_modules/ghostery-common/build/gbe/adblocker/manager.js
++++ b/node_modules/ghostery-common/build/gbe/adblocker/manager.js
+@@ -23,6 +23,17 @@ var _regions = _interopRequireDefault(require("./regions"));
+
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
++var { isMobile, isFirefox, isChromium, isEdge } = require("../core/platform");
++
++const ENV = new Map([
++  ['ext_ghostery', true],
++  ['cap_html_filtering', true],
++  ['env_firefox', isFirefox],
++  ['env_chromium', isChromium],
++  ['env_edge', isEdge],
++  ['env_mobile', isMobile],
++]);
++
+ /*!
+  * Copyright (c) 2014-present Cliqz GmbH. All rights reserved.
+  *
+@@ -353,7 +364,7 @@ class EngineManager {
+
+     const cumulativeDiff = _adblocker.default.mergeDiffs(diffs);
+
+-    let updated = this.engine.updateFromDiff(cumulativeDiff);
++    let updated = this.engine.updateFromDiff(cumulativeDiff, ENV);
+     timer.stop();
+
+     if (updated === true) {
+@@ -407,6 +418,7 @@ class EngineManager {
+
+       try {
+         this.engine = _adblocker.default.WebExtensionBlocker.deserialize(serialized);
++        this.engine.updateEnv(ENV);
+       } catch (ex) {
+         // In case there is a mismatch between the version of the code
+         // and the serialization format of the engine on disk, we might
+@@ -449,6 +461,7 @@ class EngineManager {
+
+     try {
+       this.engine = _adblocker.default.WebExtensionBlocker.deserialize(serialized);
++      this.engine.updateEnv(ENV);
+     } catch (ex) {
+       _logger.default.error('exception while loading remote engine', ex);
+