Allow filters without specific resource type to match any cpt (#42)

ghostery · Oct 8, 2018 · a371c0c · a371c0c
1 parent dda08f2
commit a371c0c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## *not released*
 
+  *  Allow filters without specific resource type to match any cpt [#42](https://github.com/cliqz-oss/adblocker/pull/42)
+
 ## 0.2.0
 
 *2018-09-25*

diff --git a/dist/adblocker.es.js b/dist/adblocker.es.js
diff --git a/dist/adblocker.umd.js b/dist/adblocker.umd.js
diff --git a/dist/adblocker.umd.min.js b/dist/adblocker.umd.min.js
diff --git a/dist/pattern-matching.es b/dist/pattern-matching.es
@@ -691,7 +691,7 @@ var NetworkFilter = (function () {
         if (mask !== undefined) {
             return getBit(this.mask, mask);
         }
-        return false;
+        return this.fromAny();
     };
     NetworkFilter.prototype.isFuzzy = function () {
         return getBit(this.mask, 524288);

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/parsing/network-filter.ts b/src/parsing/network-filter.ts
@@ -177,13 +177,13 @@ export class NetworkFilter implements IFilter {
     hostname,
     id,
   }: {
-    mask: number,
-    filter: string,
-    optDomains: string,
-    optNotDomains: string,
-    redirect: string,
-    hostname: string,
-    id: number,
+    mask: number;
+    filter: string;
+    optDomains: string;
+    optNotDomains: string;
+    redirect: string;
+    hostname: string;
+    id: number;
   }) {
     // Those fields should not be mutated.
     this.id = id;
@@ -410,8 +410,9 @@ export class NetworkFilter implements IFilter {
       return getBit(this.mask, mask);
     }
 
-    // If content type is not supported then we return false
-    return false;
+    // If content type is not supported (or not specified), we return `true`
+    // only if the filter does not specify any resource type.
+    return this.fromAny();
   }
 
   public isFuzzy() {
@@ -551,7 +552,8 @@ export function parseNetworkFilter(rawLine: string): NetworkFilter | null {
   const line: string = rawLine;
 
   // Represent options as a bitmask
-  let mask: number = NETWORK_FILTER_MASK.thirdParty | NETWORK_FILTER_MASK.firstParty;
+  let mask: number =
+    NETWORK_FILTER_MASK.thirdParty | NETWORK_FILTER_MASK.firstParty;
 
   // Temporary masks for positive (e.g.: $script) and negative (e.g.: $~script)
   // content type options.

diff --git a/test/matching.test.ts b/test/matching.test.ts
@@ -23,7 +23,6 @@ declare global {
 expect.extend({
   toMatchRequest(filter, request) {
     const processedRequest = processRawRequest({
-      cpt: 2,
       sourceUrl: '',
       url: '',
       ...request,