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

Readded the mac filter to the outgoing firewall. Added mac groups.

Browse Source 
This feature was requested by bug #0000705.
This commit is contained in:
Christian Schmidt
2010-09-02 20:04:03 +02:00
parent 4d17a269db
commit d9716b067d
10 changed files with 276 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
html/cgi-bin/outgoingfw.cgi
View File

@@ -321,7 +321,7 @@ END
$outfwsettings{'ACTION'} = 'Add rule';
}
}
if ($outfwsettings{'ACTION'} eq 'Add rule')
if ($outfwsettings{'ACTION'} eq $Lang::tr{'Add Rule'})
{
&addrule();
exit
@@ -343,7 +343,7 @@ if ($outfwsettings{'POLICY'} ne 'MODE0'){
&Header::openbox('100%', 'center', 'Rules');
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='submit' name='ACTION' value='Add rule' />
<input type='submit' name='ACTION' value='$Lang::tr{'Add Rule'}' />
</form>
END
;
@@ -462,14 +462,22 @@ END
END
;
if (($outfwsettings{'SIP'}) || ($outfwsettings{'SMAC'})) {
unless ($outfwsettings{'SIP'}) { $outfwsettings{'DISPLAY_SIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SIP'} = $outfwsettings{'SIP'}; }
unless ($outfwsettings{'SMAC'}) { $outfwsettings{'DISPLAY_SMAC'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SMAC'} = $outfwsettings{'SMAC'}; }
print <<END
<tr><td width='14%' align='right'>$Lang::tr{'source ip or net'}:
<td width='14%' align='left'>$outfwsettings{'DISPLAY_SIP'}
<td width='44%' colspan='2' align='center'>
END
;
unless ($outfwsettings{'SIP'}) {
$outfwsettings{'DISPLAY_SIP'} = 'ALL';
} else {
$outfwsettings{'DISPLAY_SIP'} = $outfwsettings{'SIP'};
}
unless ($outfwsettings{'SMAC'}) {
$outfwsettings{'DISPLAY_SMAC'} = 'ALL';
print "<tr><td /><td align='left'>$Lang::tr{'source ip or net'}: </td>";
print "<td align='left' colspan='2'>$outfwsettings{'DISPLAY_SIP'}</td>";
} else {
$outfwsettings{'DISPLAY_SMAC'} = $outfwsettings{'SMAC'};
print "<tr><td /><td align='left'>$Lang::tr{'source'} $Lang::tr{'mac address'}: </td>";
print "<td align='left' colspan='2'>$outfwsettings{'DISPLAY_SMAC'}</td>";
}
}
print <<END
<tr><td width='14%' align='right'>$Lang::tr{'time'} - </td>
@@ -627,7 +635,7 @@ print <<END
<td width='30%' align='left' colspan='2'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} /></td>
</tr>
<tr>
<td width='20%' align='right'>$Lang::tr{'protocol'}:</td>
<td width='20%' align='right'>$Lang::tr{'protocol'}</td>
<td width='30%' align='left'>
<select name='PROT'>
<option value='all' $selected{'PROT'}{'all'}>All</option>
@@ -655,6 +663,9 @@ END
<select name='SNET'>
<optgroup label='---'>
<option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option>
<optgroup label='$Lang::tr{'mac address'}'>
<option value='mac' $selected{'SNET'}{'mac'}>$Lang::tr{'source'} $Lang::tr{'mac address'}</option>
</optgroup>
<optgroup label='$Lang::tr{'ip address'}'>
<option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip or net'}</option>
<option value='red' $selected{'SNET'}{'red'}>$Lang::tr{'red'} IP</option>
@@ -674,19 +685,35 @@ END
}
print <<END
</optgroup>
<optgroup label='$Lang::tr{'advproxy NCSA group'}'>
<optgroup label='IP $Lang::tr{'advproxy NCSA group'}'>
END
;
my @ipgroups = qx(ls $configpath/ipgroups/);
foreach (sort @ipgroups){
print "\t\t\t\t\t<option value='$_' $selected{'SNET'}{'$_'}>$_</option>\n";
}
print <<END
</optgroup>
<optgroup label='MAC $Lang::tr{'advproxy NCSA group'}'>
END
;
my @macgroups = qx(ls $configpath/macgroups/);
foreach (sort @macgroups){
print "\t\t\t\t\t<option value='$_' $selected{'SNET'}{'$_'}>$_</option>\n";
}
print <<END
</optgroup>
</select>
</td>
<td width='20%' align='right' colspan='2'>$Lang::tr{'source ip or net'}<img src='/blob.gif' /></td>
<td width='30%' align='left' colspan='2'><input type='text' name='SIP' value='$outfwsettings{'SIP'}' /></td>
<td align='right' colspan='4'><font color='red'>$Lang::tr{'outgoingfw warning'}</font></td>
</tr>
<tr>
<td align='right' colspan='4' >$Lang::tr{'source ip or net'}<img src='/blob.gif' /></td>
<td align='left' colspan='4' ><input type='text' name='SIP' value='$outfwsettings{'SIP'}' /></td>
</tr>
<tr>
<td align='right' colspan='4' >$Lang::tr{'source'} $Lang::tr{'mac address'}: <img src='/blob.gif' />
<td align='left' colspan='4' ><input type='text' name='SMAC' maxlength='23' value='$outfwsettings{'SMAC'}' />
</tr>
<tr>
<td width='20%' align='right'>$Lang::tr{'logging'}:</td>

170
html/cgi-bin/outgoinggrp.cgi
View File

@@ -48,13 +48,13 @@ my %mainsettings = ();
### Values that have to be initialized
$outgrpsettings{'ACTION'} = '';
$outgrpsettings{'ipgroup'} = 'none';
$outgrpsettings{'portgroup'} = 'none';
$outgrpsettings{'macgroup'} = 'none';
&Header::getcgihash(\%outgrpsettings);
delete $outgrpsettings{'__CGI__'};delete $outgrpsettings{'x'};delete $outgrpsettings{'y'};
$selected{'ipgroup'}{$outgrpsettings{'ipgroup'}} = "selected='selected'";
$selected{'portgroup'}{$outgrpsettings{'portgroup'}} = "selected='selected'";
$selected{'macgroup'}{$outgrpsettings{'macgroup'}} = "selected='selected'";
&Header::openpage($Lang::tr{'outgoing firewall groups'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -75,24 +75,46 @@ $selected{'portgroup'}{$outgrpsettings{'portgroup'}} = "selected='selected'";
############################################################################################################################
############################################################################################################################
if ($errormessage)
{
&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
print "<class name='base'>$errormessage\n";
print "&nbsp;</class>\n";
&Header::closebox();
}
if ($outgrpsettings{'ACTION'} eq 'newipgroup')
{
&newipgroup();
} elsif ($outgrpsettings{'ACTION'} eq 'deleteipgroup' ) {
unlink("$configpath/ipgroups/$outgrpsettings{'ipgroup'}");
} elsif ($outgrpsettings{'ACTION'} eq 'addipgroup') {
open (FILE, ">$configpath/ipgroups/$outgrpsettings{'ipgroup'}") or die "Can't save $outgrpsettings{'ipgroup'} settings $!";
flock (FILE, 2);
print FILE $outgrpsettings{'ipgroupcontent'}."\n";
close FILE;
if ( -e "$configpath/macgroups/$outgrpsettings{'ipgroup'}" ){
$errormessage = "$Lang::tr{'outgoing firewall group error'}";
} else {
open (FILE, ">$configpath/ipgroups/$outgrpsettings{'ipgroup'}") or die "Can't save $outgrpsettings{'ipgroup'} settings $!";
flock (FILE, 2);
print FILE $outgrpsettings{'ipgroupcontent'}."\n";
close FILE;
}
}
if ($outgrpsettings{'ACTION'} eq 'newmacgroup')
{
&newmacgroup();
} elsif ($outgrpsettings{'ACTION'} eq 'deletemacgroup' ) {
unlink("$configpath/macgroups/$outgrpsettings{'macgroup'}");
} elsif ($outgrpsettings{'ACTION'} eq 'addmacgroup') {
if ( -e "$configpath/ipgroups/$outgrpsettings{'macgroup'}" ){
$errormessage = "$Lang::tr{'outgoing firewall group error'}";
} else {
open (FILE, ">$configpath/macgroups/$outgrpsettings{'macgroup'}") or die "Can't save $outgrpsettings{'macgroup'} settings $!";
flock (FILE, 2);
print FILE $outgrpsettings{'macgroupcontent'}."\n";
close FILE;
}
}
if ($errormessage)
{
&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
print "<class name='base'><font color=red>$errormessage\n</font>";
print "&nbsp;</class>\n";
&Header::closebox();
}
############################################################################################################################
@@ -107,6 +129,7 @@ $ipgroupcontent =~ s/\n/<br \/>/g;
&Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall ip groups'});
print <<END
<a name="outgoing showipgroup"</a>
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
<table width='95%' cellspacing='0'>
@@ -171,9 +194,91 @@ END
;
&Header::closebox();
############################################################################################################################
############################################################################################################################
my @macgroups = qx(ls $configpath/macgroups/);
if ($outgrpsettings{'macgroup'} eq "none" and $#macgroups >= 0 ){ $outgrpsettings{'macgroup'} = $macgroups[0];}
my $macgroupcontent = `cat $configpath/macgroups/$outgrpsettings{'macgroup'} 2>/dev/null`;
$macgroupcontent =~ s/\n/<br \/>/g;
&Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall mac groups'});
print <<END
<a name="outgoing showmacgroup"</a>
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
<table width='95%' cellspacing='0'>
<tr>
<td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall mac groups'}</b></td>
</tr>
<tr>
<td colspan='3' align='left'><br /></td>
</tr>
<tr>
<td align='left' colspan='2'><select name='macgroup' style="width: 200px">
END
;
foreach my $member (@macgroups) {chomp $member;print" <option value='$member' $selected{'macgroup'}{$member}>$member</option>\n";}
print <<END
</select></td>
<td align='left'>
<input type='hidden' name='ACTION' value='showmacgroup' />
<input type='image' alt='$Lang::tr{'outgoing firewall view group'}' title='$Lang::tr{'outgoing firewall view group'}' src='/images/format-justify-fill.png' />
</td>
</tr>
<tr>
<td colspan='3' align='left'><br /></td>
</tr>
<tr>
<td colspan='3' align='left'><font size=1>$macgroupcontent</font></td>
</tr>
<tr>
<td colspan='3' align='left'><br /></td>
</tr>
<tr>
<td colspan='3' align='center'><font size=1>$Lang::tr{'outgoing firewall mac groups'} - $outgrpsettings{'macgroup'}</font></td>
</tr>
</table>
</form>
<table width='10%' cellspacing='0'>
<tr>
<td align='center'>
<form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
<input type='hidden' name='ACTION' value='newmacgroup' />
<input type='image' alt='$Lang::tr{'new'}' title='$Lang::tr{'new'}' src='/images/list-add.png' />
</form>
</td>
<td align='center'>
<form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
<input type='hidden' name='ACTION' value='savemacgroup' />
<input type='hidden' name='macgroup' value='$outgrpsettings{'macgroup'}' />
<input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
</form>
</td>
<td align='center'>
<form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
<input type='hidden' name='ACTION' value='deletemacgroup' />
<input type='hidden' name='macgroup' value='$outgrpsettings{'macgroup'}' />
<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
</form>
</td>
</tr>
</table>
END
;
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
############################################################################################################################
############################################################################################################################
sub newipgroup
{
&Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall add ip group'});
@@ -210,3 +315,40 @@ END
&Header::closepage();
exit 0;
}
sub newmacgroup
{
&Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall add mac group'});
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
<table width='95%' cellspacing='0'>
<tr>
<td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall add mac group'}</b></td>
</tr>
<tr>
<td colspan='3' align='left'><br /></td>
</tr>
<tr>
<td align='left' colspan='2'>
<input type='text' name='macgroup' value='newgroup' size="30" />
</td>
<td align='left'>
<input type='hidden' name='ACTION' value='addmacgroup' />
<input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
</td>
</tr>
<tr>
<td align='left' colspan='3'>
<textarea name="macgroupcontent" cols="20" rows="5" Wrap="off">00:24:F6:04:5F:2b\n14:26:36:5A:5F:2B\n</textarea>
</td>
</tr>
</table>
</form>
END
;
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
exit 0;
}