]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/outgoinggrp.cgi
Readded the mac filter to the outgoing firewall. Added mac groups.
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / outgoinggrp.cgi
index a94ac820b8f45b2d160a597e7dea3311f788bcf2..28e52611826dd62aa4505c6baddcfedada5b2210 100644 (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;
+}
\ No newline at end of file