From 74c6d36f098ad7541a9c7253ddb3fd73e8dd3f82 Mon Sep 17 00:00:00 2001 From: N0YB Date: Fri, 15 Mar 2013 02:17:33 -0700 Subject: System Firewall Log Filtering by Fields Previous filter form retained for raw logs view. --- usr/local/www/diag_logs_filter.php | 205 ++++++++++++++++++++++++++++++------- 1 file changed, 167 insertions(+), 38 deletions(-) (limited to 'usr/local/www/diag_logs_filter.php') diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 4e0f316..1a90c61 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -46,6 +46,9 @@ require("guiconfig.inc"); require_once("filter_log.inc"); +require_once("pfsense-utils.inc"); +require_once("functions.inc"); + function getGETPOSTsettingvalue($settingname, $default) { $settingvalue = $default; @@ -64,12 +67,42 @@ if($rulenum) { exit; } -$interfacefilter = getGETPOSTsettingvalue('interface', null); -$filtertext = htmlspecialchars(getGETPOSTsettingvalue('filtertext', "")); +$filtersubmit = getGETPOSTsettingvalue('filtersubmit', null); +if ($filtersubmit) { + $interfacefilter = getGETPOSTsettingvalue('interface', null); + $filtertext = getGETPOSTsettingvalue('filtertext', ""); + $filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null); +} + +$filterlogentries_submit = getGETPOSTsettingvalue('filterlogentries_submit', null); +if ($filterlogentries_submit) { + $filterfieldsarray = array("act", "time", "interface", "srcip", "srcport", "dstip", "dstport", "proto", "tcpflags"); + + $actpass = getGETPOSTsettingvalue('actpass', null); + $actblock = getGETPOSTsettingvalue('actblock', null); + $actreject = getGETPOSTsettingvalue('actreject', null); + + $filterfieldsarray['act'] = trim($actpass . " " . $actblock . " " . $actreject); + $filterfieldsarray['act'] = $filterfieldsarray['act'] ? $filterfieldsarray['act'] : 'All'; + $filterfieldsarray['time'] = getGETPOSTsettingvalue('filterlogentries_time', null); + $filterfieldsarray['interface'] = getGETPOSTsettingvalue('filterlogentries_interfaces', null); + $filterfieldsarray['srcip'] = getGETPOSTsettingvalue('filterlogentries_sourceipaddress', null); + $filterfieldsarray['srcport'] = getGETPOSTsettingvalue('filterlogentries_sourceport', null); + $filterfieldsarray['dstip'] = getGETPOSTsettingvalue('filterlogentries_destinationipaddress', null); + $filterfieldsarray['dstport'] = getGETPOSTsettingvalue('filterlogentries_destinationport', null); + $filterfieldsarray['proto'] = getGETPOSTsettingvalue('filterlogentries_protocol', null); + $filterfieldsarray['tcpflags'] = getGETPOSTsettingvalue('filterlogentries_protocolflags', null); + $filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null); +} $filter_logfile = "{$g['varlog_path']}/filter.log"; $nentries = $config['syslog']['nentries']; + +# Override Display Quantity +if ($filterlogentries_qty) + $nentries = $filterlogentries_qty; + if (!$nentries) $nentries = 50; @@ -109,52 +142,145 @@ include("head.inc"); -
+
> +
+ + + + + + + + + + + + + + + + + + + + + +
+
+
+ /> Pass
+ /> Block
+ /> Reject
+
+ 		+
+
+ 		+
+
+ 		+
+
+ 		+
+
+ 		+
+
+
+
+
+ 		+
+
+ 		+
+
+ 		+
+
+ 		+
" />
+
+ ', '');?>   +    +
+
+
+
>
- + + $ifdesc) + $interfaces[$if] = $ifdesc; - if ($config['l2tp']['mode'] == "server") - $interfaces['l2tp'] = "L2TP VPN"; + if ($config['l2tp']['mode'] == "server") + $interfaces['l2tp'] = "L2TP VPN"; - if ($config['pptpd']['mode'] == "server") - $interfaces['pptp'] = "PPTP VPN"; + if ($config['pptpd']['mode'] == "server") + $interfaces['pptp'] = "PPTP VPN"; - if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) - $interfaces['pppoe'] = "PPPoE VPN"; + if (is_pppoe_server_enabled() && have_ruleint_access("pppoe")) + $interfaces['pppoe'] = "PPPoE VPN"; - /* add ipsec interfaces */ - if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) - $interfaces["enc0"] = "IPsec"; + /* add ipsec interfaces */ + if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) + $interfaces["enc0"] = "IPsec"; - /* add openvpn/tun interfaces */ - if ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"]) - $interfaces["openvpn"] = "OpenVPN"; - - foreach ($interfaces as $iface => $ifacename): ?> - - - - - - " /> + /* add openvpn/tun interfaces */ + if ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"]) + $interfaces["openvpn"] = "OpenVPN"; + + foreach ($interfaces as $iface => $ifacename): ?> + + + +
+ + +
+
+ + +
+
+ + +
 
+
" />
+ + + + + + ', '');?>   + + + -
+
| | -

- +
+
+
+ Show/hide rule descriptions -
@@ -162,11 +288,14 @@ include("head.inc"); $iflist = get_configured_interface_with_descr(false, true); if ($iflist[$interfacefilter]) $interfacefilter = $iflist[$interfacefilter]; - $filterlog = conv_log_filter($filter_logfile, $nentries, $nentries + 100, $filtertext, $interfacefilter); + if ($filterlogentries_submit) + $filterlog = conv_log_filter($filter_logfile, $nentries, $nentries + 100, $filterfieldsarray); + else + $filterlog = conv_log_filter($filter_logfile, $nentries, $nentries + 100, $filtertext, $interfacefilter); ?> " class="listtopic"> -