From 7d66c4bf9b228123dcd0a3757e532dcf67c3f0d9 Mon Sep 17 00:00:00 2001
From: kulikov-a <36099472+kulikov-a@users.noreply.github.com>
Date: Tue, 6 Apr 2021 10:42:05 +0300
Subject: [PATCH 01/13] fw_log.volt: add filter templates

---
 .../views/OPNsense/Diagnostics/fw_log.volt    | 250 +++++++++++++++++-
 1 file changed, 237 insertions(+), 13 deletions(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
index 416e57d5f..7c5fa9d36 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
@@ -1,6 +1,6 @@
 {#
  #
- # Copyright (c) 2014-2016 Deciso B.V.
+ # Copyright (c) 2014-2021 Deciso B.V.
  # All rights reserved.
  #
  # Redistribution and use in source and binary forms, with or without modification,
@@ -37,7 +37,7 @@
         let hostnameMap = {};
 
         /**
-         * reverse lookup address fields (replace adres part for hostname if found)
+         * reverse lookup address fields (replace address part for hostname if found)
          */
         function reverse_lookup() {
             let to_fetch = [];
@@ -354,6 +354,95 @@
             fetch_log();
         });
 
+        // templates actions
+        $("#templates").change(function () {
+            if ($('#templ_save_start').is(':visible')) {
+                //apply chosen template
+                let t_data = $(this).find('option:selected').data('template') ? $(this).find('option:selected').data('template') : {'filters': "0", 'or': "0"};
+                set_selection(t_data.filters.split(','), t_data.or);
+            } else {
+                //choose template to modify or create new one. Show Name input if New option clicked
+                if ($('#templates').val() === "00001") {
+                    $('#templates').selectpicker('hide');
+                    $('#templ_name').show().focus();
+                }
+            }
+        });
+
+        $('#templ_save_start').click(function () {
+            if ($(".badge").text() == '') {
+                BootstrapDialog.show({
+                    type: BootstrapDialog.TYPE_DANGER,
+                    title: "{{ lang._('Save filters template') }}",
+                    message: "{{ lang._('Filters not set') }}",
+                    buttons: [{
+                        label: "{{ lang._('Close') }}",
+                        action: function (dialogRef) {
+                            dialogRef.close();
+                        }
+                    }]
+                });
+            } else {
+                $('.templates').hide();
+                $('.templ_save').show();
+                $('#templ_name').focus();
+                if ($("#templates option").length == 3){
+                    //no stored templates. skip to new template name
+                    $('#templates').val("00001").selectpicker('refresh').change();
+                }
+            }
+        });
+
+        $("#templ_save_cancel").click(function () {
+            $('#templ_name').val("").hide();
+            $('.templ_save').hide();
+            $('.templates').show();
+            $('#templates').val('').selectpicker('refresh').selectpicker('show');
+        });
+
+        $("#templ_name").on('keyup', function (e) {
+            if (e.key === 'Enter' || e.keyCode === 13) {
+                $('#templ_save_apply').click();
+            } else if (e.keyCode === 27) {
+                $('#templ_name').val("").hide();
+                $('#templates').val('').selectpicker('refresh').selectpicker('show');
+            }
+        });
+
+        $("#templ_save_apply").click(function () {
+            let fltrs = "";
+            $('.badge').each(function () {
+                fltrs += $(this).text() + ",";
+            });
+            fltrs = fltrs.slice(0, -1);
+            let or = $('#filter_or_type').prop("checked") ? "1" : "0";
+            let t_data = {
+                'template': {
+                    'filters': fltrs,
+                    'or': or
+                }
+            };
+            $('#templates').selectpicker('refresh').selectpicker('show');
+            if ($("#templ_name").val().length >= 1 && $("#templ_name").is(':visible')) {
+                //new template
+                t_data.template.name = $("#templ_name").val();
+                $('#templ_name').val("").hide();
+                addTemplate(t_data);
+            } else if ($("#templ_name").val().length == 0 && $("#templ_name").is(':hidden') && $("#templates").val().length == 36) {
+                //edit template
+                let t_id = $("#templates").val();
+                t_data.template.name = $("#templates option:selected").text();
+                editTemplate(t_id, t_data);
+            }
+        });
+
+        $("#template_delete").click(function () {
+            let t_id = $('#templates').val();
+            if (t_id.length == 36) {
+                delTemplate(t_id);
+            }
+        });
+
         // fetch interface mappings on load
         ajaxGet('/api/diagnostics/interface/getInterfaceNames', {}, function(data, status) {
             interface_descriptions = data;
@@ -389,18 +478,27 @@
                             filter_value.show();
                         }
                     }).change();
+                    fetchTemplates("00000", true);
                 }
             });
+
         });
 
+        // startup poller
+        poller();
+
+
         /**
          * set new selection
          * @param items list of lexical expressions
+         * @param operator enable or disable global OR operator
          */
-        function set_selection(items)
+        function set_selection(items, operator)
         {
             // remove old selection
             $("#filters > span.badge").click();
+            // operator default value
+            operator = operator || "0";
             // collect valid condition types
             let conditions = [];
             $("#filter_condition > option").each(function(){
@@ -413,15 +511,121 @@
                     $("#filter_condition").val(parts[1]);
                     $("#filter_value").val(parts[2]);
                     $("#add_filter_condition").click();
+                } else if (value.toLowerCase() == "or=1") {
+                    operator = "1";
+                }
+            });
+            $("#filter_or_type").prop('checked', operator === "1" ? true : false);
+            $(".selectpicker").selectpicker('refresh');
+            $("#filter_tag").change();
+        }
+
+        /**
+         * add new filters template
+         * @param t_data template's parameters
+         */
+        function addTemplate(t_data) {
+            ajaxCall('/api/diagnostics/lvtemplates/addItem/', t_data, function(data, status) {
+                if ((status == "success") && (data.result == "saved")) {
+                    fetchTemplates(data.uuid);
+                } else {
+                    BootstrapDialog.show({
+                    type: BootstrapDialog.TYPE_DANGER,
+                    title: "{{ lang._('Add filters template') }}",
+                    message: "{{ lang._('Template save failed. Message: ') }}" + data.result,
+                    buttons: [{
+                        label: "{{ lang._('Close') }}",
+                        action: function (dialogRef) {
+                            dialogRef.close();
+                        }
+                        }]
+                    });
+                    fetchTemplates("00000");
+                }
+            })
+        }
+
+        /**
+         * set template new values
+         * @param t_id template uuid
+         * @param t_data template's parameters
+         */
+        function editTemplate(t_id, t_data) {
+            ajaxCall('/api/diagnostics/lvtemplates/setItem/' + t_id, t_data, function(data, status) {
+                if ((status == "success") && (data.result == "saved")) {
+                    fetchTemplates(t_id);
+                } else {
+                    BootstrapDialog.show({
+                    type: BootstrapDialog.TYPE_DANGER,
+                    title: "{{ lang._('Filters template edit') }}",
+                    message: "{{ lang._('Template edit failed. Message: ') }}" + data.result,
+                    buttons: [{
+                        label: "{{ lang._('Close') }}",
+                        action: function (dialogRef) {
+                            dialogRef.close();
+                        }
+                        }]
+                    });
+                    fetchTemplates(t_id);
+                }
+            })
+        }
+
+        /**
+         * delete filters template
+         * @param t_id template uuid
+         */
+        function delTemplate(t_id) {
+            ajaxCall('/api/diagnostics/lvtemplates/delItem/' + t_id, {}, function(data, status) {
+                if ((status == "success") && (data.result == "deleted")) {
+                    //don't reset current filters so template can be restored right after delete
+                    $("#templates option[value=" + t_id + "]").remove();
+                    $("#templates").val("").selectpicker('refresh');
+                } else {
+                    BootstrapDialog.show({
+                    type: BootstrapDialog.TYPE_DANGER,
+                    title: "{{ lang._('Filters template delete') }}",
+                    message: "{{ lang._('Template delete failed. Result: ') }}" + data.result,
+                    buttons: [{
+                        label: "{{ lang._('Close') }}",
+                        action: function (dialogRef) {
+                            dialogRef.close();
+                        }
+                        }]
+                    });
+                }
+            })
+        }
+
+        /**
+         * fetch templates from config
+         * @param opt select value to make :selected and apply
+         * @param parse_url flag to parse and apply url params on page load
+         */
+        function fetchTemplates(opt, parse_url) {
+            opt = opt || "00000";
+            //apply = apply || true;
+            $('#templ_name').val("");
+            $('#templates').empty();
+            $('#templates').append($('<option/>', {value: "00000", text: "None"}).data('template', {'filters': "0", 'or': "0"}).addClass("disp_none_opt templates"));
+            $('#templates').append($('<option/>', {value: "00001", text: "New"}).data('template', {'filters': "0", 'or': "0"}).data('icon','glyphicon-file').addClass("add_new_opt templ_save"));
+            $('#templates').selectpicker('refresh');
+            $('.templates').show();
+            $('.templ_save').hide();
+            ajaxGet('/api/diagnostics/lvtemplates/searchItem/', {}, function(data, status) {
+                let templates = data.rows;
+                $.each(templates, function(i, template) {
+                    $('#templates').append(template.uuid == opt ? $('<option/>', {value:template.uuid, text:template.name, selected: "selected" }).data('template', template) : $('<option/>', {value:template.uuid, text:template.name }).data('template', template));
+                });
+                $('#templates').selectpicker('refresh');
+                $('.badge').click();
+                $("#templates").change();
+                if (parse_url) {
+                    // get and apply url params. ie11 compat
+                    set_selection(window.location.search.substring(1).split("&"));
                 }
             });
         }
-
-        // get and apply url params. ie11 compat
-        set_selection(window.location.search.substring(1).split("&"));
-
-        // startup poller
-        poller();
     });
 </script>
 <style>
@@ -473,7 +677,7 @@
                                 </select>
                               </td>
                               <td style="width:125px;">
-                                <select id="filter_condition" class="condition"  data-width="120px">
+                                <select id="filter_condition" class="selectpicker"  data-width="120px">
                                     <option value="~" selected=selected>{{ lang._('contains') }}</option>
                                     <option value="=">{{ lang._('is') }}</option>
                                     <option value="!~">{{ lang._('does not contain') }}</option>
@@ -505,14 +709,34 @@
                       <tfoot>
                         <tr>
                             <td colspan="4">
-                                <input id="filter_or_type" type="checkbox">
-                                {{ lang._('Select any of given criteria (or)') }}
+                                <label>
+                                    <input id="filter_or_type" type="checkbox">
+                                    {{ lang._('Select any of given criteria (or)') }}
+                                </label>
                             </td>
                         </tr>
                       </tfoot>
                   </table>
                 </div>
-                <div class="col-lg-6 col-sm-12">
+                <div class="col-lg-4 col-sm-12">
+                    <div class="pull-right">
+                        <button type="button" class="btn btn-default templates"
+                            title="Save the current set of filters" id="templ_save_start"><span
+                                class="fa fa-angle-double-right"></span></button>
+                            <button type="button" class="btn btn-default templ_save" title="Cancel" id="templ_save_cancel"><span
+                                    class="fa fa-times"></span></button>
+                            <div style="display: inline-block;vertical-align: top;"><select id="templates" class="selectpicker" title="Choose template" data-width="200"></select>
+                                <input type="text" id="templ_name" placeholder="Template name" style="width:200px;vertical-align:middle;display:none;">
+                            </div>
+                            <button type="button" class="btn btn-default templ_save" title="Save template" id="templ_save_apply"><span class="fa fa-save"></span></button>
+                        <span class="templates">
+                            <button id="template_delete" type="button" class="btn btn-default" title="Deleted selected template" if="templ_del">
+                                <span class="fa fa-trash"></span>
+                            </button>
+                        </span>
+                    </div>
+                </div>
+                <div class="col-lg-2 col-sm-12">
                   <div class="pull-right">
                     <div class="checkbox-inline">
                       <label>

From de4f483f7fe53d1f8341222deeae519672984b6e Mon Sep 17 00:00:00 2001
From: kulikov-a <36099472+kulikov-a@users.noreply.github.com>
Date: Tue, 6 Apr 2021 10:56:28 +0300
Subject: [PATCH 02/13] LvtemplatesController.php: live view templates

---
 .../Diagnostics/Api/LvtemplatesController.php | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplatesController.php

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplatesController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplatesController.php
new file mode 100644
index 000000000..cfb29dbb2
--- /dev/null
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplatesController.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ *    Copyright (C) 2021 Deciso B.V.
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Diagnostics\Api;
+
+use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Base\UserException;
+use OPNsense\Core\Backend;
+use OPNsense\Core\Config;
+
+class LvtemplatesController extends ApiMutableModelControllerBase
+{
+    protected static $internalModelName = 'lvtemplates';
+    protected static $internalModelClass = 'OPNsense\Diagnostics\Lvtemplates';
+
+    public function searchItemAction()
+    {
+        return $this->searchBase("templates.template", array('name', 'filters', 'or'), "name", null, SORT_NATURAL|SORT_FLAG_CASE);
+    }
+
+    public function setItemAction($uuid)
+    {
+        return $this->setBase("template", "templates.template", $uuid);
+    }
+
+    public function addItemAction()
+    {
+        return $this->addBase("template", "templates.template");
+    }
+
+    public function getItemAction($uuid = null)
+    {
+        return $this->getBase("template", "templates.template", $uuid);
+    }
+
+    public function delItemAction($uuid)
+    {
+        return $this->delBase("templates.template", $uuid);
+    }
+ 
+}

From 614c9fda8f9de744c4d1dd3639a7e8ff49e43618 Mon Sep 17 00:00:00 2001
From: kulikov-a <36099472+kulikov-a@users.noreply.github.com>
Date: Tue, 6 Apr 2021 10:57:58 +0300
Subject: [PATCH 03/13] live view templates gui controller

---
 .../Diagnostics/LvtemplatesController.php     | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LvtemplatesController.php

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LvtemplatesController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LvtemplatesController.php
new file mode 100644
index 000000000..b95766ec3
--- /dev/null
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LvtemplatesController.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ *    Copyright (C) 2021 Deciso B.V.
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Diagnostics;
+
+use OPNsense\Base\IndexController;
+
+/**
+ * @package OPNsense\Diagnostics
+ */
+class LvtemplatesController extends IndexController
+{
+    /**
+     * firewall live view filters
+     */
+
+    public function indexAction()
+    {
+        $this->view->pick('OPNsense/Diagnostics/lvtemplates');
+        $this->view->formDialogTemplate = $this->getForm("dialogTemplate");
+    }
+
+}

From 903ba88fc7953acc84eb296d5eeef0c0f689ed32 Mon Sep 17 00:00:00 2001
From: kulikov-a <36099472+kulikov-a@users.noreply.github.com>
Date: Tue, 6 Apr 2021 10:59:21 +0300
Subject: [PATCH 04/13] live view templates model

---
 .../OPNsense/Diagnostics/Lvtemplates.php      | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.php

diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.php b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.php
new file mode 100644
index 000000000..467a86f7c
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2021 Deciso B.V.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\Diagnostics;
+
+use OPNsense\Base\BaseModel;
+
+class Lvtemplates extends BaseModel
+{
+}

From 8e8f87a15d29409555ece87eb0060351103e82f9 Mon Sep 17 00:00:00 2001
From: kulikov-a <36099472+kulikov-a@users.noreply.github.com>
Date: Tue, 6 Apr 2021 11:00:21 +0300
Subject: [PATCH 05/13] live view templates model

---
 .../OPNsense/Diagnostics/Lvtemplates.xml      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.xml

diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.xml
new file mode 100644
index 000000000..54a0da9fe
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.xml
@@ -0,0 +1,23 @@
+<model>
+    <mount>//OPNsense/Diagnostics/Lvtemplates</mount>
+    <version>0.0.1</version>
+    <description>Firewall Live View filter templates</description>
+    <items>
+        <templates>
+            <template type="ArrayField">
+                <name type="TextField">
+                    <Required>Y</Required>
+                    <mask>/^.{1,255}$/u</mask>
+                    <ValidationMessage>Should be a string between 1 and 255 characters.</ValidationMessage>
+                </name>
+                <or type="BooleanField">
+                    <default>0</default>
+                    <Required>Y</Required>
+                </or>
+                <filters type="CSVListField">
+                    <Required>Y</Required>
+                </filters>
+            </template>
+        </templates>
+    </items>
+</model>

From 90a4199e28958f398a738b9ddb98b7b4852ed59a Mon Sep 17 00:00:00 2001
From: kulikov-a <36099472+kulikov-a@users.noreply.github.com>
Date: Tue, 6 Apr 2021 12:03:18 +0300
Subject: [PATCH 06/13] dialogTemplate.xml: dialog form

---
 .../Diagnostics/forms/dialogTemplate.xml      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/dialogTemplate.xml

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/dialogTemplate.xml b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/dialogTemplate.xml
new file mode 100644
index 000000000..51ca8b626
--- /dev/null
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/dialogTemplate.xml
@@ -0,0 +1,20 @@
+<form>
+    <field>
+        <id>template.name</id>
+        <label>name</label>
+        <type>text</type>
+        <help>Template name</help>
+    </field>
+    <field>
+        <id>template.filters</id>
+        <label>Filters set</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+    </field>
+    <field>
+        <id>template.or</id>
+        <label>OR global operator</label>
+        <type>checkbox</type>
+    </field>
+</form>

From d3063a20174d8cb156dc8dea78bcfc59cdba22e2 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 6 Apr 2021 10:02:52 +0200
Subject: [PATCH 07/13] openvpn: remove OpenSSL engine support #4896

---
 src/etc/inc/plugins.inc.d/openvpn.inc        | 54 --------------------
 src/etc/inc/plugins.inc.d/openvpn/wizard.inc |  9 ----
 src/wizard/openvpn.xml                       | 13 -----
 src/www/vpn_openvpn_client.php               | 23 ++-------
 src/www/vpn_openvpn_server.php               | 26 ++--------
 5 files changed, 6 insertions(+), 119 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc
index ca1ed0e2f..64711ac0d 100644
--- a/src/etc/inc/plugins.inc.d/openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn.inc
@@ -297,56 +297,6 @@ function openvpn_get_digestlist()
     return $digests;
 }
 
-function openvpn_get_engines()
-{
-    $openssl_engines = array('none' => 'No Hardware Crypto Acceleration');
-    exec('/usr/local/bin/openssl engine -t -c 2> /dev/null', $openssl_engine_output);
-
-    if (!count($openssl_engine_output)) {
-        /* LibreSSL doesn't offer anything of value */
-        return $openssl_engines;
-    }
-
-    $openssl_engine_output = implode("\n", $openssl_engine_output);
-    $openssl_engine_output = preg_replace("/\\n\\s+/", "|", $openssl_engine_output);
-    $openssl_engine_output = explode("\n", $openssl_engine_output);
-
-    foreach ($openssl_engine_output as $oeo) {
-        $keep = true;
-        $details = explode("|", $oeo);
-        $engine = array_shift($details);
-        $linematch = array();
-        preg_match("/\((.*)\)\s(.*)/", $engine, $linematch);
-        foreach ($details as $dt) {
-            if (strpos($dt, "unavailable") !== false) {
-                $keep = false;
-            }
-            if (strpos($dt, "available") !== false) {
-                continue;
-            }
-            if (strpos($dt, "[") !== false) {
-                $ciphers = trim($dt, "[]");
-            }
-        }
-        if (!empty($ciphers)) {
-            $ciphers = " - " . $ciphers;
-        }
-        if (strlen($ciphers) > 60) {
-            $ciphers = substr($ciphers, 0, 60) . " ... ";
-        }
-        if ($keep) {
-            $openssl_engines[$linematch[1]] = $linematch[2] . $ciphers;
-        }
-    }
-    return $openssl_engines;
-}
-
-function openvpn_validate_engine($engine)
-{
-    $engines = openvpn_get_engines();
-    return array_key_exists($engine, $engines);
-}
-
 function openvpn_validate_port($value, $name)
 {
     $value = trim($value);
@@ -602,10 +552,6 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
         $conf .= "multihome\n";
     }
 
-    if (openvpn_validate_engine($settings['engine']) && ($settings['engine'] != "none")) {
-        $conf .= "engine {$settings['engine']}\n";
-    }
-
     // server specific settings
     if ($mode == 'server') {
         list($ip, $cidr) = explode('/', $settings['tunnel_network']);
diff --git a/src/etc/inc/plugins.inc.d/openvpn/wizard.inc b/src/etc/inc/plugins.inc.d/openvpn/wizard.inc
index 4fd5dd2ae..953390b17 100644
--- a/src/etc/inc/plugins.inc.d/openvpn/wizard.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn/wizard.inc
@@ -414,14 +414,6 @@ function step10_stepbeforeformdisplay()
                 $opt['value'] = $name;
                 $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
             }
-        } elseif ($field['name'] == "engine") {
-            $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
-            foreach (openvpn_get_engines() as $name => $desc) {
-                $opt = array();
-                $opt['name'] = $desc;
-                $opt['value'] = $name;
-                $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
-            }
         } elseif ($field['name'] == "nbttype") {
             $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'] = array();
             foreach ($netbios_nodetypes as $type => $name) {
@@ -755,7 +747,6 @@ function step12_submitphpaction()
     }
     $server['crypto'] = $pconfig['step10']['crypto'];
     $server['digest'] = $pconfig['step10']['digest'];
-    $server['engine'] = $pconfig['step10']['engine'];
 
     if (isset($pconfig['step11']['ovpnrule'])) {
         $rule = array();
diff --git a/src/wizard/openvpn.xml b/src/wizard/openvpn.xml
index 1c5a6b77b..00bedfac0 100644
--- a/src/wizard/openvpn.xml
+++ b/src/wizard/openvpn.xml
@@ -695,19 +695,6 @@
                 <value>SHA1</value>
                 <description>The method used to authenticate traffic between endpoints. This setting must match on the client and server side, but is otherwise set however you like.</description>
             </field>
-            <field>
-                <name>engine</name>
-                <type>select</type>
-                <displayname>Hardware Crypto</displayname>
-                <bindstofield>wizardtemp->step10->engine</bindstofield>
-                <options>
-                    <option>
-                        <name>dummy</name>
-                        <value>dummy</value>
-                    </option>
-                </options>
-                <description>The hardware cryptographic accelerator to use for this VPN connection, if any.</description>
-            </field>
             <field>
                 <type>listtopic</type>
                 <name>Tunnel Settings</name>
diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index 0507adc09..51739b98c 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -61,7 +61,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         $copy_fields = "auth_user,auth_pass,disable,mode,protocol,interface
             ,local_port,server_addr,server_port,resolve_retry,remote_random,reneg-sec
             ,proxy_addr,proxy_port,proxy_user,proxy_passwd,proxy_authtype,description
-            ,custom_options,ns_cert_type,dev_mode,caref,certref,crypto,digest,engine
+            ,custom_options,ns_cert_type,dev_mode,caref,certref,crypto,digest
             ,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6,use_shaper
             ,compression,passtos,no_tun_ipv6,route_no_pull,route_no_exec,verbosity_level";
 
@@ -102,7 +102,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         $init_fields = "auth_user,auth_pass,disable,mode,protocol,interface
             ,local_port,server_addr,server_port,resolve_retry,remote_random,reneg-sec
             ,proxy_addr,proxy_port,proxy_user,proxy_passwd,proxy_authtype,description
-            ,custom_options,ns_cert_type,dev_mode,caref,certref,crypto,digest,engine
+            ,custom_options,ns_cert_type,dev_mode,caref,certref,crypto,digest
             ,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6,use_shaper
             ,compression,passtos,no_tun_ipv6,route_no_pull,route_no_exec,verbosity_level";
 
@@ -305,7 +305,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             $copy_fields = "auth_user,auth_pass,protocol,dev_mode,local_port,reneg-sec
                 ,server_addr,server_port,resolve_retry,proxy_addr,proxy_port,remote_random
                 ,proxy_authtype,proxy_user,proxy_passwd,description,mode,crypto,digest
-                ,engine,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6
+                ,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6
                 ,use_shaper,compression,passtos,no_tun_ipv6,route_no_pull,route_no_exec
                 ,verbosity_level,interface";
 
@@ -933,23 +933,6 @@ $( document ).ready(function() {
               </div>
             </td>
           </tr>
-          <tr id="engine">
-            <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Hardware Crypto"); ?></td>
-            <td>
-              <select name="engine" class="form-control">
-<?php
-              $engines = openvpn_get_engines();
-              foreach ($engines as $name => $desc) :
-                  $selected = "";
-                  if ($name == $pconfig['engine']) {
-                      $selected = " selected=\"selected\"";
-                  }?>
-                <option value="<?=$name;?>"<?=$selected?>><?=htmlspecialchars($desc);?></option>
-<?php
-              endforeach; ?>
-              </select>
-            </td>
-          </tr>
          </table>
         </div>
        </div>
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index b019dc1b1..285ea70e4 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -59,7 +59,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
         // 1 on 1 copy of config attributes
         $copy_fields = "mode,protocol,authmode,dev_mode,interface,local_port
-            ,description,custom_options,crypto,engine,tunnel_network
+            ,description,custom_options,crypto,tunnel_network
             ,tunnel_networkv6,remote_network,remote_networkv6,gwredir,local_network
             ,local_networkv6,maxclients,compression,passtos,client2client
             ,dynamic_ip,pool_enable,topology_subnet,serverbridge_dhcp
@@ -107,7 +107,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         $pconfig['cert_depth'] = 1;
         // init all fields used in the form
         $init_fields = "mode,protocol,authmode,dev_mode,interface,local_port
-            ,description,custom_options,crypto,engine,tunnel_network
+            ,description,custom_options,crypto,tunnel_network
             ,tunnel_networkv6,remote_network,remote_networkv6,gwredir,local_network
             ,local_networkv6,maxclients,compression,passtos,client2client
             ,dynamic_ip,pool_enable,topology_subnet,serverbridge_dhcp
@@ -350,7 +350,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 openvpn_delete('server', $a_server[$id]);
             }
             // 1 on 1 copy of config attributes
-            $copy_fields = "mode,protocol,dev_mode,local_port,description,crypto,digest,engine
+            $copy_fields = "mode,protocol,dev_mode,local_port,description,crypto,digest
                 ,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6
                 ,gwredir,local_network,local_networkv6,maxclients,compression
                 ,passtos,client2client,dynamic_ip,pool_enable,topology_subnet,local_group
@@ -997,26 +997,6 @@ endif; ?>
                         </div>
                       </td>
                     </tr>
-                    <tr id="engine">
-                      <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Hardware Crypto"); ?></td>
-                      <td>
-                        <select name="engine" class="selectpicker" data-size="5" data-live-search="true">
-<?php
-                        $engines = openvpn_get_engines();
-                        foreach ($engines as $name => $desc) :
-                            $selected = "";
-                            if ($name == $pconfig['engine']) {
-                                $selected = " selected=\"selected\"";
-                            }
-                        ?>
-                          <option value="<?=$name;?>"<?=$selected?>>
-                            <?=htmlspecialchars($desc);?>
-                          </option>
-<?php
-                        endforeach; ?>
-                        </select>
-                      </td>
-                    </tr>
                     <tr class="opt_mode opt_mode_p2p_tls opt_mode_server_tls opt_mode_server_user opt_mode_server_tls_user">
                       <td style="width:22%"><a id="help_for_cert_depth" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Certificate Depth"); ?></td>
                       <td>

From f538c080653112fd7071ac5e16683f7c91480bd1 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 6 Apr 2021 11:22:08 +0200
Subject: [PATCH 08/13] unbound / blacklists: cleanse domain input. change
 regex in https://github.com/opnsense/core/issues/4898 per suggestion
 @kulikov-a

---
 src/opnsense/scripts/unbound/download_blacklists.py             | 2 +-
 .../service/templates/OPNsense/Unbound/core/blacklists.conf     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/scripts/unbound/download_blacklists.py b/src/opnsense/scripts/unbound/download_blacklists.py
index 929c0da1f..9b2549449 100755
--- a/src/opnsense/scripts/unbound/download_blacklists.py
+++ b/src/opnsense/scripts/unbound/download_blacklists.py
@@ -82,7 +82,7 @@ if __name__ == '__main__':
         sys.exit(99)
 
     domain_pattern = re.compile(
-        r'(([\da-zA-Z])([_\w-]{,62})\.){,127}(([\da-zA-Z])[_\w-]{,61})'
+        r'(([\da-zA-Z_])([_\w-]{,62})\.){,127}(([\da-zA-Z])[_\w-]{,61})'
         r'?([\da-zA-Z]\.((xn\-\-[a-zA-Z\d]+)|([a-zA-Z\d]{2,})))'
     )
 
diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/blacklists.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/blacklists.conf
index 19a258e04..b065d939d 100644
--- a/src/opnsense/service/templates/OPNsense/Unbound/core/blacklists.conf
+++ b/src/opnsense/service/templates/OPNsense/Unbound/core/blacklists.conf
@@ -55,7 +55,7 @@ custom_{{loop.index}}={{uri}}
 # exclude localhost entries
 default_pattern_1=.*localhost$
 # exclude non domain entries
-default_pattern_2=^(?![a-zA-Z\d]).*
+default_pattern_2=^(?![a-zA-Z_\d]).*
 {%    if not helpers.empty('OPNsense.unboundplus.dnsbl.whitelists')%}
 # user defined
 {%      for pattern in OPNsense.unboundplus.dnsbl.whitelists.split(',') %}

From aa56b3e45af3603513e8107f5cbdc00bc393d29c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 7 Apr 2021 12:06:34 +0200
Subject: [PATCH 09/13] system: reorder settings to let tunables override all

---
 src/etc/inc/system.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 7a202de72..08b7f3357 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1144,12 +1144,6 @@ function system_login_configure($verbose = false)
     /* copy settings already there */
     $new_loader_conf = @file_get_contents('/boot/loader.conf');
 
-    $new_loader_conf .= "# dynamically generated tunables settings follow\n";
-    foreach (system_sysctl_get() as $param => $value) {
-        $new_loader_conf .= "{$param}=\"{$value}\"\n";
-    }
-    $new_loader_conf .= "\n";
-
     $new_loader_conf .= "# dynamically generated console settings follow\n";
     foreach ($new_boot_config as $param => $value) {
         if (!empty($value)) {
@@ -1158,6 +1152,13 @@ function system_login_configure($verbose = false)
             $new_loader_conf .= "#${param}\n";
         }
     }
+    $new_loader_conf .= "\n";
+
+    $new_loader_conf .= "# dynamically generated tunables settings follow\n";
+    foreach (system_sysctl_get() as $param => $value) {
+        $new_loader_conf .= "{$param}=\"{$value}\"\n";
+    }
+
 
     /* write merged file back to target location */
     @file_put_contents('/boot/loader.conf', $new_loader_conf);

From bdb32652fb5a011b7c5fb6d996196643e0ed3180 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 6 Apr 2021 14:15:26 +0200
Subject: [PATCH 10/13] firmwre: make this clearer

Ideally, opnsense-update -M should replace this except
that -M is used to gain mirror access from other scripts
as well.  Need to think about it.
---
 src/opnsense/scripts/firmware/product.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/opnsense/scripts/firmware/product.php b/src/opnsense/scripts/firmware/product.php
index d758febf5..02023de58 100755
--- a/src/opnsense/scripts/firmware/product.php
+++ b/src/opnsense/scripts/firmware/product.php
@@ -32,7 +32,7 @@ $metafile = '/usr/local/opnsense/version/core';
 $ret = json_decode(@file_get_contents($metafile), true);
 if ($ret != null) {
     $ret['product_crypto'] = trim(shell_exec('opnsense-version -f'));
-    $ret['product_mirror'] = preg_replace('/\/[a-z0-9]{8}(-[a-z0-9]{4}){3}-[a-z0-9]{12}\//i', '/subscription-key/', trim(shell_exec('opnsense-update -M')));
+    $ret['product_mirror'] = preg_replace('/\/[a-z0-9]{8}(-[a-z0-9]{4}){3}-[a-z0-9]{12}\//i', '/${SUBSCRIPTION}/', trim(shell_exec('opnsense-update -M')));
     $ret['product_time'] = date('D M j H:i:s T Y', filemtime('/usr/local/opnsense/www/index.php'));
     $repos = explode("\n", trim(shell_exec('opnsense-verify -l')));
     sort($repos);

From 26c9ca7d08a6412ef0c51d80716611ad61774581 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 7 Apr 2021 14:48:15 +0200
Subject: [PATCH 11/13] rc: reverse list on stop action

Suggested by:	David Mora
PR:		https://github.com/opnsense/core/pull/4891
---
 src/etc/rc.freebsd | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc.freebsd b/src/etc/rc.freebsd
index 805654afb..f7b011392 100755
--- a/src/etc/rc.freebsd
+++ b/src/etc/rc.freebsd
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright (c) 2015-2017 Ad Schellevis <ad@opnsense.org>
-# Copyright (c) 2015-2020 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2015-2021 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -81,6 +81,7 @@ rc_enabled()
 
 rc_filenames="$(${RCORDER} /etc/rc.d/[a-z]* /usr/local/etc/rc.d/[a-z]* 2> /dev/null)"
 rc_filenames_defer=
+rc_filenames_reverse=
 rc_filenames_skip=
 
 for rc_filename in ${rc_filenames}; do
@@ -102,8 +103,10 @@ if [ -z "${1}" ]; then
 	exit 1
 fi
 
+rc_filenames="${rc_filenames} ${rc_filenames_defer}"
+
 # run our bootstrap command on startup
-if [ "${1}" == "start" ]; then
+if [ "${1}" = "start" ]; then
 	for rc_filename in ${rc_filenames}; do
 		eval "$(grep "^name[[:blank:]]*=" ${rc_filename})"
 
@@ -115,10 +118,15 @@ if [ "${1}" == "start" ]; then
 		eval "pre_run_cmd=\$${pre_run_var}"
 		${pre_run_cmd}
 	done
+elif [ "${1}" = "stop" ]; then
+	for rc_filename in ${rc_filenames}; do
+		rc_filenames_reverse="${rc_filename} ${rc_filenames_reverse}"
+	done
+	rc_filenames=${rc_filenames_reverse}
 fi
 
 # pass all commands to script now
-for rc_filename in ${rc_filenames} ${rc_filenames_defer}; do
+for rc_filename in ${rc_filenames}; do
 	eval "$(grep "^name[[:blank:]]*=" ${rc_filename})"
 
 	if ! rc_enabled ${rc_filename} ${name}; then

From 6658b92911441bdb0362b5093f5eec5f40777cf8 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 8 Apr 2021 12:24:01 +0200
Subject: [PATCH 12/13] system: sort system_sysctl_get() output; closes #4907

---
 src/etc/inc/system.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 08b7f3357..50ce99cea 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -153,6 +153,8 @@ function system_sysctl_get()
         }
     }
 
+    ksort($sysctls);
+
     return $sysctls;
 }
 
@@ -1159,7 +1161,6 @@ function system_login_configure($verbose = false)
         $new_loader_conf .= "{$param}=\"{$value}\"\n";
     }
 
-
     /* write merged file back to target location */
     @file_put_contents('/boot/loader.conf', $new_loader_conf);
 

From a785f717555e19417a7e999e283565d09799f8b8 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 8 Apr 2021 17:13:55 +0200
Subject: [PATCH 13/13] Firewall / Log Files / Live - refactor
 https://github.com/opnsense/core/pull/4902 a bit

---
 ...ontroller.php => LvtemplateController.php} |  13 +-
 .../Diagnostics/LvtemplatesController.php     |  50 ----
 .../Diagnostics/forms/dialogTemplate.xml      |  20 --
 .../{Lvtemplates.php => Lvtemplate.php}       |   2 +-
 .../{Lvtemplates.xml => Lvtemplate.xml}       |   2 +-
 .../views/OPNsense/Diagnostics/fw_log.volt    | 278 +++++++++---------
 6 files changed, 147 insertions(+), 218 deletions(-)
 rename src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/{LvtemplatesController.php => LvtemplateController.php} (87%)
 delete mode 100644 src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LvtemplatesController.php
 delete mode 100644 src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/dialogTemplate.xml
 rename src/opnsense/mvc/app/models/OPNsense/Diagnostics/{Lvtemplates.php => Lvtemplate.php} (97%)
 rename src/opnsense/mvc/app/models/OPNsense/Diagnostics/{Lvtemplates.xml => Lvtemplate.xml} (93%)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplatesController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplateController.php
similarity index 87%
rename from src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplatesController.php
rename to src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplateController.php
index cfb29dbb2..b19958bd9 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplatesController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplateController.php
@@ -35,14 +35,17 @@ use OPNsense\Base\UserException;
 use OPNsense\Core\Backend;
 use OPNsense\Core\Config;
 
-class LvtemplatesController extends ApiMutableModelControllerBase
+class LvtemplateController extends ApiMutableModelControllerBase
 {
-    protected static $internalModelName = 'lvtemplates';
-    protected static $internalModelClass = 'OPNsense\Diagnostics\Lvtemplates';
+    protected static $internalModelName = 'lvtemplate';
+    protected static $internalModelClass = 'OPNsense\Diagnostics\Lvtemplate';
 
     public function searchItemAction()
     {
-        return $this->searchBase("templates.template", array('name', 'filters', 'or'), "name", null, SORT_NATURAL|SORT_FLAG_CASE);
+        return $this->searchBase(
+            "templates.template",
+            array('name', 'filters', 'or'), "name", null, SORT_NATURAL|SORT_FLAG_CASE
+        );
     }
 
     public function setItemAction($uuid)
@@ -64,5 +67,5 @@ class LvtemplatesController extends ApiMutableModelControllerBase
     {
         return $this->delBase("templates.template", $uuid);
     }
- 
+
 }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LvtemplatesController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LvtemplatesController.php
deleted file mode 100644
index b95766ec3..000000000
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/LvtemplatesController.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- *    Copyright (C) 2021 Deciso B.V.
- *
- *    All rights reserved.
- *
- *    Redistribution and use in source and binary forms, with or without
- *    modification, are permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *
- *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *    POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-namespace OPNsense\Diagnostics;
-
-use OPNsense\Base\IndexController;
-
-/**
- * @package OPNsense\Diagnostics
- */
-class LvtemplatesController extends IndexController
-{
-    /**
-     * firewall live view filters
-     */
-
-    public function indexAction()
-    {
-        $this->view->pick('OPNsense/Diagnostics/lvtemplates');
-        $this->view->formDialogTemplate = $this->getForm("dialogTemplate");
-    }
-
-}
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/dialogTemplate.xml b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/dialogTemplate.xml
deleted file mode 100644
index 51ca8b626..000000000
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/forms/dialogTemplate.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<form>
-    <field>
-        <id>template.name</id>
-        <label>name</label>
-        <type>text</type>
-        <help>Template name</help>
-    </field>
-    <field>
-        <id>template.filters</id>
-        <label>Filters set</label>
-        <type>select_multiple</type>
-        <style>tokenize</style>
-        <allownew>true</allownew>
-    </field>
-    <field>
-        <id>template.or</id>
-        <label>OR global operator</label>
-        <type>checkbox</type>
-    </field>
-</form>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.php b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.php
similarity index 97%
rename from src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.php
rename to src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.php
index 467a86f7c..40262ed97 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.php
@@ -31,6 +31,6 @@ namespace OPNsense\Diagnostics;
 
 use OPNsense\Base\BaseModel;
 
-class Lvtemplates extends BaseModel
+class Lvtemplate extends BaseModel
 {
 }
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.xml
similarity index 93%
rename from src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.xml
rename to src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.xml
index 54a0da9fe..1ab01d8f0 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplates.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.xml
@@ -1,5 +1,5 @@
 <model>
-    <mount>//OPNsense/Diagnostics/Lvtemplates</mount>
+    <mount>//OPNsense/Firewall/Lvtemplate</mount>
     <version>0.0.1</version>
     <description>Firewall Live View filter templates</description>
     <items>
diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
index 7c5fa9d36..06b60b69d 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
@@ -74,6 +74,139 @@
             }
         }
 
+        /**
+         * set new selection
+         * @param items list of lexical expressions
+         * @param operator enable or disable global OR operator
+         */
+        function set_selection(items, operator)
+        {
+            // remove old selection
+            $("#filters > span.badge").click();
+            // collect valid condition types
+            let conditions = [];
+            $("#filter_condition > option").each(function(){
+                conditions.push($(this).val());
+            });
+            items.forEach(function(value) {
+                let parts = value.split(new RegExp("("+conditions.join("|")+")(.+)$"));
+                if (parts.length >= 3 && $("#filter_tag").val(parts[0]).val() === parts[0] ) {
+                    $("#filter_tag").val(parts[0]);
+                    $("#filter_condition").val(parts[1]);
+                    $("#filter_value").val(parts[2]);
+                    $("#add_filter_condition").click();
+                } else if (value.toLowerCase() == "or=1") {
+                    operator = "1";
+                }
+            });
+            $("#filter_or_type").prop('checked', operator === "1" ? true : false);
+            $(".selectpicker").selectpicker('refresh');
+            $("#filter_tag").change();
+        }
+
+        /**
+         * add new filters template
+         * @param t_data template's parameters
+         */
+        function addTemplate(t_data) {
+            ajaxCall('/api/diagnostics/lvtemplate/addItem/', t_data, function(data, status) {
+                if (data.result == "saved") {
+                    fetchTemplates(data.uuid);
+                } else {
+                    BootstrapDialog.show({
+                    type: BootstrapDialog.TYPE_DANGER,
+                    title: "{{ lang._('Add filters template') }}",
+                    message: "{{ lang._('Template save failed. Message: ') }}" + data.result,
+                    buttons: [{
+                        label: "{{ lang._('Close') }}",
+                        action: function (dialogRef) {
+                            dialogRef.close();
+                        }
+                        }]
+                    });
+                    fetchTemplates("00000");
+                }
+            })
+        }
+
+        /**
+         * set template new values
+         * @param t_id template uuid
+         * @param t_data template's parameters
+         */
+        function editTemplate(t_id, t_data) {
+            ajaxCall('/api/diagnostics/lvtemplate/setItem/' + t_id, t_data, function(data, status) {
+                if (data.result == "saved") {
+                    fetchTemplates(t_id);
+                } else {
+                    BootstrapDialog.show({
+                    type: BootstrapDialog.TYPE_DANGER,
+                    title: "{{ lang._('Filters template edit') }}",
+                    message: "{{ lang._('Template edit failed. Message: ') }}" + data.result,
+                    buttons: [{
+                        label: "{{ lang._('Close') }}",
+                        action: function (dialogRef) {
+                            dialogRef.close();
+                        }
+                        }]
+                    });
+                    fetchTemplates(t_id);
+                }
+            })
+        }
+
+        /**
+         * delete filters template
+         * @param t_id template uuid
+         */
+        function delTemplate(t_id) {
+            ajaxCall('/api/diagnostics/lvtemplate/delItem/' + t_id, {}, function(data, status) {
+                if (data.result == "deleted") {
+                    //don't reset current filters so template can be restored right after delete
+                    $("#templates option[value=" + t_id + "]").remove();
+                    $("#templates").val("").selectpicker('refresh');
+                } else {
+                    BootstrapDialog.show({
+                    type: BootstrapDialog.TYPE_DANGER,
+                    title: "{{ lang._('Filters template delete') }}",
+                    message: "{{ lang._('Template delete failed. Result: ') }}" + data.result,
+                    buttons: [{
+                        label: "{{ lang._('Close') }}",
+                        action: function (dialogRef) {
+                            dialogRef.close();
+                        }
+                        }]
+                    });
+                }
+            })
+        }
+
+        /**
+         * fetch templates from config
+         * @param opt select value to make :selected and apply
+         */
+        function fetchTemplates(opt) {
+            opt = opt || "00000";
+            //apply = apply || true;
+            $('#templ_name').val("");
+            $('#templates').empty();
+            $('#templates').append($('<option/>', {value: "00000", text: "None"}).data('template', {'filters': "0", 'or': "0"}).addClass("disp_none_opt templates"));
+            $('#templates').append($('<option/>', {value: "00001", text: "New"}).data('template', {'filters': "0", 'or': "0"}).data('icon','glyphicon-file').addClass("add_new_opt templ_save"));
+            $('#templates').selectpicker('refresh');
+            $('.templates').show();
+            $('.templ_save').hide();
+            ajaxGet('/api/diagnostics/lvtemplate/searchItem/', {}, function(data, status) {
+                let templates = data.rows;
+                $.each(templates, function(i, template) {
+                    $('#templates').append(template.uuid == opt ? $('<option/>', {value:template.uuid, text:template.name, selected: "selected" }).data('template', template) : $('<option/>', {value:template.uuid, text:template.name }).data('template', template));
+                });
+                $('#templates').selectpicker('refresh');
+                $('.badge').click();
+                $("#templates").change();
+            });
+        }
+
+
         function fetch_log() {
             var record_spec = [];
             // read heading, contains field specs
@@ -478,154 +611,17 @@
                             filter_value.show();
                         }
                     }).change();
-                    fetchTemplates("00000", true);
+                    fetchTemplates("00000");
                 }
             });
 
         });
 
+        // get and apply url params. ie11 compat
+        set_selection(window.location.search.substring(1).split("&"), "0");
+
         // startup poller
         poller();
-
-
-        /**
-         * set new selection
-         * @param items list of lexical expressions
-         * @param operator enable or disable global OR operator
-         */
-        function set_selection(items, operator)
-        {
-            // remove old selection
-            $("#filters > span.badge").click();
-            // operator default value
-            operator = operator || "0";
-            // collect valid condition types
-            let conditions = [];
-            $("#filter_condition > option").each(function(){
-                conditions.push($(this).val());
-            });
-            items.forEach(function(value) {
-                let parts = value.split(new RegExp("("+conditions.join("|")+")(.+)$"));
-                if (parts.length >= 3 && $("#filter_tag").val(parts[0]).val() === parts[0] ) {
-                    $("#filter_tag").val(parts[0]);
-                    $("#filter_condition").val(parts[1]);
-                    $("#filter_value").val(parts[2]);
-                    $("#add_filter_condition").click();
-                } else if (value.toLowerCase() == "or=1") {
-                    operator = "1";
-                }
-            });
-            $("#filter_or_type").prop('checked', operator === "1" ? true : false);
-            $(".selectpicker").selectpicker('refresh');
-            $("#filter_tag").change();
-        }
-
-        /**
-         * add new filters template
-         * @param t_data template's parameters
-         */
-        function addTemplate(t_data) {
-            ajaxCall('/api/diagnostics/lvtemplates/addItem/', t_data, function(data, status) {
-                if ((status == "success") && (data.result == "saved")) {
-                    fetchTemplates(data.uuid);
-                } else {
-                    BootstrapDialog.show({
-                    type: BootstrapDialog.TYPE_DANGER,
-                    title: "{{ lang._('Add filters template') }}",
-                    message: "{{ lang._('Template save failed. Message: ') }}" + data.result,
-                    buttons: [{
-                        label: "{{ lang._('Close') }}",
-                        action: function (dialogRef) {
-                            dialogRef.close();
-                        }
-                        }]
-                    });
-                    fetchTemplates("00000");
-                }
-            })
-        }
-
-        /**
-         * set template new values
-         * @param t_id template uuid
-         * @param t_data template's parameters
-         */
-        function editTemplate(t_id, t_data) {
-            ajaxCall('/api/diagnostics/lvtemplates/setItem/' + t_id, t_data, function(data, status) {
-                if ((status == "success") && (data.result == "saved")) {
-                    fetchTemplates(t_id);
-                } else {
-                    BootstrapDialog.show({
-                    type: BootstrapDialog.TYPE_DANGER,
-                    title: "{{ lang._('Filters template edit') }}",
-                    message: "{{ lang._('Template edit failed. Message: ') }}" + data.result,
-                    buttons: [{
-                        label: "{{ lang._('Close') }}",
-                        action: function (dialogRef) {
-                            dialogRef.close();
-                        }
-                        }]
-                    });
-                    fetchTemplates(t_id);
-                }
-            })
-        }
-
-        /**
-         * delete filters template
-         * @param t_id template uuid
-         */
-        function delTemplate(t_id) {
-            ajaxCall('/api/diagnostics/lvtemplates/delItem/' + t_id, {}, function(data, status) {
-                if ((status == "success") && (data.result == "deleted")) {
-                    //don't reset current filters so template can be restored right after delete
-                    $("#templates option[value=" + t_id + "]").remove();
-                    $("#templates").val("").selectpicker('refresh');
-                } else {
-                    BootstrapDialog.show({
-                    type: BootstrapDialog.TYPE_DANGER,
-                    title: "{{ lang._('Filters template delete') }}",
-                    message: "{{ lang._('Template delete failed. Result: ') }}" + data.result,
-                    buttons: [{
-                        label: "{{ lang._('Close') }}",
-                        action: function (dialogRef) {
-                            dialogRef.close();
-                        }
-                        }]
-                    });
-                }
-            })
-        }
-
-        /**
-         * fetch templates from config
-         * @param opt select value to make :selected and apply
-         * @param parse_url flag to parse and apply url params on page load
-         */
-        function fetchTemplates(opt, parse_url) {
-            opt = opt || "00000";
-            //apply = apply || true;
-            $('#templ_name').val("");
-            $('#templates').empty();
-            $('#templates').append($('<option/>', {value: "00000", text: "None"}).data('template', {'filters': "0", 'or': "0"}).addClass("disp_none_opt templates"));
-            $('#templates').append($('<option/>', {value: "00001", text: "New"}).data('template', {'filters': "0", 'or': "0"}).data('icon','glyphicon-file').addClass("add_new_opt templ_save"));
-            $('#templates').selectpicker('refresh');
-            $('.templates').show();
-            $('.templ_save').hide();
-            ajaxGet('/api/diagnostics/lvtemplates/searchItem/', {}, function(data, status) {
-                let templates = data.rows;
-                $.each(templates, function(i, template) {
-                    $('#templates').append(template.uuid == opt ? $('<option/>', {value:template.uuid, text:template.name, selected: "selected" }).data('template', template) : $('<option/>', {value:template.uuid, text:template.name }).data('template', template));
-                });
-                $('#templates').selectpicker('refresh');
-                $('.badge').click();
-                $("#templates").change();
-                if (parse_url) {
-                    // get and apply url params. ie11 compat
-                    set_selection(window.location.search.substring(1).split("&"));
-                }
-            });
-        }
     });
 </script>
 <style>