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/pages/settings/components/custom-filters.js

@@ -44,7 +44,7 @@ function parseFilters(text = '') {
 }
 
 async function submitFilters(host) {
-  const { networkFilters, cosmeticFilters } = host.filters;
+  const { networkFilters } = host.filters;
 
   // Update DNR
   if (__PLATFORM__ !== 'firefox') {
@@ -75,7 +75,7 @@ async function submitFilters(host) {
   // Update engine
   await chrome.runtime.sendMessage({
     action: 'customFilters:engine',
-    filters: [...networkFilters, ...cosmeticFilters].join('\n'),
+    filters: host.input.text,
   });
 
   // Save input

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

@@ -22,6 +22,23 @@ 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', checkUserAgent('Firefox')],
+  ['env_firefox', checkUserAgent('Firefox')],
+  ['env_chromium', checkUserAgent('Chrome')],
+  ['env_edge', checkUserAgent('Edg')],
+  ['env_mobile', checkUserAgent('Mobile')],
+]);
+
+const deserializeEngine = (engineBytes) => {
+  const engine = FiltersEngine.deserialize(engineBytes);
+  engine.updateEnv(ENV);
+  return engine;
+};
+
 const engines = new Map();
 
 function loadFromMemory(name) {
@@ -94,7 +111,7 @@ async function loadFromStorage(name) {
     const engineBytes = await table.get(name);
 
     if (engineBytes) {
-      const engine = FiltersEngine.deserialize(engineBytes);
+      const engine = deserializeEngine(engineBytes);
       shareExceptions(name, engine);
       saveToMemory(name, engine);
 
@@ -190,8 +207,7 @@ async function update(name) {
         .then((res) => res.arrayBuffer());
 
       const engineBytes = new Uint8Array(arrayBuffer);
-      engine = FiltersEngine.deserialize(engineBytes);
-
+      engine = deserializeEngine(engineBytes);
       shareExceptions(name, engine);
       // Save the new engine to memory and storage
       saveToMemory(name, engine);
@@ -280,7 +296,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.
@@ -325,8 +341,7 @@ async function loadFromDisk(name) {
     );
 
     const engineBytes = new Uint8Array(await response.arrayBuffer());
-    const engine = FiltersEngine.deserialize(engineBytes);
-
+    const engine = deserializeEngine(engineBytes);
     shareExceptions(name, engine);
     saveToMemory(name, engine);
     saveToStorage(name);
@@ -378,6 +393,7 @@ export async function createCustomEngine(filters = '') {
     enableHtmlFiltering: true,
   });
   const engine = FiltersEngine.parse(filters, config);
+  engine.updateEnv(ENV);
 
   saveToMemory(CUSTOM_ENGINE, engine);
   saveToStorage(CUSTOM_ENGINE);