use strict;
# enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
my $configfile = "/var/ipfire/outgoing/rules";
my $p2pfile = "/var/ipfire/outgoing/p2protocols";
-my $servicefile = "/var/ipfire/outgoing/defaultservices"
+my $servicefile = "/var/ipfire/outgoing/defaultservices";
+
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
$outfwsettings{'POLICY'}='MODE0';
unlink $configfile;
system("/usr/bin/touch $configfile");
+ my $MODE = $outfwsettings{'POLICY'};
+ %outfwsettings = ();
+ $outfwsettings{'POLICY'} = "$MODE";
&General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings);
}
if ($outfwsettings{'ACTION'} eq $Lang::tr{'save'})
{
+ my $MODE = $outfwsettings{'POLICY'};
+ %outfwsettings = ();
+ $outfwsettings{'POLICY'} = "$MODE";
&General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings);
+ system("/usr/local/bin/outgoingfwctrl");
}
if ($outfwsettings{'ACTION'} eq 'enable')
{
}
}
close FILE;
+ system("/usr/local/bin/outgoingfwctrl");
}
if ($outfwsettings{'ACTION'} eq 'disable')
{
}
}
close FILE;
+ system("/usr/local/bin/outgoingfwctrl");
}
if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
{
($configline[4] eq $outfwsettings{'NAME'}) &&
($configline[5] eq $outfwsettings{'SIP'}) &&
($configline[6] eq $outfwsettings{'SMAC'}) &&
- ($configline[7] eq $outfwsettings{'DIP'}) &&
+ ($configline[7] eq $outfwsettings{'DIP'}) &&
+ ($configline[9] eq $outfwsettings{'LOG'}) &&
($configline[8] eq $outfwsettings{'DPORT'}))
{
print FILE $configentry;
close FILE;
$selected{'SNET'}{"$outfwsettings{'SNET'}"} = 'selected';
$selected{'PROT'}{"$outfwsettings{'PROT'}"} = 'selected';
+ $selected{'LOG'}{"$outfwsettings{'LOG'}"} = 'selected';
&addrule();
&Header::closebigbox();
&Header::closepage();
- exit
+ exit
+ system("/usr/local/bin/outgoingfwctrl");
}
if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
{
($configline[5] eq $outfwsettings{'SIP'}) &&
($configline[6] eq $outfwsettings{'SMAC'}) &&
($configline[7] eq $outfwsettings{'DIP'}) &&
+ ($configline[9] eq $outfwsettings{'LOG'}) &&
($configline[8] eq $outfwsettings{'DPORT'}))
{
print FILE $configentry;
}
}
close FILE;
+ system("/usr/local/bin/outgoingfwctrl");
}
if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'})
{
if ( $outfwsettings{'VALID'} eq 'yes' ) {
open( FILE, ">> $configfile" ) or die "Unable to write $configfile";
print FILE <<END
-$outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};
+$outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};
END
;
close FILE;
+ system("/usr/local/bin/outgoingfwctrl");
} else {
$outfwsettings{'ACTION'} = 'Add rule';
}
print <<END
<hr />
<table border='0' width='100%' cellspacing='0'>
- <tr bgcolor='white'>
- <td width='14%'><b>Protokoll</b>
- <td width='14%'><b>Netzwerk</b>
- <td width='14%'><b>Ziel</b>
- <td width='14%'><b>Anmerkung</b>
- <td width='14%'><b>Politik</b>
- <td width='30%'><b>Aktionen</b>
+ <tr bgcolor='$color{'color22'}'>
+ <td width='14%' align='center'><b>Protokoll</b>
+ <td width='14%' align='center'><b>Netzwerk</b>
+ <td width='14%' align='center'><b>Ziel</b>
+ <td width='14%' align='center'><b>Anmerkung</b>
+ <td width='14%' align='center'><b>Politik</b>
+ <td width='16%' align='center'><b>Logging</b>
+ <td width='14%' align='center'><b>Aktionen</b>
END
;
foreach $configentry (sort @configs)
$outfwsettings{'SMAC'} = $configline[6];
$outfwsettings{'DIP'} = $configline[7];
$outfwsettings{'DPORT'} = $configline[8];
+ $outfwsettings{'LOG'} = $configline[9];
if ($outfwsettings{'DIP'} eq ''){ $outfwsettings{'DISPLAY_DIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_DIP'} = $outfwsettings{'DIP'}; }
if ($outfwsettings{'DPORT'} eq ''){ $outfwsettings{'DISPLAY_DPORT'} = 'ALL'; } else { $outfwsettings{'DISPLAY_DPORT'} = $outfwsettings{'DPORT'}; }
- if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY'>"; }
- if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW'>"; }
+ if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY' />"; }
+ if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW' />"; }
if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){
print <<END
- <tr bgcolor='#F0F0F0'>
+ <tr bgcolor='$color{'color20'}'>
<td align='center'>$outfwsettings{'PROT'}
<td align='center'>$outfwsettings{'SNET'}
<td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}
<td align='center'>$outfwsettings{'NAME'}
<td align='center'>$outfwsettings{'DISPLAY_STATE'}
- <td align='right'>
+ <td align='center'>$outfwsettings{'LOG'}
+ <td align='center'>
<table border='0' cellpadding='0' cellspacing='0'><tr>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='PROT' value=$outfwsettings{'PROT'}>
- <input type='hidden' name='STATE' value=$outfwsettings{'STATE'}>
- <input type='hidden' name='SNET' value=$outfwsettings{'SNET'}>
- <input type='hidden' name='DPORT' value=$outfwsettings{'DPORT'}>
- <input type='hidden' name='DIP' value=$outfwsettings{'DIP'}>
- <input type='hidden' name='SIP' value=$outfwsettings{'SIP'}>
- <input type='hidden' name='NAME' value=$outfwsettings{'NAME'}>
- <input type='hidden' name='SMAC' value=$outfwsettings{'SMAC'}>
- <input type='hidden' name='ENABLED' value=$outfwsettings{'ENABLED'}>
- <input type='hidden' name='ACTION' value=$Lang::tr{'edit'}>
- <input type='image' src='/images/edit.gif' width="20" height="20" alt=$Lang::tr{'edit'}>
+ <input type='hidden' name='PROT' value='$outfwsettings{'PROT'}' />
+ <input type='hidden' name='STATE' value='$outfwsettings{'STATE'}' />
+ <input type='hidden' name='SNET' value='$outfwsettings{'SNET'}' />
+ <input type='hidden' name='DPORT' value='$outfwsettings{'DPORT'}' />
+ <input type='hidden' name='DIP' value='$outfwsettings{'DIP'}' />
+ <input type='hidden' name='SIP' value='$outfwsettings{'SIP'}' />
+ <input type='hidden' name='NAME' value='$outfwsettings{'NAME'}' />
+ <input type='hidden' name='SMAC' value='$outfwsettings{'SMAC'}' />
+ <input type='hidden' name='ENABLED' value='$outfwsettings{'ENABLED'}' />
+ <input type='hidden' name='LOG' value='$outfwsettings{'LOG'}' />
+ <input type='hidden' name='ACTION' value=$Lang::tr{'edit'} />
+ <input type='image' src='/images/edit.gif' width="20" height="20" alt=$Lang::tr{'edit'} />
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='PROT' value=$outfwsettings{'PROT'}>
- <input type='hidden' name='STATE' value=$outfwsettings{'STATE'}>
- <input type='hidden' name='SNET' value=$outfwsettings{'SNET'}>
- <input type='hidden' name='DPORT' value=$outfwsettings{'DPORT'}>
- <input type='hidden' name='DIP' value=$outfwsettings{'DIP'}>
- <input type='hidden' name='SIP' value=$outfwsettings{'SIP'}>
- <input type='hidden' name='NAME' value=$outfwsettings{'NAME'}>
- <input type='hidden' name='SMAC' value=$outfwsettings{'SMAC'}>
- <input type='hidden' name='ENABLED' value=$outfwsettings{'ENABLED'}>
- <input type='hidden' name='ACTION' value=$Lang::tr{'delete'}>
- <input type='image' src='/images/delete.gif' width="20" height="20" alt=$Lang::tr{'delete'}>
+ <input type='hidden' name='PROT' value='$outfwsettings{'PROT'}' />
+ <input type='hidden' name='STATE' value='$outfwsettings{'STATE'}' />
+ <input type='hidden' name='SNET' value='$outfwsettings{'SNET'}' />
+ <input type='hidden' name='DPORT' value='$outfwsettings{'DPORT'}' />
+ <input type='hidden' name='DIP' value='$outfwsettings{'DIP'}' />
+ <input type='hidden' name='SIP' value='$outfwsettings{'SIP'}' />
+ <input type='hidden' name='NAME' value='$outfwsettings{'NAME'}' />
+ <input type='hidden' name='SMAC' value='$outfwsettings{'SMAC'}' />
+ <input type='hidden' name='ENABLED' value='$outfwsettings{'ENABLED'}' />
+ <input type='hidden' name='LOG' value='$outfwsettings{'LOG'}' />
+ <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} />
+ <input type='image' src='/images/delete.gif' width="20" height="20" alt=$Lang::tr{'delete'} />
</form></table>
END
;
&Header::closebox();
}
-if ($outfwsettings{'POLICY'} eq 'MODE2'){
+if ($outfwsettings{'POLICY'} ne 'MODE0'){
open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
@p2ps = <FILE>;
close FILE;
&Header::openbox('100%', 'center', 'P2P-Block');
print <<END
<table width='40%'>
- <tr bgcolor='#FFFFFF'><td width='66%'><b>Protokoll</b>
- <td width='33%'><b>Status</b>
+ <tr bgcolor='$color{'color22'}'><td width='66%' align=center><b>Protokoll</b>
+ <td width='33%' align=center><b>Status</b>
END
;
my $id = 1;
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
END
;
- if ($id % 2) {
- print "\t\t\t<tr bgcolor='#F0F0F0'>\n";
- }
- else {
- print "\t\t\t<tr bgcolor='#FAFAFA'>\n";
- }
- $id++;
- print <<END
+ print "\t\t\t<tr bgcolor='$color{'color20'}'>\n";
+ print <<END
<td width='66%' align='center'>$p2pline[0]:
- <td width='33%' align='center'><input type='hidden' name='P2PROT' value=$p2pline[1]>
+ <td width='33%' align='center'><input type='hidden' name='P2PROT' value='$p2pline[1]' />
END
;
if ($p2pline[2] eq 'on') {
print <<END
- <input type='hidden' name='ACTION' value='disable'>
- <input type='image' name='submit' src='/images/stock_ok.png' alt=''>
+ <input type='hidden' name='ACTION' value='disable' />
+ <input type='image' name='submit' src='/images/stock_ok.png' alt='' />
END
;
} else {
print <<END
- <input type='hidden' name='ACTION' value='enable'>
- <input type='image' name='submit' src='/images/stock_stop.png' alt=''>
+ <input type='hidden' name='ACTION' value='enable' />
+ <input type='image' name='submit' src='/images/stock_stop.png' alt='' />
END
;
}
;
}
print <<END
- <tr><td colspan='2' align='center'>Klicken Sie auf die Symbole um das entsprechende P2P-Netz zu (de-)aktivieren.
</table>
+ <br />Klicken Sie auf die Symbole um das entsprechende iptables P2P-Blockmodul zu (de-)aktivieren.
END
;
&Header::closebox();
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
- <tr><td width='10%' align='right'><b>Modus 0:</b><td width='90%' align='left' colspan='2'>In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.
- <tr><td width='10%' align='right'><b>Modus 1:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.
- <tr><td width='10%' align='right'><b>Modus 2:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.<br />Hier ist eine Besonderheit der P2P-Filter.
- <tr><td colspan='3'><hr />
- <tr><td width='10%' align='right'> <select name='POLICY'><option value='MODE0' $selected{'POLICY'}{'MODE0'}>Modus 0</option><option value='MODE1' $selected{'POLICY'}{'MODE1'}>Modus 1</option><option value='MODE2' $selected{'POLICY'}{'MODE2'}>Modus 2</option></select>
+ <tr><td width='10%' align='left'><b>Modus 0:</b><td width='90%' align='left' colspan='2'>In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.</td></tr>
+ <tr><td width='10%' align='left'><b>Modus 1:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.</td></tr>
+ <tr><td width='10%' align='left'><b>Modus 2:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.</td></tr>
+ <tr><td colspan='3'><hr /></td></tr>
+ <tr><td width='10%' align='left'> <select name='POLICY' style="width: 85px"><option value='MODE0' $selected{'POLICY'}{'MODE0'}>Modus 0</option><option value='MODE1' $selected{'POLICY'}{'MODE1'}>Modus 1</option><option value='MODE2' $selected{'POLICY'}{'MODE2'}>Modus 2</option></select>
<td width='45%' align='left'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
- <td width='45%' align='right'>
+ <td width='45%' align='left'>
END
;
if ($outfwsettings{'POLICY'} ne 'MODE0') {
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='80%'>
- <tr><td width='20%' align='right'>Anmerkung: <img src='/blob.gif'>
- <td width='30%' align='left'><input type='text' name='NAME' maxlength='30' value='$outfwsettings{'NAME'}'>
+ <tr><td width='20%' align='right'>Anmerkung: <img src='/blob.gif' />
+ <td width='30%' align='left'><input type='text' name='NAME' maxlength='30' value='$outfwsettings{'NAME'}' />
<td width='20%' align='right'>Aktiviert:
- <td width='30%' align='left'><input type='checkbox' name='ENABLED' $selected{'ENABLED'}>
+ <td width='30%' align='left'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} />
<tr><td width='20%' align='right'>Protokoll:
<td width='30%' align='left'><select name='PROT'><option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option><option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option><option value='udp' $selected{'PROT'}{'udp'}>UDP</option></select>
<td width='20%' align='right'>Sicherheitspolitik:
END
;
if ($outfwsettings{'POLICY'} eq 'MODE1'){
- print "\t\t\tALLOW<input type='hidden' name='STATE' value='ALLOW'>\n";
+ print "\t\t\tALLOW<input type='hidden' name='STATE' value='ALLOW' />\n";
} elsif ($outfwsettings{'POLICY'} eq 'MODE2'){
- print "\t\t\tDENY<input type='hidden' name='STATE' value='DENY'>\n";
+ print "\t\t\tDENY<input type='hidden' name='STATE' value='DENY' />\n";
}
print <<END
<tr><td width='20%' align='right'>Quellnetz:
}
print <<END
</select>
- <td width='20%' align='right'>Quell-IP-Adresse: <img src='/blob.gif'>
- <td width='30%' align='left'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}'>
- <tr><td width='50%' colspan='2'>
- <td width='20%' align='right'>Quell-MAC-Adresse: <img src='/blob.gif'>
- <td width='30%' align='left'><input type='text' name='SMAC' maxlength='23' value='$outfwsettings{'SMAC'}'>
- <tr><td width='20%' align='right'>Ziel-IP-Adresse: <img src='/blob.gif'>
- <td width='30%' align='left'><input type='text' name='DIP' maxlength='15' value='$outfwsettings{'DIP'}'>
- <td width='20%' align='right'>Ziel-Port: <img src='/blob.gif'>
- <td width='30%' align='left'><input type='text' name='DPORT' maxlength='11' value='$outfwsettings{'DPORT'}'>
+ <td width='20%' align='right'>Quell-IP-Adresse: <img src='/blob.gif' />
+ <td width='30%' align='left'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}' />
+ <tr><td width='20%' align='right'>Logging:
+ <td width='30%' align='left'><select name='LOG'><option value='$Lang::tr{'active'}' $selected{'LOG'}{$Lang::tr{'active'}}>$Lang::tr{'active'}</option><option value='$Lang::tr{'inactive'}' $selected{'LOG'}{$Lang::tr{'inactive'}}>$Lang::tr{'inactive'}</option></select></td>
+ <td width='20%' align='right'>Quell-MAC-Adresse: <img src='/blob.gif' />
+ <td width='30%' align='left'><input type='text' name='SMAC' maxlength='23' value='$outfwsettings{'SMAC'}' />
+ <tr><td width='20%' align='right'>Ziel-IP-Adresse: <img src='/blob.gif' />
+ <td width='30%' align='left'><input type='text' name='DIP' maxlength='15' value='$outfwsettings{'DIP'}' />
+ <td width='20%' align='right'>Ziel-Port: <img src='/blob.gif' />
+ <td width='30%' align='left'><input type='text' name='DPORT' maxlength='11' value='$outfwsettings{'DPORT'}' />
<tr><td colspan='4'>
- <tr><td width='40%' align='right' colspan='2'><img src='/blob.gif'> $Lang::tr{'this field may be blank'}
- <td width='60%' align='left' colspan='2'><input type='submit' name='ACTION' value=$Lang::tr{'add'}>
+ <tr><td width='40%' align='right' colspan='2'><img src='/blob.gif' />$Lang::tr{'this field may be blank'}
+ <td width='60%' align='left' colspan='2'><input type='submit' name='ACTION' value=$Lang::tr{'add'} />
</table></form>
END
;
&Header::closebox();
-if ($outfwsettings{'POLICY'} eq 'MODE1')
+if ($outfwsettings{'POLICY'} eq 'MODE1' || $outfwsettings{'POLICY'} eq 'MODE2')
{
&Header::openbox('100%', 'center', 'Quick Add');
my @defservices = <FILE>;
close FILE;
-print "<table width='100%'><tr bgcolor='#F0F0F0'><td><b>$Lang::tr{'service'}</b></td><td><b>$Lang::tr{'description'}</b></td><td><b>$Lang::tr{'port'}</b></td><td><b>$Lang::tr{'protocol'}</b></td><td><b>$Lang::tr{'source net'}</b></td><td></td></tr>";
+print "<table width='100%'><tr bgcolor='$color{'color20'}'><td><b>$Lang::tr{'service'}</b></td><td><b>$Lang::tr{'description'}</b></td><td><b>$Lang::tr{'port'}</b></td><td><b>$Lang::tr{'protocol'}</b></td><td><b>$Lang::tr{'source net'}</b></td><td><b>$Lang::tr{'logging'}</b></td><td></td></tr>";
foreach my $serviceline(@defservices)
{
my @service = split(/,/,$serviceline);
print "<option value='orange' $selected{'SNET'}{'orange'}>$Lang::tr{'dmz'}</option>";
}
print <<END
- </select></td><td>
+ </select></td>
+ <td><select name='LOG'><option value='$Lang::tr{'active'}'>$Lang::tr{'active'}</option><option value='$Lang::tr{'inactive'}' 'selected'>$Lang::tr{'inactive'}</option></select></td><td>
<input type='hidden' name='ACTION' value=$Lang::tr{'add'} />
<input type='image' alt='$Lang::tr{'add'}' src='/images/add.gif' />
<input type='hidden' name='ENABLED' value='on' />
- <input type='hidden' name='STATE' value='ALLOW' />
- </form></td></tr>
END
;
+ if ($outfwsettings{'POLICY'} eq 'MODE1'){ print "<input type='hidden' name='STATE' value='ALLOW' /></form></td></tr>";}
+ elsif ($outfwsettings{'POLICY'} eq 'MODE2'){print "<input type='hidden' name='STATE' value='DENY' /></form></td></tr>";}
}
-print "</table>";
-
+ print "</table>";
&Header::closebox();
+ }
}
-
-}
-
projects / people / pmueller / ipfire-2.x.git / blobdiff