From 7b0659d5dd3004fc987f328c42d4f89aa3b37601 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 12 Nov 2020 22:32:48 +0100 Subject: [PATCH 1/6] dns/bind: reject built-in ACL names --- dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6466c0033..51eb97422 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 @@ -12,8 +12,8 @@ Y - /^([0-9a-zA-Z]){1,32}$/u - Should be a string between 1 and 32 characters. Allowed characters are 0-9a-zA-Z + /^(?!any$|localhost$|localnets$|none$)[0-9a-zA-Z]{1,32}$/u + Should be a string between 1 and 32 characters. Allowed characters are 0-9a-zA-Z. Built-in ACL names must not be used: any, localhost, localnets, none. From 449fc4990180f0e3f779085fe215d5ed94095a95 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 12 Nov 2020 22:42:30 +0100 Subject: [PATCH 2/6] dns/bind: fix small UI glitch (truncated checkboxes) --- .../src/opnsense/mvc/app/views/OPNsense/Bind/general.volt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt index 60d74b68c..455bee71f 100644 --- a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt +++ b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt @@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE.
- +
@@ -86,7 +86,7 @@ POSSIBILITY OF SUCH DAMAGE. -
{{ lang._('Enabled') }}
+
@@ -117,7 +117,7 @@ POSSIBILITY OF SUCH DAMAGE.

{{ lang._('Records') }}

-
{{ lang._('Enabled') }}
+
From 4f39145eaf3d4bbe56417d93aaebbbf59c109c00 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 12 Nov 2020 22:50:44 +0100 Subject: [PATCH 3/6] dns/bind: add button to delete selected items --- .../src/opnsense/mvc/app/views/OPNsense/Bind/general.volt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt index 455bee71f..e42640843 100644 --- a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt +++ b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt @@ -72,6 +72,7 @@ POSSIBILITY OF SUCH DAMAGE. @@ -108,6 +109,7 @@ POSSIBILITY OF SUCH DAMAGE. @@ -136,6 +138,7 @@ POSSIBILITY OF SUCH DAMAGE. @@ -219,9 +222,11 @@ $( document ).ready(function() { if (ids.length > 0) { request['domain'] = ids[0]; $("#recordAddBtn").show(); + $("#recordDelBtn").show(); $("#record-area").show(); } else { $("#recordAddBtn").hide(); + $("#recordDelBtn").hide(); $("#record-area").hide(); } return request; From e703a8d19b0a855c0188dc10c9b5a2e24ff51af7 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 12 Nov 2020 22:51:24 +0100 Subject: [PATCH 4/6] dns/bind: bump version --- dns/bind/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dns/bind/Makefile b/dns/bind/Makefile index 3323aea67..48b788c2a 100644 --- a/dns/bind/Makefile +++ b/dns/bind/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= bind -PLUGIN_VERSION= 1.13 -PLUGIN_REVISION= 1 +PLUGIN_VERSION= 1.14 PLUGIN_COMMENT= BIND domain name service PLUGIN_DEPENDS= bind916 PLUGIN_MAINTAINER= m.muenz@gmail.com From f6a694c1a20e03de71c147511c063d7a0a71f8da Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 12 Nov 2020 22:58:21 +0100 Subject: [PATCH 5/6] dns/bind: update changelog --- dns/bind/pkg-descr | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr index 99d74dce5..545d1b6b6 100644 --- a/dns/bind/pkg-descr +++ b/dns/bind/pkg-descr @@ -8,6 +8,12 @@ necessary for asking and answering name service questions. Plugin Changelog ================ +1.14 + +* Reject built-in ACL names +* Fix truncated checkboxes +* Add button to delete selected items + 1.13 * Update BIND to 9.16 From ff83e858d9269db01b70c863dff1dc699d03c184 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Thu, 12 Nov 2020 23:08:42 +0100 Subject: [PATCH 6/6] dns/bind: relax ACL name mask --- dns/bind/pkg-descr | 1 + dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr index 545d1b6b6..4c59d1e86 100644 --- a/dns/bind/pkg-descr +++ b/dns/bind/pkg-descr @@ -13,6 +13,7 @@ Plugin Changelog * Reject built-in ACL names * Fix truncated checkboxes * Add button to delete selected items +* Relax ACL name mask (allow underscores and hyphens) 1.13 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 51eb97422..6abff3a73 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 @@ -12,8 +12,8 @@ Y - /^(?!any$|localhost$|localnets$|none$)[0-9a-zA-Z]{1,32}$/u - Should be a string between 1 and 32 characters. Allowed characters are 0-9a-zA-Z. Built-in ACL names must not be used: any, localhost, localnets, none. + /^(?!any$|localhost$|localnets$|none$)[0-9a-zA-Z_\-]{1,32}$/u + Should be a string between 1 and 32 characters. Allowed characters are 0-9a-zA-Z_-. Built-in ACL names must not be used: any, localhost, localnets, none.
{{ lang._('Enabled') }} +
+
+