Added trusted flag to the filters registry (#562)

* Added trusted flag to the filters registry * Update hostlists-builder/index.js Co-authored-by: Slava <[email protected]> --------- Co-authored-by: Slava <[email protected]>
AdguardTeam · Nov 21, 2024 · 427887e · 427887e
1 parent dd718c6
commit 427887e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceFolder}/index.js"
+            "program": "${workspaceFolder}/scripts/compose.js"
         },
         {
             "type": "pwa-node",

diff --git a/README.md b/README.md
@@ -71,6 +71,7 @@ The files `/assets/filters.json` and `/assets/filters-dev.json` must not be edit
   - `environment` - either `dev` or `prod`. Only `prod` lists are available in AdGuard DNS.
   - `disabled` - if set to `true`, the blocklist won't be updated.
   - `tags` — a list of [tags](#tags)
+  - `trusted` - a flag that allows using `$dnsrewrite` rules for this filter. If the filter is not trusted, `$dnsrewrite` rules will be removed from the compiled filter.
 
     <details>
       <summary>Metadata example</summary>
@@ -86,7 +87,8 @@ The files `/assets/filters.json` and `/assets/filters-dev.json` must not be edit
     "expires": "4 days",
     "displayNumber": 3,
     "environment": "prod",
-    "tags": []
+    "tags": [],
+    "trusted": true
   }
   ```
 

diff --git a/filters/general/filter_1_DnsFilter/metadata.json b/filters/general/filter_1_DnsFilter/metadata.json
@@ -11,5 +11,6 @@
   "environment": "prod",
   "tags": [
     "purpose:general"
-  ]
+  ],
+  "trusted": true
 }
diff --git a/filters/general/filter_59_DnsPopupsFilter/metadata.json b/filters/general/filter_59_DnsPopupsFilter/metadata.json
@@ -11,5 +11,6 @@
   "environment": "prod",
   "tags": [
     "purpose:general"
-  ]
+  ],
+  "trusted": true
 }
diff --git a/hostlists-builder/index.js b/hostlists-builder/index.js
@@ -175,11 +175,18 @@ async function build(filtersDir, tagsDir, localesDir, assetsDir, groupsDir) {
         revision.setVersionCandidate();
         revision.setTimeUpdatedCandidate();
 
-        const hostlistCompiled = await hostlistCompiler({
+        let hostlistCompiled = await hostlistCompiler({
           ...hostlistConfiguration,
           version: revision.getVersionCandidate(),
         });
 
+        if (!metadata.trusted) {
+          // Remove $dnsrewrite rules if the filter is not trusted.
+          hostlistCompiled = hostlistCompiled.filter((line) => {
+            return !line.includes('dnsrewrite=');
+          });
+        }
+
         const hash = calculateRevisionHash(hostlistCompiled);
 
         // Rewrites the filter if it's actually changed.