Skip to content

Commit

Permalink
Merge pull request #31 from BBcan177/patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbgarga
rbgarga committed Dec 15, 2015
2 parents 2789205 + b77616d commit d5be635
Show file tree
Hide file tree
Showing 17 changed files with 145 additions and 330 deletions.
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-pfBlockerNG
PORTVERSION= 2.0.3
PORTVERSION= 2.0.4
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
97 changes: 2 additions & 95 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,9 @@
/* ====================================================================================== */
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerng</name>
<version>2.0.3</version>
<title>pfBlockerNG: General Settings</title>
<version>2.0.4</version>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save General Settings</addedit_string>
<menu>
Expand All @@ -65,96 +62,6 @@
<executable>lighttpd_pfb</executable>
<description>pfBlockerNG DNSBL Web Server</description>
</service>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.priv.inc</item>
<prefix>/etc/inc/priv/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.inc</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_install.inc</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_extra.inc</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.php</item>
<prefix>/usr/local/www/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_alerts.php</item>
<prefix>/usr/local/www/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_alerts_ar.php</item>
<prefix>/usr/local/www/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_update.php</item>
<prefix>/usr/local/www/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_log.php</item>
<prefix>/usr/local/www/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_threats.php</item>
<prefix>/usr/local/www/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.widget.php</item>
<prefix>/usr/local/www/widgets/widgets/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/widget-pfblockerng.inc</item>
<prefix>/usr/local/www/widgets/include/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.js</item>
<prefix>/usr/local/www/widgets/javascript/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_top20.xml</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_dnsbl.xml</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_dnsbl_lists.xml</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_dnsbl_easylist.xml</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_v4lists.xml</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_v6lists.xml</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_sync.xml</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.sh</item>
<prefix>/usr/local/pkg/pfblockerng/</prefix>
<chmod>0755</chmod>
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/index.php</item>
<prefix>/usr/local/www/pfblockerng/www/</prefix>
<chmod>0755</chmod>
</additional_files_needed>
<tabs>
<tab>
<text>General</text>
Expand Down
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ function pfb_download_failure($alias, $header, $pfbfolder, $vtype, $list_url) {
// Query Firewall aliastables
$result = find_reported_header($ip, "{$pfbfolder}/*", TRUE);
if (!empty($result)) {
$log = " [ {$ip} ] Firewall IP block found in: [ {$result} ]\n";
$log = " [ {$ip} ] Firewall IP block found in: [ {$result[1]} | {$result[0]} ]\n";
pfb_logger("{$log}", 2);
$pfbfound = TRUE;
}
Expand Down
6 changes: 1 addition & 5 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng_dnsbl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@
/* ========================================================================== */
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerngdnsblsettings</name>
<version>1.0</version>
<title>pfBlockerNG: DNSBL: Settings</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save DNSBL general settings</addedit_string>
<menu>
Expand Down
6 changes: 1 addition & 5 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng_dnsbl_easylist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@
/* ========================================================================== */
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerngdnsbleasylist</name>
<version>1.0</version>
<title>pfBlockerNG: DNSBL: EasyList</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save DNSBL Easylist settings</addedit_string>
<menu>
Expand Down
8 changes: 2 additions & 6 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng_dnsbl_lists.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@
/* ========================================================================== */
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerngdnsbl</name>
<version>1.0</version>
<title>pfBlockerNG: DNSBL: Lists</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save DNSBL Feeds settings</addedit_string>
<menu>
Expand Down Expand Up @@ -176,7 +172,7 @@
</description>
</field>
<field>
<fielddescr><![CDATA[<strong>DNSBL</strong>]]></fielddescr>
<fielddescr><![CDATA[DNSBL]]></fielddescr>
<description><![CDATA[<br /><strong>'Format'</strong>: Select the file format that URL will retrieve.<br />
<ul><li><strong>'auto'</strong>&emsp;- Default parser</li>
<li><strong>'rsync'</strong> - RSync Lists</li></ul>
Expand Down
8 changes: 2 additions & 6 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng_sync.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,8 @@
/* ========================================================================== */
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerngsync</name>
<version>1.0</version>
<title>pfBlockerNG: XMLRPC Sync</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save XMLRPC Sync settings</addedit_string>
<menu>
Expand Down Expand Up @@ -216,4 +212,4 @@
pfblockerng_sync_on_changes();
]]>
</custom_php_resync_config_command>
</packagegui>
</packagegui>
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng_top20.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerngtopspammers</name>
<version>1.0</version>
<title>pfBlockerNG: Top 20 Spammer Countries</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save Top20 settings</addedit_string>
<menu>
Expand Down
6 changes: 1 addition & 5 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng_v4lists.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@
/* ========================================================================== */
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockernglistsv4</name>
<version>1.0</version>
<title>pfBlockerNG: IPv4 Alias/List Configuration</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save IPv4 settings</addedit_string>
<menu>
Expand Down
6 changes: 1 addition & 5 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng_v6lists.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@
/* ========================================================================== */
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockernglistsv6</name>
<version>1.0</version>
<title>pfBlockerNG: IPv6 Alias/List Configuration</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save IPv6 settings</addedit_string>
<menu>
Expand Down
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Domain Name (DNSBL) blocking via Unbound DNS Resolver.]]></descr>
<category>Security</category>
<pkginfolink>https://forum.pfsense.org/index.php?topic=102470.0</pkginfolink>
<version>2.0.3</version>
<version>2.0.4</version>
<status>RELEASE</status>
<required_version>2.3</required_version>
<maintainer>BBCan177@gmail.com</maintainer>
Expand Down
12 changes: 2 additions & 10 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,12 +723,8 @@ function pfblockerng_get_countries() {
/* ========================================================================== */
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerng{$cont_name_lower}</name>
<version>1.0</version>
<title>pfBlockerNG: {$cont}</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save {$cont} settings</addedit_string>
<menu>
Expand Down Expand Up @@ -1132,12 +1128,8 @@ interfaces. Typical uses of 'Deny' rules are:<br />
*/
]]>
</copyright>
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerngreputation</name>
<version>1.0</version>
<title>pfBlockerNG: IPv4 Reputation</title>
<title>Firewall/pfBlockerNG</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save Reputation Settings</addedit_string>
<menu>
Expand Down
36 changes: 13 additions & 23 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng_alerts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ function conv_log_filter_lite($logfile, $nentries, $tail, $pfbdenycnt, $pfbpermi
return $fields_array;
}
}
$pgtitle = array(gettext("pfBlockerNG"), gettext("Alerts"));
$pgtitle = array(gettext('Firewall'), gettext("pfBlockerNG"), gettext("Alerts"));
include_once('head.inc');

// refresh every 60 secs
Expand All @@ -660,28 +660,18 @@ function conv_log_filter_lite($logfile, $nentries, $tail, $pfbdenycnt, $pfbpermi
print_info_box($savemsg);
}

?>
<table summary="tabs">
<tr>
<td class="tabnavtbl">
<?php
$tab_array = array();
$tab_array[] = array(gettext("General"), false, "/pkg_edit.php?xml=pfblockerng.xml");
$tab_array[] = array(gettext("Update"), false, "/pfblockerng/pfblockerng_update.php");
$tab_array[] = array(gettext("Alerts"), true, "/pfblockerng/pfblockerng_alerts.php");
$tab_array[] = array(gettext("Reputation"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_reputation.xml");
$tab_array[] = array(gettext("IPv4"), false, "/pkg.php?xml=/pfblockerng/pfblockerng_v4lists.xml");
$tab_array[] = array(gettext("IPv6"), false, "/pkg.php?xml=/pfblockerng/pfblockerng_v6lists.xml");
$tab_array[] = array(gettext("DNSBL"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_dnsbl.xml");
$tab_array[] = array(gettext("Country"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_top20.xml");
$tab_array[] = array(gettext("Logs"), false, "/pfblockerng/pfblockerng_log.php");
$tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_sync.xml");
display_top_tabs($tab_array, true);
?>
</td>
</tr>
</table>
<?php
$tab_array = array();
$tab_array[] = array(gettext("General"), false, "/pkg_edit.php?xml=pfblockerng.xml");
$tab_array[] = array(gettext("Update"), false, "/pfblockerng/pfblockerng_update.php");
$tab_array[] = array(gettext("Alerts"), true, "/pfblockerng/pfblockerng_alerts.php");
$tab_array[] = array(gettext("Reputation"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_reputation.xml");
$tab_array[] = array(gettext("IPv4"), false, "/pkg.php?xml=/pfblockerng/pfblockerng_v4lists.xml");
$tab_array[] = array(gettext("IPv6"), false, "/pkg.php?xml=/pfblockerng/pfblockerng_v6lists.xml");
$tab_array[] = array(gettext("DNSBL"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_dnsbl.xml");
$tab_array[] = array(gettext("Country"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_top20.xml");
$tab_array[] = array(gettext("Logs"), false, "/pfblockerng/pfblockerng_log.php");
$tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_sync.xml");
display_top_tabs($tab_array, true);

// Create Form
$form = new Form(false);
Expand Down
36 changes: 13 additions & 23 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng_log.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ function getlogs($logdir, $log_extentions = array('log')) {
$s_logfile = '';
}

$pgtitle = array(gettext('pfBlockerNG'), gettext('Log Browser'));
$pgtitle = array(gettext('Firewall'), gettext('pfBlockerNG'), gettext('Log Browser'));
include_once('head.inc');

if ($input_errors) {
Expand All @@ -242,28 +242,18 @@ function getlogs($logdir, $log_extentions = array('log')) {
print_info_box($savemsg);
}

?>
<table summary="tabs">
<tr>
<td class="tabnavtbl">
<?php
$tab_array = array();
$tab_array[] = array(gettext("General"), false, "/pkg_edit.php?xml=pfblockerng.xml");
$tab_array[] = array(gettext("Update"), false, "/pfblockerng/pfblockerng_update.php");
$tab_array[] = array(gettext("Alerts"), false, "/pfblockerng/pfblockerng_alerts.php");
$tab_array[] = array(gettext("Reputation"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_reputation.xml");
$tab_array[] = array(gettext("IPv4"), false, "/pkg.php?xml=/pfblockerng/pfblockerng_v4lists.xml");
$tab_array[] = array(gettext("IPv6"), false, "/pkg.php?xml=/pfblockerng/pfblockerng_v6lists.xml");
$tab_array[] = array(gettext("DNSBL"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_dnsbl.xml");
$tab_array[] = array(gettext("Country"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_top20.xml");
$tab_array[] = array(gettext("Logs"), true, "/pfblockerng/pfblockerng_log.php");
$tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_sync.xml");
display_top_tabs($tab_array, true);
?>
</td>
</tr>
</table>
<?php
$tab_array = array();
$tab_array[] = array(gettext("General"), false, "/pkg_edit.php?xml=pfblockerng.xml");
$tab_array[] = array(gettext("Update"), false, "/pfblockerng/pfblockerng_update.php");
$tab_array[] = array(gettext("Alerts"), false, "/pfblockerng/pfblockerng_alerts.php");
$tab_array[] = array(gettext("Reputation"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_reputation.xml");
$tab_array[] = array(gettext("IPv4"), false, "/pkg.php?xml=/pfblockerng/pfblockerng_v4lists.xml");
$tab_array[] = array(gettext("IPv6"), false, "/pkg.php?xml=/pfblockerng/pfblockerng_v6lists.xml");
$tab_array[] = array(gettext("DNSBL"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_dnsbl.xml");
$tab_array[] = array(gettext("Country"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_top20.xml");
$tab_array[] = array(gettext("Logs"), true, "/pfblockerng/pfblockerng_log.php");
$tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=/pfblockerng/pfblockerng_sync.xml");
display_top_tabs($tab_array, true);

// Create Form
$form = new Form(false);
Expand Down
Loading

0 comments on commit d5be635

Please sign in to comment.