All exceptions filters are exempt from requiring a trusted source

Related feedback: uBlockOrigin/uBlock-issues#2895 (reply in thread)
gorhill · Nov 14, 2023 · d2b8d99 · d2b8d99
1 parent 1e05665
commit d2b8d99
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
@@ -235,8 +235,10 @@ const normalizeRawFilter = function(parser, sourceIsTrusted = false) {
         if ( reng.aliases.has(token) ) {
             token = reng.aliases.get(token);
         }
-        if ( sourceIsTrusted !== true && reng.tokenRequiresTrust(token) ) {
-            return;
+        if ( parser.isException() !== true ) {
+            if ( sourceIsTrusted !== true ) {
+                if ( reng.tokenRequiresTrust(token) ) { return; }
+            }
         }
         args[0] = token.slice(0, -3);
     }

diff --git a/src/js/static-filtering-parser.js b/src/js/static-filtering-parser.js
@@ -1481,7 +1481,7 @@ export class AstFilterParser {
             case NODE_TYPE_NET_OPTION_NAME_REPLACE: {
                 realBad = abstractTypeCount || behaviorTypeCount || unredirectableTypeCount;
                 if ( realBad ) { break; }
-                if ( this.options.trustedSource !== true ) {
+                if ( isException !== true && this.options.trustedSource !== true ) {
                     this.astError = AST_ERROR_UNTRUSTED_SOURCE;
                     realBad = true;
                     break;
@@ -1496,7 +1496,7 @@ export class AstFilterParser {
             case NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM:
                 realBad = abstractTypeCount || behaviorTypeCount || unredirectableTypeCount;
                 if ( realBad ) { break; }
-                if ( this.options.trustedSource !== true ) {
+                if ( isException !== true && this.options.trustedSource !== true ) {
                     this.astError = AST_ERROR_UNTRUSTED_SOURCE;
                     realBad = true;
                     break;