Have urltransform= use the same syntax as replace=

gorhill · gorhill · commit d7c99b46e622 · 2023-11-05T11:19:03.000-05:00
Related issue: uBlockOrigin/uBlock-issues#2924
diff --git a/src/js/static-filtering-parser.js b/src/js/static-filtering-parser.js
@@ -1490,9 +1490,10 @@ export class AstFilterParser {
                     realBad = true;
                     break;
                 }
-                if ( this.interactive ) {
-                    const value = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_REPLACE);
-                    realBad = parseReplaceValue(value) === undefined;
+                const value = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_REPLACE);
+                if ( parseReplaceValue(value) === undefined ) {
+                    this.astError = AST_ERROR_OPTION_BADVALUE;
+                    realBad = true;
                 }
                 break;
             }
@@ -1504,8 +1505,8 @@ export class AstFilterParser {
                     realBad = true;
                     break;
                 }
-                const path = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM);
-                if ( path.charCodeAt(0) !== 0x2F /* / */ ) {
+                const value = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM);
+                if ( parseReplaceValue(value) === undefined ) {
                     this.astError = AST_ERROR_OPTION_BADVALUE;
                     realBad = true;
                 }
@@ -3008,6 +3009,7 @@ export function parseReplaceValue(s) {
     if ( parser.transform ) {
         pattern = parser.normalizeArg(pattern);
     }
+    if ( pattern === '' ) { return; }
     pattern = pattern
         .replace(reEscapedDollarSign, '$1$$$')
         .replace(reEscapedComma, '$1,');
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
@@ -5275,9 +5275,21 @@ FilterContainer.prototype.transformRequest = function(fctxt) {
     if ( directives === undefined ) { return; }
     const directive = directives[directives.length-1];
     if ( (directive.bits & ALLOW_REALM) !== 0 ) { return directives; }
+    if ( directive.refs instanceof Object === false ) { return; }
+    const { refs } = directive;
+    if ( refs.$cache === null ) {
+        refs.$cache = sfp.parseReplaceValue(refs.value);
+    }
+    const cache = refs.$cache;
+    if ( cache === undefined ) { return; }
     const redirectURL = new URL(fctxt.url);
-    if ( directive.value === redirectURL.pathname ) { return; }
-    redirectURL.pathname = directive.value;
+    const before = redirectURL.pathname + redirectURL.search;
+    if ( cache.re.test(before) !== true ) { return; }
+    const after = before.replace(cache.re, cache.replacement);
+    if ( after === before ) { return; }
+    const searchPos = after.includes('?') && after.indexOf('?') || after.length;
+    redirectURL.pathname = after.slice(0, searchPos);
+    redirectURL.search = after.slice(searchPos);
     fctxt.redirectURL = redirectURL.href;
     return directives;
 };

Original file line number	Diff line number	Diff line change
`@@ -1490,9 +1490,10 @@ export class AstFilterParser {`
`1490`	`1490`	`realBad = true;`
`1491`	`1491`	`break;`
`1492`	`1492`	`}`
`1493`		`- if ( this.interactive ) {`
`1494`		`- const value = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_REPLACE);`
`1495`		`- realBad = parseReplaceValue(value) === undefined;`
	`1493`	`+ const value = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_REPLACE);`
	`1494`	`+ if ( parseReplaceValue(value) === undefined ) {`
	`1495`	`+ this.astError = AST_ERROR_OPTION_BADVALUE;`
	`1496`	`+ realBad = true;`
`1496`	`1497`	`}`
`1497`	`1498`	`break;`
`1498`	`1499`	`}`
`@@ -1504,8 +1505,8 @@ export class AstFilterParser {`
`1504`	`1505`	`realBad = true;`
`1505`	`1506`	`break;`
`1506`	`1507`	`}`
`1507`		`- const path = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM);`
`1508`		`- if ( path.charCodeAt(0) !== 0x2F /* / */ ) {`
	`1508`	`+ const value = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM);`
	`1509`	`+ if ( parseReplaceValue(value) === undefined ) {`
`1509`	`1510`	`this.astError = AST_ERROR_OPTION_BADVALUE;`
`1510`	`1511`	`realBad = true;`
`1511`	`1512`	`}`
`@@ -3008,6 +3009,7 @@ export function parseReplaceValue(s) {`
`3008`	`3009`	`if ( parser.transform ) {`
`3009`	`3010`	`pattern = parser.normalizeArg(pattern);`
`3010`	`3011`	`}`
	`3012`	`+ if ( pattern === '' ) { return; }`
`3011`	`3013`	`pattern = pattern`
`3012`	`3014`	`.replace(reEscapedDollarSign, '$1$$$')`
`3013`	`3015`	`.replace(reEscapedComma, '$1,');`