Fix regex-like filter representation in logger

gorhill · gorhill · commit 34504a0a1a9d · 2019-12-04T10:42:03.000-05:00
Related discussion: - uBlockOrigin/uBlock-issues#805 (comment) uBO was testing for regex-like plain patterns after prepending `@@` in the case of exception filters, thus preventing proper detection of regex-like plain patterns. The filtering engine was not affected, only the proper rendering of the filter in the logger was affected.
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
@@ -223,9 +223,6 @@ const toLogDataInternal = function(categoryBits, tokenHash, iunit) {
     const domains = [];
     const logData = { pattern, regex, domains, options, isRegex: false };
     filterUnits[iunit].logData(logData);
-    if ( categoryBits & 0x001 ) {
-        logData.pattern.unshift('@@');
-    }
     if ( categoryBits & 0x002 ) {
         logData.options.unshift('important');
     }
@@ -246,6 +243,9 @@ const toLogDataInternal = function(categoryBits, tokenHash, iunit) {
     ) {
         raw += '*';
     }
+    if ( categoryBits & 0x001 ) {
+        raw = '@@' + raw;
+    }
     if ( domains.length !== 0 ) {
         options.push(`domain=${domains.join('|')}`);
     }

Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,6 @@ const toLogDataInternal = function(categoryBits, tokenHash, iunit) {`
`223`	`223`	`const domains = [];`
`224`	`224`	`const logData = { pattern, regex, domains, options, isRegex: false };`
`225`	`225`	`filterUnits[iunit].logData(logData);`
`226`		`- if ( categoryBits & 0x001 ) {`
`227`		`- logData.pattern.unshift('@@');`
`228`		`- }`
`229`	`226`	`if ( categoryBits & 0x002 ) {`
`230`	`227`	`logData.options.unshift('important');`
`231`	`228`	`}`
`@@ -246,6 +243,9 @@ const toLogDataInternal = function(categoryBits, tokenHash, iunit) {`
`246`	`243`	`) {`
`247`	`244`	`raw += '*';`
`248`	`245`	`}`
	`246`	`+ if ( categoryBits & 0x001 ) {`
	`247`	`+ raw = '@@' + raw;`
	`248`	`+ }`
`249`	`249`	`if ( domains.length !== 0 ) {`
`250`	`250`	options.push(`domain=${domains.join('\|')}`);
`251`	`251`	`}`