From b1ef3af0c8c141b75dc61ba9c68f80b961e9f03d Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Sun, 15 Nov 2015 22:35:26 -0500 Subject: pfBlockerNG v2.0 --- config/pfblockerng/pfblockerng_log.php | 119 +++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 52 deletions(-) (limited to 'config/pfblockerng/pfblockerng_log.php') diff --git a/config/pfblockerng/pfblockerng_log.php b/config/pfblockerng/pfblockerng_log.php index a235f20a..9d823038 100644 --- a/config/pfblockerng/pfblockerng_log.php +++ b/config/pfblockerng/pfblockerng_log.php @@ -9,15 +9,16 @@ Portions of this code are based on original work done for the Snort package for pfSense from the following contributors: - Copyright (C) 2005 Bill Marquette . - Copyright (C) 2003-2004 Manuel Kasper . - Copyright (C) 2006 Scott Ullrich - Copyright (C) 2009 Robert Zelaya Sr. Developer - Copyright (C) 2012 Ermal Luci + Copyright (c) 2015 Electric Sheep Fencing, LLC. All rights reserved. + Copyright (c) 2009 Robert Zelaya Sr. Developer + Copyright (c) 2005 Bill Marquette + Copyright (c) 2004-2005 Scott Ullrich + Copyright (c) 2004 Manuel Kasper (BSD 2 clause) + All rights reserved. Adapted for Suricata by: - Copyright (C) 2015 Bill Meeks + Copyright (c) 2015 Bill Meeks All rights reserved. Javascript and Integration modifications by J. Nieuwenhuizen @@ -46,9 +47,9 @@ POSSIBILITY OF SUCH DAMAGE. */ -require_once("guiconfig.inc"); -require_once("globals.inc"); -require_once("/usr/local/pkg/pfblockerng/pfblockerng.inc"); +require_once('guiconfig.inc'); +require_once('globals.inc'); +require_once('/usr/local/pkg/pfblockerng/pfblockerng.inc'); pfb_global(); @@ -61,10 +62,10 @@ function getlogs($logdir, $log_extentions = array('log')) { // Get logfiles $log_filenames = array(); foreach ($log_extentions as $extention) { - if ($extention <> '*') { - $log_filenames = array_merge($log_filenames, glob($logdir . "*." . $extention)); + if ($extention != '*') { + $log_filenames = array_merge($log_filenames, glob($logdir . '*.' . $extention)); } else { - $log_filenames = array_merge($log_filenames, glob($logdir . "*")); + $log_filenames = array_merge($log_filenames, glob($logdir . '*')); } } @@ -91,22 +92,28 @@ function getlogs($logdir, $log_extentions = array('log')) { $pfb_logtypes = array( 'defaultlogs' => array('name' => 'Log Files', 'logdir' => "{$pfb['logdir']}/", - 'logs' => array("pfblockerng.log", "error.log", "geoip.log", "maxmind_ver"), + 'logs' => array('pfblockerng.log', 'error.log', 'dnsbl.log', 'extras.log', 'maxmind_ver'), 'download' => TRUE, 'clear' => TRUE ), 'masterfiles' => array('name' => 'Masterfiles', 'logdir' => "{$pfb['dbdir']}/", - 'logs' => array("masterfile", "mastercat"), + 'logs' => array('masterfile', 'mastercat'), 'download' => TRUE, 'clear' => FALSE ), - 'originallogs' => array('name' => 'Original Files', + 'originallogs' => array('name' => 'Original IP Files', 'ext' => array('orig', 'raw'), 'logdir' => "{$pfb['origdir']}/", 'download' => TRUE, 'clear' => TRUE ), + 'origdnslogs' => array('name' => 'Original DNS Files', + 'ext' => array('orig', 'raw'), + 'logdir' => "{$pfb['dnsorigdir']}/", + 'download' => TRUE, + 'clear' => TRUE + ), 'denylogs' => array('name' => 'Deny Files', 'ext' => 'txt', 'txt' => 'deny', @@ -114,6 +121,13 @@ $pfb_logtypes = array( 'defaultlogs' => array('name' => 'Log Files', 'download' => TRUE, 'clear' => TRUE ), + 'dnsbl' => array('name' => 'DNSBL Files', + 'ext' => array('txt', 'ip'), + 'txt' => 'dnsbl', + 'logdir' => "{$pfb['dnsdir']}/", + 'download' => TRUE, + 'clear' => TRUE + ), 'permitlogs' => array('name' => 'Permit Files', 'ext' => 'txt', 'txt' => 'permit', @@ -151,13 +165,19 @@ $pfb_logtypes = array( 'defaultlogs' => array('name' => 'Log Files', 'logdir' => "{$pfb['ccdir']}/", 'download' => TRUE, 'clear' => FALSE + ), + 'unbound' => array('name' => 'Unbound', + 'ext' => 'conf', + 'logdir' => "{$pfb['dnsbldir']}/", + 'download' => TRUE, + 'clear' => FALSE ) ); // Check logtypes $logtypeid = 'defaultlogs'; if (isset($_POST['logtype'])) { - $logtypeid = $_POST['logtype']; + $logtypeid = htmlspecialchars($_POST['logtype']); } elseif (isset($_GET['logtype'])) { $logtypeid = htmlspecialchars($_GET['logtype']); } @@ -165,17 +185,17 @@ if (isset($_POST['logtype'])) { // Check if POST has been set if (isset($_POST['file'])) { clearstatcache(); - $pfb_logfilename = $_POST['file']; + $pfb_logfilename = htmlspecialchars($_POST['file']); $pfb_ext = pathinfo($pfb_logfilename, PATHINFO_EXTENSION); // Load log if ($_POST['action'] == 'load') { if (!is_file($pfb_logfilename)) { - echo "|3|" . gettext("Log file is empty or does not exist") . ".|"; + echo "|3|" . gettext('Log file is empty or does not exist') . ".|"; } else { $data = file_get_contents($pfb_logfilename); if ($data === false) { - echo "|1|" . gettext("Failed to read log file") . ".|"; + echo "|1|" . gettext('Failed to read log file') . ".|"; } else { $data = base64_encode($data); echo "|0|" . $pfb_logfilename . "|" . $data . "|"; @@ -186,7 +206,7 @@ if (isset($_POST['file'])) { } if (isset($_POST['logFile'])) { - $s_logfile = $_POST['logFile']; + $s_logfile = htmlspecialchars($_POST['logFile']); // Clear selected file if (isset($_POST['clear'])) { @@ -201,32 +221,33 @@ if (isset($_POST['logFile'])) { header('Pragma: '); header('Cache-Control: '); } else { - header("Pragma: private"); - header("Cache-Control: private, must-revalidate"); + header('Pragma: private'); + header('Cache-Control: private, must-revalidate'); } - header("Content-Type: application/octet-stream"); - header("Content-length: " . filesize($s_logfile)); - header("Content-disposition: attachment; filename = " . basename($s_logfile)); + header('Content-Type: application/octet-stream'); + header('Content-length: ' . filesize($s_logfile)); + header('Content-disposition: attachment; filename = ' . basename($s_logfile)); ob_end_clean(); //important or other post will fail readfile($s_logfile); } } } else { - $s_logfile = ""; + $s_logfile = ''; } -$pgtitle = gettext("pfBlockerNG: Log Browser"); -include_once("head.inc"); +$pgtitle = gettext('pfBlockerNG: Log Browser'); +include_once('head.inc'); ?> + "); +echo("
"); if ($savemsg) { print_info_box($savemsg); } @@ -282,22 +303,16 @@ if ($savemsg) { @@ -311,9 +326,9 @@ if ($savemsg) { -   -   -   +   +   +  
@@ -324,16 +339,16 @@ if ($savemsg) { $clearable = FALSE; $downloadable = FALSE; foreach ($pfb_logtypes as $id => $logtype) { - $selected = ""; + $selected = ''; if ($id == $logtypeid) { - $selected = " selected"; + $selected = ' selected'; $clearable = $logtype['clear']; $downloadable = $logtype['download']; } echo("\n"); } ?> -    +   @@ -347,14 +362,14 @@ if ($savemsg) { $logs = getlogs($pfb_logtypes[$logtypeid]['logdir'], $pfb_logtypes[$logtypeid]['ext']); } foreach ($logs as $log) { - $selected = ""; + $selected = ''; if ($log == $pfb_logfilename) { - $selected = " selected"; + $selected = ' selected'; } echo("\n"); } ?> -    +   @@ -424,6 +439,6 @@ if ($savemsg) { //]]> - + \ No newline at end of file -- cgit v1.2.3