From 23aae2f87ea31622d32948e7834d52a9e7152dd0 Mon Sep 17 00:00:00 2001
From: Robbert Rijkse <42551307+sestary@users.noreply.github.com>
Date: Tue, 10 Jan 2023 08:43:26 -0500
Subject: [PATCH] dns/bind: ensure the ACL names are unique (#3254)

---
 dns/bind/pkg-descr                                         | 1 +
 dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr
index f9ffd920c..425d1c4c2 100644
--- a/dns/bind/pkg-descr
+++ b/dns/bind/pkg-descr
@@ -11,6 +11,7 @@ Plugin Changelog
 
 1.25
 
+* Ensure you can only add one ACL with the same name (contributed by Robbert Rijkse)
 * Cleanup/Fix the Master/Slave domain dialogs (contributed by Robbert Rijkse)
 * Revamp the logging page with proper columns (contributed by Robbert Rijkse)
 * Add UI for RNDC Key configuration (contributed by Robbert Rijkse)
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
index 474a0a0df..c7dd88785 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
@@ -14,6 +14,12 @@
                     <Required>Y</Required>
                     <mask>/^(?!any$|localhost$|localnets$|none$)[0-9a-zA-Z_\-]{1,32}$/u</mask>
                     <ValidationMessage>Should be a string between 1 and 32 characters. Allowed characters are 0-9, a-z, A-Z, _ and -. Built-in ACL names must not be used: any, localhost, localnets, none.</ValidationMessage>
+                     <Constraints>
+                        <check001>
+                            <ValidationMessage>An ACL with this name already exists.</ValidationMessage>
+                            <type>UniqueConstraint</type>
+                        </check001>
+                    </Constraints>
                 </name>
                 <networks type="NetworkField">
                     <default></default>