Heuristic to prevent too eager argument type classification

ghostery · Oct 28, 2023 · 103f5e9 · 103f5e9
1 parent dbeddfa
commit 103f5e9
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 4 deletions.
diff --git a/packages/adblocker/src/filters/cosmetic.ts b/packages/adblocker/src/filters/cosmetic.ts
@@ -719,13 +719,13 @@ export default class CosmeticFilter implements IFilter {
           if (inArgument === false) {
             if (char === ' ') {
               // ignore
-            } else if (char === '"') {
+            } else if (char === '"' && selector.indexOf('"', index + 1) > 0) {
               inDoubleQuotes = true;
-            } else if (char === "'") {
+            } else if (char === "'" && selector.indexOf("'", index + 1) > 0) {
               inSingleQuotes = true;
-            } else if (char === '{') {
+            } else if (char === '{' && selector.indexOf('}', index + 1) > 0) {
               objectNesting += 1;
-            } else if (char === '/') {
+            } else if (char === '/' && selector.indexOf('/', index + 1) > 0) {
               inRegexp = true;
             } else {
               inArgument = true;

diff --git a/packages/adblocker/test/parsing.test.ts b/packages/adblocker/test/parsing.test.ts
@@ -2146,6 +2146,52 @@ describe('scriptlets arguments parsing', () => {
 
     it('complex', () => {
       for (const [scriptlet, expected] of [
+        [
+          'script-name, {x, y',
+          {
+            name: 'script-name',
+            args: ['{x', 'y'],
+          },
+        ],
+        [
+          'script-name, "x, y',
+          {
+            name: 'script-name',
+            args: ['"x', 'y'],
+          },
+        ],
+        [
+          "script-name, 'x, y",
+          {
+            name: 'script-name',
+            args: ["'x", 'y'],
+          },
+        ],
+        [
+          'script-name, /x, y',
+          {
+            name: 'script-name',
+            args: ['/x', 'y'],
+          },
+        ],
+        [
+          'xml-prune,a/b,///,,c',
+          {
+            name: 'xml-prune',
+            args: ['a/b', '///', '', 'c'],
+          },
+        ],
+        [
+          `xml-prune, xpath(//*[name()="MPD"]/@mediaPresentationDuration | //*[name()="Period"][.//*[name()="BaseURL" and contains(text()\\,'/ads-')]] | //*[name()="Period"]/@start), Period[id^="Ad"i], .mpd`,
+          {
+            name: 'xml-prune',
+            args: [
+              `xpath(//*[name()="MPD"]/@mediaPresentationDuration | //*[name()="Period"][.//*[name()="BaseURL" and contains(text()\\,'/ads-')]] | //*[name()="Period"]/@start)`,
+              'Period[id^="Ad"i]',
+              '.mpd',
+            ],
+          },
+        ],
         [
           'xml-prune,a/b,,c',
           {