]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/ids.cgi
ids.cgi: Rename snortrules hash to idsrules.
[ipfire-2.x.git] / html / cgi-bin / ids.cgi
index daf9b341b512fe5e1e7b96efbe25b19a26b1218b..df2bfe5a58b84a3c571350e8bc4ade12ca6c3d0e 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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        #
@@ -24,55 +24,63 @@ use strict;
 # enable only the following on debugging purpose
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
-use File::Copy;
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "${General::swroot}/ids-functions.pl";
 
 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 %idsrules = ();
 my %snortsettings=();
+my %rulesetsources = ();
+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);
 
+my $snortrulepath = "/etc/snort/rules";
+my $snortusedrulefilesfile = "${General::swroot}/snort/snort-used-rulefiles.conf";
+my $errormessage;
+
 &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{'ACTION'} = '';
 $snortsettings{'RULES'} = '';
 $snortsettings{'OINKCODE'} = '';
-$snortsettings{'INSTALLDATE'} = '';
-$snortsettings{'FILE'} = '';
 
-&Header::getcgihash(\%snortsettings, {'wantfile' => 1, 'filevar' => 'FH'});
+#Get GUI values
+&Header::getcgihash(\%cgiparams);
 
-my $snortrulepath = "/etc/snort/rules";
-my $restartsnortrequired = 0;
-my %snortrules;
-my $rule = '';
-my $table1colour = '';
-my $table2colour = '';
-my $var = '';
-my $value = '';
-my $tmp = '';
-my $linkedrulefile = '';
-my $border = '';
-my $checkboxname = '';
-
-## Grab all available snort rules and store them in the snortrules hash.
+# Check if any error has been stored.
+if (-e $IDS::storederrorfile) {
+        # Open file to read in the stored error message.
+        open(FILE, "<$IDS::storederrorfile") or die "Could not open $IDS::storederrorfile. $!\n";
+
+        # Read the stored error message.
+        $errormessage = <FILE>;
+
+        # Close file.
+        close (FILE);
+
+        # Delete the file, which is now not longer required.
+        unlink($IDS::storederrorfile);
+}
+
+
+## Grab all available snort rules and store them in the idsrules hash.
 #
 # Open snort rules directory and do a directory listing.
 opendir(DIR, $snortrulepath) or die $!;
@@ -92,97 +100,224 @@ opendir(DIR, $snortrulepath) or die $!;
                next unless (-R "$snortrulepath/$file");
 
                # Call subfunction to read-in rulefile and add rules to
-               # the snortrules hash.
+               # the idsrules hash.
                &readrulesfile("$file");
        }
 
 closedir(DIR);
 
-if ($snortsettings{'OINKCODE'} ne "") {
-       $errormessage = $Lang::tr{'invalid input for oink code'} unless ($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/);
-}
+# 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";
+
+       # Read-in content.
+       my @lines = <FILE>;
 
-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";
+       # Close file.
+       close(FILE);
+
+       # Loop through the array.
+       foreach my $line (@lines) {
+               # Remove newlines.
+               chomp($line);
+
+               # Skip comments.
+               next if ($line =~ /\#/);
+
+               # Skip blank  lines.
+               next if ($line =~ /^\s*$/);
+
+               # Gather rule sid and message from the ruleline.
+               if ($line =~ /.*include \$RULE_PATH\/(.*)/) {
+                       my $rulefile = $1;
+
+                       # Add the rulefile to the %idsrules hash.
+                       $idsrules{$rulefile}{'Rulefile'}{'State'} = "on";
+               }
        }
+}
 
-       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";
+# 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 idsrules.
+       foreach my $rulefile(keys %idsrules) {
+               # 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};
                }
-               if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on')
-               {
-                       system ('/usr/bin/touch', "${General::swroot}/snort/enable_green");
-               } else {
-                       unlink "${General::swroot}/snort/enable_green";
+       }
+
+       # Loop through the hash of idsrules.
+       foreach my $rulefile (keys %idsrules) {
+               # Loop through the single rules of the rulefile.
+               foreach my $sid (keys %{$idsrules{$rulefile}}) {
+                       # Skip the current sid if it is not numeric.
+                       next unless ($sid =~ /\d+/ );
+
+                       # Check if there exists a key in the cgiparams hash for this sid.
+                       if (exists($cgiparams{$sid})) {
+                               # Look if the rule is disabled.
+                               if ($idsrules{$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{$rulefile}{$sid};
+                                       }
+                               }
+                       } else {
+                               # Look if the rule is enabled.
+                               if ($idsrules{$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{$rulefile}{$sid};
+                               }
+                       }
                }
-               if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on')
-               {
-                       system ('/usr/bin/touch', "${General::swroot}/snort/enable_blue");
-               } else {
-                       unlink "${General::swroot}/snort/enable_blue";
+       }
+
+       # Open enabled sid's file for writing.
+       open(FILE, ">$enabled_sids_file") or die "Could not write to $enabled_sids_file. $!\n";
+
+       # Write header to file.
+       print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
+
+       # Check if the enabled_sids array contains any sid's.
+       if (@enabled_sids) {
+               # Loop through the array of enabled sids and write them to the file.
+               foreach my $sid (@enabled_sids) {
+                       print FILE "enablesid $sid\n";
                }
-               if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on')
-               {
-                       system ('/usr/bin/touch', "${General::swroot}/snort/enable_orange");
-               } else {
-                       unlink "${General::swroot}/snort/enable_orange";
+       }
+
+       # Close file after writing.
+       close(FILE);
+
+       # 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";
+
+       # Check if the enabled_sids array contains any sid's.
+        if (@disabled_sids) {
+               # Loop through the array of disabled sids and write them to the file.
+               foreach my $sid (@disabled_sids) {
+                       print FILE "disablesid $sid\n";
                }
-               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";
+       }
+
+       # Close file after writing.
+       close(FILE);
+
+       # Open file for used rulefiles.
+       open (FILE, ">$snortusedrulefilesfile") or die "Could not write 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);
+
+       # Lock the webpage and print message.
+       &working_notice("$Lang::tr{'snort working'}");
+
+       # Call oinkmaster to alter the ruleset.
+       &IDS::oinkmaster();
+
+       # Reload page.
+       &reload();
+
+# Download new ruleset.
+} elsif ($cgiparams{'RULESET'} eq $Lang::tr{'download new ruleset'}) {
+       # Check if the red device is active.
+       unless (-e "${General::swroot}/red/active") {
+               $errormessage = $Lang::tr{'could not download latest updates'};
        }
 
-       # INSTALLMD5 is not in the form, so not retrieved by getcgihash
-       &General::readhash("${General::swroot}/snort/settings", \%snortsettings);
+       # Check if enought free disk space is availabe.
+       $errormessage = &IDS::checkdiskspace();
 
-       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;
+       # Check if any errors happend.
+       unless ($errormessage) {
+               # Lock the webpage and print notice about downloading
+               # a new ruleset.
+               &working_notice("$Lang::tr{'snort working'}");
 
-                       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`;
+               # Call subfunction to download the ruleset.
+               $errormessage = &IDS::downloadruleset();
 
-                                       }
+               # Check if the downloader returned an error.
+               if ($errormessage) {
+                       # Call function to store the errormessage.
+                       &IDS::log_error($errormessage);
 
-                                       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);
-                                       }
-                               }
-                       }
+                       # Preform a reload of the page.
+                       &reload();
+               } else {
+                       # Call subfunction to launch oinkmaster.
+                       &IDS::oinkmaster();
+
+                       # Perform a reload of the page.
+                       &reload();
+               }
+       }
+# Save snort settings.
+} elsif ($cgiparams{'SNORT'} eq $Lang::tr{'save'}) {
+       # Prevent form name from been stored in conf file.
+       delete $cgiparams{'SNORT'};
+
+       # Check if an oinkcode has been provided.
+       if ($cgiparams{'OINKCODE'}) {
+               # Check if the oinkcode contains unallowed chars.
+               unless ($cgiparams{'OINKCODE'} =~ /^[a-z0-9]+$/) {
+                       $errormessage = $Lang::tr{'invalid input for oink code'};
                }
        }
+
+       # Go on if there are no error messages.
+       if (!$errormessage) {
+               # Store settings into settings file.
+               &General::writehash("${General::swroot}/snort/settings", \%cgiparams);
+
+               # Call snortctrl to restart snort
+               system('/usr/local/bin/snortctrl restart >/dev/null');
+       }
 }
 
+# Read-in snortsettings
+&General::readhash("${General::swroot}/snort/settings", \%snortsettings);
+
 $checked{'ENABLE_SNORT'}{'off'} = '';
 $checked{'ENABLE_SNORT'}{'on'} = '';
 $checked{'ENABLE_SNORT'}{$snortsettings{'ENABLE_SNORT'}} = "checked='checked'";
@@ -218,19 +353,6 @@ END
 
 &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";
@@ -238,108 +360,107 @@ 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'}' title='$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 system'});
+
+my $rulesdate;
+
+# Check if a ruleset allready has been downloaded.
+if ( -f "$IDS::rulestarball"){
+       # Call stat on the filename to obtain detailed information.
+        my @Info = stat("$IDS::rulestarball");
+
+       # Grab details about the creation time.
+        $rulesdate = localtime($Info[9]);
 }
 
-&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system'});
 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
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='100%' border='0'>
+               <tr>
+                       <td class='base' width='25%'>
+                               <input type='checkbox' name='ENABLE_SNORT' $checked{'ENABLE_SNORT'}{'on'}>RED Snort
+                       </td>
+
+                       <td class='base' width='25%'>
+                               <input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'}>GREEN Snort
+                       </td>
+
+                       <td class='base' width='25%'>
 END
 ;
-if ($netsettings{'BLUE_DEV'} ne '') {
-  print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_SNORT_BLUE' $checked{'ENABLE_SNORT_BLUE'}{'on'} />   BLUE Snort";
+
+# Check if a blue device is configured.
+if ($netsettings{'BLUE_DEV'}) {
+  print "<input type='checkbox' name='ENABLE_SNORT_BLUE' $checked{'ENABLE_SNORT_BLUE'}{'on'} />BLUE Snort\n";
 }
-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 "</td>\n";
+
+print "<td width='25%'>\n";
+
+# Check if an orange device is configured.
+if ($netsettings{'ORANGE_DEV'}) {
+  print "<input type='checkbox' name='ENABLE_SNORT_ORANGE' $checked{'ENABLE_SNORT_ORANGE'}{'on'} />ORANGE Snort\n";
 }
-  print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ENABLE_SNORT' $checked{'ENABLE_SNORT'}{'on'} />   RED Snort";
 
 print <<END
-</td></tr>
-<tr>
-       <td><br><br></td>
-</tr>
-<tr>
-       <td><b>$Lang::tr{'ids rules update'}</b></td>
-</tr>
-<tr>
-       <td><select name='RULES'>
+                       </td>
+               </tr>
+
+               <tr>
+                       <td colspan='4'><br><br></td>
+               </tr>
+
+               <tr>
+                       <td colspan='4'><b>$Lang::tr{'ids rules update'}</b></td>
+               </tr>
+
+               <tr>
+                       <td colspan='4'><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='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>
-<tr>
-       <td nowrap='nowrap'>Oinkcode:&nbsp;<input type='text' size='40' name='OINKCODE' value='$snortsettings{'OINKCODE'}' /></td>
-</tr>
-<tr>
-       <td width='30%' align='left'><br><input type='submit' name='ACTION' value='$Lang::tr{'download new ruleset'}' />
-END
-;
-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>
-<br><br>
-<table width='100%'>
-<tr>
-       <td align='right'><input type='hidden' name='ACTION2' value='snort' /><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-</tr>
-</table>
+                       </td>
+               </tr>
+
+               <tr>
+                       <td colspan='4'>
+                               <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'}</br>
+                       </td>
+               </tr>
+
+               <tr>
+                       <td colspan='4' nowrap='nowrap'>Oinkcode:&nbsp;<input type='text' size='40' name='OINKCODE' value='$snortsettings{'OINKCODE'}'></td>
+               </tr>
+
+               <tr>
+                       <td colspan='4' align='left'><br>
+                               <input type='submit' name='RULESET' value='$Lang::tr{'download new ruleset'}'>&nbsp;$Lang::tr{'updates installed'}: $rulesdate
+                       </td>
+
+               </tr>
+       </table>
+
+       <br><br>
+
+       <table width='100%'>
+               <tr>
+                       <td align='right'><input type='submit' name='SNORT' value='$Lang::tr{'save'}' /></td>
+               </tr>
+       </table>
 </form>
 END
 ;
 
-if ($results ne '') {
-       print "$results";
-}
-
 &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";
 
@@ -348,18 +469,18 @@ if ($results ne '') {
        my $rulesetcount = 1;
 
        # Loop over each rule file
-       foreach my $rulefile (sort keys(%snortrules)) {
+       foreach my $rulefile (sort keys(%idsrules)) {
                my $rulechecked = '';
 
                # Check if rule file is enabled
-               if ($snortrules{$rulefile}{"State"} eq 'Enabled') {
+               if ($idsrules{$rulefile}{'Rulefile'}{'State'} eq 'on') {
                        $rulechecked = 'CHECKED';
                }
 
                # Table and rows for the rule files.
                print"<tr>\n";
                print"<td class='base' width='5%'>\n";
-               print"<input type='checkbox' name='SNORT_RULE_$rulefile' $rulechecked>\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";
@@ -380,10 +501,13 @@ if ($results ne '') {
                print "<table width='100%'>\n";
 
                # Loop over rule file rules
-               foreach my $sid (sort {$a <=> $b} keys(%{$snortrules{$rulefile}})) {
+               foreach my $sid (sort {$a <=> $b} keys(%{$idsrules{$rulefile}})) {
                        # Local vars
                        my $ruledefchecked = '';
 
+                       # Skip rulefile itself.
+                       next if ($sid eq "Rulefile");
+
                        # If 2 rules have been displayed, start a new row
                        if (($lines % 2) == 0) {
                                print "</tr><tr>\n";
@@ -400,7 +524,7 @@ if ($results ne '') {
                        }
 
                        # Set rule state
-                       if ($snortrules{$rulefile}{$sid}{'State'} eq 'Enabled') {
+                       if ($idsrules{$rulefile}{$sid}{'State'} eq 'on') {
                                $ruledefchecked = 'CHECKED';
                        }
 
@@ -408,7 +532,7 @@ if ($results ne '') {
                        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>";
+                       print "<td class='base' width='45%' $col>$idsrules{$rulefile}{$sid}{'Description'}</td>";
 
                        # Increment rule count
                        $lines++;
@@ -432,49 +556,57 @@ if ($results ne '') {
 print <<END
 <table width='100%'>
 <tr>
-       <td width='100%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}'>
+       <td width='100%' align='right'><input type='submit' name='RULESET' value='$Lang::tr{'update'}'>
                &nbsp; <!-- space for future online help link -->
        </td>
 </tr>
 </table>
+</form>
 END
 ;
 &Header::closebox();
-
 &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>";
+#
+## A function to display a notice, to lock the webpage and
+## tell the user which action currently will be performed.
+#
+sub working_notice ($) {
+       my ($message) = @_;
+
+       &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
+       &Header::openbigbox('100%', 'left', '', $errormessage);
+       &Header::openbox( 'Waiting', 1,);
+               print <<END;
+                       <table>
+                               <tr>
+                                       <td><img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' /></td>
+                                       <td>$message</td>
+                               </tr>
+                       </table>
+END
        &Header::closebox();
+       &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 %proxysettings=();
-       &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
-
-       if ($_=$proxysettings{'UPSTREAM_PROXY'}) {
-               ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);
-       }
+#
+## A tiny function to perform a reload of the webpage after one second.
+#
+sub reload () {
+       print "<meta http-equiv='refresh' content='1'>\n";
 
-       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 --output-document=/var/tmp/snortrules.tar.gz $url");
-       } else {
-               system("wget -r -o /var/tmp/log --output-document=/var/tmp/snortrules.tar.gz $url");
-       }
+       # Stop the script.
+       exit;
 }
 
+#
+## Private function to read-in and parse rules of a given rulefile.
+#
+## The given file will be read, parsed and all valid rules will be stored by ID,
+## message/description and it's state in the idsrules hash.
+#
 sub readrulesfile ($) {
        my $rulefile = shift;
 
@@ -506,16 +638,16 @@ sub readrulesfile ($) {
 
                        # Check if a rule has been found.
                        if ($sid && $msg) {
-                               # Add rule to the snortrules hash.
-                               $snortrules{$rulefile}{$sid}{'Description'} = $msg;
+                               # Add rule to the idsrules hash.
+                               $idsrules{$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'} = "Disabled";
+                                       $idsrules{$rulefile}{$sid}{'State'} = "off";
                                } else {
                                        # Otherwise the rule is enabled.
-                                       $snortrules{$rulefile}{$sid}{'State'} = "Enabled";
+                                       $idsrules{$rulefile}{$sid}{'State'} = "on";
                                }
                        }
                }