From b3ce3bde07750e25fabca14faf18c0e5f0eb74dc Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Sun, 30 Nov 2014 18:49:04 -0500 Subject: pfBlockerNG Beta v0.99 pkg_config.10.xml edits and associated files for Package pfBlockerNG --- config/pfblockerng/pfblockerng.xml | Bin 0 -> 47000 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 config/pfblockerng/pfblockerng.xml (limited to 'config/pfblockerng/pfblockerng.xml') diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml new file mode 100644 index 00000000..5e08f7a5 Binary files /dev/null and b/config/pfblockerng/pfblockerng.xml differ -- cgit v1.2.3 From a68f5263bc92a88f92d97ddbdffb49f51514e075 Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Sun, 30 Nov 2014 20:15:36 -0500 Subject: Revert "pfBlockerNG Beta v0.99" This reverts commit b3ce3bde07750e25fabca14faf18c0e5f0eb74dc. --- config/pfblockerng/pfblockerng.xml | Bin 47000 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 config/pfblockerng/pfblockerng.xml (limited to 'config/pfblockerng/pfblockerng.xml') diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml deleted file mode 100644 index 5e08f7a5..00000000 Binary files a/config/pfblockerng/pfblockerng.xml and /dev/null differ -- cgit v1.2.3 From f51fcf2745bbff493b026d00354642b2fcb562bb Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Sun, 30 Nov 2014 21:28:47 -0500 Subject: pkg_config.10.xml Edits and Associated pkg files Edits for pkg_config.10.xml All Associated files for pkg pfBlockerNG --- config/pfblockerng/pfblockerng.xml | 551 +++++++++++++++++++++++++++++++++++++ 1 file changed, 551 insertions(+) create mode 100644 config/pfblockerng/pfblockerng.xml (limited to 'config/pfblockerng/pfblockerng.xml') diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml new file mode 100644 index 00000000..eb1d96f1 --- /dev/null +++ b/config/pfblockerng/pfblockerng.xml @@ -0,0 +1,551 @@ + + + + + + + + Describe your package here + Describe your package requirements here + Currently there are no FAQ items provided. + pfblockerng + 1.0 + pfBlockerNG: General Settings + /usr/local/pkg/pfblockerng/pfblockerng.inc + + pfBlockerNG + pfblockerng.xml + Configure pfblockerNG +
Firewall
+ /pkg_edit.php?xml=pfblockerng.xml + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.inc + /usr/local/pkg/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.php + /usr/local/www/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_alerts.php + /usr/local/www/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_update.php + /usr/local/www/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_log.php + /usr/local/www/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_diag_dns.php + /usr/local/www/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.widget.php + /usr/local/www/widgets/widgets/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/widget-pfblockerng.inc + /usr/local/www/widgets/include/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.js + /usr/local/www/widgets/javascript/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_top20.xml + /usr/local/pkg/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_v4lists.xml + /usr/local/pkg/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_v6lists.xml + /usr/local/pkg/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng_sync.xml + /usr/local/pkg/pfblockerng/ + 0644 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/Africa_v4.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/Africa_v6.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/Asia_v4.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/Asia_v6.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/Europe_v4.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/Europe_v6.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/North_America_v4.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/North_America_v6.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/Oceania_v4.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/Oceania_v6.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/South_America_v4.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/cc/South_America_v6.txt + /var/db/pfblockerng/cc/ + 0444 + + + https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.sh + /usr/local/pkg/pfblockerng/ + 0755 + + + https://packages.pfsense.org/packages/config/pfblockerng/geoipupdate.sh + /usr/local/pkg/pfblockerng/ + 0755 + + + + General + /pkg_edit.php?xml=pfblockerng.xml&id=0 + + + + Update + /pfblockerng/pfblockerng_update.php + + + Alerts + /pfblockerng/pfblockerng_alerts.php + + + Reputation + /pkg_edit.php?xml=/pfblockerng/pfblockerng_reputation.xml&id=0 + + + IPv4 + /pkg.php?xml=/pfblockerng/pfblockerng_v4lists.xml + + + IPv6 + /pkg.php?xml=/pfblockerng/pfblockerng_v6lists.xml + + + Top20 + /pkg_edit.php?xml=/pfblockerng/pfblockerng_top20.xml&id=0 + + + Africa + /pkg_edit.php?xml=/pfblockerng/pfblockerng_Africa.xml&id=0 + + + Asia + /pkg_edit.php?xml=/pfblockerng/pfblockerng_Asia.xml&id=0 + + + Europe + /pkg_edit.php?xml=/pfblockerng/pfblockerng_Europe.xml&id=0 + + + N.A. + /pkg_edit.php?xml=/pfblockerng/pfblockerng_NorthAmerica.xml&id=0 + + + Oceania + /pkg_edit.php?xml=/pfblockerng/pfblockerng_Oceania.xml&id=0 + + + S.A. + /pkg_edit.php?xml=/pfblockerng/pfblockerng_SouthAmerica.xml&id=0 + + + Logs + /pfblockerng/pfblockerng_log.php + + + Sync + /pkg_edit.php?xml=/pfblockerng/pfblockerng_sync.xml&id=0 + + + + + pfBlockerNG General Settings + listtopic + + + LINKS + none + Firewall Alias     Firewall Rules     Firewall Logs]]> + info + + + Enable pfBlockerNG]]> + enable_cb + checkbox + + If "Keep Settings" is not "enabled" on pkg Install/De-Install, all Settings will be Wiped!]]> + + + CRON MIN Start Time + pfb_min + : 00
+ Select Cron Update Minute ]]> + select + + + + + + + + + CRON Base Hour Start Time + pfb_hour + 1
+ Select Cron Base Start Hour ]]> + select + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 'Daily/Weekly' Start Hour + pfb_dailystart + 1
+ Select 'Daily' Schedule Start Hour
+ This is used for the 'Daily/Weekly' Scheduler Only.]]> + select + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Remove Duplication + enable_dup + checkbox + Only for IPv4 Lists + + + Enable Suppression + suppression + checkbox + + Country Blocking Lists cannot be Suppressed.
+ This will also remove RFC1918 addresses, 0.0.0.0 and 127.0.0.1 from all Lists.

+ Alerts can be Suppressed using the '+' icon in the Alerts Tab and IPs added to the 'pfBlockerNGSuppress' Alias
+ A Blocked IP in a CIDR other than /24 will need to be Suppressed by an 'Permit Outbound' Firewall Rule]]> + + + + Keep Settings/Lists After Disable/Re-Install/De-Install]]> + pfb_keep + checkbox + Keep Settings and Lists intact when pfBlockerNG is Disabled or After pfBlockerNG Re-Install/De-Install + + + Reload Existing Lists + pfb_reuse + checkbox + 'ONE-TIME' Reload of Existing Blocklists without Downloading New Lists.
+ This is useful if the Lists become out of 'sync' or Reputation changes were made.

+ When Lists are removed, Reputation changes or Countries Enabled/Disabled, a 'Reload' should be executed.

+ After 'Enabling' this option, Hit 'SAVE' and perform a 'Manual Update' or wait for the Next CRON Job.]]> + + + + Global Enable Logging + enable_log + checkbox + Enable Global Logging to Status: System Logs: FIREWALL ( Log ). This overrides any Log Settings in the Alias Tabs. + + + Disable MaxMind Country Database CRON Updates + database_cc + checkbox + + This does not affect the MaxMind Binary Cron Task]]> + + + + Logfile Size + log_maxlines + 20000
+ Select number of Lines to Keep in Log File]]> + select + + + + + + + + + + + + listtopic + + + Inbound Interface(s) + inbound_interface + WAN
Select the interface(s) you want to Apply Rules to]]> + interfaces_selection + loopback + + + + + - Rule Action + inbound_deny_action + Block
+ Select 'Rule Action' for Inbound Rules]]> + select + + + + + + + Outbound Interface(s) + outbound_interface + LAN or none.
Select the interface(s) you want to Apply Rules to]]> + interfaces_selection + loopback + + + + + - Rule Action + outbound_deny_action + Reject
+ Select 'Rule Action' for Outbound rules]]> + select + + + + + + + OpenVPN Interface]]> + openvpn_action + checkbox + Select to add Auto-Rules for OpenVPN. These will be added to 'Floating Rules' or OpenVPN Rules Tab. + + + Floating Rules]]> + enable_float + checkbox + Enabled:  Auto-Rules will be generated in the 'Floating Rules' Tab

+ Disabled: Auto-Rules will be generated in the Selected Inbound/Outbound Interfaces

+ Rules will be ordered by the selection below.]]> + + + Rule Order]]> + pass_order + Default Order: | pfB_Block/Reject | All other Rules | (original format)

+ Select The 'Order' of the Rules
+ Selecting 'original format', sets pfBlockerNG rules at the top of the Firewall TAB.
+ Selecting any other 'Order' will re-order all the Rules to the format indicated!]]> + select + + + + + + + + + Auto Rule Suffix]]> + autorule_suffix + auto rule
+ Select 'Auto Rule' Description Suffix for Auto Defined rules. pfBlockerNG Must be Disabled to Modify Suffix]]> + select + + + + + + + + + listtopic + + + Credits + credits + info + + pfBlockerNG Created in 2014 by BBcan177. +

Based upon pfBlocker by Marcello Coutinho and Tom Schaefer.
+ Country Database GeoLite distributed under the Creative Commons Attribution-ShareAlike 3.0 Unported License by: + MaxMind Inc. @ MaxMind.com. + The Database is Automatically Updated the First Tuesday of Each Month]]> + + + pfBlocker Validation Check + pfblocker_cb + checkbox + Disable pfBlockerNG if the pfBlocker package is Enabled. Click to Disable this validation check. + + + Gold Membership + info + Gold Membership
or support the developer @ BBCan177@gmail.com]]> + + + Click to SAVE Settings and/or Rule Edits.       Changes are Applied via CRON or + 'Manual Update']]> + listtopic + + + + pfblockerng_php_install_command(); + + + pfblockerng_php_deinstall_command(); + + + pfblockerng_validate_input($_POST, $input_errors); + + + global $pfb; + $pfb['save'] = TRUE; + sync_package_pfblockerng(); + + \ No newline at end of file -- cgit v1.2.3 From 2b9a6c889f8579dfcbecd0d5c1f4f5185271a917 Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Mon, 8 Dec 2014 00:00:17 -0500 Subject: Remove "Reload" Option from the General Tab "Force Reload" will be added to the "Update" TAB. --- config/pfblockerng/pfblockerng.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'config/pfblockerng/pfblockerng.xml') diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml index eb1d96f1..469cb1fc 100644 --- a/config/pfblockerng/pfblockerng.xml +++ b/config/pfblockerng/pfblockerng.xml @@ -378,16 +378,6 @@ checkbox Keep Settings and Lists intact when pfBlockerNG is Disabled or After pfBlockerNG Re-Install/De-Install - - Reload Existing Lists - pfb_reuse - checkbox - 'ONE-TIME' Reload of Existing Blocklists without Downloading New Lists.
- This is useful if the Lists become out of 'sync' or Reputation changes were made.

- When Lists are removed, Reputation changes or Countries Enabled/Disabled, a 'Reload' should be executed.

- After 'Enabling' this option, Hit 'SAVE' and perform a 'Manual Update' or wait for the Next CRON Job.]]> - - Global Enable Logging enable_log @@ -530,7 +520,7 @@ Click to SAVE Settings and/or Rule Edits.       Changes are Applied via CRON or - 'Manual Update']]> + 'Force Update']]> listtopic -- cgit v1.2.3 From 40438c8ba1f7348d840e807e1c8446f5e8bf5561 Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Tue, 9 Dec 2014 21:56:52 -0500 Subject: XHTML mods All
to
Widget Added alt="" to img tags Closed any open tags > to /> --- config/pfblockerng/pfblockerng.xml | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'config/pfblockerng/pfblockerng.xml') diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml index 469cb1fc..996ed3b6 100644 --- a/config/pfblockerng/pfblockerng.xml +++ b/config/pfblockerng/pfblockerng.xml @@ -272,13 +272,13 @@ Enable pfBlockerNG]]> enable_cb checkbox - + If "Keep Settings" is not "enabled" on pkg Install/De-Install, all Settings will be Wiped!]]> CRON MIN Start Time pfb_min - : 00
+ : 00
Select Cron Update Minute ]]> select @@ -291,7 +291,7 @@ CRON Base Hour Start Time pfb_hour - 1
+ 1
Select Cron Base Start Hour ]]> select @@ -324,8 +324,8 @@ 'Daily/Weekly' Start Hour pfb_dailystart - 1
- Select 'Daily' Schedule Start Hour
+ 1
+ Select 'Daily' Schedule Start Hour
This is used for the 'Daily/Weekly' Scheduler Only.]]> select @@ -365,10 +365,10 @@ Enable Suppression suppression checkbox - - Country Blocking Lists cannot be Suppressed.
- This will also remove RFC1918 addresses, 0.0.0.0 and 127.0.0.1 from all Lists.

- Alerts can be Suppressed using the '+' icon in the Alerts Tab and IPs added to the 'pfBlockerNGSuppress' Alias
+ + Country Blocking Lists cannot be Suppressed.
+ This will also remove any RFC1918 addresses from all Lists.

+ Alerts can be Suppressed using the '+' icon in the Alerts Tab and IPs added to the 'pfBlockerNGSuppress' Alias
A Blocked IP in a CIDR other than /24 will need to be Suppressed by an 'Permit Outbound' Firewall Rule]]> @@ -388,14 +388,14 @@ Disable MaxMind Country Database CRON Updates database_cc checkbox - + This does not affect the MaxMind Binary Cron Task]]> Logfile Size log_maxlines - 20000
+ 20000
Select number of Lines to Keep in Log File]]> select @@ -414,7 +414,7 @@ Inbound Interface(s) inbound_interface - WAN
Select the interface(s) you want to Apply Rules to]]> + WAN
Select the interface(s) you want to Apply Rules to]]> interfaces_selection loopback @@ -423,7 +423,7 @@ - Rule Action inbound_deny_action - Block
+ Block
Select 'Rule Action' for Inbound Rules]]> select @@ -434,7 +434,7 @@ Outbound Interface(s) outbound_interface - LAN or none.
Select the interface(s) you want to Apply Rules to]]> + LAN or none.
Select the interface(s) you want to Apply Rules to]]> interfaces_selection loopback @@ -443,7 +443,7 @@ - Rule Action outbound_deny_action - Reject
+ Reject
Select 'Rule Action' for Outbound rules]]> select @@ -461,16 +461,16 @@ Floating Rules]]> enable_float checkbox - Enabled:  Auto-Rules will be generated in the 'Floating Rules' Tab

- Disabled: Auto-Rules will be generated in the Selected Inbound/Outbound Interfaces

+ Enabled:  Auto-Rules will be generated in the 'Floating Rules' Tab

+ Disabled: Auto-Rules will be generated in the Selected Inbound/Outbound Interfaces

Rules will be ordered by the selection below.]]> Rule Order]]> pass_order - Default Order: | pfB_Block/Reject | All other Rules | (original format)

- Select The 'Order' of the Rules
- Selecting 'original format', sets pfBlockerNG rules at the top of the Firewall TAB.
+ Default Order: | pfB_Block/Reject | All other Rules | (original format)

+ Select The 'Order' of the Rules
+ Selecting 'original format', sets pfBlockerNG rules at the top of the Firewall TAB.
Selecting any other 'Order' will re-order all the Rules to the format indicated!]]> select @@ -483,7 +483,7 @@ Auto Rule Suffix]]> autorule_suffix - auto rule
+ auto rule
Select 'Auto Rule' Description Suffix for Auto Defined rules. pfBlockerNG Must be Disabled to Modify Suffix]]> select @@ -502,7 +502,7 @@ info pfBlockerNG Created in 2014 by BBcan177. -

Based upon pfBlocker by Marcello Coutinho and Tom Schaefer.
+

Based upon pfBlocker by Marcello Coutinho and Tom Schaefer.
Country Database GeoLite distributed under the Creative Commons Attribution-ShareAlike 3.0 Unported License by: MaxMind Inc. @ MaxMind.com. The Database is Automatically Updated the First Tuesday of Each Month]]> @@ -516,7 +516,7 @@ Gold Membership info - Gold Membership
or support the developer @ BBCan177@gmail.com]]> + Gold Membership
or support the developer @ BBCan177@gmail.com]]> Click to SAVE Settings and/or Rule Edits.       Changes are Applied via CRON or -- cgit v1.2.3 From 836f1eeb5010902f3bc9d15812afd6330180409d Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Thu, 18 Dec 2014 17:09:00 -0500 Subject: Mods to inc file. Add extra spaces to improve text clarity. --- config/pfblockerng/pfblockerng.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/pfblockerng/pfblockerng.xml') diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml index 996ed3b6..a8517a30 100644 --- a/config/pfblockerng/pfblockerng.xml +++ b/config/pfblockerng/pfblockerng.xml @@ -470,8 +470,8 @@ pass_order Default Order: | pfB_Block/Reject | All other Rules | (original format)

Select The 'Order' of the Rules
- Selecting 'original format', sets pfBlockerNG rules at the top of the Firewall TAB.
- Selecting any other 'Order' will re-order all the Rules to the format indicated!]]> +   Selecting 'original format', sets pfBlockerNG rules at the top of the Firewall TAB.
+   Selecting any other 'Order' will re-order all the Rules to the format indicated!]]> select -- cgit v1.2.3