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

Make firewall convert scripts more robust.

Browse Source 
The converter scripts procude a lot of error, when they get executed on a system with
a previously installed version of the New Firewall or they get run twice.

In this case the scripts will detect that their input files are missing and will exit with
an error message. The scripts now also check if the input files are empty (no corresponding
rules created) and will exit with an nothing to do message.
This commit is contained in:
Stefan Schantl
2014-01-18 18:11:09 +01:00
parent 0053269b90
commit 37c84696a2
4 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/firewall/convert-dmz
View File

@@ -55,6 +55,15 @@ my $field29 = 'ALL';
my $field30 = '';
my $field31 = 'dnat';
if (! -e "$dmzconfig") {
print "DMZ config file not found. Exiting!\n";
exit(1);
}
if (! -s "$dmzconfig") {
print "Empty DMZ configuration file. Nothing to do. Exiting...\n";
exit(0);
}
open(FILE, $dmzconfig) or die 'Unable to open config file.';
my @current = <FILE>;

28
config/firewall/convert-outgoingfw
View File

@@ -48,8 +48,8 @@ my $ccdconfig = "${General::swroot}/ovpn/ccd.conf";
my $fwdfwconfig = "${General::swroot}/firewall/config";
my $outfwconfig = "${General::swroot}/firewall/outgoing";
my $fwdfwsettings = "${General::swroot}/firewall/settings";
my @ipgroups = qx(ls $ipgrouppath);
my @macgroups = qx(ls $macgrouppath);
my @ipgroups = qx(ls $ipgrouppath 2>/dev/null);
my @macgroups = qx(ls $macgrouppath 2>/dev/null);
my @hostarray=();
my %outsettings=();
my %hosts=();
@@ -65,16 +65,36 @@ my %ownnet=();
my %ovpnSettings = ();
my @active= ('Aktiv', 'aktiv', 'Active', 'Activo', 'Actif', 'Actief', 'Aktywne', 'Активен', 'Aktif');
&General::readhash("${General::swroot}/ovpn/settings", \%ovpnSettings);
&General::readhash($outfwsettings,\%outsettings);
&General::readhash("${General::swroot}/ethernet/settings", \%ownnet);
if (-e "$outfwsettings") {
&General::readhash($outfwsettings,\%outsettings);
}
else
{
print "Config file for outgoing-firewall not found. Exiting!\n";
exit(1);
}
if (! -s "$outfwsettings") {
print "Empty DMZ configuration file. Nothing to do. Exiting...\n";
exit(0);
}
#ONLY RUN if /var/ipfire/outgoing exists
if ( -d "/var/ipfire/outgoing"){
&process_groups;
&process_rules;
&process_p2p;
}
else
{
print "/var/ipfire/outgoing not found. Exiting!\n";
exit 1
}
system("/usr/local/bin/firewallctrl");
sub process_groups
{
if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}
@@ -111,7 +131,7 @@ sub process_groups
foreach my $group (@macgroups){
chomp $group;
print LOG "\nProcessing MAC-GROUP: $group...\n";
open (DATEI, "<$macgrouppath/$group");
open (DATEI, "<$macgrouppath/$group") or die 'Unable to open config file.';
my @zeilen = <DATEI>;
foreach my $mac (@zeilen){
chomp($mac);

11
config/firewall/convert-portfw
View File

@@ -36,6 +36,17 @@ my ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$rem
my ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1);
my $count=0;
my $jump;
if (! -e "$portfwconfig") {
print "Config file for portforward not found. Exiting!\n";
exit(1);
}
if (! -s "$portfwconfig") {
print "Empty portforward configuration file. Nothing to do. Exiting...\n";
exit(0);
}
if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}
open(FILE, $portfwconfig) or die 'Unable to open config file.';
my @current = <FILE>;

11
config/firewall/convert-xtaccess
View File

@@ -49,6 +49,17 @@ my $field28 = '';
my $field29 = 'ALL';
my $field30 = '';
my $field31 = 'dnat';
if (! -e "$xtaccessconfig") {
print "Config file for external access not found. Exiting!\n";
exit(1);
}
if (! -s "$xtaccessconfig") {
print "Empty external access configuration file. Nothing to do. Exiting...\n";
exit(0);
}
open(FILE, $xtaccessconfig) or die 'Unable to open config file.';
my @current = <FILE>;
close(FILE);