dns/bind: sync with master

hippi-viking · Nov 18, 2020 · ced72ff · ced72ff
1 parent a57c741
commit ced72ff
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git 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=	[email protected]

diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr
@@ -8,6 +8,13 @@ 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
+* Relax ACL name mask (allow underscores and hyphens)
+
 1.13
 
 * Update BIND to 9.16

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
@@ -12,8 +12,8 @@
                 <name type="TextField">
                     <default></default>
                     <Required>Y</Required>
-                    <mask>/^([0-9a-zA-Z]){1,32}$/u</mask>
-                    <ValidationMessage>Should be a string between 1 and 32 characters. Allowed characters are 0-9a-zA-Z</ValidationMessage>
+                    <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-9a-zA-Z_-. Built-in ACL names must not be used: any, localhost, localnets, none.</ValidationMessage>
                 </name>
                 <networks type="NetworkField">
                     <default></default>

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
@@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE.
         </div>
     </div>
     <div id="acls" class="tab-pane fade in">
-        <table id="grid-acls" class="table table-responsive" data-editDialog="dialogEditBindAcl">
+        <table id="grid-acls" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="dialogEditBindAcl">
             <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
@@ -72,6 +72,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     <td colspan="5"></td>
                     <td>
                         <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
+                        <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button>
                     </td>
                 </tr>
             </tfoot>
@@ -86,7 +87,7 @@ POSSIBILITY OF SUCH DAMAGE.
         <div class="alert alert-warning" role="alert" style="min-height:65px;">
             <div style="margin-top: 8px;">{{ lang._('Zone management is still in experimental state, use with caution.') }}</div>
         </div>
-        <table id="grid-domains" class="table table-responsive" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindDomain">
+        <table id="grid-domains" class="table table-condensed table-hover table-striped table-responsive" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindDomain">
             <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
@@ -108,6 +109,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     <td colspan="5"></td>
                     <td>
                         <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
+                        <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button>
                     </td>
                 </tr>
             </tfoot>
@@ -117,7 +119,7 @@ POSSIBILITY OF SUCH DAMAGE.
             <h2>{{ lang._('Records') }}</h2>
         </div>
         <div id="record-area">
-            <table id="grid-records" class="table table-responsive" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindRecord">
+            <table id="grid-records" class="table table-condensed table-hover table-striped table-responsive" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindRecord">
                 <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
@@ -136,6 +138,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     <td colspan="5"></td>
                     <td>
                         <button id="recordAddBtn" data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
+                        <button id="recordDelBtn" data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button>
                     </td>
                 </tr>
                 </tfoot>
@@ -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;