From 010922c3291ae9163973daf47308036f1124bdb6 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Wed, 11 Jul 2018 09:33:20 +0200
Subject: [PATCH] dns/bind: acl, forwards, menu item (#731)

---
 .../{ACLController.php => AclController.php}  | 16 ++++++-------
 .../OPNsense/Bind/GeneralController.php       |  2 +-
 ...gEditBindACL.xml => dialogEditBindAcl.xml} |  4 +++-
 .../OPNsense/Bind/forms/general.xml           |  8 +++++++
 .../models/OPNsense/Bind/{ACL.php => Acl.php} |  2 +-
 .../models/OPNsense/Bind/{ACL.xml => Acl.xml} |  3 ++-
 .../mvc/app/models/OPNsense/Bind/General.xml  | 17 ++++++++++----
 .../app/models/OPNsense/Bind/Menu/Menu.xml    |  2 +-
 .../mvc/app/views/OPNsense/Bind/general.volt  | 16 ++++++-------
 .../templates/OPNsense/Bind/named.conf        | 23 +++++++++----------
 10 files changed, 56 insertions(+), 37 deletions(-)
 rename dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/{ACLController.php => AclController.php} (84%)
 rename dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/{dialogEditBindACL.xml => dialogEditBindAcl.xml} (82%)
 rename dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/{ACL.php => Acl.php} (98%)
 rename dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/{ACL.xml => Acl.xml} (90%)

diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/ACLController.php b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/AclController.php
similarity index 84%
rename from dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/ACLController.php
rename to dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/AclController.php
index 856b923c4..13a375848 100644
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/ACLController.php
+++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/AclController.php
@@ -31,33 +31,33 @@ namespace OPNsense\Bind\Api;
 
 use \OPNsense\Base\ApiMutableModelControllerBase;
 
-class ACLController extends ApiMutableModelControllerBase
+class AclController extends ApiMutableModelControllerBase
 {
     static protected $internalModelName = 'acl';
-    static protected $internalModelClass = '\OPNsense\Bind\ACL';
+    static protected $internalModelClass = '\OPNsense\Bind\Acl';
 
-    public function searchACLAction()
+    public function searchAclAction()
     {
         return $this->searchBase('acls.acl', array("enabled", "name", "networks"));
     }
-    public function getACLAction($uuid = null)
+    public function getAclAction($uuid = null)
     {
         $this->sessionClose();
         return $this->getBase('acl', 'acls.acl', $uuid);
     }
-    public function addACLAction()
+    public function addAclAction()
     {
         return $this->addBase('acl', 'acls.acl');
     }
-    public function delACLAction($uuid)
+    public function delAclAction($uuid)
     {
         return $this->delBase('acls.acl', $uuid);
     }
-    public function setACLAction($uuid)
+    public function setAclAction($uuid)
     {
         return $this->setBase('acl', 'acls.acl', $uuid);
     }
-    public function toggleACLAction($uuid)
+    public function toggleAclAction($uuid)
     {
         return $this->toggleBase('acls.acl', $uuid);
     }
diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/GeneralController.php b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/GeneralController.php
index 62c586b9b..1ce4029f9 100644
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/GeneralController.php
+++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/GeneralController.php
@@ -33,7 +33,7 @@ class GeneralController extends \OPNsense\Base\IndexController
     public function indexAction()
     {
         $this->view->generalForm = $this->getForm("general");
-        $this->view->formDialogEditBindACL = $this->getForm("dialogEditBindACL");
+        $this->view->formDialogEditBindAcl = $this->getForm("dialogEditBindAcl");
         $this->view->pick('OPNsense/Bind/general');
     }
 }
diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindACL.xml b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindAcl.xml
similarity index 82%
rename from dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindACL.xml
rename to dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindAcl.xml
index c031a3cf4..1931d97ef 100644
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindACL.xml
+++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/dialogEditBindAcl.xml
@@ -14,7 +14,9 @@
     <field>
         <id>acl.networks</id>
         <label>Network List</label>
-        <type>text</type>
+        <style>tokenize</style>
+        <type>select_multiple</type>
+        <allownew>true</allownew>
         <help>List of networks for this ACL.</help>
     </field>
 </form>
diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml
index 151df0a46..b65e56abf 100644
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml
+++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml
@@ -21,4 +21,12 @@
         <allownew>true</allownew>
         <help>Set the IPv6 addresses the service should listen to.</help>
     </field>
+    <field>
+        <id>general.forwarders</id>
+        <label>DNS Forwarders</label>
+        <style>tokenize</style>
+        <type>select_multiple</type>
+        <allownew>true</allownew>
+        <help>Set one or more hosts to send your DNS queries if the request is unknown.</help>
+    </field>
 </form>
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/ACL.php b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.php
similarity index 98%
rename from dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/ACL.php
rename to dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.php
index f5f03fd7d..0f0fcb562 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/ACL.php
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.php
@@ -26,6 +26,6 @@ namespace OPNsense\Bind;
 
 use OPNsense\Base\BaseModel;
 
-class ACL extends BaseModel
+class Acl extends BaseModel
 {
 }
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
similarity index 90%
rename from dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/ACL.xml
rename to dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Acl.xml
index fde892196..6466c0033 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
@@ -17,8 +17,9 @@
                 </name>
                 <networks type="NetworkField">
                     <default></default>
-                    <FieldSeparator>;</FieldSeparator>
+                    <FieldSeparator>,</FieldSeparator>
                     <Required>Y</Required>
+                    <asList>Y</asList>
                 </networks>
             </acl>
         </acls>
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml
index 65312333c..a2376b78b 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml
@@ -8,12 +8,21 @@
             <Required>Y</Required>
         </enabled>
         <listenv4 type="NetworkField">
-            <FieldSeparator>;</FieldSeparator>
-            <Required>N</Required>
+            <default>127.0.0.1</default>
+            <FieldSeparator>,</FieldSeparator>
+            <Required>Y</Required>
+            <asList>Y</asList>
         </listenv4>
         <listenv6 type="NetworkField">
-            <FieldSeparator>;</FieldSeparator>
-            <Required>N</Required>
+            <default>::1</default>
+            <FieldSeparator>,</FieldSeparator>
+            <Required>Y</Required>
+            <asList>Y</asList>
         </listenv6>
+        <forwarders type="NetworkField">
+            <FieldSeparator>,</FieldSeparator>
+            <Required>N</Required>
+            <asList>Y</asList>
+        </forwarders>
     </items>
 </model>
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
index 821d6bf61..42f8d3ad5 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
   <Services>
-    <BIND cssClass="fa fa-map-marked" url="/ui/bind/general/index" />
+    <BIND cssClass="fa fa-tags" url="/ui/bind/general/index" />
   </Services>
 </menu>
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 c3d99d953..b855958ac 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
@@ -44,7 +44,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-responsive" data-editDialog="dialogEditBindAcl">
             <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
@@ -73,7 +73,7 @@ POSSIBILITY OF SUCH DAMAGE.
     </div>
 </div>
 
-{{ partial("layout_partials/base_dialog",['fields':formDialogEditBindACL,'id':'dialogEditBindACL','label':lang._('Edit ACL')])}}
+{{ partial("layout_partials/base_dialog",['fields':formDialogEditBindAcl,'id':'dialogEditBindAcl','label':lang._('Edit ACL')])}}
 
 <script>
 $( document ).ready(function() {
@@ -88,12 +88,12 @@ $( document ).ready(function() {
     });
 
     $("#grid-acls").UIBootgrid(
-        {   'search':'/api/bind/acl/searchACL',
-            'get':'/api/bind/acl/getACL/',
-            'set':'/api/bind/acl/setACL/',
-            'add':'/api/bind/acl/addACL/',
-            'del':'/api/bind/acl/delACL/',
-            'toggle':'/api/bind/acl/toggleACL/'
+        {   'search':'/api/bind/acl/searchAcl',
+            'get':'/api/bind/acl/getAcl/',
+            'set':'/api/bind/acl/setAcl/',
+            'add':'/api/bind/acl/addAcl/',
+            'del':'/api/bind/acl/delAcl/',
+            'toggle':'/api/bind/acl/toggleAcl/'
         }
     );
 
diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
index 2cbf0ae69..32098723f 100644
--- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
+++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
@@ -1,5 +1,13 @@
 {% if helpers.exists('OPNsense.bind.general.enabled') and OPNsense.bind.general.enabled == '1' %}
 
+{% if helpers.exists('OPNsense.bind.acl.acls.acl') %}
+{%   for acl_list in helpers.toList('OPNsense.bind.acl.acls.acl') %}
+{%     if acl_list.enabled == '1' %}
+acl "{{ acl_list.name }}" { {{ acl_list.networks.replace(',', '; ') }}; };
+{%     endif %}
+{%   endfor %}
+{% endif %}
+
 options {
 
         directory       "/usr/local/etc/namedb/working";
@@ -14,21 +22,12 @@ options {
         listen-on-v6    { {{ OPNsense.bind.general.listenv6.replace(',', '; ') }}; };
 {% endif %}
 
-/*
-        forwarders {
-                127.0.0.1;
-        };
-*/
+{% if helpers.exists('OPNsense.bind.general.forwarders') and OPNsense.bind.general.forwarders != '' %}
+        forwarders    { {{ OPNsense.bind.general.forwarders.replace(',', '; ') }}; };
+{% endif %}
 
 };
 
-// If the 'forwarders' clause is not empty the default is to 'forward first'
-// which will fall back to sending a query from your local server if the name
-// servers in 'forwarders' do not have the answer.  Alternatively you can
-// force your name server to never initiate queries of its own by enabling the
-// following line:
-//      forward only;
-
 zone "." { type hint; file "/usr/local/etc/namedb/named.root"; };
 
 zone "localhost"        { type master; file "/usr/local/etc/namedb/master/localhost-forward.db"; };