webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

firewall/rules.pl: Make geoipsettings hash and locations array

Browse Source 
script-wide available.

This allows to re-use them.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2019-12-08 18:47:08 +01:00
parent 9b2594d8e6
commit f5ad4246de
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
config/firewall/rules.pl
View File

@@ -55,6 +55,10 @@ my %customgrp=();
my %configinputfw=();
my %configoutgoingfw=();
my %confignatfw=();
my %geoipsettings = (
"GEOIPBLOCK_ENABLED" => "off"
);
my @p2ps=();
my $configfwdfw = "${General::swroot}/firewall/config";
@@ -73,6 +77,15 @@ my $netsettings = "${General::swroot}/ethernet/settings";
&General::readhasharray($configoutgoing, \%configoutgoingfw);
&General::readhasharray($configgrp, \%customgrp);
# Check if the geoip settings file exists
if (-e "$geoipfile") {
# Read settings file
&General::readhash("$geoipfile", \%geoipsettings);
}
# Get all GeoIP locations.
my @locations = &fwlib::get_geoip_locations();
my @log_limit_options = &make_log_limit_options();
my $POLICY_INPUT_ALLOWED = 0;
@@ -583,27 +596,15 @@ sub p2pblock {
}
sub geoipblock {
my %geoipsettings = ();
$geoipsettings{'GEOIPBLOCK_ENABLED'} = "off";
# Flush iptables chain.
run("$IPTABLES -F GEOIPBLOCK");
# Check if the geoip settings file exists
if (-e "$geoipfile") {
# Read settings file
&General::readhash("$geoipfile", \%geoipsettings);
}
# If geoip blocking is not enabled, we are finished here.
if ($geoipsettings{'GEOIPBLOCK_ENABLED'} ne "on") {
# Exit submodule. Process remaining script.
return;
}
# Get supported locations.
my @locations = &fwlib::get_geoip_locations();
# Loop through all supported geoip locations and
# create iptables rules, if blocking this country
# is enabled.