From 7b2119578fc9838a5a808980c9c8d8ef0ebd50e4 Mon Sep 17 00:00:00 2001
From: Robbert Rijkse <42551307+sestary@users.noreply.github.com>
Date: Wed, 11 Jan 2023 08:34:21 -0500
Subject: [PATCH] move RNDC key to general page (#3258)

---
 .../OPNsense/Bind/GeneralController.php       |  1 -
 .../OPNsense/Bind/forms/general.xml           | 19 ++++++++++++++
 .../OPNsense/Bind/forms/rndcKey.xml           | 14 -----------
 .../mvc/app/views/OPNsense/Bind/general.volt  | 25 -------------------
 4 files changed, 19 insertions(+), 40 deletions(-)
 delete mode 100644 dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/rndcKey.xml

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 f233b57bb..663acb058 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
@@ -34,7 +34,6 @@ class GeneralController extends \OPNsense\Base\IndexController
     {
         $this->view->generalForm = $this->getForm("general");
         $this->view->dnsblForm = $this->getForm("dnsbl");
-        $this->view->rndcKeyForm = $this->getForm("rndcKey");
         $this->view->formDialogEditBindAcl = $this->getForm("dialogEditBindAcl");
         $this->view->formDialogEditBindPrimaryDomain = $this->getForm("dialogEditBindPrimaryDomain");
         $this->view->formDialogEditBindSecondaryDomain = $this->getForm("dialogEditBindSecondaryDomain");
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 f929beedd..e40b6dc86 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
@@ -169,4 +169,23 @@
         <advanced>true</advanced>
         <help>Except a list of IPs from rate-limiting like ::1</help>
     </field>
+    <field>
+        <type>header</type>
+        <label>RNDC Key</label>
+        <advanced>true</advanced>
+    </field>
+    <field>
+        <id>general.rndcalgo</id>
+        <label>Algorithm</label>
+        <type>dropdown</type>
+        <advanced>true</advanced>
+        <help>Set the authentication algorithm for the RNDC key. This requires a restart of the Bind Service.</help>
+    </field>
+    <field>
+        <id>general.rndcsecret</id>
+        <label>Secret</label>
+        <type>text</type>
+        <advanced>true</advanced>
+        <help>The base64-encoded RNDC key. This requires a restart of the Bind Service.</help>
+    </field>
 </form>
diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/rndcKey.xml b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/rndcKey.xml
deleted file mode 100644
index 48f2fc43d..000000000
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/rndcKey.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<form>
-    <field>
-        <id>general.rndcalgo</id>
-        <label>Algorithm</label>
-        <type>dropdown</type>
-        <help>Set the authentication algorithm for the RNDC key.</help>
-    </field>
-    <field>
-        <id>general.rndcsecret</id>
-        <label>Secret</label>
-        <type>text</type>
-        <help>The base64-encoded RNDC key.</help>
-    </field>
-</form>
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 9e8749d3b..cf7991ec9 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
@@ -32,7 +32,6 @@ POSSIBILITY OF SUCH DAMAGE.
     <li class="active"><a data-toggle="tab" href="#general">{{ lang._('General') }}</a></li>
     <li><a data-toggle="tab" href="#dnsbl">{{ lang._('DNSBL') }}</a></li>
     <li><a data-toggle="tab" href="#acls">{{ lang._('ACLs') }}</a></li>
-    <li><a data-toggle="tab" href="#keys">{{ lang._('Keys') }}</a></li>
     <li><a data-toggle="tab" href="#primary-domains">{{ lang._('Primary Zones') }}</a></li>
     <li><a data-toggle="tab" href="#secondary-domains">{{ lang._('Secondary Zones') }}</a></li>
 </ul>
@@ -85,21 +84,6 @@ POSSIBILITY OF SUCH DAMAGE.
             <br /><br />
         </div>
     </div>
-    <div id="keys" class="tab-pane fade in">
-        <div class="content-box">
-            <div class="col-md-12">
-                <h2>{{ lang._('RNDC Key') }}</h2>
-            </div>
-            {{ partial("layout_partials/base_form",['fields':rndcKeyForm,'id':'frm_general_settings'])}}
-        </div>
-        <div class="col-md-12">
-            <hr />
-            <button class="btn btn-primary" id="saveRestartAct_rndckey" type="button"><b>{{ lang._('Save & Restart') }}</b> <i id="saveRestartAct_rndckey_progress"></i></button>
-            <br />
-            <b>Note:</b> Bind will be restarted when you Save, this is required when the RNDC key changes.
-            <br /><br />
-        </div>
-    </div>
     <div id="primary-domains" class="tab-pane fade in">
         <div class="col-md-12">
             <h2>{{ lang._('Zones') }}</h2>
@@ -339,15 +323,6 @@ $( document ).ready(function() {
         });
     });
 
-    $("#saveRestartAct_rndckey").click(function(){
-        saveFormToEndpoint(url="/api/bind/general/set", formid='frm_general_settings',callback_ok=function(){
-            $("#saveRestartAct_rndckey_progress").addClass("fa fa-spinner fa-pulse");
-            ajaxCall("/api/bind/service/restart", {}, function(data,status) {
-                updateServiceControlUI('bind');
-                $("#saveRestartAct_rndckey_progress").removeClass("fa fa-spinner fa-pulse");
-            });
-        });
-    });
     $(".saveAct_domain").click(function(){
         $(".saveAct_domain_progress").addClass("fa fa-spinner fa-pulse");
         ajaxCall("/api/bind/service/reconfigure", {}, function(data,status) {