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 458017c5c..6d1856ffa 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml @@ -137,6 +137,7 @@ + diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json index d08b95556..c93e4d138 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json +++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json @@ -137,13 +137,6 @@ "diag_logs_dhcp.php*" ] }, - "page-diagnostics-logs-firewall": { - "name": "WebCfg - Diagnostics: Logs: Firewall page", - "descr": "Allow access to the 'Diagnostics: Logs: Firewall' page.", - "match": [ - "diag_logs_filter.php*" - ] - }, "page-diagnostics-logs-gateways": { "name": "WebCfg - Diagnostics: Logs: Gateways page", "descr": "Allow access to the 'Diagnostics: Logs: System: Gateways' page.", @@ -453,13 +446,34 @@ "status.php*" ] }, - "page-hidden-nolongerincluded": { - "name": "WebCfg - Hidden: No longer included page", - "descr": "Allow access to the 'Hidden: No longer included' page.", + "page-diagnostics-logs-firewall": { + "name": "WebCfg - Diagnostics: Logs: Firewall: Normal View page", + "descr": "Allow access to the 'Diagnostics: Logs: Firewall: Normal View' page.", + "match": [ + "diag_logs_filter.php*" + ] + }, + "page-diagnostics-logs-firewall-plain": { + "name": "WebCfg - Diagnostics: Logs: Firewall: Plain View page", + "descr": "Allow access to the 'Diagnostics: Logs: Firewall: Plain View' page.", + "match": [ + "diag_logs_filter_plain.php*" + ] + }, + "page-diagnostics-logs-firewall-dynamic": { + "name": "WebCfg - Diagnostics: Logs: Firewall: Dynamic View page", + "descr": "Allow access to the 'Diagnostics: Logs: Firewall: Dynamic View' page.", "match": [ "diag_logs_filter_dynamic.php*" ] }, + "page-diagnostics-logs-firewall-summary": { + "name": "WebCfg - Diagnostics: Logs: Firewall: Summary View page", + "descr": "Allow access to the 'Diagnostics: Logs: Firewall: Summary View' page.", + "match": [ + "diag_logs_filter_summary.php*" + ] + }, "page-interfaces-assignnetworkports": { "name": "WebCfg - Interfaces: Assign network ports page", "descr": "Allow access to the 'Interfaces: Assign network ports' page.", diff --git a/src/www/diag_logs_filter.php b/src/www/diag_logs_filter.php index 3c6bbc2ba..c3a97f1be 100644 --- a/src/www/diag_logs_filter.php +++ b/src/www/diag_logs_filter.php @@ -615,7 +615,7 @@ include("head.inc"); $Include_Act = explode(",", str_replace(" ", ",", $filterfieldsarray['act'])); if ($filterfieldsarray['interface'] == "All") $interface = ""; ?> -
"> +
@@ -687,7 +687,7 @@ include("head.inc");
- - - - - - - -
-
-
- " /> -
-
diff --git a/src/www/diag_logs_filter_plain.php b/src/www/diag_logs_filter_plain.php new file mode 100644 index 000000000..379b2f16c --- /dev/null +++ b/src/www/diag_logs_filter_plain.php @@ -0,0 +1,98 @@ + + Copyright (C) 2004-2009 Scott Ullrich + Copyright (C) 2003-2009 Manuel Kasper + Originally Sponsored By Anathematic @ pfSense Forums + 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. +*/ + +require_once("guiconfig.inc"); +require_once("filter.inc"); +require_once("filter_log.inc"); +require_once("system.inc"); +require_once("pfsense-utils.inc"); +require_once("interfaces.inc"); + +$filter_logfile = '/var/log/filter.log'; + +if (isset($config['syslog']['nentries'])) { + $nentries = $config['syslog']['nentries']; +} else { + $nentries = 50; +} + +if (isset($_POST['clear'])) { + clear_clog($filter_logfile); +} + +$pgtitle = array(gettext('Firewall'), gettext('Log Files'), gettext('Plain View')); +$shortcut_section = "firewall"; +include("head.inc"); + +?> + + + + + +
+
+
+ + 0) print_input_errors($input_errors); ?> + +
+ +
+ +
+ + + + + + + + + +
+
+
+ " /> +
+
+
+ + + +
+
+
+
+
+ + diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php index df0627e2d..fcebc3563 100644 --- a/src/www/diag_logs_settings.php +++ b/src/www/diag_logs_settings.php @@ -100,7 +100,6 @@ $pconfig['logdefaultpass'] = isset($config['syslog']['nologdefaultpass']); $pconfig['logbogons'] = !isset($config['syslog']['nologbogons']); $pconfig['logprivatenets'] = !isset($config['syslog']['nologprivatenets']); $pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']); -$pconfig['rawfilter'] = isset($config['syslog']['rawfilter']); $pconfig['filterdescriptions'] = $config['syslog']['filterdescriptions']; $pconfig['disablelocallogging'] = isset($config['syslog']['disablelocallogging']); $pconfig['logfilesize'] = $config['syslog']['logfilesize']; @@ -179,7 +178,6 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) { $config['syslog']['nologbogons'] = $_POST['logbogons'] ? false : true; $config['syslog']['nologprivatenets'] = $_POST['logprivatenets'] ? false : true; $config['syslog']['nologlighttpd'] = $_POST['loglighttpd'] ? false : true; - $config['syslog']['rawfilter'] = $_POST['rawfilter'] ? true : false; if (is_numeric($_POST['filterdescriptions']) && $_POST['filterdescriptions'] > 0) $config['syslog']['filterdescriptions'] = $_POST['filterdescriptions']; else @@ -355,12 +353,6 @@ function check_everything() {
- - Raw Logs - /> -
- - Filter descriptions