Improve quote usage in filter options and scriptlets

gorhill · gorhill · commit 8ba71f09d756 · 2024-12-13T10:54:01.000-05:00
Related feedback: uBlockOrigin/uBlock-issues#760 (comment) Using quotes in filter option values is meant to remove ambiguity when the value contains special characters. This was not working when the value started with `$`. For example, fixes usage of quotes in: $removeparam='$deep_link' Also, fixed logger output for scriptlets using empty parameters in quotes.
diff --git a/src/js/scriptlet-filtering-core.js b/src/js/scriptlet-filtering-core.js
@@ -99,7 +99,7 @@ const patchScriptlet = (content, arglist) => {
 };
 
 const requote = s => {
-    if ( /^(["'`]).+\1$|,/.test(s) === false ) { return s; }
+    if ( /^(["'`]).*\1$|,|^$/.test(s) === false ) { return s; }
     if ( s.includes("'") === false ) { return `'${s}'`; }
     if ( s.includes('"') === false ) { return `"${s}"`; }
     if ( s.includes('`') === false ) { return `\`${s}\``; }
diff --git a/src/js/static-filtering-parser.js b/src/js/static-filtering-parser.js
@@ -1477,18 +1477,15 @@ export class AstFilterParser {
         if ( j === -1 ) { return end; }
         if ( (j+1) === end ) { return end; }
         for (;;) {
-            const before = s.charCodeAt(j-1);
-            if ( j !== start && before === 0x24 /* $ */ ) { return -1; }
-            const after = s.charCodeAt(j+1);
-            if (
-                after !== 0x29 /* ) */ &&
-                after !== 0x2F /* / */ &&
-                after !== 0x7C /* | */ &&
-                before !== 0x5C /* \ */
-            ) {
-                return j;
+            const before = s.charAt(j-1);
+            if ( before === '$' ) { return -1; }
+            const after = s.charAt(j+1);
+            if ( ')/|'.includes(after) === false ) {
+                if ( before === '' || '"\'\\`'.includes(before) === false ) {
+                    return j;
+                }
             }
-            if ( j <= start ) { break; }
+            if ( j === start ) { break; }
             j = s.lastIndexOf('$', j-1);
             if ( j === -1 ) { break; }
         }
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
@@ -419,7 +419,7 @@ class LogData {
     }
 
     static requote(s) {
-        if ( /^(["'`]).+\1$|,/.test(s) === false ) { return s; }
+        if ( /^\$|^(["'`]).*\1$|,/.test(s) === false ) { return s; }
         if ( s.includes("'") === false ) { return `'${s}'`; }
         if ( s.includes('"') === false ) { return `"${s}"`; }
         if ( s.includes('`') === false ) { return `\`${s}\``; }

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ class LogData {`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`static requote(s) {`
`422`		- if ( /^(["'`]).+\1$\|,/.test(s) === false ) { return s; }
	`422`	+ if ( /^\$\|^(["'`]).*\1$\|,/.test(s) === false ) { return s; }
`423`	`423`	if ( s.includes("'") === false ) { return `'${s}'`; }
`424`	`424`	if ( s.includes('"') === false ) { return `"${s}"`; }
`425`	`425`	if ( s.includes('`') === false ) { return `\`${s}\``; }