From 7bd9d462de4035d508b108ab0bedc3fda87e1326 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Wed, 30 Jan 2013 06:22:59 +0100 Subject: [PATCH] Forward Firewall: Deleted MODE0 from WEB Interface and added a table for DMZ-Rules. --- html/cgi-bin/forwardfw.cgi | 48 ++++++++++++++++++-------------------- lfs/configroot | 2 +- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi index 4fc74aab7..8f6ca585e 100755 --- a/html/cgi-bin/forwardfw.cgi +++ b/html/cgi-bin/forwardfw.cgi @@ -303,13 +303,15 @@ if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'reset'}) &checkcounter($configinputfw{$key}[5],$configinputfw{$key}[6],,); &checkcounter($configinputfw{$key}[14],$configinputfw{$key}[15],,); } - $fwdfwsettings{'POLICY'}='MODE0'; + system("rm ${General::swroot}/forward/config"); system("rm ${General::swroot}/forward/input"); &General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings); unless (-e "${General::swroot}/forward/config") { system("touch ${General::swroot}/forward/config"); } unless (-e "${General::swroot}/forward/input") { system("touch ${General::swroot}/forward/input"); } %fwdfwsettings = (); + $fwdfwsettings{'POLICY'}='MODE2'; + &General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings); &reread_rules; } @@ -517,39 +519,23 @@ sub dec_counter } sub base { - if ($fwdfwsettings{'POLICY'} eq 'MODE0'){ $selected{'POLICY'}{'MODE0'} = 'selected'; } else { $selected{'POLICY'}{'MODE0'} = ''; } if ($fwdfwsettings{'POLICY'} eq 'MODE1'){ $selected{'POLICY'}{'MODE1'} = 'selected'; } else { $selected{'POLICY'}{'MODE1'} = ''; } if ($fwdfwsettings{'POLICY'} eq 'MODE2'){ $selected{'POLICY'}{'MODE2'} = 'selected'; } else { $selected{'POLICY'}{'MODE2'} = ''; } - &hint; - if ($fwdfwsettings{'POLICY'} ne 'MODE0' && $fwdfwsettings{'POLICY'} ne '') { - &addrule; - } - - #print""; - #foreach (0 .. 40){ - #my $i="color".$_; - #print""; - #} - #print"
$_
"; - if ($fwdfwsettings{'POLICY'} eq 'MODE1' || $fwdfwsettings{'POLICY'} eq 'MODE2' ) { - &p2pblock; - } + &addrule; + &p2pblock; &Header::openbox('100%', 'center', 'Policy'); print < - -
$Lang::tr{'mode'} 0:$Lang::tr{'outgoing firewall mode0'}
$Lang::tr{'mode'} 1:$Lang::tr{'outgoing firewall mode1'}
$Lang::tr{'mode'} 2:$Lang::tr{'outgoing firewall mode2'}
+
END - if ($fwdfwsettings{'POLICY'} ne 'MODE0'&& $fwdfwsettings{'POLICY'} ne '' ) { - print "$Lang::tr{'outgoing firewall reset'}: "; - } + print "$Lang::tr{'outgoing firewall reset'}: "; print "
"; &Header::closebox(); } @@ -1731,7 +1717,9 @@ sub get_serviceports } sub viewtablerule { + &viewtablenew(\%configfwdfw,$configfwdfw,$Lang::tr{'fwdfw rules'},"Forward" ); + &viewtablenew(\%configfwdfw,$configfwdfw,'',"DMZ" ); &viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'external access'} ); } sub viewtablenew @@ -1740,8 +1728,17 @@ sub viewtablenew my $config=shift; my $title=shift; my $title1=shift; - - if ( ! -z "$config"){ + my $go=''; + &General::readhasharray("$config", $hash); + #check if there are DMZ entries + if ($title1 eq 'DMZ'){ + foreach my $key (keys %$hash){ + if ($$hash{$key}[4] eq 'ORANGE' || $$hash{$key}[6] eq 'ORANGE'){$go='on';} + } + }elsif( ! -z "$config" ){ + $go='on'; + } + if($go ne ''){ &Header::openbox('100%', 'left',$title); my $count=0; my ($gif,$log); @@ -1750,11 +1747,13 @@ sub viewtablenew my $tooltip; my @tmpsrc=(); my $coloryellow=''; - &General::readhasharray("$config", $hash); print"$title1
"; print""; print""; foreach my $key (sort {$a <=> $b} keys %$hash){ + #check if we have a FORWARDFW OR DMZ RULE + if ($title1 eq 'DMZ' && ($$hash{$key}[4] ne 'ORANGE' && $$hash{$key}[6] ne 'ORANGE')){next;} + if ($title1 eq 'Forward' && ($$hash{$key}[4] eq 'ORANGE' || $$hash{$key}[6] eq 'ORANGE')){next;} @tmpsrc=(); #check if vpn hosts/nets have been deleted if($$hash{$key}[3] =~ /ipsec/i || $$hash{$key}[3] =~ /ovpn/i){ @@ -1843,7 +1842,6 @@ END END - print< END diff --git a/lfs/configroot b/lfs/configroot index 4c039977b..88fa9f2f8 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -118,7 +118,7 @@ $(TARGET) : echo "DROPFORWARD=on" >> $(CONFIG_ROOT)/optionsfw/settings echo "FWPOLICY=DROP" >> $(CONFIG_ROOT)/optionsfw/settings echo "DROPPORTSCAN=on" >> $(CONFIG_ROOT)/optionsfw/settings - echo "POLICY=MODE0" >> $(CONFIG_ROOT)/forward/settings + echo "POLICY=MODE2" >> $(CONFIG_ROOT)/forward/settings # set rules.pl executable chmod 755 $(CONFIG_ROOT)/forward/bin/rules.pl
#$Lang::tr{'fwdfw source'}Log$Lang::tr{'fwdfw target'}$Lang::tr{'protocol'}$Lang::tr{'remark'}$Lang::tr{'fwdfw action'}