{
&error;
- &Header::openbox('100%', 'left', $Lang::tr{'fwdfw menu'});
+ &Header::openbox('100%', 'left', "");
print <<END;
<form method="POST" action="">
<table border='0' width="100%">
<tr>
- <td>
+ <td align='center'>
<input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'>
- </td>
- <td align="right">
END
if (&General::firewall_needs_reload()) {
</table>
</form>
- <hr>
+ <br>
END
+
&Header::closebox();
&viewtablerule;
}
}elsif ($val eq 'IPFire' ){
$tdcolor="style='background-color: $Header::colourred;color:white;'";
return;
+ }elsif ($val eq 'OpenVPN-Dyn' ){
+ $tdcolor="style='background-color: $Header::colourovpn;color:white;'";
+ return;
+ }elsif ($val eq 'IPsec RW' ){
+ $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
+ return;
}elsif($val =~ /^(.*?)\/(.*?)$/){
my ($sip,$scidr) = split ("/",$val);
if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
&gen_dd_block('src','grp1');
print"<hr>";
&Header::closebox();
+
#---SNAT / DNAT ------------------------------------------------
&Header::openbox('100%', 'left', 'NAT');
print<<END;
<div class="NAT">
<table width='100%' border='0'>
<tr>
- <td colspan='2'></td>
- <td width='1%'>
- <input type='radio' name='nat' id='dnat' value='dnat' checked>
+ <td width='5%'></td>
+ <td width='40%'>
+ <label>
+ <input type='radio' name='nat' id='dnat' value='dnat' checked>
+ $Lang::tr{'fwdfw dnat'}
+ </label>
+ </td>
+END
+
+ if (%aliases) {
+ print <<END;
+ <td width='25%' align='right'>$Lang::tr{'dnat address'}:</td>
+ <td width='30%'>
+ <select name='dnat' style='width: 100%;'>
+ <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'} ($netsettings{'RED_ADDRESS'})</option>
+END
+ foreach my $alias (sort keys %aliases) {
+ print "<option value='$alias' $selected{'dnat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
+ }
+
+ print "</select>";
+ } else {
+ print <<END;
+ <td colspan="2" width='55%'>
+ <input type='hidden' name='dnat' value='Default IP'>
</td>
- <td width='50%'>$Lang::tr{'fwdfw dnat'}</td>
END
- print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='dnat' style='width:140px;'>";
- print "<option value='ALL' $selected{'dnat'}{$Lang::tr{'all'}}>$Lang::tr{'all'}</option>";
- print "<option value='Default IP' $selected{'dnat'}{'Default IP'}>Default IP</option>";
- foreach my $alias (sort keys %aliases)
- {
- print "<option value='$alias' $selected{'dnat'}{$alias}>$alias</option>";
}
- print"</select></td></tr>";
+ print "</tr>";
+
#SNAT
- print"<tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}></td><td width='20%'>$Lang::tr{'fwdfw snat'}</td>";
- print"<td width='8%'>Firewall: </td><td width='20%' align='right'><select name='snat' style='width:140px;'>";
- foreach my $alias (sort keys %aliases)
- {
- print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>";
- }
- foreach my $network (sort keys %defaultNetworks)
- {
+ print <<END;
+ <tr>
+ <td width='5%'></td>
+ <td width='40%'>
+ <label>
+ <input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}>
+ $Lang::tr{'fwdfw snat'}
+ </label>
+ </td>
+ <td width='25%' align='right'>$Lang::tr{'snat new source ip address'}:</td>
+ <td width='30%'>
+ <select name='snat' style='width: 100%;'>
+END
+
+ foreach my $alias (sort keys %aliases) {
+ print "<option value='$alias' $selected{'snat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
+ }
+
+ # XXX this is composed in a very ugly fashion
+ foreach my $network (sort keys %defaultNetworks) {
next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
next if($defaultNetworks{$network}{'NAME'} eq "ALL");
next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
+ next if($defaultNetworks{$network}{'NAME'} =~ /IPsec/i);
+
print "<option value='$defaultNetworks{$network}{'NAME'}'";
print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
- print ">$network</option>";
+ print ">$network ($defaultNetworks{$network}{'NET'})</option>";
}
- print"</select></td></tr></table>";
- print"</div>";
+
+ print <<END;
+ </select>
+ </td>
+ </tr>
+ </table>
+ </div>
+END
&Header::closebox();
+
#---TARGET------------------------------------------------------
&Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'});
print<<END;
if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;\|_()\/\s]*$/) {
return 0;}
# First character can only be a letter or a digit
- if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9]*$/) {
+ if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9(]*$/) {
return 0;}
# Last character can only be a letter or a digit
if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9.:;_)]*$/) {
return 0;}
return 1;
}
-sub viewtablerule
-{
+
+sub viewtablerule {
&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
- &viewtablenew(\%configfwdfw,$configfwdfw,"","Forward" );
- &viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} );
- &viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
+
+ &viewtablenew(\%configfwdfw, $configfwdfw, $Lang::tr{'firewall rules'});
+ &viewtablenew(\%configinputfw, $configinput, $Lang::tr{'external access'});
+ &viewtablenew(\%configoutgoingfw, $configoutgoing, $Lang::tr{'outgoing firewall'});
}
+
sub viewtablenew
{
my $hash=shift;
my $config=shift;
my $title=shift;
- my $title1=shift;
my $go='';
+
+ my $show_box = (! -z $config) || ($optionsfw{'SHOWTABLES'} eq 'on');
+ return if (!$show_box);
+
&General::get_aliases(\%aliases);
&General::readhasharray("$confighost", \%customhost);
&General::readhasharray("$config", $hash);
&General::readhasharray("$configccdnet", \%ccdnet);
&General::readhasharray("$configccdhost", \%ccdhost);
- if( ! -z $config){
- &Header::openbox('100%', 'left',$title);
+
+ &Header::openbox('100%', 'left', $title);
+ print "<table width='100%' cellspacing='0' border='0'>";
+
+ if (! -z $config) {
my $count=0;
my ($gif,$log);
my $ruletype;
my $tooltip;
my @tmpsrc=();
my $coloryellow='';
- print <<END;
- <b>$title1</b>
- <br>
- <table width='100%' cellspacing='0' border='0'>
+ print <<END;
<tr>
<th align='right' width='3%'>
#
if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire' || $$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'){
print "$ipfireiface $Lang::tr{'red1'}";
- }elsif ($$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE'|| $$hash{$key}[6] eq 'ALL')
+ }elsif ($$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE'|| $$hash{$key}[6] eq 'ALL' || $$hash{$key}[6] eq 'RED')
{
print "$ipfireiface ".&get_name($$hash{$key}[6]);
}else{
}
print"<tr bgcolor='FFFFFF'><td colspan='13' height='1'></td></tr>";
}
- print"</table>";
- #SHOW FINAL RULE
- print "<table width='100%'rules='cols' border='1'>";
- my $col;
- if ($config eq '/var/ipfire/firewall/config'){
- my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
- if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- }else{
- $col="bgcolor='green'";
- }
- &show_defaultrules($col,$pol);
- }elsif ($config eq '/var/ipfire/firewall/outgoing'){
- if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }else{
- $col="bgcolor='green'";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }
- }else{
- print"<tr><td bgcolor='darkred' width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td bgcolor='darkred' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+ } elsif ($optionsfw{'SHOWTABLES'} eq 'on') {
+ print <<END;
+ <tr>
+ <td colspan='7' height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td>
+ </tr>
+END
+ }
+
+ #SHOW FINAL RULE
+ my $policy = 'fwdfw ' . $fwdfwsettings{'POLICY'};
+ my $colour = "bgcolor='green'";
+ if ($fwdfwsettings{'POLICY'} eq 'MODE1') {
+ $colour = "bgcolor='darkred'";
+ }
+
+ my $message;
+ if (($config eq '/var/ipfire/firewall/config') && ($fwdfwsettings{'POLICY'} ne 'MODE1')) {
+ print <<END;
+ <tr>
+ <td colspan='13'> </td>
+ </tr>
+ <tr>
+ <td colspan='13'>
+ <table width="100%" border='1' rules="cols" cellspacing='0'>
+END
+
+ # GREEN
+ print <<END;
+ <tr>
+ <td align='center'>
+ <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+ </td>
+ <td align='center'>
+ <font color="$Header::colourred">$Lang::tr{'red'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+END
+
+ if (&Header::orange_used()) {
+ print <<END;
+ <td align='center'>
+ <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+END
}
- print"</table>";
- print "<hr>";
- print "<br><br>";
- &Header::closebox();
- }else{
- if ($optionsfw{'SHOWTABLES'} eq 'on'){
- print "<b>$title1</b><br>";
- print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>";
- my $col;
- if ($config eq '/var/ipfire/firewall/config'){
- my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
- if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- }else{
- $col="bgcolor='green'";
- }
- &show_defaultrules($col,$pol);
- }elsif ($config eq '/var/ipfire/firewall/outgoing'){
- print "<table width='100%' rules='cols' border='1'>";
- my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
- if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
- $col="bgcolor='darkred'";
- print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }else{
- $col="bgcolor='green'";
- print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }
- }else{
- print "<table width='100%' rules='cols' border='1'>";
- print"<tr><td bgcolor='darkred' align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td align='center' bgcolor='darkred'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
- }
- print"</table><br><br>";
+
+ if (&Header::blue_used()) {
+ print <<END;
+ <td align='center'>
+ <font color="$Header::colourblue">$Lang::tr{'blue'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+END
}
- }
-}
-&Header::closebigbox();
-&Header::closepage();
-sub show_defaultrules
-{
- my $col=shift;
- my $pol=shift;
- #STANDARD RULES (From WIKI)
- print"</table>";
- if ($col eq "bgcolor='green'"){
- print "<br><table width='100%' rules='cols' border='1' >";
- my $blue = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::blue_used());
- my $orange = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol block'})" if (&Header::orange_used());
- my $blue1 = "<font color=$Header::colourblue> $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::blue_used());
- my $orange1 = "<font color=$Header::colourorange> $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol allow'})" if (&Header::orange_used());
- print"<tr><td align='center'><font color='#000000'>$Lang::tr{'green'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
- print"<td align='center'>$orange1</td>" if (&Header::orange_used());
- print"<td align='center'>$blue1</td>" if (&Header::blue_used());
print"</tr>";
- if (&Header::orange_used()){
- print"<tr><td align='center' width='20%'><font color='#000000'>$Lang::tr{'orange'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
- print"<td align='center'>$blue</td>" if (&Header::blue_used());
+
+ # ORANGE
+ if (&Header::orange_used()) {
+ print <<END;
+ <tr>
+ <td align='center' width='20%'>
+ <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+ </td>
+ <td align='center'>
+ <font color="$Header::colourred">$Lang::tr{'red'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+ <td align='center'>
+ <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+ ($Lang::tr{'fwdfw pol block'})
+ </td>
+END
+
+ if (&Header::blue_used()) {
+ print <<END;
+ <td align='center'>
+ <font color="$Header::colourblue">$Lang::tr{'blue'}</font>
+ ($Lang::tr{'fwdfw pol block'})
+ </td>
+END
+ }
+
print"</tr>";
}
- if (&Header::blue_used()){
- print"<tr><td align='center'><font color='#000000'>$Lang::tr{'blue'}</td><td align='center'> <font color=$Header::colourred> $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td>";
- print"<td align='center'>$orange</td>" if (&Header::orange_used());
- print"<td align='center'><font color=$Header::colourgreen> $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td>";
+
+ if (&Header::blue_used()) {
+ print <<END;
+ <tr>
+ <td align='center'>
+ <font color="$Header::colourblue">$Lang::tr{'blue'}</font>
+ </td>
+ <td align='center'>
+ <font color="$Header::colourred">$Lang::tr{'red'}</font>
+ ($Lang::tr{'fwdfw pol allow'})
+ </td>
+END
+
+ if (&Header::orange_used()) {
+ print <<END;
+ <td align='center'>
+ <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
+ ($Lang::tr{'fwdfw pol block'})
+ </td>
+ <td align='center'>
+ <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
+ ($Lang::tr{'fwdfw pol block'})
+ </td>
+END
+ }
+
print"</tr>";
}
- print"<tr><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'} </font></td><td $col colspan='3' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
- }elsif($col eq "bgcolor='darkred'"){
- print "<table width='100%' rules='cols' border='1' >";
- print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol block'}</font></td></tr>";
+
+ print <<END;
+ </table>
+ </td>
+ </tr>
+END
+
+ $message = $Lang::tr{'fwdfw pol allow'};
+
+ } elsif ($config eq '/var/ipfire/firewall/outgoing') {
+ $message = $Lang::tr{'fwdfw pol allow'};
+
+ } else {
+ $message = $Lang::tr{'fwdfw pol block'};
+ $colour = "bgcolor='darkred'";
}
+
+ if ($message) {
+ print <<END;
+ <tr>
+ <td $colour align='center' colspan='13'>
+ <font color='#FFFFFF'>$Lang::tr{'policy'}: $message</font>
+ </td>
+ </tr>
+END
+ }
+
+ print "</table>";
+ print "<br>";
+
+ &Header::closebox();
}
+
+&Header::closebigbox();
+&Header::closepage();
projects / people / teissler / ipfire-2.x.git / blobdiff