From 8afe702361df75049329c0db3ce7f91127498f54 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Mon, 3 Apr 2023 16:07:55 -0500
Subject: dns: T5143: Apply constraint for domain name in DNS forwarding

This will prevent arbitrary strings from being entered as domain names.

Additionally, reuse the fqdn validator instead of a custom regex.
---
 interface-definitions/dns-forwarding.xml.in | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in
index 14b38b24d..2b6892ce5 100644
--- a/interface-definitions/dns-forwarding.xml.in
+++ b/interface-definitions/dns-forwarding.xml.in
@@ -83,6 +83,13 @@
               <tagNode name="domain">
                 <properties>
                   <help>Domain to forward to a custom DNS server</help>
+                  <valueHelp>
+                    <format>text</format>
+                    <description>An absolute DNS domain name</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="fqdn"/>
+                  </constraint>
                 </properties>
                 <children>
                   #include <include/name-server-ipv4-ipv6-port.xml.i>
@@ -105,10 +112,10 @@
                   <help>Domain to host authoritative records for</help>
                   <valueHelp>
                     <format>text</format>
-                    <description>An absolute DNS name</description>
+                    <description>An absolute DNS domain name</description>
                   </valueHelp>
                   <constraint>
-                    <regex>[-_a-zA-Z0-9.]{1,63}</regex>
+                    <validator name="fqdn"/>
                   </constraint>
                 </properties>
                 <children>
-- 
cgit v1.2.3