lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 10:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter/logs: plain view extracted from normal view; closes #437

Browse Source
This commit is contained in:
Franco Fichtner 2015-10-16 23:48:08 +02:00
parent 36fea88a19
commit 08b49c052e
5 changed files with 125 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View File

@ -137,6 +137,7 @@
<Normal VisibleName="Normal View" order="100" url="/diag_logs_filter.php"/>
<Dynamic VisibleName="Dynamic View" order="200" url="/diag_logs_filter_dynamic.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>
<NAT cssClass="fa fa-exchange">
<PortForward order="100" VisibleName="Port Forward" url="/firewall_nat.php">

34
src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
View File

@ -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.",

21
src/www/diag_logs_filter.php
View File

@ -615,7 +615,7 @@ include("head.inc");
$Include_Act = explode(",", str_replace(" ", ",", $filterfieldsarray['act']));
if ($filterfieldsarray['interface'] == "All") $interface = "";
?>
<div class="table-responsive widgetconfigdiv" id="filterlogentries_show" style="<?=(!isset($config['syslog']['rawfilter']))?"":"display:none"?>">
<div class="table-responsive widgetconfigdiv" id="filterlogentries_show">
<table class="table table-striped">
<thead>
<tr>
@ -687,7 +687,7 @@ include("head.inc");
<table class="table table-striped table-sort">
<?php if (!isset($config['syslog']['rawfilter'])):
<?php
$iflist = get_configured_interface_with_descr(false, true);
if (isset($iflist[$interfacefilter]))
$interfacefilter = $iflist[$interfacefilter];
@ -804,23 +804,6 @@ include("head.inc");
<?php endif;
endforeach;
buffer_rules_clear(); ?>
<?php else: ?>
<tr>
<td colspan="2" class="listtopic">
<strong><?php printf(gettext("Last %s firewall log entries"),$nentries);?></strong></td>
</tr>
<?php
if($filtertext)
dump_clog($filter_logfile, $nentries, true, array("$filtertext"));
else
dump_clog($filter_logfile, $nentries);
?>
<tr><td colspan="2">
<form id="clearform" name="clearform" action="diag_logs_filter.php" method="post" style="margin-top: 14px;">
<input id="submit" name="clear" type="submit" class="btn btn-primary" value="<?=gettext("Clear log");?>" />
</form>
</td></tr>
<?php endif; ?>
</table>
</div>

98
src/www/diag_logs_filter_plain.php Normal file
View File

@ -0,0 +1,98 @@
<?php
/*
Copyright (C) 2014 Deciso B.V.
Copyright (C) 2009-2010 Jim Pingle <jpingle@gmail.com>
Copyright (C) 2004-2009 Scott Ullrich
Copyright (C) 2003-2009 Manuel Kasper <mk@neon1.net>
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");
?>
<body>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<div class="tab-content content-box col-xs-12">
<div class="table-responsive">
<table class="table table-striped table-sort">
<tr>
<td colspan="2" class="listtopic">
<strong><?php printf(gettext("Last %s firewall log entries"),$nentries);?></strong></td>
</tr>
<?php dump_clog($filter_logfile, $nentries); ?>
<tr><td colspan="2">
<form id="clearform" name="clearform" action="diag_logs_filter.php" method="post" style="margin-top: 14px;">
<input id="submit" name="clear" type="submit" class="btn btn-primary" value="<?=gettext("Clear log");?>" />
</form>
</td></tr>
</table>
</div>
</td>
</tr>
</table>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>

8
src/www/diag_logs_settings.php
View File

@ -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() {
<strong><?=gettext("Log errors from the web server process.");?></strong><br />
<?=gettext("Hint: If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the main system log.");?></td>
</tr>
<tr>
<td valign="top" class="vtable">Raw Logs</td>
<td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked=\"checked\""; ?> />
<strong><?=gettext("Show raw filter logs");?></strong><br />
<?=gettext("Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information, but it is more difficult to read.");?></td>
</tr>
<tr>
<td valign="top" class="vtable">Filter descriptions</td>
<td class="vtable">