]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/ids.cgi
ids.cgi: Drop enabled rulefile from cgiparams hash after processing
[ipfire-2.x.git] / html / cgi-bin / ids.cgi
index ff72b7894b2457754a55021124a0d78e396599b5..3740bd801c5da4022f0c1d43d668cc159477183a 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  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        #
@@ -30,359 +30,287 @@ 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 %netsettings = ();
 my %snortsettings=();
+my %cgiparams=();
 my %checked=();
 my %selected=();
-my %netsettings=();
-our $errormessage = '';
-our $results = '';
-our $tempdir = '';
-our $url='';
+
+# Read-in main settings, for language, theme and colors.
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
+# Get netsettings.
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
 &Header::showhttpheaders();
 
+# Default settings for snort.
 $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{'ACTION2'} = '';
 $snortsettings{'RULES'} = '';
 $snortsettings{'OINKCODE'} = '';
 $snortsettings{'INSTALLDATE'} = '';
-$snortsettings{'FILE'} = '';
-$snortsettings{'UPLOAD'} = '';
 
-&Header::getcgihash(\%snortsettings, {'wantfile' => 1, 'filevar' => 'FH'});
+#Get GUI values
+&Header::getcgihash(\%cgiparams);
 
-####################### Added for snort rules control #################################
-my $snortrulepath; # change to "/etc/snort/rules" - maniac
-my @snortconfig;
+my $snortrulepath = "/etc/snort/rules";
+my $snortusedrulefilesfile = "${General::swroot}/snort/snort-used-rulefiles.conf";
 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;
+my $errormessage;
+my $url;
 
-               # 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";
+## Grab all available snort rules and store them in the snortrules hash.
+#
+# Open snort rules directory and do a directory listing.
+opendir(DIR, $snortrulepath) or die $!;
+       # Loop through the direcory.
+       while (my $file = readdir(DIR)) {
 
-                       # 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;
-                                       }
+               # We only want files.
+               next unless (-f "$snortrulepath/$file");
 
-                                       # 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;
-                                               }
-                                       }
+               # Ignore empty files.
+               next if (-z "$snortrulepath/$file");
 
-                                       # 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';
-                                               }
-                                       }
-                               }
+               # Use a regular expression to find files ending in .rules
+               next unless ($file =~ m/\.rules$/);
 
-                               # Print ruleline to RULEFILE
-                               print RULEFILE "$ruleline\n";
-                       }
+               # Ignore files which are not read-able.
+               next unless (-R "$snortrulepath/$file");
 
-                       # Close RULEFILE
-                       close(RULEFILE);
+               # Call subfunction to read-in rulefile and add rules to
+               # the snortrules hash.
+               &readrulesfile("$file");
+       }
 
-                       # 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;
-                               }
+closedir(DIR);
 
-                               # Strip out leading # from rule line
-                               $line =~ s/\# ?//i;
+# Gather used rulefiles.
+#
+# Check if the file for activated rulefiles is not empty.
+if(-f $snortusedrulefilesfile) {
+       # Open the file for used rulefile and read-in content.
+       open(FILE, $snortusedrulefilesfile) or die "Could not open $snortusedrulefilesfile. $!\n";
 
-                               # Check if it does not exists (which means it is disabled), append a #
-                               if (!exists $snortsettings{"SNORT_RULE_$rule"}) {
-                                       $line = "# $line";
-                               }
+       # Read-in content.
+       my @lines = <FILE>;
 
-                       }
+       # Close file.
+       close(FILE);
 
-                       # Check for rule state
-                       if ($line =~ /^\#/) {
-                               $snortrules{$rule}{"State"} = "Disabled";
-                       } else {
-                               $snortrules{$rule}{"State"} = "Enabled";
-                       }
+       # Loop through the array.
+       foreach my $line (@lines) {
+               # Remove newlines.
+               chomp($line);
 
-                       # Set rule description
-                       $snortrules{$rule}{"Description"} = $snortruledesc;
+               # Skip comments.
+               next if ($line =~ /\#/);
 
-                       # 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'};
-                       }
+               # Skip blank  lines.
+               next if ($line =~ /^\s*$/);
 
-                       $snortruledesc = '';
-                       print FILE "$line\n";
-               } elsif ($line =~ /var RULE_PATH/) {
-                       ($tmp, $tmp, $snortrulepath) = split(' ', $line);
-                       print FILE "$line\n";
-               } else {
-                       print FILE "$line\n";
+               # Gather rule sid and message from the ruleline.
+               if ($line =~ /.*include \$RULE_PATH\/(.*)/) {
+                       my $rulefile = $1;
+
+                       # Add the rulefile to the %snortrules hash.
+                       $snortrules{$rulefile}{'Rulefile'}{'State'} = "on";
                }
        }
-       close(FILE);
+}
 
-       if ($restartsnortrequired) {
-               system('/usr/local/bin/snortctrl restart >/dev/null');
+# Save ruleset.
+if ($cgiparams{'RULESET'} eq $Lang::tr{'update'}) {
+       my $enabled_sids_file = "${General::swroot}/snort/oinkmaster-enabled-sids.conf";
+       my $disabled_sids_file = "${General::swroot}/snort/oinkmaster-disabled-sids.conf";
+
+       # Arrays to store sid which should be added to the corresponding files.
+       my @enabled_sids;
+       my @disabled_sids;
+       my @enabled_rulefiles;
+
+       # Loop through the hash of snortrules.
+       foreach my $rulefile(keys %snortrules) {
+               # Check if the rulefile is enabled.
+               if ($cgiparams{$rulefile} eq "on") {
+                       # Add rulefile to the array of enabled rulefiles.
+                       push(@enabled_rulefiles, $rulefile);
+
+                       # Drop item from cgiparams hash.
+                       delete $cgiparams{$rulefile};
+               }
+
+               # Loop through the single rules of the rulefile.
+               foreach my $sid (keys %{$snortrules{$rulefile}}) {
+                       # Check if there exists a key in the cgiparams hash for this sid.
+                       if (exists($cgiparams{$sid})) {
+                               # Look if the rule is disabled.
+                               if ($snortrules{$rulefile}{$sid}{'State'} eq "off") {
+                                       # Check if the state has been set to 'on'.
+                                       if ($cgiparams{$sid} eq "on") {
+                                               # Add the sid to the enabled_sids array.
+                                               push(@enabled_sids, $sid);
+
+                                               # Drop item from cgiparams hash.
+                                               delete $cgiparams{$sid};
+                                       }
+                               }
+                       } else {
+                               # Look if the rule is enabled.
+                               if ($snortrules{$rulefile}{$sid}{'State'} eq "on") {
+                                       # Check if the state is 'on' and should be disabled.
+                                       # In this case there is no entry
+                                       # for the sid in the cgiparams hash.
+                                       # Add it to the disabled_sids array.
+                                       push(@disabled_sids, $sid);
+
+                                       # Drop item from cgiparams hash.
+                                       delete $cgiparams{$sid};
+                               }
+                       }
+               }
        }
-}
 
-#######################  End added for snort rules control  #################################
+       # Check if the enabled_sids array contains any sid's.
+       if (@enabled_sids) {
+               # Open enabled sid's file for writing.
+               open(FILE, ">$enabled_sids_file") or die "Could not write to $enabled_sids_file. $!\n";
 
-if ($snortsettings{'RULES'} eq 'subscripted') {
-       $url=" https://www.snort.org/rules/snortrules-snapshot-2961.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
-} elsif ($snortsettings{'RULES'} eq 'registered') {
-       $url=" https://www.snort.org/rules/snortrules-snapshot-2961.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
-} elsif ($snortsettings{'RULES'} eq 'community') {
-       $url=" https://www.snort.org/rules/community";
-} else {
-       $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
-}
+               # Write header to file.
+               print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
 
-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{'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 ('/usr/bin/touch', "${General::swroot}/snort/enable");
-       } else {
-               unlink "${General::swroot}/snort/enable";
-       }
-       if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on')
-       {
-               system ('/usr/bin/touch', "${General::swroot}/snort/enable_green");
-       } else {
-               unlink "${General::swroot}/snort/enable_green";
-       }
-       if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on')
-       {
-               system ('/usr/bin/touch', "${General::swroot}/snort/enable_blue");
-       } else {
-               unlink "${General::swroot}/snort/enable_blue";
-       }
-       if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on')
-       {
-               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";
+               # Loop through the array of enabled sids and write them to the file.
+               foreach my $sid (@enabled_sids) {
+                       print FILE "enable_sid $sid\n";
+               }
+
+               # Close file after writing.
+               close(FILE);
        }
-       if ($snortsettings{'ENABLE_GUARDIAN'} eq 'on')
-       {
-               system ('/usr/bin/touch', "${General::swroot}/guardian/enable");
-       } else {
-               unlink "${General::swroot}/guardian/enable";
+
+       # Check if the enabled_sids array contains any sid's.
+       if (@disabled_sids) {
+                # Open disabled sid's file for writing.
+                open(FILE, ">$disabled_sids_file") or die "Could not write to $disabled_sids_file. $!\n";
+
+                # Write header to file.
+                print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
+
+                # Loop through the array of disabled sids and write them to the file.
+                foreach my $sid (@disabled_sids) {
+                        print FILE "disable_sid $sid\n";
+                }
+
+                # Close file after writing.
+                close(FILE);
+        }
+
+       # Open file for used rulefiles.
+       open (FILE, ">$snortusedrulefilesfile") or die "Could not wirte to $snortusedrulefilesfile. $!\n";
+
+       # Write header to file.
+       print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
+
+       # Check if the enabled_rulefiles array contains any entries.
+       if (@enabled_rulefiles) {
+               # Loop through the array of rulefiles which should be loaded and write the to the file.
+               foreach my $file (@enabled_rulefiles) {
+                       print FILE "include \$RULE_PATH/$file\n";
+               }
        }
 
-       system('/usr/local/bin/snortctrl restart >/dev/null');
+       # Close file after writing.
+       close(FILE);
+}
 
-} 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');
+if ($snortsettings{'OINKCODE'} ne "") {
+       $errormessage = $Lang::tr{'invalid input for oink code'} unless ($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/);
 }
-        # 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'} || $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'}) {
+if (!$errormessage) {
+       if ($snortsettings{'RULES'} eq 'subscripted') {
+               $url=" https://www.snort.org/rules/snortrules-snapshot-29111.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+       } elsif ($snortsettings{'RULES'} eq 'registered') {
+               $url=" https://www.snort.org/rules/snortrules-snapshot-29111.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+       } elsif ($snortsettings{'RULES'} eq 'community') {
+               $url=" https://www.snort.org/rules/community";
+       } else {
+               $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
+       }
 
-       my @df = `/bin/df -B M /var`;
-       foreach my $line (@df) {
-               next if $line =~ m/^Filesystem/;
-               my $return;
+       if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) {
+               &General::writehash("${General::swroot}/snort/settings", \%snortsettings);
+               if ($snortsettings{'ENABLE_SNORT'} eq 'on')
+               {
+                       system ('/usr/bin/touch', "${General::swroot}/snort/enable");
+               } else {
+                       unlink "${General::swroot}/snort/enable";
+               }
+               if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on')
+               {
+                       system ('/usr/bin/touch', "${General::swroot}/snort/enable_green");
+               } else {
+                       unlink "${General::swroot}/snort/enable_green";
+               }
+               if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on')
+               {
+                       system ('/usr/bin/touch', "${General::swroot}/snort/enable_blue");
+               } else {
+                       unlink "${General::swroot}/snort/enable_blue";
+               }
+               if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on')
+               {
+                       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 ($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 {
+               system('/usr/local/bin/snortctrl restart >/dev/null');
+       }
 
-                               if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} ){
+       # INSTALLMD5 is not in the form, so not retrieved by getcgihash
+       &General::readhash("${General::swroot}/snort/settings", \%snortsettings);
 
-                                       &downloadrulesfile();
-                                       sleep(3);
-                                       $return = `cat /var/tmp/log 2>/dev/null`;
+       if ($snortsettings{'ACTION'} eq $Lang::tr{'download 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 {
+                                       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"){
+                                       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);
                                        }
+                               }
                        }
                }
        }
@@ -400,9 +328,6 @@ $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{'ENABLE_GUARDIAN'}{'off'} = '';
-$checked{'ENABLE_GUARDIAN'}{'on'} = '';
-$checked{'ENABLE_GUARDIAN'}{$snortsettings{'ENABLE_GUARDIAN'}} = "checked='checked'";
 $selected{'RULES'}{'nothing'} = '';
 $selected{'RULES'}{'community'} = '';
 $selected{'RULES'}{'emerging'} = '';
@@ -412,31 +337,17 @@ $selected{'RULES'}{$snortsettings{'RULES'}} = "selected='selected'";
 
 &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
 
-####################### Added for snort rules control #################################
-print "<script type='text/javascript' src='/include/snortupdateutility.js'></script>";
+### Java 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>
+<script>
+       // Tiny java script function to show/hide the rules
+       // of a given category.
+       function showhide(tblname) {
+               \$("#" + tblname).toggle();
+       }
+</script>
 END
 ;
-#######################  End added for snort rules control  #################################
 
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
@@ -504,9 +415,6 @@ if ($netsettings{'ORANGE_DEV'} ne '') {
   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
 </td></tr>
@@ -528,7 +436,7 @@ print <<END
 </tr>
 <tr>
        <td><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 license'} <a href='https://www.snort.org/subscribe' 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>
@@ -558,181 +466,107 @@ print <<END
 END
 ;
 
-if ($results ne '') {
-       print "$results";
-}
-
 &Header::closebox();
 
-####################### 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='right' 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();
-}
+&Header::openbox('100%', 'LEFT', $Lang::tr{'intrusion detection system rules'});
+       print"<form method='POST' action='$ENV{'SCRIPT_NAME'}'>\n";
 
+       # Output display table for rule files
+       print "<table width='100%'>\n";
 
+       # Local variable required for java script to show/hide
+       # rules of a rulefile.
+       my $rulesetcount = 1;
 
+       # Loop over each rule file
+       foreach my $rulefile (sort keys(%snortrules)) {
+               my $rulechecked = '';
 
-####################### 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>";
+               # Check if rule file is enabled
+               if ($snortrules{$rulefile}{'Rulefile'}{'State'} eq 'on') {
+                       $rulechecked = 'CHECKED';
+               }
 
-               print "<form method='post'>";
+               # Table and rows for the rule files.
+               print"<tr>\n";
+               print"<td class='base' width='5%'>\n";
+               print"<input type='checkbox' name='$rulefile' $rulechecked>\n";
+               print"</td>\n";
+               print"<td class='base' width='90%'><b>$rulefile</b></td>\n";
+               print"<td class='base' width='5%' align='right'>\n";
+               print"<a href=\"javascript:showhide('ruleset$rulesetcount')\">SHOW</a>\n";
+               print"</td>\n";
+               print"</tr>\n";
+
+               # Rows which will be hidden per default and will contain the single rules.
+               print"<tr  style='display:none' id='ruleset$rulesetcount'>\n";
+               print"<td colspan='3'>\n";
 
                # 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;
-                       }
+               my $lines;
+               my $rows;
+               my $col;
 
-                       # 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;
-                       }
+               # New table for the single rules.
+               print "<table width='100%'>\n";
 
-                       # Check if rule file is enabled
-                       if ($snortrules{$rulefile}{"State"} eq 'Enabled') {
-                               $rulechecked = 'CHECKED';
-                       }
+               # Loop over rule file rules
+               foreach my $sid (sort {$a <=> $b} keys(%{$snortrules{$rulefile}})) {
+                       # Local vars
+                       my $ruledefchecked = '';
 
-                       # 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";
-                                               }
-                                       }
-                               }
-                       }
+                       # Skip rulefile itself.
+                       next if ($sid eq "Rulefile");
 
-                       # Strip out extra & & ? from rulefilelink
-                       $rulefilelink =~ s/^\?\&/\?/i;
+                       # If 2 rules have been displayed, start a new row
+                       if (($lines % 2) == 0) {
+                               print "</tr><tr>\n";
 
-                       # Check for a single '?' and replace with page for proper link display
-                       if ($rulefilelink eq '?') {
-                               $rulefilelink = "ids.cgi";
+                               # Increase rows by once.
+                               $rows++;
                        }
 
-                       # 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>";
+                       # Colour lines.
+                       if ($rows % 2) {
+                               $col="bgcolor='$color{'color20'}'";
                        } else {
-                               # Output rule file 'Description'
-                               print "<table width='100%'><tr><td class='base'>$snortrules{$rulefile}{'Description'}</td></tr>";
+                               $col="bgcolor='$color{'color22'}'";
                        }
 
-                       # Check for display flag
-                       if ($displayrulefilerules) {
-                               # Rule file definition rule display
-                               print "<tr><td class='base' valign='top'><table border='0'><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;
-                                       }
+                       # Set rule state
+                       if ($snortrules{$rulefile}{$sid}{'State'} eq 'on') {
+                               $ruledefchecked = 'CHECKED';
+                       }
 
-                                       # Check for rules state
-                                       if ($snortrules{$rulefile}{'Definition'}{$ruledef}{'State'} eq 'Enabled') {
-                                               $ruledefchecked = 'CHECKED';
-                                       }
+                       # Create rule checkbox and display rule description
+                       print "<td class='base' width='5%' align='right' $col>\n";
+                       print "<input type='checkbox' NAME='$sid' $ruledefchecked>\n";
+                       print "</td>\n";
+                       print "<td class='base' width='45%' $col>$snortrules{$rulefile}{$sid}{'Description'}</td>";
 
-                                       # 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 rule count
+                       $lines++;
+               }
 
-                                       # Increment count
-                                       $ruledefdisplaycnt++;
-                               }
+               # If do not have a second rule for row, create empty cell
+               if (($lines % 2) != 0) {
+                       print "<td class='base'></td>";
+               }
 
-                               # 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 "</tr></table></td></tr>";
-               }
+               # Finished whith the rule file, increase count.
+               $rulesetcount++;
+       }
 
-                       # Close display table
-                       print "</table>";
+       # Close display table
+       print "</table>";
 
-                       # Increment ruledisplaycnt
-               $ruledisplaycnt++;
-               }
-       print "</td></tr></table></td></tr></table>";
-       print <<END
+print <<END
 <table width='100%'>
 <tr>
-       <td width='100%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
+       <td width='100%' align='right'><input type='submit' name='RULESET' value='$Lang::tr{'update'}'>
                &nbsp; <!-- space for future online help link -->
        </td>
 </tr>
@@ -740,13 +574,17 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 </form>
 END
 ;
-       &Header::closebox();
-}
+&Header::closebox();
 
-#######################  End added for snort rules control  #################################
 &Header::closebigbox();
 &Header::closepage();
 
+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();
+}
+
 sub downloadrulesfile {
        my $peer;
        my $peerport;
@@ -766,8 +604,55 @@ sub downloadrulesfile {
        }
 
        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");
+               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 --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");
+               system("wget -r -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url");
        }
 }
+
+sub readrulesfile ($) {
+       my $rulefile = shift;
+
+       # Open rule file and read in contents
+       open(RULEFILE, "$snortrulepath/$rulefile") or die "Unable to read $rulefile!";
+
+       # Store file content in an array.
+       my @lines = <RULEFILE>;
+
+       # Close file.
+       close(RULEFILE);
+
+       # Loop over rule file contents
+       foreach my $line (@lines) {
+               # Remove whitespaces.
+               chomp $line;
+
+               # Skip blank  lines.
+               next if ($line =~ /^\s*$/);
+
+               # Local vars.
+               my $sid;
+               my $msg;
+
+               # Gather rule sid and message from the ruleline.
+               if ($line =~ m/.*msg:\"(.*?)\"\; .* sid:(.*?); /) {
+                       $msg = $1;
+                       $sid = $2;
+
+                       # Check if a rule has been found.
+                       if ($sid && $msg) {
+                               # Add rule to the snortrules hash.
+                               $snortrules{$rulefile}{$sid}{'Description'} = $msg;
+
+                               # Grab status of the rule. Check if ruleline starts with a "dash".
+                               if ($line =~ /^\#/) {
+                                       # If yes, the rule is disabled.
+                                       $snortrules{$rulefile}{$sid}{'State'} = "off";
+                               } else {
+                                       # Otherwise the rule is enabled.
+                                       $snortrules{$rulefile}{$sid}{'State'} = "on";
+                               }
+                       }
+               }
+        }
+}