]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/ids.cgi
ids.cgi: Rework section to configure the IDS
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / ids.cgi
index 2b9b7c0b164c331598696b8900d8df7a2448d210..0dce9e994d44ad814d8984493cb4d59b9b7473a5 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,17 +24,17 @@ 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 = ();
-my %netsettings = ();
-my %snortrules = ();
-my %snortsettings=();
+my %idsrules = ();
+my %idssettings=();
+my %rulesetsources = ();
 my %cgiparams=();
 my %checked=();
 my %selected=();
@@ -43,56 +43,55 @@ my %selected=();
 &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);
+# Get the available network zones, based on the config type of the system and store
+# the list of zones in an array.
+my @network_zones = &IDS::get_available_network_zones();
 
-&Header::showhttpheaders();
+my $idsusedrulefilesfile = "$IDS::settingsdir/suricata-used-rulefiles.yaml";
+my $errormessage;
 
-# Default settings for snort.
-$snortsettings{'ENABLE_SNORT'} = 'off';
-$snortsettings{'ENABLE_SNORT_GREEN'} = 'off';
-$snortsettings{'ENABLE_SNORT_BLUE'} = 'off';
-$snortsettings{'ENABLE_SNORT_ORANGE'} = 'off';
-$snortsettings{'RULES'} = '';
-$snortsettings{'OINKCODE'} = '';
-$snortsettings{'INSTALLDATE'} = '';
+&Header::showhttpheaders();
 
 #Get GUI values
 &Header::getcgihash(\%cgiparams);
 
-my $snortrulepath = "/etc/snort/rules";
-my $snortusedrulefilesfile = "${General::swroot}/snort/snort-used-rulefiles.conf";
-my $errormessage;
+# 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";
 
-# Try to determine if oinkmaster is running.
-my $oinkmaster_pid = `pidof oinkmaster.pl -x`;
+        # Read the stored error message.
+        $errormessage = <FILE>;
 
-# If oinkmaster is running display output.
-if ($oinkmaster_pid) {
-       &working("$Lang::tr{'snort working'}");
+        # 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 snortrules hash.
+
+## 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 $!;
+opendir(DIR, $IDS::rulespath) or die $!;
        # Loop through the direcory.
        while (my $file = readdir(DIR)) {
 
                # We only want files.
-               next unless (-f "$snortrulepath/$file");
+               next unless (-f "$IDS::rulespath/$file");
 
                # Ignore empty files.
-               next if (-z "$snortrulepath/$file");
+               next if (-z "$IDS::rulespath/$file");
 
                # Use a regular expression to find files ending in .rules
                next unless ($file =~ m/\.rules$/);
 
                # Ignore files which are not read-able.
-               next unless (-R "$snortrulepath/$file");
+               next unless (-R "$IDS::rulespath/$file");
 
                # Call subfunction to read-in rulefile and add rules to
-               # the snortrules hash.
+               # the idsrules hash.
                &readrulesfile("$file");
        }
 
@@ -101,9 +100,9 @@ closedir(DIR);
 # Gather used rulefiles.
 #
 # Check if the file for activated rulefiles is not empty.
-if(-f $snortusedrulefilesfile) {
+if(-f $idsusedrulefilesfile) {
        # Open the file for used rulefile and read-in content.
-       open(FILE, $snortusedrulefilesfile) or die "Could not open $snortusedrulefilesfile. $!\n";
+       open(FILE, $idsusedrulefilesfile) or die "Could not open $idsusedrulefilesfile. $!\n";
 
        # Read-in content.
        my @lines = <FILE>;
@@ -123,27 +122,27 @@ if(-f $snortusedrulefilesfile) {
                next if ($line =~ /^\s*$/);
 
                # Gather rule sid and message from the ruleline.
-               if ($line =~ /.*include \$RULE_PATH\/(.*)/) {
+               if ($line =~ /.*(.*)/) {
                        my $rulefile = $1;
 
-                       # Add the rulefile to the %snortrules hash.
-                       $snortrules{$rulefile}{'Rulefile'}{'State'} = "on";
+                       # Add the rulefile to the %idsrules hash.
+                       $idsrules{$rulefile}{'Rulefile'}{'State'} = "on";
                }
        }
 }
 
 # 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";
+       my $enabled_sids_file = "$IDS::settingsdir/oinkmaster-enabled-sids.conf";
+       my $disabled_sids_file = "$IDS::settingsdir/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) {
+       # 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.
@@ -154,17 +153,17 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'update'}) {
                }
        }
 
-       # Loop through the hash of snortrules.
-       foreach my $rulefile (keys %snortrules) {
+       # Loop through the hash of idsrules.
+       foreach my $rulefile (keys %idsrules) {
                # Loop through the single rules of the rulefile.
-               foreach my $sid (keys %{$snortrules{$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 ($snortrules{$rulefile}{$sid}{'State'} eq "off") {
+                               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.
@@ -176,7 +175,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'update'}) {
                                }
                        } else {
                                # Look if the rule is enabled.
-                               if ($snortrules{$rulefile}{$sid}{'State'} eq "on") {
+                               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.
@@ -225,7 +224,11 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'update'}) {
        close(FILE);
 
        # Open file for used rulefiles.
-       open (FILE, ">$snortusedrulefilesfile") or die "Could not write to $snortusedrulefilesfile. $!\n";
+       open (FILE, ">$idsusedrulefilesfile") or die "Could not write to $idsusedrulefilesfile. $!\n";
+
+       # Write yaml header to the file.
+       print FILE "%YAML 1.1\n";
+       print FILE "---\n\n";
 
        # Write header to file.
        print FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
@@ -234,64 +237,55 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'update'}) {
        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";
+                       print FILE " - $file\n";
                }
        }
 
        # Close file after writing.
        close(FILE);
 
+       # Lock the webpage and print message.
+       &working_notice("$Lang::tr{'snort working'}");
+
        # Call oinkmaster to alter the ruleset.
-       &oinkmaster();
+       &IDS::oinkmaster();
+
+       # Reload page.
+       &reload();
 
 # Download new ruleset.
 } elsif ($cgiparams{'RULESET'} eq $Lang::tr{'download new ruleset'}) {
-       # Local var.
-       my $return;
-
-       # Call diskfree to gather the free disk space of /var.
-       my @df = `/bin/df -B M /var`;
-
-       # Loop through the output.
-       foreach my $line (@df) {
-               # Ignore header line.
-               next if $line =~ m/^Filesystem/;
-
-               # Search for a line with the device information.
-               if ($line =~ m/dev/ ) {
-                       # Split the line into single pieces.
-                       my @values = split(' ', $line);
-                       my ($filesystem, $blocks, $used, $available, $used_perenctage, $mounted_on) = @values;
-
-                       # Check if the available disk space is more than 300MB.
-                       if ($available < 300) {
-                               # If there is not enough space, print out an error message.
-                               $errormessage = "$Lang::tr{'not enough disk space'} < 300MB, /var $1MB";
-                       } else {
-                               # Call subfunction to download the ruleset.
-                               &downloadrulesfile();
+       # Check if the red device is active.
+       unless (-e "${General::swroot}/red/active") {
+               $errormessage = $Lang::tr{'could not download latest updates'};
+       }
 
-                               # Sleep for 3 seconds.
-                               sleep(3);
+       # Check if enought free disk space is availabe.
+       if(&IDS::checkdiskspace()) {
+               $errormessage = "$Lang::tr{'not enough disk space'}";
+       }
 
-                               # Gather return of the external wget.
-                               $return = `cat /var/tmp/log 2>/dev/null`;
-                       }
+       # Check if any errors happend.
+       unless ($errormessage) {
+               # Lock the webpage and print notice about downloading
+               # a new ruleset.
+               &working_notice("$Lang::tr{'snort working'}");
 
-                       # Check if there was an error.
-                       if ($return =~ "ERROR") {
-                               # Store error message for display.
-                               $errormessage = "<br /><pre>".$return."</pre>";
-                       } else {
-                               # Remove logfile.
-                               unlink("/var/tmp/log");
+               # Call subfunction to download the ruleset.
+               if(&IDS::downloadruleset()) {
+                       $errormessage = $Lang::tr{'could not download latest updates'};
 
-                               # Call subfunction to launch oinkmaster.
-                               &oinkmaster();
+                       # Call function to store the errormessage.
+                       &IDS::_store_error_message($errormessage);
 
-                               # Sleep for 2 seconds.
-                               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.
@@ -310,65 +304,25 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'update'}) {
        # Go on if there are no error messages.
        if (!$errormessage) {
                # Store settings into settings file.
-               &General::writehash("${General::swroot}/snort/settings", \%cgiparams);
+               &General::writehash("$IDS::settingsdir/settings", \%cgiparams);
 
-               # Create/Remove control files for snort.
-               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";
-               }
-
-               # Call snortctrl to restart snort
-               system('/usr/local/bin/snortctrl restart >/dev/null');
+               # Call suricatactrl to restart the IDS
+               system('/usr/local/bin/suricatactrl 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'";
-$checked{'ENABLE_SNORT_GREEN'}{'off'} = '';
-$checked{'ENABLE_SNORT_GREEN'}{'on'} = '';
-$checked{'ENABLE_SNORT_GREEN'}{$snortsettings{'ENABLE_SNORT_GREEN'}} = "checked='checked'";
-$checked{'ENABLE_SNORT_BLUE'}{'off'} = '';
-$checked{'ENABLE_SNORT_BLUE'}{'on'} = '';
-$checked{'ENABLE_SNORT_BLUE'}{$snortsettings{'ENABLE_SNORT_BLUE'}} = "checked='checked'";
-$checked{'ENABLE_SNORT_ORANGE'}{'off'} = '';
-$checked{'ENABLE_SNORT_ORANGE'}{'on'} = '';
-$checked{'ENABLE_SNORT_ORANGE'}{$snortsettings{'ENABLE_SNORT_ORANGE'}} = "checked='checked'";
+# Read-in idssettings
+&General::readhash("$IDS::settingsdir/settings", \%idssettings);
+
+$checked{'ENABLE_IDS'}{'off'} = '';
+$checked{'ENABLE_IDS'}{'on'} = '';
+$checked{'ENABLE_IDS'}{$idssettings{'ENABLE_IDS'}} = "checked='checked'";
 $selected{'RULES'}{'nothing'} = '';
 $selected{'RULES'}{'community'} = '';
 $selected{'RULES'}{'emerging'} = '';
 $selected{'RULES'}{'registered'} = '';
 $selected{'RULES'}{'subscripted'} = '';
-$selected{'RULES'}{$snortsettings{'RULES'}} = "selected='selected'";
+$selected{'RULES'}{$idssettings{'RULES'}} = "selected='selected'";
 
 &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
 
@@ -394,65 +348,124 @@ if ($errormessage) {
 }
 
 &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]);
+}
+
 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_IDS' $checked{'ENABLE_IDS'}{'on'}>$Lang::tr{'ids activate'} $Lang::tr{'intrusion detection system'}
+                       </td>
+
+                       <td class='base' width='25%'>
+                               &nbsp
+                       </td>
+               </tr>
+
+               <tr>
+                       <td colspan='2'><br><br>
+               </tr>
+
+               <tr>
+                       <td class='base' width='25%'>
+                               <b>$Lang::tr{'ids analyze incomming traffic'}</b>
+                       </td>
+
+                       <td class='base' width='25%'>
+                               <b>$Lang::tr{'ids analyze routing traffic'}</b>
+                       </td>
+               </tr>
 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";
-}
-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";
+
+# Loop through the array of available networks and print config options.
+foreach my $zone (@network_zones) {
+       my $checked_input;
+       my $checked_forward;
+
+       # Convert current zone name to upper case.
+       my $zone_upper = uc($zone);
+
+       # Grab checkbox status from settings hash.
+       if ($idssettings{"ENABLE_IDS_INPUT_$zone_upper"} eq "on") {
+               $checked_input = "checked = 'checked'";
+       }
+
+       # Do the same for the forward setting.
+       if ($idssettings{"ENABLE_IDS_FORWARD_$zone_upper"} eq "on") {
+               $checked_forward = "checked = 'checked'";
+       }
+
+       print "<tr>\n";
+       print "<td class='base' width='25%'>\n";
+       print "<input type='checkbox' name='ENABLE_IDS_INPUT_$zone_upper' $checked_input>$Lang::tr{'ids active on'} $Lang::tr{$zone}\n";
+       print "</td>\n";
+
+       print "<td class='base' width='25%'>\n";
+       print "<input type='checkbox' name='ENABLE_IDS_FORWARD_$zone_upper' $checked_forward>$Lang::tr{'ids active on'} $Lang::tr{$zone}\n";
+       print "</td>\n";
+       print "</tr>\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'>
+               </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='RULESET' 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='submit' name='SNORT' 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='$idssettings{'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
 ;
@@ -470,11 +483,11 @@ END
        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}{'Rulefile'}{'State'} eq 'on') {
+               if ($idsrules{$rulefile}{'Rulefile'}{'State'} eq 'on') {
                        $rulechecked = 'CHECKED';
                }
 
@@ -502,7 +515,7 @@ END
                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 = '';
 
@@ -525,7 +538,7 @@ END
                        }
 
                        # Set rule state
-                       if ($snortrules{$rulefile}{$sid}{'State'} eq 'on') {
+                       if ($idsrules{$rulefile}{$sid}{'State'} eq 'on') {
                                $ruledefchecked = 'CHECKED';
                        }
 
@@ -533,7 +546,7 @@ END
                        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++;
@@ -569,87 +582,50 @@ END
 &Header::closebigbox();
 &Header::closepage();
 
-sub working ($) {
-       my $message = $_[0];
-
-        &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
-        &Header::openbigbox('100%', 'left', '', $errormessage);
-        &Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1'>" );
-        print <<END;
-        <table>
-                <tr>
-                        <td><img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' /></td>
-                        <td>$message</td>
-                </tr>
-                <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>
-        </table>
+#
+## 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();
-        exit;
+       &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;
-       }
-
-       # Gather snort settings.
-       my %snortsettings = ();
-       &General::readhash("${General::swroot}/snort/settings", \%snortsettings);
-
-       # Get all available ruleset locations.
-       my %urls=();
-       &General::readhash("${General::swroot}/snort/ruleset-sources.list", \%urls);
-
-       # Grab the right url based on the configured vendor.
-       my $url = $urls{$snortsettings{'RULES'}};
-
-       # Check and pass oinkcode if the vendor requires one.
-       $url =~ s/\<oinkcode\>/$snortsettings{'OINKCODE'}/g;
-
-       # Abort if no url could be determined for the vendor.
-       unless($url) {
-               $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}))?(?:\/.*?)?$/);
-       }
-
-       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");
-       }
-}
+#
+## A tiny function to perform a reload of the webpage after one second.
+#
+sub reload () {
+       print "<meta http-equiv='refresh' content='1'>\n";
 
-sub oinkmaster () {
-       # Call oinkmaster to generate ruleset.
-       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 2>&1 &");
+       # 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;
 
        # Open rule file and read in contents
-       open(RULEFILE, "$snortrulepath/$rulefile") or die "Unable to read $rulefile!";
+       open(RULEFILE, "$IDS::rulespath/$rulefile") or die "Unable to read $rulefile!";
 
        # Store file content in an array.
        my @lines = <RULEFILE>;
@@ -676,16 +652,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'} = "off";
+                                       $idsrules{$rulefile}{$sid}{'State'} = "off";
                                } else {
                                        # Otherwise the rule is enabled.
-                                       $snortrules{$rulefile}{$sid}{'State'} = "on";
+                                       $idsrules{$rulefile}{$sid}{'State'} = "on";
                                }
                        }
                }