From: Vladimír Čunát Date: Fri, 7 Nov 2025 13:36:21 +0000 (+0100) Subject: treewide nit: reduce visible usage of "blacklist" and "whitelist" words X-Git-Tag: v6.0.17~5^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb26182dec86d865bb58ec79e790c1dc47e57c87;p=thirdparty%2Fknot-resolver.git treewide nit: reduce visible usage of "blacklist" and "whitelist" words I can understand that this naming tradition... isn't great. --- diff --git a/doc/user/config-views.rst b/doc/user/config-views.rst index b9e46c51d..47a9ebee5 100644 --- a/doc/user/config-views.rst +++ b/doc/user/config-views.rst @@ -6,7 +6,7 @@ Views and ACLs ============== Views allow to differentiate resolver behavior based on "who asked the query". -This allows you to achieve access control, personalized blacklists and filters based on how the DNS request came. +This allows you to achieve access control, personalized blocklists and filters based on how the DNS request arrived. .. code-block:: yaml diff --git a/doc/user/gettingstarted-config.rst b/doc/user/gettingstarted-config.rst index 262e2e05c..1968ee5ba 100644 --- a/doc/user/gettingstarted-config.rst +++ b/doc/user/gettingstarted-config.rst @@ -125,7 +125,7 @@ The following example allows only queries from clients on the subnet ``192.0.2.0 # refuse everything that hasn't matched - subnets: [ 0.0.0.0/0, "::/0" ] answer: refused - # whitelist queries identified by subnet + # allow queries identified by subnet - subnets: [ 192.0.2.0/24 ] answer: allow diff --git a/etc/config/config.cluster b/etc/config/config.cluster index 87873be48..18b94716c 100644 --- a/etc/config/config.cluster +++ b/etc/config/config.cluster @@ -33,4 +33,4 @@ hints.root({ }) -- Apply RPZ for all clients, default rule is DENY -policy.add(policy.rpz(policy.DENY, 'blacklist.rpz')) +policy.add(policy.rpz(policy.DENY, 'blocklist.rpz')) diff --git a/etc/config/config.example.isp.yaml b/etc/config/config.example.isp.yaml index 6f7fbe504..4b3cf4fc7 100644 --- a/etc/config/config.example.isp.yaml +++ b/etc/config/config.example.isp.yaml @@ -25,14 +25,14 @@ views: # refuse everything that hasn't matched - subnets: [ 0.0.0.0/0, "::/0" ] answer: refused - # whitelist queries identified by subnet + # allow queries identified by subnet - subnets: [ 192.0.2.0/24 ] answer: allow local-data: rpz: # apply RPZ for all clients, default rule is DENY - - file: blacklist.rpz + - file: blocklist.rpz lua: script: | diff --git a/etc/config/config.isp b/etc/config/config.isp index b8600529a..ab55b7507 100644 --- a/etc/config/config.isp +++ b/etc/config/config.isp @@ -54,7 +54,7 @@ end local monitor_id = event.recurrent(1 * minute, speed_monitor()) -- apply RPZ for all clients, default rule is DENY -policy.add(policy.rpz(policy.DENY, 'blacklist.rpz')) +policy.add(policy.rpz(policy.DENY, 'blocklist.rpz')) -- whitelist queries identified by subnet view:addr(''192.168.1.0/24'', policy.all(policy.PASS)) diff --git a/modules/policy/README.rst b/modules/policy/README.rst index 1d9d02c8d..9bb1f56e7 100644 --- a/modules/policy/README.rst +++ b/modules/policy/README.rst @@ -119,7 +119,7 @@ Following actions stop the policy matching on the query, i.e. other rules are no Let the query pass through; it's useful to make exceptions before wider rules. For example: - More specific whitelist rule must precede generic blacklist rule: + More specific whitelist rule must precede generic blocklist rule: .. code-block:: lua diff --git a/modules/view/README.rst b/modules/view/README.rst index 1e4f6491e..a7f11efc7 100644 --- a/modules/view/README.rst +++ b/modules/view/README.rst @@ -6,7 +6,7 @@ Views and ACLs ============== The :ref:`policy ` module implements policies for global query matching, e.g. solves "how to react to certain query". -This module combines it with query source matching, e.g. "who asked the query". This allows you to create personalized blacklists, filters and ACLs. +This module combines it with query source matching, e.g. "who asked the query". This allows you to create personalized blocklists, filters and ACLs. There are two identification mechanisms: