webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forward Firewall: Bugfix of last commit. Added "Interface" to source or target that uses "Firewall" interfaces

Browse Source
This commit is contained in:
Alexander Marx
2013-07-02 08:21:38 +02:00
committed by Michael Tremer
parent d4cb89d2d1
commit cb4439f394
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
html/cgi-bin/forwardfw.cgi
View File

@@ -134,7 +134,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
} }
#check if we try to break rules #check if we try to break rules
if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){ if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){
$errormessage.=$Lang::tr{'fwdfw err same'}; $errormessage=$Lang::tr{'fwdfw err same'};
} }
#INPUT part #INPUT part
if($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){ if($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){
@@ -772,7 +772,7 @@ sub checkrule
} }
#check if source and target identical #check if source and target identical
if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ALL'){ if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ALL'){
$errormessage.=$Lang::tr{'fwdfw err same'}; $errormessage=$Lang::tr{'fwdfw err same'};
return $errormessage; return $errormessage;
} }
#get source and targetip address if possible #get source and targetip address if possible
@@ -2267,11 +2267,13 @@ END
$ipfireiface='Interface'; $ipfireiface='Interface';
} }
if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire' && $$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1' || $$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE' ){ if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire' && $$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1' || $$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE' ){
if ($$hash{$key}[6] eq 'RED1') if ($$hash{$key}[6] eq 'RED1'){
{
print "$ipfireiface $Lang::tr{'red1'}"; print "$ipfireiface $Lang::tr{'red1'}";
}elsif ($$hash{$key}[6] ne 'RED')
{
print "$ipfireiface $$hash{$key}[6]";
}else{ }else{
print &get_name($$hash{$key}[6]); print "$$hash{$key}[6]";
} }
}elsif ($$hash{$key}[5] eq 'tgt_addr'){ }elsif ($$hash{$key}[5] eq 'tgt_addr'){
my ($split1,$split2) = split("/",$$hash{$key}[6]); my ($split1,$split2) = split("/",$$hash{$key}[6]);
@@ -2281,7 +2283,7 @@ END
print $$hash{$key}[6]; print $$hash{$key}[6];
} }
}else{ }else{
print "$ipfireiface $$hash{$key}[6]"; print "$$hash{$key}[6]";
} }
$tdcolor=''; $tdcolor='';
#TARGETPORT #TARGETPORT

2
langs/en/cgi-bin/en.pl
View File

@@ -996,7 +996,7 @@
'fwdfw wd_fri' => 'Fri', 'fwdfw wd_fri' => 'Fri',
'fwdfw wd_sat' => 'Sat', 'fwdfw wd_sat' => 'Sat',
'fwdfw wd_sun' => 'Sun', 'fwdfw wd_sun' => 'Sun',
'fwdfw xt access' => 'Access to firewall', 'fwdfw xt access' => 'Input',
'fwhost addgrp' => 'Add Network / Host Group:', 'fwhost addgrp' => 'Add Network / Host Group:',
'fwhost addgrpname' => 'Groupname:', 'fwhost addgrpname' => 'Groupname:',
'fwhost addhost' => 'Add Host:', 'fwhost addhost' => 'Add Host:',