]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/ids.cgi
snort: update to 2.9.5.3.
[people/teissler/ipfire-2.x.git] / html / cgi-bin / ids.cgi
index 035ee83ebdaaf4d280f40043eb33d6db23423047..4bd0128cb4cf4a5e4ff6e0de3d76e4010e393da2 100644 (file)
@@ -1,33 +1,49 @@
 #!/usr/bin/perl
-#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The SmoothWall Team
-#
-# $Id: ids.cgi,v 1.8.2.18 2005/07/27 21:35:22 franck78 Exp $
-#
-
-use LWP::UserAgent;
-use File::Copy;
-use File::Temp qw/ tempfile tempdir /;
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
 use strict;
 
 # enable only the following on debugging purpose
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
+use File::Copy;
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
+
+$a = new CGI;
+
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
 my %snortsettings=();
 my %checked=();
+my %selected=();
 my %netsettings=();
 our $errormessage = '';
-our $md5 = '0';# not '' to avoid displaying the wrong message when INSTALLMD5 not set
-our $realmd5 = '';
 our $results = '';
 our $tempdir = '';
 our $url='';
@@ -39,76 +55,335 @@ $snortsettings{'ENABLE_SNORT'} = 'off';
 $snortsettings{'ENABLE_SNORT_GREEN'} = 'off';
 $snortsettings{'ENABLE_SNORT_BLUE'} = 'off';
 $snortsettings{'ENABLE_SNORT_ORANGE'} = 'off';
+$snortsettings{'ENABLE_GUARDIAN'} = 'off';
+$snortsettings{'GUARDIAN_INTERFACE'} = `cat /var/ipfire/red/iface`;
+$snortsettings{'GUARDIAN_HOSTGATEWAYBYTE'} = '1';
+$snortsettings{'GUARDIAN_LOGFILE'} = '/var/log/guardian/guardian.log';
+$snortsettings{'GUARDIAN_ALERTFILE'} = '/var/log/snort/alert';
+$snortsettings{'GUARDIAN_IGNOREFILE'} = '/var/ipfire/guardian/guardian.ignore';
+$snortsettings{'GUARDIAN_TARGETFILE'} = '/var/ipfire/guardian/guardian.target';
+$snortsettings{'GUARDIAN_TIMELIMIT'} = '86400';
 $snortsettings{'ACTION'} = '';
-$snortsettings{'RULESTYPE'} = '';
+$snortsettings{'ACTION2'} = '';
+$snortsettings{'RULES'} = '';
 $snortsettings{'OINKCODE'} = '';
 $snortsettings{'INSTALLDATE'} = '';
-$snortsettings{'INSTALLMD5'} = '';
+$snortsettings{'FILE'} = '';
+$snortsettings{'UPLOAD'} = '';
 
 &Header::getcgihash(\%snortsettings, {'wantfile' => 1, 'filevar' => 'FH'});
 
-if ($snortsettings{'RULESTYPE'} eq 'subscripted') {
-       $url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.3_s.tar.gz";
+####################### Added for snort rules control #################################
+my $snortrulepath; # change to "/etc/snort/rules" - maniac
+my @snortconfig;
+my $restartsnortrequired = 0;
+my %snortrules;
+my $rule = '';
+my $table1colour = '';
+my $table2colour = '';
+my $var = '';
+my $value = '';
+my $tmp = '';
+my $linkedrulefile = '';
+my $border = '';
+my $checkboxname = '';
+
+if (-e "/etc/snort/snort.conf") {
+
+
+       # Open snort.conf file, read it in, close it, and re-open for writing
+       open(FILE, "/etc/snort/snort.conf") or die 'Unable to read snort config file.';
+       @snortconfig = <FILE>;
+       close(FILE);
+       open(FILE, ">/etc/snort/snort.conf") or die 'Unable to write snort config file.';
+
+    my @rules = `cd /etc/snort/rules/ && ls *.rules 2>/dev/null`;    # With this loop the rule might be display with correct rulepath set
+       foreach (@rules) {
+       chomp $_;
+       my $temp = join(";",@snortconfig);
+    if ( $temp =~ /$_/ ){next;}
+    else { push(@snortconfig,"#include \$RULE_PATH/".$_);}
+       }
+
+       # Loop over each line
+       foreach my $line (@snortconfig) {
+               # Trim the line
+               chomp $line;
+
+               # Check for a line with .rules
+               if ($line =~ /\.rules$/) {
+                       # Parse out rule file name
+                       $rule = $line;
+                       $rule =~ s/\$RULE_PATH\///i;
+                       $rule =~ s/ ?include ?//i;
+                       $rule =~ s/\#//i;
+                       my $snortrulepathrule = "$snortrulepath/$rule";
+
+                       # Open rule file and read in contents
+                       open(RULEFILE, "$snortrulepath/$rule") or die "Unable to read snort rule file for reading => $snortrulepath/$rule.";
+                       my @snortrulefile = <RULEFILE>;
+                       close(RULEFILE);
+                       open(RULEFILE, ">$snortrulepath/$rule") or die "Unable to write snort rule file for writing $snortrulepath/$rule";
+
+                       # Local vars
+                       my $dashlinecnt = 0;
+                       my $desclook = 1;
+                       my $snortruledesc = '';
+                       my %snortruledef = ();
+                       my $rulecnt = 1;
+
+                       # Loop over rule file contents
+                       foreach my $ruleline (@snortrulefile) {
+                               chomp $ruleline;
+
+                               # If still looking for a description
+                               if ($desclook) {
+                                       # If line does not start with a # anymore, then done looking for a description
+                                       if ($ruleline !~ /^\#/) {
+                                               $desclook = 0;
+                                       }
+
+                                       # If see more than one dashed line, (start to) create rule file description
+                                       if ($dashlinecnt > 1) {
+                                               # Check for a line starting with a #
+                                               if ($ruleline =~ /^\#/ and $ruleline !~ /^\#alert/) {
+                                                       # Create tempruleline
+                                                       my $tempruleline = $ruleline;
+
+                                                       # Strip off # and clean up line
+                                                       $tempruleline =~ s/\# ?//i;
+
+                                                       # Check for part of a description
+                                                       if ($snortruledesc eq '') {
+                                                               $snortruledesc = $tempruleline;
+                                                       } else {
+                                                               $snortruledesc .= " $tempruleline";
+                                                       }
+                                               } else {
+                                                       # Must be done
+                                                       $desclook = 0;
+                                               }
+                                       }
+
+                                       # If have a dashed line, increment count
+                                       if ($ruleline =~ /\# ?\-+/) {
+                                               $dashlinecnt++;
+                                       }
+                               } else {
+                                       # Parse out rule file rule's message for display
+                                       if ($ruleline =~ /(msg\:\"[^\"]+\";)/) {
+                                               my $msg = '';
+                                               $msg = $1;
+                                               $msg =~ s/msg\:\"//i;
+                                               $msg =~ s/\";//i;
+                                               $snortruledef{$rulecnt}{'Description'} = $msg;
+
+                                               # Check for 'Save' and rule file displayed in query string
+                                               if (($snortsettings{'ACTION'} eq $Lang::tr{'update'}) && ($ENV{'QUERY_STRING'} =~ /$rule/i)) {
+                                                       # Check for a disable rule which is now enabled, or an enabled rule which is now disabled
+                                                       if ((($ruleline =~ /^\#/) && (exists $snortsettings{"SNORT_RULE_$rule\_$rulecnt"})) || (($ruleline !~ /^\#/) && (!exists $snortsettings{"SNORT_RULE_$rule\_$rulecnt"}))) {
+                                                               $restartsnortrequired = 1;
+                                                       }
+
+                                                       # Strip out leading # from rule line
+                                                       $ruleline =~ s/\# ?//i;
+
+                                                       # Check if it does not exists (which means it is disabled), append a #
+                                                       if (!exists $snortsettings{"SNORT_RULE_$rule\_$rulecnt"}) {
+                                                               $ruleline = "#"." $ruleline";
+                                                       }
+                                               }
+
+                                               # Check if ruleline does not begin with a #, so it is enabled
+                                               if ($ruleline !~ /^\#/) {
+                                                       $snortruledef{$rulecnt++}{'State'} = 'Enabled';
+                                               } else {
+                                                       # Otherwise it is disabled
+                                                       $snortruledef{$rulecnt++}{'State'} = 'Disabled';
+                                               }
+                                       }
+                               }
+
+                               # Print ruleline to RULEFILE
+                               print RULEFILE "$ruleline\n";
+                       }
+
+                       # Close RULEFILE
+                       close(RULEFILE);
+
+                       # Check for 'Save'
+                       if ($snortsettings{'ACTION'} eq $Lang::tr{'update'}) {
+                               # Check for a disable rule which is now enabled, or an enabled rule which is now disabled
+                               if ((($line =~ /^\#/) && (exists $snortsettings{"SNORT_RULE_$rule"})) || (($line !~ /^\#/) && (!exists $snortsettings{"SNORT_RULE_$rule"}))) {
+                                       $restartsnortrequired = 1;
+                               }
+
+                               # Strip out leading # from rule line
+                               $line =~ s/\# ?//i;
+
+                               # Check if it does not exists (which means it is disabled), append a #
+                               if (!exists $snortsettings{"SNORT_RULE_$rule"}) {
+                                       $line = "# $line";
+                               }
+
+                       }
+
+                       # Check for rule state
+                       if ($line =~ /^\#/) {
+                               $snortrules{$rule}{"State"} = "Disabled";
+                       } else {
+                               $snortrules{$rule}{"State"} = "Enabled";
+                       }
+
+                       # Set rule description
+                       $snortrules{$rule}{"Description"} = $snortruledesc;
+
+                       # Loop over sorted rules
+                       foreach my $ruledef (sort {$a <=> $b} keys(%snortruledef)) {
+                               $snortrules{$rule}{"Definition"}{$ruledef}{'Description'} = $snortruledef{$ruledef}{'Description'};
+                               $snortrules{$rule}{"Definition"}{$ruledef}{'State'} = $snortruledef{$ruledef}{'State'};
+                       }
+
+                       $snortruledesc = '';
+                       print FILE "$line\n";
+               } elsif ($line =~ /var RULE_PATH/) {
+                       ($tmp, $tmp, $snortrulepath) = split(' ', $line);
+                       print FILE "$line\n";
+               } else {
+                       print FILE "$line\n";
+               }
+       }
+       close(FILE);
+
+       if ($restartsnortrequired) {
+               system('/usr/local/bin/snortctrl restart >/dev/null');
+       }
+}
+
+#######################  End added for snort rules control  #################################
+
+if ($snortsettings{'RULES'} eq 'subscripted') {
+       $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2953.tar.gz/$snortsettings{'OINKCODE'}";
+} elsif ($snortsettings{'RULES'} eq 'registered') {
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2950.tar.gz/$snortsettings{'OINKCODE'}";
+} elsif ($snortsettings{'RULES'} eq 'community') {
+       $url=" http://s3.amazonaws.com/snort-org/www/rules/community/community-rules.tar.gz";
 } else {
-       $url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.3.tar.gz";
+       $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
 }
 
-if ($snortsettings{'ACTION'} eq $Lang::tr{'save'})
+if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" )
 {
        $errormessage = $Lang::tr{'invalid input for oink code'} unless (
            ($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/)  ||
-           ($snortsettings{'RULESTYPE'} eq 'nothing' )       );
+           ($snortsettings{'RULES'} eq 'nothing' ) ||
+           ($snortsettings{'RULES'} eq 'emerging' ) ||
+           ($snortsettings{'RULES'} eq 'community' ));
 
        &General::writehash("${General::swroot}/snort/settings", \%snortsettings);
        if ($snortsettings{'ENABLE_SNORT'} eq 'on')
        {
-               system ('/bin/touch', "${General::swroot}/snort/enable");
+               system ('/usr/bin/touch', "${General::swroot}/snort/enable");
        } else {
                unlink "${General::swroot}/snort/enable";
-       } 
+       }
        if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on')
        {
-               system ('/bin/touch', "${General::swroot}/snort/enable_green");
+               system ('/usr/bin/touch', "${General::swroot}/snort/enable_green");
        } else {
                unlink "${General::swroot}/snort/enable_green";
-       } 
+       }
        if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on')
        {
-               system ('/bin/touch', "${General::swroot}/snort/enable_blue");
+               system ('/usr/bin/touch', "${General::swroot}/snort/enable_blue");
        } else {
                unlink "${General::swroot}/snort/enable_blue";
-       } 
+       }
        if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on')
        {
-               system ('/bin/touch', "${General::swroot}/snort/enable_orange");
+               system ('/usr/bin/touch', "${General::swroot}/snort/enable_orange");
        } else {
                unlink "${General::swroot}/snort/enable_orange";
        }
+       if ($snortsettings{'ENABLE_PREPROCESSOR_HTTP_INSPECT'} eq 'on')
+       {
+               system ('/usr/bin/touch', "${General::swroot}/snort/enable_preprocessor_http_inspect");
+       } else {
+               unlink "${General::swroot}/snort/enable_preprocessor_http_inspect";
+       }
+       if ($snortsettings{'ENABLE_GUARDIAN'} eq 'on')
+       {
+               system ('/usr/bin/touch', "${General::swroot}/guardian/enable");
+       } else {
+               unlink "${General::swroot}/guardian/enable";
+       }
 
-       system('/usr/local/bin/restartsnort','red','orange','blue','green');
-} else {
+       system('/usr/local/bin/snortctrl restart >/dev/null');
+
+} elsif ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "guardian" ){
+                       foreach my $key (keys %snortsettings){
+                               if ( $key !~ /^GUARDIAN/ ){
+                                       delete $snortsettings{$key};
+                               }
+                       }
+                       &General::writehashpart("${General::swroot}/snort/settings", \%snortsettings);
+                       open(IGNOREFILE, ">$snortsettings{'GUARDIAN_IGNOREFILE'}") or die "Unable to write guardian ignore file $snortsettings{'GUARDIAN_IGNOREFILE'}";
+                               print IGNOREFILE $snortsettings{'GUARDIAN_IGNOREFILE_CONTENT'};
+                       close(IGNOREFILE);
+                       open(GUARDIAN, ">/var/ipfire/guardian/guardian.conf") or die "Unable to write guardian conf /var/ipfire/guardian/guardian.conf";
+                               print GUARDIAN <<END
+Interface   $snortsettings{'GUARDIAN_INTERFACE'}
+HostGatewayByte   $snortsettings{'GUARDIAN_HOSTGATEWAYBYTE'}
+LogFile   $snortsettings{'GUARDIAN_LOGFILE'}
+AlertFile   $snortsettings{'GUARDIAN_ALERTFILE'}
+IgnoreFile   $snortsettings{'GUARDIAN_IGNOREFILE'}
+TargetFile   $snortsettings{'GUARDIAN_TARGETFILE'}
+TimeLimit   $snortsettings{'GUARDIAN_TIMELIMIT'}
+END
+;
+                       close(GUARDIAN);
+               system('/usr/local/bin/snortctrl restart >/dev/null');
+}
         # INSTALLMD5 is not in the form, so not retrieved by getcgihash
        &General::readhash("${General::swroot}/snort/settings", \%snortsettings);
-}
 
-if ($snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'}) {
-       $md5 = &getmd5;
-       if (($snortsettings{'INSTALLMD5'} ne $md5) && defined $md5 ) {
-               chomp($md5);
-               my $filename = &downloadrulesfile();
-               if (defined $filename) {
-                       # Check MD5sum
-                       $realmd5 = `/usr/bin/md5sum $filename`;
-                       chomp ($realmd5);
-                       $realmd5 =~ s/^(\w+)\s.*$/$1/;
-                       if ($md5 ne $realmd5) {
-                               $errormessage = "$Lang::tr{'invalid md5sum'}";
+if ($snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} || $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'}) {
+
+       my @df = `/bin/df -B M /var`;
+       foreach my $line (@df) {
+               next if $line =~ m/^Filesystem/;
+               my $return;
+
+               if ($line =~ m/dev/ ) {
+               $line =~ m/^.* (\d+)M.*$/;
+               my @temp = split(/ +/,$line);
+                       if ($1<300) {
+                               $errormessage = "$Lang::tr{'not enough disk space'} < 300MB, /var $1MB";
                        } else {
-                               $results = "<b>$Lang::tr{'installed updates'}</b>\n<pre>";
-                               $results .=`/usr/local/bin/oinkmaster.pl -s -u file://$filename -C /var/ipcop/snort/oinkmaster.conf -o /etc/snort 2>&1`;
-                               $results .= "</pre>";
+
+                               if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} ){
+
+                                       &downloadrulesfile();
+                                       sleep(3);
+                                       $return = `cat /var/tmp/log 2>/dev/null`;
+
+                               } elsif ( $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'} ) {
+                                       my $upload = $a->param("UPLOAD");
+                                       open UPLOADFILE, ">/var/tmp/snortrules.tar.gz";
+                                       binmode $upload;
+                                       while ( <$upload> ) {
+                                       print UPLOADFILE;
+                                       }
+                                       close UPLOADFILE;
+                               }
+
+                                       if ($return =~ "ERROR"){
+                                               $errormessage = "<br /><pre>".$return."</pre>";
+                                       } else {
+                                               system("/usr/local/bin/oinkmaster.pl -v -s -u file:///var/tmp/snortrules.tar.gz -C /var/ipfire/snort/oinkmaster.conf -o /etc/snort/rules >>/var/tmp/log 2>&1 &");
+                                               sleep(2);
+                                       }
                        }
-                       unlink ($filename);
                }
        }
 }
@@ -125,15 +400,59 @@ $checked{'ENABLE_SNORT_BLUE'}{$snortsettings{'ENABLE_SNORT_BLUE'}} = "checked='c
 $checked{'ENABLE_SNORT_ORANGE'}{'off'} = '';
 $checked{'ENABLE_SNORT_ORANGE'}{'on'} = '';
 $checked{'ENABLE_SNORT_ORANGE'}{$snortsettings{'ENABLE_SNORT_ORANGE'}} = "checked='checked'";
-$checked{'RULESTYPE'}{'nothing'} = '';
-$checked{'RULESTYPE'}{'registered'} = '';
-$checked{'RULESTYPE'}{'subscripted'} = '';
-$checked{'RULESTYPE'}{$snortsettings{'RULESTYPE'}} = "checked='checked'";
+$checked{'ENABLE_GUARDIAN'}{'off'} = '';
+$checked{'ENABLE_GUARDIAN'}{'on'} = '';
+$checked{'ENABLE_GUARDIAN'}{$snortsettings{'ENABLE_GUARDIAN'}} = "checked='checked'";
+$selected{'RULES'}{'nothing'} = '';
+$selected{'RULES'}{'community'} = '';
+$selected{'RULES'}{'emerging'} = '';
+$selected{'RULES'}{'registered'} = '';
+$selected{'RULES'}{'subscripted'} = '';
+$selected{'RULES'}{$snortsettings{'RULES'}} = "selected='selected'";
 
 &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
 
+####################### Added for snort rules control #################################
+print "<SCRIPT LANGUAGE='JavaScript' SRC='/include/snortupdateutility.js'></SCRIPT>";
+print <<END
+<STYLE TYPE="text/css">
+<!--
+.section {
+       border: groove;
+}
+.row1color {
+       border: ridge;
+       background-color: $color{'color22'};
+}
+.row2color {
+       border: ridge;
+       background-color: $color{'color20'};
+}
+.rowselected {
+       border: double #FF0000;
+       background-color: #DCDCDC;
+}
+-->
+</STYLE>
+END
+;
+#######################  End added for snort rules control  #################################
+
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
+###############
+# DEBUG DEBUG
+# &Header::openbox('100%', 'left', 'DEBUG');
+# my $debugCount = 0;
+# foreach my $line (sort keys %snortsettings) {
+# print "$line = $snortsettings{$line}<br />\n";
+# $debugCount++;
+# }
+# print "&nbsp;Count: $debugCount\n";
+# &Header::closebox();
+# DEBUG DEBUG
+###############
+
 if ($errormessage) {
        &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
        print "<class name='base'>$errormessage\n";
@@ -141,38 +460,56 @@ if ($errormessage) {
        &Header::closebox();
 }
 
+my $return = `pidof oinkmaster.pl -x`;
+chomp($return);
+if ($return) {
+       &Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='10;'>" );
+       print <<END;
+       <table>
+               <tr><td>
+                               <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
+                       <td>
+                               $Lang::tr{'snort working'}
+               <tr><td colspan='2' align='center'>
+                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='image' alt='$Lang::tr{'reload'}' src='/images/view-refresh.png' />
+                       </form>
+               <tr><td colspan='2' align='left'><pre>
+END
+       my @output = `tail -20 /var/tmp/log`;
+       foreach (@output) {
+               print "$_";
+       }
+       print <<END;
+                       </pre>
+               </table>
+END
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit;
+       refreshpage();
+}
+
 &Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system2'});
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'><table width='100%'>
-<tr>
-       <td class='base'><input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'} />
-               GREEN Snort</td>
-</tr>
+<tr><td class='base'><input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'} />GREEN Snort
 END
 ;
 if ($netsettings{'BLUE_DEV'} ne '') {
-print <<END
-<tr>
-       <td class='base'><input type='checkbox' name='ENABLE_SNORT_BLUE' $checked{'ENABLE_SNORT_BLUE'}{'on'} />
-               BLUE Snort</td>
-</tr>
-END
-;
+  print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_SNORT_BLUE' $checked{'ENABLE_SNORT_BLUE'}{'on'} />   BLUE Snort";
 }
 if ($netsettings{'ORANGE_DEV'} ne '') {
-print <<END
-<tr>
-       <td class='base'><input type='checkbox' name='ENABLE_SNORT_ORANGE' $checked{'ENABLE_SNORT_ORANGE'}{'on'} />
-               ORANGE Snort</td>
-</tr>
-END
-;
+  print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_SNORT_ORANGE' $checked{'ENABLE_SNORT_ORANGE'}{'on'} />   ORANGE Snort";
 }
+  print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_SNORT' $checked{'ENABLE_SNORT'}{'on'} />   RED Snort";
+if ( -e "/var/ipfire/guardian/guardian.conf" ) {
+  print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_GUARDIAN' $checked{'ENABLE_GUARDIAN'}{'on'} />  Guardian";
+}
+
 print <<END
-<tr>
-       <td class='base'><input type='checkbox' name='ENABLE_SNORT' $checked{'ENABLE_SNORT'}{'on'} />
-               RED Snort</td>
-</tr>
+</td></tr>
 <tr>
        <td><hr /></td>
 </tr>
@@ -180,53 +517,41 @@ print <<END
        <td><b>$Lang::tr{'ids rules update'}</b></td>
 </tr>
 <tr>
-       <td><input type='radio' name='RULESTYPE' value='nothing' $checked{'RULESTYPE'}{'nothing'} />
-               $Lang::tr{'no'}</td>
-</tr>
-<tr>
-       <td><input type='radio' name='RULESTYPE' value='registered' $checked{'RULESTYPE'}{'registered'} />
-               $Lang::tr{'registered user rules'}</td>
-</tr>
-<tr>
-       <td><input type='radio' name='RULESTYPE' value='subscripted' $checked{'RULESTYPE'}{'subscripted'} />
-               $Lang::tr{'subscripted user rules'}</td>
+       <td><select name='RULES'>
+                               <option value='nothing' $selected{'RULES'}{'nothing'} >$Lang::tr{'no'}</option>
+                               <option value='emerging' $selected{'RULES'}{'emerging'} >$Lang::tr{'emerging rules'}</option>
+                               <option value='community' $selected{'RULES'}{'community'} >$Lang::tr{'community rules'}</option>
+                               <option value='registered' $selected{'RULES'}{'registered'} >$Lang::tr{'registered user rules'}</option>
+                               <option value='subscripted' $selected{'RULES'}{'subscripted'} >$Lang::tr{'subscripted user rules'}</option>
+                       </select>
+       </td>
 </tr>
 <tr>
        <td><br />
-               $Lang::tr{'ids rules license'} <a href='http://www.snort.org/' target='_blank'>http://www.snort.org</a>.<br />
-               <br />
-               $Lang::tr{'ids rules license2'} <a href='http://www.snort.org/reg-bin/userprefs.cgi' target='_blank'>USER PREFERENCES</a>, $Lang::tr{'ids rules license3'}<br />
+               $Lang::tr{'ids rules license'} <a href='https://www.snort.org/signup' target='_blank'>www.snort.org</a>$Lang::tr{'ids rules license1'}<br /><br />
+               $Lang::tr{'ids rules license2'} <a href='https://www.snort.org/account/oinkcode' target='_blank'>Get an Oinkcode</a>, $Lang::tr{'ids rules license3'}
        </td>
 </tr>
 <tr>
-       <td nowrap='nowrap'>Oink Code:&nbsp;<input type='text' size='40' name='OINKCODE' value='$snortsettings{'OINKCODE'}' /></td>
+       <td nowrap='nowrap'>Oinkcode:&nbsp;<input type='text' size='40' name='OINKCODE' value='$snortsettings{'OINKCODE'}' /></td>
 </tr>
 <tr>
        <td width='30%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' />
 END
 ;
-
-if ($snortsettings{'INSTALLMD5'} eq $md5) {
-       print "&nbsp;$Lang::tr{'rules already up to date'}</td>";
-} else {
-       if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} && $md5 eq $realmd5 ) {
-               $snortsettings{'INSTALLMD5'} = $realmd5;
-               $snortsettings{'INSTALLDATE'} = `/bin/date +'%Y-%m-%d'`;
-               &General::writehash("${General::swroot}/snort/settings", \%snortsettings);
-       }
-       print "&nbsp;$Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>";
+if ( -e "/var/tmp/snortrules.tar.gz"){
+       my @Info = stat("/var/tmp/snortrules.tar.gz");
+       $snortsettings{'INSTALLDATE'} = localtime($Info[9]);
 }
+print "&nbsp;$Lang::tr{'updates installed'}: $snortsettings{'INSTALLDATE'}</td>";
+
 print <<END
 </tr>
 </table>
 <hr />
 <table width='100%'>
 <tr>
-       <td width='55%'>&nbsp;</td>
-       <td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-       <td width='5%'>
-               &nbsp; <!-- space for future online help link -->
-       </td>
+       <td align='center'><input type='hidden' name='ACTION2' value='snort' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
 </tr>
 </table>
 </form>
@@ -238,76 +563,213 @@ if ($results ne '') {
 }
 
 &Header::closebox();
-&Header::closebigbox();
-&Header::closepage();
 
-sub getmd5 {
-       # Retrieve MD5 sum from $url.md5 file
-       #
-       my $md5buf = &geturl("$url.md5");
-       return undef unless $md5buf;
-
-       if (0) { # 1 to debug
-               my $filename='';
-               my $fh='';
-               ($fh, $filename) = tempfile('/tmp/XXXXXXXX',SUFFIX => '.md5' );
-               binmode ($fh);
-               syswrite ($fh, $md5buf->content);
-               close($fh);
-       }
-       return $md5buf->content;
+####################### Added for guardian control ####################################
+if ( -e "/var/ipfire/guardian/guardian.conf" ) {
+       &Header::openbox('100%', 'LEFT', $Lang::tr{'guardian configuration'});
+print <<END
+<form method='post' action='$ENV{'SCRIPT_NAME'}'><table width='100%'>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian interface'}</td><td align='left'><input type='text' name='GUARDIAN_INTERFACE' value='$snortsettings{'GUARDIAN_INTERFACE'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian timelimit'}</td><td align='left'><input type='text' name='GUARDIAN_TIMELIMIT' value='$snortsettings{'GUARDIAN_TIMELIMIT'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian logfile'}</td><td align='left'><input type='text' name='GUARDIAN_LOGFILE' value='$snortsettings{'GUARDIAN_LOGFILE'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian alertfile'}</td><td align='left'><input type='text' name='GUARDIAN_ALERTFILE' value='$snortsettings{'GUARDIAN_ALERTFILE'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'guardian ignorefile'}</td><td align='left'><textarea name='GUARDIAN_IGNOREFILE_CONTENT' cols='32' rows='6' wrap='off'>
+END
+;
+       print `cat /var/ipfire/guardian/guardian.ignore`;
+print <<END
+</textarea></td></tr>
+<tr><td align='center' colspan='2'><input type='hidden' name='ACTION2' value='guardian' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
+</table>
+</form>
+END
+;
+       &Header::closebox();
 }
-sub downloadrulesfile {
-       my $return = &geturl($url);
-       return undef unless $return;
 
-       if (index($return->content, "\037\213") == -1 ) { # \037\213 is .gz beginning
-               $errormessage = $Lang::tr{'invalid loaded file'};
-               return undef;
-       }
 
-       my $filename='';
-       my $fh='';
-       ($fh, $filename) = tempfile('/tmp/XXXXXXXX',SUFFIX => '.tar.gz' );#oinkmaster work only with this extension
-       binmode ($fh);
-       syswrite ($fh, $return->content);
-       close($fh);
-       return $filename;
+
+
+####################### Added for snort rules control #################################
+if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable_green" || -e "${General::swroot}/snort/enable_blue" || -e "${General::swroot}/snort/enable_orange" ) {
+       &Header::openbox('100%', 'LEFT', $Lang::tr{'intrusion detection system rules'});
+               # Output display table for rule files
+               print "<TABLE width='100%'><TR><TD VALIGN='TOP'><TABLE>";
+
+               print "<form method='post'>";
+
+               # Local vars
+               my $ruledisplaycnt = 1;
+               my $rulecnt = keys %snortrules;
+               $rulecnt++;
+               $rulecnt = $rulecnt / 2;
+
+               # Loop over each rule file
+               foreach my $rulefile (sort keys(%snortrules)) {
+                       my $rulechecked = '';
+
+                       # Hide inkompatible Block rules
+                       if ($rulefile =~'-BLOCK.rules') {
+                               next;
+                       }
+
+                       # Check if reached half-way through rule file rules to start new column
+               if ($ruledisplaycnt > $rulecnt) {
+                               print "</TABLE></TD><TD VALIGN='TOP'><TABLE>";
+                               $ruledisplaycnt = 0;
+                       }
+
+                       # Check if rule file is enabled
+                       if ($snortrules{$rulefile}{"State"} eq 'Enabled') {
+                               $rulechecked = 'CHECKED';
+                       }
+
+                       # Create rule file link, vars array, and display flag
+                       my $rulefilelink = "?RULEFILE=$rulefile";
+                       my $rulefiletoclose = '';
+                       my @queryvars = ();
+                       my $displayrulefilerules = 0;
+
+                       # Check for passed in query string
+                       if ($ENV{'QUERY_STRING'}) {
+                               # Split out vars
+                               @queryvars = split(/\&/, $ENV{'QUERY_STRING'});
+
+                               # Loop over values
+                               foreach $value (@queryvars) {
+                                       # Split out var pairs
+                                       ($var, $linkedrulefile) = split(/=/, $value);
+
+                                       # Check if var is 'RULEFILE'
+                                       if ($var eq 'RULEFILE') {
+                                               # Check if rulefile equals linkedrulefile
+                                               if ($rulefile eq $linkedrulefile) {
+                                                       # Set display flag
+                                                       $displayrulefilerules = 1;
+
+                                                       # Strip out rulefile from rulefilelink
+                                                       $rulefilelink =~ s/RULEFILE=$linkedrulefile//g;
+                                               } else {
+                                                       # Add linked rule file to rulefilelink
+                                                       $rulefilelink .= "&RULEFILE=$linkedrulefile";
+                                               }
+                                       }
+                               }
+                       }
+
+                       # Strip out extra & & ? from rulefilelink
+                       $rulefilelink =~ s/^\?\&/\?/i;
+
+                       # Check for a single '?' and replace with page for proper link display
+                       if ($rulefilelink eq '?') {
+                               $rulefilelink = "ids.cgi";
+                       }
+
+                       # Output rule file name and checkbox
+                       print "<TR><TD CLASS='base' VALIGN='TOP'><INPUT TYPE='checkbox' NAME='SNORT_RULE_$rulefile' $rulechecked> <A HREF='$rulefilelink'>$rulefile</A></TD></TR>";
+                       print "<TR><TD CLASS='base' VALIGN='TOP'>";
+
+                       # Check for empty 'Description'
+                       if ($snortrules{$rulefile}{'Description'} eq '') {
+                               print "<TABLE WIDTH='100%'><TR><TD CLASS='base'>No description available</TD></TR>";
+                       } else {
+                               # Output rule file 'Description'
+                               print "<TABLE WIDTH='100%'><TR><TD CLASS='base'>$snortrules{$rulefile}{'Description'}</TD></TR>";
+                       }
+
+                       # Check for display flag
+                       if ($displayrulefilerules) {
+                               # Rule file definition rule display
+                               print "<TR><TD CLASS='base' VALIGN='TOP'><TABLE border=1><TR>";
+
+                               # Local vars
+                               my $ruledefdisplaycnt = 0;
+                               my $ruledefcnt = keys %{$snortrules{$rulefile}{"Definition"}};
+                               $ruledefcnt++;
+                               $ruledefcnt = $ruledefcnt / 2;
+
+                               # Loop over rule file rules
+                               foreach my $ruledef (sort {$a <=> $b} keys(%{$snortrules{$rulefile}{"Definition"}})) {
+                                       # Local vars
+                                       my $ruledefchecked = '';
+
+                                       # If have display 2 rules, start new row
+                                       if (($ruledefdisplaycnt % 2) == 0) {
+                                               print "</TR><TR>";
+                                               $ruledefdisplaycnt = 0;
+                                       }
+
+                                       # Check for rules state
+                                       if ($snortrules{$rulefile}{'Definition'}{$ruledef}{'State'} eq 'Enabled') {
+                                               $ruledefchecked = 'CHECKED';
+                                       }
+
+                                       # Create rule file rule's checkbox
+                                       $checkboxname = "SNORT_RULE_$rulefile";
+                                       $checkboxname .= "_$ruledef";
+                                       print "<TD CLASS='base'><INPUT TYPE='checkbox' NAME='$checkboxname' $ruledefchecked> $snortrules{$rulefile}{'Definition'}{$ruledef}{'Description'}</TD>";
+
+                                       # Increment count
+                                       $ruledefdisplaycnt++;
+                               }
+
+                               # If do not have second rule for row, create empty cell
+                               if (($ruledefdisplaycnt % 2) != 0) {
+                                       print "<TD CLASS='base'></TD>";
+                               }
+
+                               # Close display table
+                               print "</TR></TABLE></TD></TR>";
+               }
+
+                       # Close display table
+                       print "</TABLE>";
+
+                       # Increment ruledisplaycnt
+               $ruledisplaycnt++;
+               }
+       print "</TD></TR></TABLE></TD></TR></TABLE>";
+       print <<END
+<table width='100%'>
+<tr>
+       <td width='33%'>&nbsp;</td>
+       <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
+       <td width='33%'>
+               &nbsp; <!-- space for future online help link -->
+       </td>
+</tr>
+</table>
+</form>
+END
+;
+       &Header::closebox();
 }
 
-sub geturl ($) {
-       my $url=$_[0];
+#######################  End added for snort rules control  #################################
+&Header::closebigbox();
+&Header::closepage();
+
+sub downloadrulesfile {
+       my $peer;
+       my $peerport;
+
+       unlink("/var/tmp/log");
 
        unless (-e "${General::swroot}/red/active") {
                $errormessage = $Lang::tr{'could not download latest updates'};
                return undef;
        }
 
-       my $downloader = LWP::UserAgent->new;
-       $downloader->timeout(5);
-
        my %proxysettings=();
        &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
 
        if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
-               my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
-               if ($proxysettings{'UPSTREAM_USER'}) {
-                       $downloader->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$peer:$peerport/");
-               } else {
-                       $downloader->proxy("http","http://$peer:$peerport/");
-               }
+               ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
        }
 
-       my $return = $downloader->get($url,'Cache-Control','no-cache');
-
-       if ($return->code == 403) {
-               $errormessage = $Lang::tr{'access refused with this oinkcode'};
-               return undef;
-       } elsif (!$return->is_success()) {
-               $errormessage = $Lang::tr{'could not download latest updates'};
-               return undef;
+       if ($peer) {
+               system("wget -r --proxy=on --proxy-user=$proxysettings{'UPSTREAM_USER'} --proxy-passwd=$proxysettings{'UPSTREAM_PASSWORD'} -e http_proxy=http://$peer:$peerport/ -o /var/tmp/log --no-check-certificate --output-document=/var/tmp/snortrules.tar.gz $url");
+       } else {
+               system("wget -r --no-check-certificate -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url");
        }
-
-       return $return;
-
 }