From 8ab96059614c6d802108729e6cb9bfbe3287a69d Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 6 Mar 2020 19:09:43 +0100
Subject: [PATCH] os-firewall: add apply action and assign an acl for this
 controller. for https://github.com/opnsense/plugins/issues/1720

---
 .../OPNsense/Firewall/Api/FilterController.php  | 14 ++++++++++++--
 .../app/models/OPNsense/Firewall/ACL/ACL.xml    |  9 +++++++++
 .../mvc/app/views/OPNsense/Firewall/filter.volt | 17 ++++++++++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml

diff --git a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
index 27a684b60..d2ed30745 100644
--- a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+++ b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
@@ -27,7 +27,8 @@
  */
 namespace OPNsense\Firewall\Api;
 
-use \OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Core\Backend;
 
 class FilterController extends ApiMutableModelControllerBase
 {
@@ -63,4 +64,13 @@ class FilterController extends ApiMutableModelControllerBase
     {
         return $this->toggleBase("rules.rule", $uuid, $enabled);
     }
-}
\ No newline at end of file
+
+    public function applyAction()
+    {
+        if ($this->request->isPost()) {
+            return array("status" => (new Backend())->configdRun('filter reload'));
+        } else {
+            return array("status" => "error");
+        }
+    }
+}
diff --git a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml
new file mode 100644
index 000000000..e063715bd
--- /dev/null
+++ b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml
@@ -0,0 +1,9 @@
+<acl>
+    <page-filter-api>
+        <name>Firewall: Rules: API</name>
+        <patterns>
+            <pattern>ui/firewall/filter/*</pattern>
+            <pattern>api/firewall/filter/*</pattern>
+        </patterns>
+    </page-filter-api>
+</acl>
diff --git a/net/firewall/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt b/net/firewall/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
index fb9809b3a..1e3389e9f 100644
--- a/net/firewall/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
+++ b/net/firewall/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
@@ -19,6 +19,8 @@
                 }
             });
         }
+
+        $("#reconfigureAct").SimpleActionButton();
     });
 </script>
 
@@ -29,7 +31,7 @@
 <div class="tab-content content-box">
     <div id="rules" class="tab-pane fade in active">
         <!-- tab page "filter rules" -->
-        <table id="grid-rules" class="table table-condensed table-hover table-striped" data-editDialog="DialogFilterRule">
+        <table id="grid-rules" class="table table-condensed table-hover table-striped" data-editDialog="DialogFilterRule" data-editAlert="FilterRuleChangeMessage">
             <thead>
                 <tr>
                     <th data-column-id="uuid" data-type="string" data-identifier="true"  data-visible="false">{{ lang._('ID') }}</th>
@@ -51,6 +53,19 @@
                 </tr>
             </tfoot>
         </table>
+        <div class="col-md-12">
+        <div id="FilterRuleChangeMessage" class="alert alert-info" style="display: none" role="alert">
+            {{ lang._('After changing settings, please remember to apply them with the button below') }}
+        </div>
+        <hr/>
+        <button class="btn btn-primary" id="reconfigureAct"
+                data-endpoint='/api/firewall/filter/apply'
+                data-label="{{ lang._('Apply') }}"
+                data-error-title="{{ lang._('Filter load error') }}"
+                type="button"
+        ></button>
+        <br/><br/>
+    </div>
     </div>
 </div>