From eb76729d63245e2e8f06f4d6d52d2fd4aab4fb1f Mon Sep 17 00:00:00 2001
From: khramshinr <khramshinr@gmail.com>
Date: Tue, 30 Jan 2024 14:12:01 +0700
Subject: dns forwarding: T5687: Implement ECS settings for PowerDNS recursor

---
 .../service_dns_forwarding.xml.in                  | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'interface-definitions/service_dns_forwarding.xml.in')

diff --git a/interface-definitions/service_dns_forwarding.xml.in b/interface-definitions/service_dns_forwarding.xml.in
index 0f8863438..b520af44d 100644
--- a/interface-definitions/service_dns_forwarding.xml.in
+++ b/interface-definitions/service_dns_forwarding.xml.in
@@ -735,6 +735,49 @@
                   </constraint>
                 </properties>
               </leafNode>
+              <node name="options">
+                <properties>
+                  <help>DNS server options</help>
+                </properties>
+                <children>
+                  <leafNode name="ecs-add-for">
+                    <properties>
+                      <help>List of client netmasks for which EDNS Client Subnet will be added</help>
+                      <valueHelp>
+                        <format>ipv4net</format>
+                        <description>IP addresses or subnets, negation supported</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>ipv6net</format>
+                        <description>IPv6 addresses or subnets, negation supported</description>
+                      </valueHelp>
+                      <multi/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="ecs-ipv4-bits">
+                    <properties>
+                      <help>Number of bits of IPv4 address to pass for EDNS Client Subnet</help>
+                      <valueHelp>
+                        <format>u32:0-32</format>
+                        <description>Number of bits of IPv4 address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 0-32"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="edns-subnet-allow-list">
+                    <properties>
+                      <help>List of netmasks and domains that we should enable EDNS subnet for</help>
+                      <valueHelp>
+                        <format>txt</format>
+                        <description>Netmask or domain</description>
+                      </valueHelp>
+                      <multi/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
             </children>
           </node>
         </children>
-- 
cgit v1.2.3


From c4b6c156549ea03262793c78532c2456e8713b81 Mon Sep 17 00:00:00 2001
From: khramshinr <khramshinr@gmail.com>
Date: Wed, 31 Jan 2024 12:13:07 +0700
Subject: dns forwarding: T5687: Implement ECS settings for PowerDNS recursor

Fix option descriptions
---
 interface-definitions/service_dns_forwarding.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'interface-definitions/service_dns_forwarding.xml.in')

diff --git a/interface-definitions/service_dns_forwarding.xml.in b/interface-definitions/service_dns_forwarding.xml.in
index b520af44d..788f0c18e 100644
--- a/interface-definitions/service_dns_forwarding.xml.in
+++ b/interface-definitions/service_dns_forwarding.xml.in
@@ -742,7 +742,7 @@
                 <children>
                   <leafNode name="ecs-add-for">
                     <properties>
-                      <help>List of client netmasks for which EDNS Client Subnet will be added</help>
+                      <help>Client netmask for which EDNS Client Subnet will be added</help>
                       <valueHelp>
                         <format>ipv4net</format>
                         <description>IP addresses or subnets, negation supported</description>
@@ -768,7 +768,7 @@
                   </leafNode>
                   <leafNode name="edns-subnet-allow-list">
                     <properties>
-                      <help>List of netmasks and domains that we should enable EDNS subnet for</help>
+                      <help>Netmask or domain that we should enable EDNS subnet for</help>
                       <valueHelp>
                         <format>txt</format>
                         <description>Netmask or domain</description>
-- 
cgit v1.2.3


From 049560725b93de49ec2d5a779e391e61d568ceb6 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 1 Feb 2024 20:32:04 +0100
Subject: dns forwarding: T5687: add missing constraints on ecs-add-for CLI
 node

Completion help suggests only IPv4 and IPv6 prefixes are supported, thus add a
proper constraint enforcing this.
---
 interface-definitions/service_dns_forwarding.xml.in | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'interface-definitions/service_dns_forwarding.xml.in')

diff --git a/interface-definitions/service_dns_forwarding.xml.in b/interface-definitions/service_dns_forwarding.xml.in
index 788f0c18e..a54618e82 100644
--- a/interface-definitions/service_dns_forwarding.xml.in
+++ b/interface-definitions/service_dns_forwarding.xml.in
@@ -745,12 +745,26 @@
                       <help>Client netmask for which EDNS Client Subnet will be added</help>
                       <valueHelp>
                         <format>ipv4net</format>
-                        <description>IP addresses or subnets, negation supported</description>
+                        <description>IPv4 prefix to match</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>!ipv4net</format>
+                        <description>Match everything except the specified IPv4 prefix</description>
                       </valueHelp>
                       <valueHelp>
                         <format>ipv6net</format>
-                        <description>IPv6 addresses or subnets, negation supported</description>
+                        <description>IPv6 prefix to match</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>!ipv6net</format>
+                        <description>Match everything except the specified IPv6 prefix</description>
                       </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-prefix"/>
+                        <validator name="ipv4-prefix-exclude"/>
+                        <validator name="ipv6-prefix"/>
+                        <validator name="ipv6-prefix-exclude"/>
+                      </constraint>
                       <multi/>
                     </properties>
                   </leafNode>
-- 
cgit v1.2.3