From c62616e856479ab61e12ca1ec797610f5a12b377 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 5 Nov 2017 19:22:01 +0100
Subject: [PATCH] firewall live log, replace menu item "dynamic" with new live
 view, change color scheme and fix some JS issues for
 https://github.com/opnsense/core/issues/1788

---
 .../app/models/OPNsense/Base/Menu/Menu.xml    |  4 +-
 .../mvc/app/models/OPNsense/Core/ACL/ACL.xml  |  4 +-
 .../views/OPNsense/Diagnostics/fw_log.volt    | 53 +++++++++----------
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 6ec9f3226..84ed2b039 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -199,8 +199,8 @@
             <StatesSummary order="90" VisibleName="States Summary" url="/diag_states_summary.php"/>
         </Diagnostics>
         <LogFiles order="400" VisibleName="Log Files" cssClass="fa fa-eye fa-fw">
-            <Normal VisibleName="Normal View" order="100" url="/diag_logs_filter.php"/>
-            <Dynamic VisibleName="Dynamic View" order="200" url="/diag_logs_filter_dynamic.php"/>
+            <Live VisibleName="Live" order="100" url="/ui/diagnostics/firewall/log"/>
+            <Normal VisibleName="Normal View" order="200" url="/diag_logs_filter.php"/>
             <Summary VisibleName="Summary View" order="300" url="/diag_logs_filter_summary.php"/>
             <Plain VisibleName="Plain View" order="400" url="/diag_logs_filter_plain.php"/>
         </LogFiles>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
index dd13b89f3..582e1ef70 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
@@ -311,7 +311,9 @@
     <page-diagnostics-logs-firewall-dynamic>
         <name>Diagnostics: Logs: Firewall: Dynamic View</name>
         <patterns>
-            <pattern>diag_logs_filter_dynamic.php*</pattern>
+            <pattern>ui/diagnostics/firewall/log*</pattern>
+            <pattern>api/diagnostics/firewall/log*</pattern>
+            <pattern>api/diagnostics/interface/getInterfaceNames*</pattern>
         </patterns>
     </page-diagnostics-logs-firewall-dynamic>
     <page-diagnostics-logs-firewall-summary>
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 4e682c298..5abb9e0df 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
@@ -84,40 +84,39 @@ POSSIBILITY OF SUCH DAMAGE.
                             });
 
                             if (record['action'] == 'pass') {
-                                log_tr.css('background', 'rgba(5, 142, 73, 0.6)');
+                                log_tr.css('background', 'rgba(5, 142, 73, 0.3)');
                             } else if (record['action'] == 'block') {
-                                log_tr.css('background', '#ff6666');
+                                log_tr.css('background', 'rgba(235, 9, 9, 0.3)');
                             }
                             $("#grid-log > tbody > tr:first").before(log_tr);
-                            // apply filter after load
-                            $("#filter").keyup();
-
-                            // bind info buttons
-                            $(".act_info").unbind('click').click(function(){
-                                var sender_tr = $(this).parent().parent();
-                                var sender_details = sender_tr.data('details');
-                                var hidden_columns = ['__spec__', '__host__', '__digest__'];
-                                var sorted_keys = Object.keys(sender_details).sort();
-                                var tbl = $('<table class="table table-condensed table-hover"/>');
-                                for (i=0 ; i < sorted_keys.length; i++) {
-                                    if (hidden_columns.indexOf(sorted_keys[i]) === -1 ) {
-                                        var row = $("<tr/>");
-                                        row.append($("<td/>").text(sorted_keys[i]));
-                                        row.append($("<td/>").text(sender_details[sorted_keys[i]]));
-                                        tbl.append(row);
-                                    }
-                                }
-                                BootstrapDialog.show({
-                                   title: "{{ lang._('Detailed rule info') }}",
-                                   message: tbl,
-                                   type: BootstrapDialog.TYPE_INFO,
-                                   draggable: true
-                                });
-                            });
                         }
                     }
                     // limit output
                     $("#grid-log > tbody > tr:gt("+(parseInt($("#limit").val())-1)+")").remove();
+                    // apply filter after load
+                    $("#filter").keyup();
+                    // bind info buttons
+                    $(".act_info").unbind('click').click(function(){
+                        var sender_tr = $(this).parent().parent();
+                        var sender_details = sender_tr.data('details');
+                        var hidden_columns = ['__spec__', '__host__', '__digest__'];
+                        var sorted_keys = Object.keys(sender_details).sort();
+                        var tbl = $('<table class="table table-condensed table-hover"/>');
+                        for (i=0 ; i < sorted_keys.length; i++) {
+                            if (hidden_columns.indexOf(sorted_keys[i]) === -1 ) {
+                                var row = $("<tr/>");
+                                row.append($("<td/>").text(sorted_keys[i]));
+                                row.append($("<td/>").text(sender_details[sorted_keys[i]]));
+                                tbl.append(row);
+                            }
+                        }
+                        BootstrapDialog.show({
+                           title: "{{ lang._('Detailed rule info') }}",
+                           message: tbl,
+                           type: BootstrapDialog.TYPE_INFO,
+                           draggable: true
+                        });
+                    });
                 }
             });
         };