Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pfBlockerNG - version 2.0.12 #121

Merged
merged 10 commits into from Apr 26, 2016
Merged

pfBlockerNG - version 2.0.12 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3b0c699
Update pfblockerng.inc
BBcan177 Apr 26, 2016
8804cf9
Update pfblockerng.sh
BBcan177 Apr 26, 2016
16c2afe
Update pfblockerng.inc
BBcan177 Apr 26, 2016
41fa2d7
Update index.php
BBcan177 Apr 26, 2016
03f663d
Update pfblockerng.php
BBcan177 Apr 26, 2016
98a2d6a
Update pfblockerng_alerts.php
BBcan177 Apr 26, 2016
bf6fda0
Update pfblockerng_log.php
BBcan177 Apr 26, 2016
1790bc4
Update pfblockerng_update.php
BBcan177 Apr 26, 2016
83e0db6
Update pfblockerng.widget.php
BBcan177 Apr 26, 2016
977c7b6
Update Makefile
BBcan177 Apr 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/Makefile
View file
Open in desktop
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-pfBlockerNG
PORTVERSION= 2.0.11
PORTVERSION= 2.0.12
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
20 changes: 10 additions & 10 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng.inc
View file
Open in desktop
Expand Up @@ -294,7 +294,7 @@ function pfb_log_mgmt() {
function pfb_logger($log, $logtype) {
global $g, $pfb;

$now = date('m/d/y G:i:s', time());
$now = date('m/d/y H:i:s', time());

// Only log timestamp if new
if (strpos($log, 'NOW') !== FALSE) {
Expand Down Expand Up @@ -1514,7 +1514,7 @@ function pfb_firewall_rule($action, $pfb_alias, $vtype='', $pfb_log, $agateway_i
if ($pfb['config']['enable_log'] == 'on' || $pfb_log == 'enabled') {
$rule['log'] = '';
}
if ($agateway_out != 'default') {
if (!empty($agateway_out) && $agateway_out != 'default') {
$rule['gateway'] = "{$agateway_out}";
if ($pfb['float'] == 'on') {
$rule['direction'] = 'out';
Expand Down Expand Up @@ -1557,7 +1557,7 @@ function pfb_firewall_rule($action, $pfb_alias, $vtype='', $pfb_log, $agateway_i
if ($pfb['config']['enable_log'] == 'on' || $pfb_log == 'enabled') {
$rule['log'] = '';
}
if ($agateway_in != 'default') {
if (!empty($agateway_in) && $agateway_in != 'default') {
$rule['gateway'] = "{$agateway_in}";
if ($pfb['float'] == 'on') {
$rule['direction'] = 'in';
Expand Down Expand Up @@ -1599,7 +1599,7 @@ function pfb_firewall_rule($action, $pfb_alias, $vtype='', $pfb_log, $agateway_i
if ($pfb['config']['enable_log'] == 'on' || $pfb_log == 'enabled') {
$rule['log'] = '';
}
if ($agateway_out != 'default') {
if (!empty($agateway_out) && $agateway_out != 'default') {
$rule['gateway'] = "{$agateway_out}";
if ($pfb['float'] == 'on') {
$rule['direction'] = 'out';
Expand Down Expand Up @@ -1642,7 +1642,7 @@ function pfb_firewall_rule($action, $pfb_alias, $vtype='', $pfb_log, $agateway_i
if ($pfb['config']['enable_log'] == 'on' || $pfb_log == 'enabled') {
$rule['log'] = '';
}
if ($agateway_in != 'default') {
if (!empty($agateway_in) && $agateway_in != 'default') {
$rule['gateway'] = "{$agateway_in}";
if ($pfb['float'] == 'on') {
$rule['direction'] = 'in';
Expand Down Expand Up @@ -1682,7 +1682,7 @@ function pfb_firewall_rule($action, $pfb_alias, $vtype='', $pfb_log, $agateway_i
if ($pfb['config']['enable_log'] == 'on' || $pfb_log == 'enabled') {
$rule['log'] = '';
}
if ($agateway_out != 'default') {
if (!empty($agateway_out) && $agateway_out != 'default') {
$rule['gateway'] = "{$agateway_out}";
$rule['direction'] = 'out';
}
Expand Down Expand Up @@ -1721,7 +1721,7 @@ function pfb_firewall_rule($action, $pfb_alias, $vtype='', $pfb_log, $agateway_i
if ($pfb['config']['enable_log'] == 'on' || $pfb_log == 'enabled') {
$rule['log'] = '';
}
if ($agateway_in != 'default') {
if (!empty($agateway_in) && $agateway_in != 'default') {
$rule['gateway'] = "{$agateway_in}";
$rule['direction'] = 'in';
}
Expand Down Expand Up @@ -1875,7 +1875,7 @@ function pfb_livetail($logfile, $mode) {
$line = strstr($pfb_buffer, ' ) compare', TRUE);
$line = ltrim(strstr($line, '] ( ', FALSE), '] ( ');
if (!empty($line)) {
$log = "DNSBL Reject HTTPS," . date('M d G:i:s', time()) . ",{$line}\n";
$log = "DNSBL Reject HTTPS," . date('M d H:i:s', time()) . ",{$line}\n";
@file_put_contents($pfb['dnslog'], $log, FILE_APPEND | LOCK_EX);

// Query DNSBL Alias for Domain list.
Expand Down Expand Up @@ -3040,7 +3040,7 @@ function sync_package_pfblockerng($cron='') {
@fclose($pfb_output);

// Update domain alias statistics
$dns_now = date('M d G:i', time());
$dns_now = date('M d H:i:s', time());
$pfbfound = FALSE;
foreach ($dnsbl_info as $key => $line) {
// Update existing alias stats
Expand Down Expand Up @@ -3069,7 +3069,7 @@ function sync_package_pfblockerng($cron='') {
}
}
if (!$pfbfound) {
$dns_now = date('M d G:i', time());
$dns_now = date('M d H:i:s', time());
$dnsbl_info[] = explode(',', "{$alias},{$dns_now},disabled,0");
}
}
Expand Down
2 changes: 2 additions & 0 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng.sh
View file
Open in desktop
Expand Up @@ -343,6 +343,8 @@ duplicate() {
echo ' ------------------------------'
printf "%-10s %-10s %-10s %-10s\n" " ${counto}" "${countm}" "${countf}" " [ ${sanity} ]"
echo ' -----------------------------------------------------------------'

emptyfiles # Call emptyfiles function
}


Expand Down
6 changes: 6 additions & 0 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng.php
View file
Open in desktop
Expand Up @@ -341,6 +341,12 @@ function pfblockerng_sync_cron() {
continue;
}

// Attempt download, when a previous 'fail' file marker is found.
if (file_exists("{$pfbfolder}/{$header}.fail")) {
pfb_update_check($header, $row['url'], $pfbfolder, $pfborig, $pflex, $row['format']);
continue;
}

// Allow cURL SSL downgrade if user configured.
$pflex = FALSE;
if ($row['state'] == 'Flex') {
Expand Down
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng_alerts.php
View file
Open in desktop
Expand Up @@ -770,7 +770,7 @@ function conv_log_filter_lite($logfile, $nentries, $tail, $pfbdenycnt, $pfbpermi
'hostlookup',
'Auto-Resolve',
NULL,
($hostookup == 'on' ? TRUE : FALSE),
($hostlookup == 'on' ? TRUE : FALSE),
'on'
))->setHelp('Auto-Resolve')->setAttribute('title', 'Select to \'Auto-Resolve\' Hosts.');

Expand Down
1 change: 1 addition & 0 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng_log.php
View file
Open in desktop
Expand Up @@ -226,6 +226,7 @@ function getlogs($logdir, $log_extentions = array('log')) {
}
@fpassthru($fd);
@fclose($fd);
exit;
}
}
} else {
Expand Down
5 changes: 2 additions & 3 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng_update.php
View file
Open in desktop
Expand Up @@ -87,7 +87,6 @@ function pfb_cron_update($type) {
exec('/bin/ps -wx', $result_cron);
if (preg_grep("/pfblockerng[.]php\s+?(cron|update|updatednsbl)/", $result_cron)) {
pfbupdate_status(gettext("Force {$type} Terminated - Failed due to Active Running Task. Click 'View' for running process"));
header('Location: /pfblockerng/pfblockerng_update.php');
exit;
}

Expand Down Expand Up @@ -198,7 +197,7 @@ function pfb_cron_update($type) {
$cron_hour_begin = $line;
}
if (($line * 3600) + ($pfb['min'] * 60) > $currentdaysec) {
$cron_hour_next = $line;
$cron_hour_next = $line;
break;
}
}
Expand Down Expand Up @@ -252,7 +251,7 @@ function pfb_cron_update($type) {
$options .= ' <dt>Update:</dt><dd>will download any new Alias/Lists.</dd>';
$options .= ' <dt>Cron:</dt><dd>will download any Alias/Lists that are within the Frequency Setting (due for Update).</dd>';
$options .= ' <dt>Reload:</dt><dd>will reload all Lists using the existing Downloaded files.<br />';
$options .= ' This is useful when Lists are out of <q>sync</q> or Reputation changes were made.</dd>';
$options .= ' This is useful when Lists are out of <q>sync</q> or Reputation changes were made.</dd>';
$options .= '</dl></div>';

// Create Form
Expand Down
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/www/index.php
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
echo base64_decode('R0lGODlhAQABAJAAAP8AAAAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw==');

// Record DNSBL HTTP Alert to logfile
$datereq = date('M d H:i:s', $_SERVER['REQUEST_TIME']);
$datereq = date('M d H:i:s', time());
$req_agent = str_replace(',', '', "{$_SERVER['HTTP_REFERER']} | {$_SERVER['REQUEST_URI']} | {$_SERVER['HTTP_USER_AGENT']}");
$log = htmlspecialchars("DNSBL Reject,{$datereq},{$_SERVER['HTTP_HOST']},{$_SERVER['REMOTE_ADDR']},{$req_agent}\n");
if (!empty($log)) {
Expand Down
10 changes: 3 additions & 7 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/www/widgets/widgets/pfblockerng.widget.php
View file
Open in desktop
Expand Up @@ -386,18 +386,14 @@ function pfBlockerNG_get_table($mode='') {
<div class="table-responsive">
<!-- Print failed downloads (if any) -->
<?php if (!empty($results)): ?>
<ol style="white-space: nowrap; text-overflow: ellipsis;"><small>
<ol style="white-space: nowrap; text-overflow: ellipsis;
max-height: <?=($pfb['maxfails'] * 1.37) + 0.1;?>em; overflow-y: scroll;"><small>
<?
$counter = 1;
foreach ($results as $result) {
if ($counter > $pfb['maxfails'] && $entries > $pfb['maxfails']) {
// To many errors stop displaying
print (($entries - $pfb['maxfails']) . gettext(' more error(s)...'));
break;
}
if ($counter == 1) {
print ("<li>{$result}&emsp;<i class=\"fa fa-trash icon-pointer\" id=\"pfblockerngackicon\"
title=\"" . gettext("Clear Failed Downloads") . "\" ></i></li>");
title=\"" . gettext("Clear Failed Downloads") . "\" ></i></li>");
} else {
print ("<li>{$result}</li>");
}
Expand Down