]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/ids.cgi
ids.cgi: Do not longer use hard-coded status messages in
[ipfire-2.x.git] / html / cgi-bin / ids.cgi
index 42d2ca7fbc928d6360e15445e9128fedd40a7ac4..1d4c3928c1b9393ce8e0a1854d0ffe345502ba39 100644 (file)
@@ -20,6 +20,7 @@
 ###############################################################################
 
 use strict;
+use experimental 'smartmatch';
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -38,7 +39,7 @@ my %color = ();
 my %mainsettings = ();
 my %idsrules = ();
 my %idssettings=();
-my %rulessettings=();
+my %used_providers=();
 my %cgiparams=();
 my %checked=();
 my %selected=();
@@ -102,7 +103,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq
                my $new_entry_remark = $cgiparams{'IGNORE_ENTRY_REMARK'};
 
                # Read-in ignoredfile.
-               &General::readhasharray($IDS::ignored_file, \%ignored);
+               &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignored_file);
 
                # Check if we should edit an existing entry and got an ID.
                if (($cgiparams{'WHITELIST'} eq $Lang::tr{'update'}) && ($cgiparams{'ID'})) {
@@ -164,7 +165,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq
                undef($cgiparams{'ID'});
 
                # Read-in ignoredfile.
-               &General::readhasharray($IDS::ignored_file, \%ignored);
+               &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignored_file);
 
                # Grab the configured status of the corresponding entry.
                my $status = $ignored{$id}[2];
@@ -198,7 +199,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq
        my %ignored = ();
 
        # Read-in ignoredfile.
-       &General::readhasharray($IDS::ignored_file, \%ignored);
+       &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignored_file);
 
        # Drop entry from the hash.
        delete($ignored{$cgiparams{'ID'}});
@@ -254,6 +255,10 @@ if (-e $IDS::storederrorfile) {
 if ($cgiparams{'RULESET'}) {
        ## Grab all available rules and store them in the idsrules hash.
        #
+
+       # Get enabled providers.
+       my @enabled_providers = &IDS::get_enabled_providers();
+
        # Open rules directory and do a directory listing.
        opendir(DIR, $IDS::rulespath) or die $!;
                # Loop through the direcory.
@@ -274,6 +279,15 @@ if ($cgiparams{'RULESET'}) {
                        # Skip whitelist rules file.
                        next if( $file eq "whitelist.rules");
 
+                       # Splitt vendor from filename.
+                       my @filename_parts = split(/-/, $file);
+
+                       # Assign vendor name for easy processing.
+                       my $vendor = @filename_parts[0];
+
+                       # Skip rulefile if the provider is disabled.
+                       next unless ($vendor ~~ @enabled_providers);
+
                        # Call subfunction to read-in rulefile and add rules to
                        # the idsrules hash.
                        &readrulesfile("$file");
@@ -281,255 +295,130 @@ if ($cgiparams{'RULESET'}) {
 
        closedir(DIR);
 
-       # Gather used rulefiles.
-       #
-       # Check if the file for activated rulefiles is not empty.
-       if(-f $IDS::used_rulefiles_file) {
-               # Open the file for used rulefile and read-in content.
-               open(FILE, $IDS::used_rulefiles_file) or die "Could not open $IDS::used_rulefiles_file. $!\n";
-
-               # Read-in content.
-               my @lines = <FILE>;
-
-               # 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 =~ /.*- (.*)/) {
-                               my $rulefile = $1;
-
-                               # Check if the current rulefile exists in the %idsrules hash.
-                               # If not, the file probably does not exist anymore or contains
-                               # no rules.
-                               if($idsrules{$rulefile}) {
-                                       # Add the rulefile state to the %idsrules hash.
-                                       $idsrules{$rulefile}{'Rulefile'}{'State'} = "on";
-                               }
+       # Loop through the array of used providers.
+       foreach my $provider (@enabled_providers) {
+               # Gather used rulefiles.
+               my @used_rulesfiles = &IDS::get_provider_used_rulesfiles($provider);
+
+               # Loop through the array of used rulesfiles.
+               foreach my $rulefile (@used_rulesfiles) {
+                       # Check if the current rulefile exists in the %idsrules hash.
+                       # If not, the file probably does not exist anymore or contains
+                       # no rules.
+                       if($idsrules{$rulefile}) {
+                               # Add the rulefile state to the %idsrules hash.
+                               $idsrules{$rulefile}{'Rulefile'}{'State'} = "on";
                        }
                }
        }
 }
 
-# Save ruleset configuration.
-if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
-       my %oldsettings;
+# Save ruleset.
+if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
+       # Get enabled providers.
+       my @enabled_providers = &IDS::get_enabled_providers();
 
-       # Read-in current (old) IDS settings.
-       &General::readhash("$IDS::rules_settings_file", \%oldsettings);
+       # Loop through the array of enabled providers.
+       foreach my $provider (@enabled_providers) {
+               # Hash to store the used-enabled and disabled sids.
+               my %enabled_disabled_sids;
 
-       # Prevent form name from been stored in conf file.
-       delete $cgiparams{'RULESET'};
-
-       # Check if the choosen vendor (URL) requires an subscription/oinkcode.
-       if ($IDS::Ruleset::Providers{$cgiparams{'RULES'}}{'requires_subscription'} eq "True") {
-               # Check if an subscription/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'};
-                       }
-               } else {
-                       # Print an error message, that an subsription/oinkcode is required for this
-                       # vendor.
-                       $errormessage = $Lang::tr{'ids oinkcode required'};
-               }
-       }
+               # Hash to store the enabled rulefiles for the current processed provider.
+               my %used_rulefiles;
 
-       # Go on if there are no error messages.
-       if (!$errormessage) {
-               # Store settings into settings file.
-               &General::writehash("$IDS::rules_settings_file", \%cgiparams);
+               # Get name of the file which holds the ruleset modification of the provider.
+               my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
 
-               # Check if a ruleset is present - if not or the source has been changed download it.
-               if((! %idsrules) || ($oldsettings{'RULES'} ne $cgiparams{'RULES'})) {
-                       # Check if the red device is active.
-                       unless (-e "${General::swroot}/red/active") {
-                               $errormessage = "$Lang::tr{'could not download latest updates'} - $Lang::tr{'system is offline'}";
-                       }
+               # Get the name of the file which contains the used rulefiles for this provider.
+               my $used_rulefiles_file = &IDS::get_provider_used_rulesfiles_file($provider);
 
-                       # Check if enough free disk space is availabe.
-                       if(&IDS::checkdiskspace()) {
-                               $errormessage = "$Lang::tr{'not enough disk space'}";
-                       }
+               # Read-in modifications file, if exists.
+               &General::readhash("$modifications_file", \%enabled_disabled_sids) if (-f "$modifications_file");
 
-                       # Check if any errors happend.
-                       unless ($errormessage) {
-                               # Lock the webpage and print notice about downloading
-                               # a new ruleset.
-                               &working_notice("$Lang::tr{'ids working'}");
+               # Loop through the hash of idsrules.
+               foreach my $rulefile (keys %idsrules) {
+                       # Split the rulefile to get the vendor.
+                       my @filename_parts = split(/-/, $rulefile);
 
-                               # Write the modify sid's file and pass the taken ruleaction.
-                               &IDS::write_modify_sids_file();
+                       # Assign rulefile vendor.
+                       my $rulefile_vendor = @filename_parts[0];
 
-                               # Call subfunction to download the ruleset.
-                               if(&IDS::downloadruleset()) {
-                                       $errormessage = $Lang::tr{'could not download latest updates'};
+                       # Skip the rulefile if the vendor is not our current processed provider.
+                       next unless ($rulefile_vendor eq $provider);
 
-                                       # Call function to store the errormessage.
-                                       &IDS::_store_error_message($errormessage);
-                               } else {
-                                       # Call subfunction to launch oinkmaster.
-                                       &IDS::oinkmaster();
-                               }
+                       # Check if the rulefile is enabled.
+                       if ($cgiparams{$rulefile} eq "on") {
+                               # Add the rulefile to the hash of enabled rulefiles of this provider.
+                               $used_rulefiles{$rulefile} = "enabled";
 
-                               # Check if the IDS is running.
-                               if(&IDS::ids_is_running()) {
-                                       # Call suricatactrl to stop the IDS - because of the changed
-                                       # ruleset - the use has to configure it before suricata can be
-                                       # used again.
-                                       &IDS::call_suricatactrl("stop");
-                               }
-
-                               # Perform a reload of the page.
-                               &reload();
+                               # Drop item from cgiparams hash.
+                               delete $cgiparams{$rulefile};
                        }
-               }
-       }
-
-# Save ruleset.
-} elsif ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
-       # Arrays to store which rulefiles have been enabled and will be used.
-       my @enabled_rulefiles;
-
-       # Hash to store the user-enabled and disabled sids.
-       my %enabled_disabled_sids;
-
-       # Store if a restart of suricata is required.
-       my $suricata_restart_required;
-
-       # Loop through the hash of idsrules.
-       foreach my $rulefile(keys %idsrules) {
-               # Check if the state of the rulefile has been changed.
-               unless ($cgiparams{$rulefile} eq $idsrules{$rulefile}{'Rulefile'}{'State'}) {
-                       # A restart of suricata is required to apply the changes of the used rulefiles.
-                       $suricata_restart_required = 1;
-               }
-
-               # 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};
-               }
-       }
 
-       # Read-in the files for enabled/disabled sids.
-       # This will be done by calling the read_enabled_disabled_sids_file function two times
-       # and merge the returned hashes together into the enabled_disabled_sids hash.
-       %enabled_disabled_sids = (
-               &read_enabled_disabled_sids_file($IDS::disabled_sids_file),
-               &read_enabled_disabled_sids_file($IDS::enabled_sids_file));
-
-       # 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/Modify the sid to/in the enabled_disabled_sids hash.
-                                               $enabled_disabled_sids{$sid} = "enabled";
+                       # 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/Modify the sid to/in the enabled_disabled_sids hash.
+                                                       $enabled_disabled_sids{$sid} = "enabled";
+
+                                                       # 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/Modify it to/in the enabled_disabled_sids hash.
+                                               $enabled_disabled_sids{$sid} = "disabled";
 
                                                # 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/Modify it to/in the enabled_disabled_sids hash.
-                                       $enabled_disabled_sids{$sid} = "disabled";
-
-                                       # Drop item from cgiparams hash.
-                                       delete $cgiparams{$rulefile}{$sid};
-                               }
                        }
                }
-       }
 
-       # Open enabled sid's file for writing.
-       open(ENABLED_FILE, ">$IDS::enabled_sids_file") or die "Could not write to $IDS::enabled_sids_file. $!\n";
-
-       # Open disabled sid's file for writing.
-       open(DISABLED_FILE, ">$IDS::disabled_sids_file") or die "Could not write to $IDS::disabled_sids_file. $!\n";
-
-       # Write header to the files.
-       print ENABLED_FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
-       print DISABLED_FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
-
-       # Check if the hash for enabled/disabled files contains any entries.
-       if (%enabled_disabled_sids) {
-               # Loop through the hash.
-               foreach my $sid (keys %enabled_disabled_sids) {
-                       # Check if the sid is enabled.
-                       if ($enabled_disabled_sids{$sid} eq "enabled") {
-                               # Print the sid to the enabled_sids file.
-                               print ENABLED_FILE "enablesid $sid\n";
-                       # Check if the sid is disabled.
-                       } elsif ($enabled_disabled_sids{$sid} eq "disabled") {
-                               # Print the sid to the disabled_sids file.
-                               print DISABLED_FILE "disablesid $sid\n";
-                       # Something strange happende - skip the current sid.
-                       } else {
-                               next;
-                       }
+               # Check if the hash for enabled/disabled sids contains any entries.
+               if (%enabled_disabled_sids) {
+                       # Write the modifications file.
+                       &General::writehash("$modifications_file", \%enabled_disabled_sids);
                }
-       }
 
-       # Close file for enabled_sids after writing.
-       close(ENABLED_FILE);
-
-       # Close file for disabled_sids after writing.
-       close(DISABLED_FILE);
+               # Write the used rulefiles file.
+               &General::writehash("$used_rulefiles_file", \%used_rulefiles);
+       }
 
        # Call function to generate and write the used rulefiles file.
-       &IDS::write_used_rulefiles_file(@enabled_rulefiles);
+       &IDS::write_used_rulefiles_file(@enabled_providers);
 
        # Lock the webpage and print message.
-       &working_notice("$Lang::tr{'ids apply ruleset changes'}");
-
-       # Call oinkmaster to alter the ruleset.
-       &IDS::oinkmaster();
+       &oinkmaster_web();
 
        # Check if the IDS is running.
        if(&IDS::ids_is_running()) {
-               # Check if a restart of suricata is required.
-               if ($suricata_restart_required) {
-                       # Call suricatactrl to perform the restart.
-                       &IDS::call_suricatactrl("restart");
-               } else {
-                       # Call suricatactrl to perform a reload.
-                       &IDS::call_suricatactrl("reload");
-               }
+               # Call suricatactrl to perform a reload.
+               &IDS::call_suricatactrl("reload");
        }
 
        # Reload page.
        &reload();
 
 # Download new ruleset.
-} elsif ($cgiparams{'RULESET'} eq $Lang::tr{'update ruleset'}) {
+} elsif ($cgiparams{'PROVIDERS'} eq $Lang::tr{'ids force ruleset update'}) {
+       # Assign given provider handle.
+       my $provider = $cgiparams{'PROVIDER'};
+
        # Check if the red device is active.
        unless (-e "${General::swroot}/red/active") {
                $errormessage = "$Lang::tr{'could not download latest updates'} - $Lang::tr{'system is offline'}";
@@ -547,8 +436,8 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
                &working_notice("$Lang::tr{'ids download new ruleset'}");
 
                # Call subfunction to download the ruleset.
-               if(&IDS::downloadruleset()) {
-                       $errormessage = $Lang::tr{'could not download latest updates'};
+               if(&IDS::downloadruleset($provider)) {
+                       $errormessage = "$provider - $Lang::tr{'could not download latest updates'}";
 
                        # Call function to store the errormessage.
                        &IDS::_store_error_message($errormessage);
@@ -557,7 +446,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
                        &reload();
                } else {
                        # Call subfunction to launch oinkmaster.
-                       &IDS::oinkmaster();
+                       &oinkmaster_web();
 
                        # Check if the IDS is running.
                        if(&IDS::ids_is_running()) {
@@ -569,6 +458,63 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
                        &reload();
                }
        }
+
+# Reset a provider to it's defaults.
+} elsif ($cgiparams{'PROVIDERS'} eq "$Lang::tr{'ids reset provider'}") {
+       # Get enabled providers.
+       my @enabled_providers = &IDS::get_enabled_providers();
+
+       # Grab provider handle from cgihash.
+       my $provider = $cgiparams{'PROVIDER'};
+
+       # Lock the webpage and print message.
+       &working_notice("$Lang::tr{'ids apply ruleset changes'}");
+
+       # Get the name of the file which contains the used rulefiles for this provider.
+       my $used_rulefiles_file = &IDS::get_provider_used_rulesfiles_file($provider);
+
+       # Remove the file if it exists.
+       unlink("$used_rulefiles_file") if (-f "$used_rulefiles_file");
+
+       # Call function to get the path and name for file which holds the ruleset modifications
+       # for the given provider.
+       my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
+
+       # Check if the file exists.
+       if (-f $modifications_file) {
+               # Remove the file, as requested.
+               unlink("$modifications_file");
+       }
+
+       # Write used rulesfiles file.
+       &IDS::write_used_rulefiles_file(@enabled_providers);
+
+       # Regenerate ruleset.
+       &oinkmaster_web();
+
+       # Check if the IDS is running.
+       if(&IDS::ids_is_running()) {
+               # Get amount of enabled providers.
+               my $amount = @enabled_providers;
+
+               # Check if at least one enabled provider remains.
+               if ($amount >= 1) {
+                       # Call suricatactrl to perform a reload.
+                       &IDS::call_suricatactrl("reload");
+
+               # Stop suricata if no enabled provider remains.
+               } else {
+                       # Call suricatactrel to perform the stop.
+                       &IDS::call_suricatactrl("stop");
+               }
+       }
+
+       # Undefine providers flag.
+       undef($cgiparams{'PROVIDERS'});
+
+       # Reload page.
+       &reload();
+
 # Save IDS settings.
 } elsif ($cgiparams{'IDS'} eq $Lang::tr{'save'}) {
        my %oldidssettings;
@@ -578,14 +524,17 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
        # Read-in current (old) IDS settings.
        &General::readhash("$IDS::ids_settings_file", \%oldidssettings);
 
+       # Get enabled providers.
+       my @enabled_providers = &IDS::get_enabled_providers();
+
        # Prevent form name from been stored in conf file.
        delete $cgiparams{'IDS'};
 
        # Check if the IDS should be enabled.
        if ($cgiparams{'ENABLE_IDS'} eq "on") {
-               # Check if any ruleset is available. Otherwise abort and display an error.
-               unless(%idsrules) {
-                       $errormessage = $Lang::tr{'ids no ruleset available'};
+               # Check if at least one provider is enabled. Otherwise abort and display an error.
+               unless(@enabled_providers) {
+                       $errormessage = $Lang::tr{'ids no enabled ruleset provider'};
                }
 
                # Loop through the array of available interfaces.
@@ -593,7 +542,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
                        # Convert interface name into upper case.
                        my $zone_upper = uc($zone);
 
-                       # Check if the IDS is enabled for this interaces.
+                       # Check if the IDS is enabled for these interfaces.
                        if ($cgiparams{"ENABLE_IDS_$zone_upper"}) {
                                # Increase count.
                                $monitored_zones++;
@@ -612,12 +561,6 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
                &General::writehash("$IDS::ids_settings_file", \%cgiparams);
        }
 
-       # Check if the the automatic rule update hass been touched.
-       if($cgiparams{'AUTOUPDATE_INTERVAL'} ne $oldidssettings{'AUTOUPDATE_INTERVAL'}) {
-               # Call suricatactrl to set the new interval.
-               &IDS::call_suricatactrl("cron", $cgiparams{'AUTOUPDATE_INTERVAL'});
-       }
-
        # Generate file to store the home net.
        &IDS::generate_home_net_file();
 
@@ -627,24 +570,6 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
        # Generate file to store the HTTP ports.
        &IDS::generate_http_ports_file();
 
-       # Write the modify sid's file and pass the taken ruleaction.
-       &IDS::write_modify_sids_file();
-
-       # Check if "MONITOR_TRAFFIC_ONLY" has been changed.
-       if($cgiparams{'MONITOR_TRAFFIC_ONLY'} ne $oldidssettings{'MONITOR_TRAFFIC_ONLY'}) {
-               # Check if a ruleset exists.
-               if (%idsrules) {
-                       # Lock the webpage and print message.
-                       &working_notice("$Lang::tr{'ids working'}");
-
-                       # Call oinkmaster to alter the ruleset.
-                       &IDS::oinkmaster();
-
-                       # Set reload_page to "True".
-                       $reload_page="True";
-               }
-       }
-
        # Check if the IDS currently is running.
        if(&IDS::ids_is_running()) {
                # Check if ENABLE_IDS is set to on.
@@ -665,6 +590,352 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
                # Perform a reload of the page.
                &reload();
        }
+
+# Toggle Enable/Disable autoupdate for a provider
+} elsif ($cgiparams{'AUTOUPDATE'} eq $Lang::tr{'toggle enable disable'}) {
+       my %used_providers = ();
+
+       # Only go further, if an ID has been passed.
+       if ($cgiparams{'ID'}) {
+               # Assign the given ID.
+               my $id = $cgiparams{'ID'};
+
+               # Undef the given ID.
+               undef($cgiparams{'ID'});
+
+               # Read-in providers settings file.
+               &General::readhasharray($IDS::providers_settings_file, \%used_providers);
+
+               # Grab the configured status of the corresponding entry.
+               my $status_autoupdate = $used_providers{$id}[2];
+
+               # Switch the status.
+               if ($status_autoupdate eq "disabled") {
+                       $status_autoupdate = "enabled";
+               } else {
+                       $status_autoupdate = "disabled";
+               }
+
+               # Modify the status of the existing entry.
+               $used_providers{$id} = ["$used_providers{$id}[0]", "$used_providers{$id}[1]", "$status_autoupdate", "$used_providers{$id}[3]", "$used_providers{$id}[4]"];
+
+               # Write the changed hash to the providers settings file.
+               &General::writehasharray($IDS::providers_settings_file, \%used_providers);
+       }
+
+# Add/Edit a provider to the list of used providers.
+#
+} elsif (($cgiparams{'PROVIDERS'} eq "$Lang::tr{'add'}") || ($cgiparams{'PROVIDERS'} eq "$Lang::tr{'update'}")) {
+       my %used_providers = ();
+
+       # Read-in providers settings file.
+       &General::readhasharray("$IDS::providers_settings_file", \%used_providers);
+
+       # Assign some nice human-readable values.
+       my $provider = $cgiparams{'PROVIDER'};
+       my $subscription_code = $cgiparams{'SUBSCRIPTION_CODE'};
+       my $status_autoupdate;
+       my $mode;
+       my $regenerate_ruleset_required;
+
+       # Handle autoupdate checkbox.
+       if ($cgiparams{'ENABLE_AUTOUPDATE'} eq "on") {
+               $status_autoupdate = "enabled";
+       } else {
+               $status_autoupdate = "disabled";
+       }
+
+       # Handle monitor traffic only checkbox.
+       if ($cgiparams{'MONITOR_TRAFFIC_ONLY'} eq "on") {
+               $mode = "IDS";
+       } else {
+               $mode = "IPS";
+       }
+
+       # Check if we are going to add a new provider.
+       if ($cgiparams{'PROVIDERS'} eq "$Lang::tr{'add'}") {
+               # Loop through the hash of used providers.
+               foreach my $id ( keys %used_providers) {
+                       # Check if the choosen provider is already in use.
+                       if ($used_providers{$id}[0] eq "$provider") {
+                               # Assign error message.
+                               $errormessage = "$Lang::tr{'ids the choosen provider is already in use'}";
+                       }
+               }
+       }
+
+       # Check if the provider requires a subscription code.
+       if ($IDS::Ruleset::Providers{$provider}{'requires_subscription'} eq "True") {
+               # Check if an subscription code has been provided.
+               if ($subscription_code) {
+                       # Check if the code contains unallowed chars.
+                       unless ($subscription_code =~ /^[a-z0-9]+$/) {
+                               $errormessage = $Lang::tr{'invalid input for subscription code'};
+                       }
+               } else {
+                       # Print an error message, that an subsription code is required for this
+                       # provider.
+                       $errormessage = $Lang::tr{'ids subscription code required'};
+               }
+       }
+
+       # Go further if there was no error.
+       if ($errormessage eq '') {
+               my $id;
+               my $status;
+
+               # Check if we should edit an existing entry and got an ID.
+               if (($cgiparams{'PROVIDERS'} eq $Lang::tr{'update'}) && ($cgiparams{'ID'})) {
+                       # Assin the provided id.
+                       $id = $cgiparams{'ID'};
+
+                       # Undef the given ID.
+                       undef($cgiparams{'ID'});
+
+                       # Grab the configured mode.
+                       my $stored_mode = $used_providers{$id}[4];
+
+                       # Check if the ruleset action (mode) has been changed.
+                       if ($stored_mode ne $mode) {
+                               # It has been changed, so the ruleset needs to be regenerated.
+                               $regenerate_ruleset_required = "1";
+                       }
+
+                       # Grab the configured status of the corresponding entry.
+                       $status = $used_providers{$id}[3];
+               } else {
+                       # Each newly added entry automatically should be enabled.
+                       $status = "enabled";
+
+                       # Generate the ID for the new entry.
+                       #
+                       # Sort the keys by their ID and store them in an array.
+                       my @keys = sort { $a <=> $b } keys %used_providers;
+
+                       # Reverse the key array.
+                       my @reversed = reverse(@keys);
+
+                       # Obtain the last used id.
+                       my $last_id = @reversed[0];
+
+                       # Increase the last id by one and use it as id for the new entry.
+                       $id = ++$last_id;
+               }
+
+               # Add/Modify the entry to/in the used providers hash..
+               $used_providers{$id} = ["$provider", "$subscription_code", "$status_autoupdate", "$status", "$mode"];
+
+               # Write the changed hash to the providers settings file.
+               &General::writehasharray($IDS::providers_settings_file, \%used_providers);
+
+               # Check if a new provider will be added.
+               if ($cgiparams{'PROVIDERS'} eq $Lang::tr{'add'}) {
+                       # Check if the red device is active.
+                       unless (-e "${General::swroot}/red/active") {
+                               $errormessage = "$Lang::tr{'ids could not add provider'} - $Lang::tr{'system is offline'}";
+                       }
+
+                       # Check if enough free disk space is availabe.
+                       if(&IDS::checkdiskspace()) {
+                               $errormessage = "$Lang::tr{'ids could not add provider'} - $Lang::tr{'not enough disk space'}";
+                       }
+
+                       # Check if any errors happend.
+                       unless ($errormessage) {
+                               # Lock the webpage and print notice about downloading
+                               # a new ruleset.
+                               &working_notice("$Lang::tr{'ids working'}");
+
+                               # Download the ruleset.
+                               if(&IDS::downloadruleset($provider)) {
+                                       $errormessage = "$Lang::tr{'ids could not add provider'} - $Lang::tr{'ids unable to download the ruleset'}";
+
+                                       # Call function to store the errormessage.
+                                       &IDS::_store_error_message($errormessage);
+
+                                       # Remove the configured provider again.
+                                       &remove_provider($id);
+                               } else {
+                                       # Extract the ruleset
+                                       &IDS::extractruleset($provider);
+
+                                       # Move the ruleset.
+                                       &IDS::move_tmp_ruleset();
+
+                                       # Cleanup temporary directory.
+                                       &IDS::cleanup_tmp_directory();
+                               }
+
+                               # Perform a reload of the page.
+                               &reload();
+                       } else {
+                               # Remove the configured provider again.
+                               &remove_provider($id);
+                       }
+               }
+
+               # Check if the ruleset has to be regenerated.
+               if ($regenerate_ruleset_required) {
+                       # Call oinkmaster web function.
+                       &oinkmaster_web();
+
+                       # Perform a reload of the page.
+                       &reload();
+               }
+       }
+
+       # Undefine providers flag.
+       undef($cgiparams{'PROVIDERS'});
+
+## Toggle Enabled/Disabled for an existing provider.
+#
+} elsif ($cgiparams{'PROVIDERS'} eq $Lang::tr{'toggle enable disable'}) {
+       my %used_providers = ();
+       my $provider_includes_action;
+
+       # Value if oinkmaster has to be executed.
+       my $oinkmaster = "False";
+
+       # Only go further, if an ID has been passed.
+       if ($cgiparams{'ID'}) {
+               # Assign the given ID.
+               my $id = $cgiparams{'ID'};
+
+               # Undef the given ID.
+               undef($cgiparams{'ID'});
+
+               # Read-in file which contains the provider settings.
+               &General::readhasharray($IDS::providers_settings_file, \%used_providers);
+
+               # Grab the configured status of the corresponding entry.
+               my $status = $used_providers{$id}[3];
+
+               # Grab the provider handle.
+               my $provider_handle = $used_providers{$id}[0];
+
+               # Switch the status.
+               if ($status eq "enabled") {
+                       $status = "disabled";
+
+                       # Set the provider includes action to "remove" for removing the entry.
+                       $provider_includes_action = "remove";
+               } else {
+                       $status = "enabled";
+
+                       # Set the provider includes action to "add".
+                       $provider_includes_action = "add";
+
+                       # This operation requires to launch oinkmaster.
+                       $oinkmaster = "True";
+               }
+
+               # Modify the status of the existing entry.
+               $used_providers{$id} = ["$used_providers{$id}[0]", "$used_providers{$id}[1]", "$used_providers{$id}[2]", "$status", "$used_providers{$id}[4]"];
+
+               # Write the changed hash to the providers settings file.
+               &General::writehasharray($IDS::providers_settings_file, \%used_providers);
+
+               # Get all enabled providers.
+               my @enabled_providers = &IDS::get_enabled_providers();
+
+               # Write the main providers include file.
+               &IDS::write_used_rulefiles_file(@enabled_providers);
+
+               # Check if oinkmaster has to be executed.
+               if ($oinkmaster eq "True") {
+                       # Launch oinkmaster.
+                       &oinkmaster_web();
+               }
+
+               # Check if the IDS is running.
+               if(&IDS::ids_is_running()) {
+                       # Gather the amount of enabled providers (elements in the array).
+                       my $amount = @enabled_providers;
+
+                       # Check if there are still enabled ruleset providers.
+                       if ($amount >= 1) {
+                               # Call suricatactrl to perform a restart.
+                               &IDS::call_suricatactrl("restart");
+
+                       # No active ruleset provider, suricata has to be stopped.
+                       } else {
+                               # Stop suricata.
+                               &IDS::call_suricatactrl("stop");
+                       }
+               }
+
+               # Undefine providers flag.
+               undef($cgiparams{'PROVIDERS'});
+
+               # Reload page.
+               &reload();
+       }
+
+## Remove provider from the list of used providers.
+#
+} elsif ($cgiparams{'PROVIDERS'} eq $Lang::tr{'remove'}) {
+       # Assign a nice human-readable variable.
+       my $id = $cgiparams{'ID'};
+
+       # Grab the provider name bevore deleting.
+       my $provider = &get_provider_handle($id);
+
+       # Remove the provider.
+       &remove_provider($id);
+
+       # Undef the given ID.
+       undef($cgiparams{'ID'});
+
+       # Drop the stored ruleset file.
+       &IDS::drop_dl_rulesfile($provider);
+
+       # Get the name of the provider rulessets include file.
+       my $provider_used_rulefile = &IDS::get_provider_used_rulesfiles_file($provider);
+
+       # Drop the file, it is not longer needed.
+       unlink("$provider_used_rulefile");
+
+       # Call function to get the path and name for the given providers
+       # ruleset modifications file..
+       my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
+
+       # Check if the file exists.
+       if (-f $modifications_file) {
+               # Remove the file, which is not longer needed.
+               unlink("$modifications_file");
+       }
+
+       # Regenerate ruleset.
+       &oinkmaster_web();
+
+       # Gather all enabled providers.
+       my @enabled_providers = &IDS::get_enabled_providers();
+
+       # Regenerate main providers include file.
+       &IDS::write_used_rulefiles_file(@enabled_providers);
+
+       # Check if the IDS is running.
+       if(&IDS::ids_is_running()) {
+               # Get amount of enabled providers.
+               my $amount = @enabled_providers;
+
+               # Check if at least one enabled provider remains.
+               if ($amount >= 1) {
+                       # Call suricatactrl to perform a reload.
+                       &IDS::call_suricatactrl("restart");
+
+               # Stop suricata if no enabled provider remains.
+               } else {
+                       # Call suricatactrel to perform the stop.
+                       &IDS::call_suricatactrl("stop");
+               }
+       }
+
+       # Undefine providers flag.
+       undef($cgiparams{'PROVIDERS'});
+
+       # Reload page.
+       &reload();
 }
 
 &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
@@ -675,6 +946,8 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
 
 if ($cgiparams{'RULESET'} eq "$Lang::tr{'ids customize ruleset'}" ) {
        &show_customize_ruleset();
+} elsif ($cgiparams{'PROVIDERS'} ne "") {
+       &show_add_provider();
 } else {
        &show_mainpage();
 }
@@ -698,59 +971,16 @@ sub show_display_error_message() {
 ## Function to display the main IDS page.
 #
 sub show_mainpage() {
-       # Read-in idssettings and rulesetsettings
+       # Read-in idssettings and provider settings.
        &General::readhash("$IDS::ids_settings_file", \%idssettings);
-       &General::readhash("$IDS::rules_settings_file", \%rulessettings);
-
-       # If no autoupdate intervall has been configured yet, set default value.
-       unless(exists($idssettings{'AUTOUPDATE_INTERVAL'})) {
-               # Set default to "weekly".
-               $idssettings{'AUTOUPDATE_INTERVAL'} = 'weekly';
-       }
+       &General::readhasharray("$IDS::providers_settings_file", \%used_providers);
 
        # Read-in ignored hosts.
-       &General::readhasharray("$IDS::settingsdir/ignored", \%ignored);
+       &General::readhasharray("$IDS::ignored_file", \%ignored) if (-e $IDS::ignored_file);
 
        $checked{'ENABLE_IDS'}{'off'} = '';
        $checked{'ENABLE_IDS'}{'on'} = '';
        $checked{'ENABLE_IDS'}{$idssettings{'ENABLE_IDS'}} = "checked='checked'";
-       $checked{'MONITOR_TRAFFIC_ONLY'}{'off'} = '';
-       $checked{'MONITOR_TRAFFIC_ONLY'}{'on'} = '';
-       $checked{'MONITOR_TRAFFIC_ONLY'}{$idssettings{'MONITOR_TRAFFIC_ONLY'}} = "checked='checked'";
-       $selected{'RULES'}{'nothing'} = '';
-       $selected{'RULES'}{$rulessettings{'RULES'}} = "selected='selected'";
-       $selected{'AUTOUPDATE_INTERVAL'}{'off'} = '';
-       $selected{'AUTOUPDATE_INTERVAL'}{'daily'} = '';
-       $selected{'AUTOUPDATE_INTERVAL'}{'weekly'} = '';
-       $selected{'AUTOUPDATE_INTERVAL'}{$rulessettings{'AUTOUPDATE_INTERVAL'}} = "selected='selected'";
-
-       ### Java Script ###
-       print "<script>\n";
-print <<END
-               // Java Script function to show/hide the text input field for
-               // Oinkcode/Subscription code.
-               var update_code = function() {
-                       if(\$('#RULES').val() == 'registered') {
-                               \$('#code').show();
-                       } else if(\$('#RULES').val() == 'subscripted') {
-                               \$('#code').show();
-                       } else if(\$('#RULES').val() == 'emerging_pro') {
-                               \$('#code').show();
-                       } else {
-                               \$('#code').hide();
-                       }
-               };
-
-               // JQuery function to call corresponding function when
-               // the ruleset is changed or the page is loaded for showing/hiding
-               // the code area.
-               \$(document).ready(function() {
-                       \$('#RULES').change(update_code);
-                       update_code();
-               });
-       </script>
-END
-;
 
        # Draw current state of the IDS
        &Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system'});
@@ -803,8 +1033,8 @@ END
 END
        }
 
-       # Only show this area, if a ruleset is present.
-       if (%idsrules) {
+       # Only show this area, if at least one ruleset provider is configured.
+       if (%used_providers) {
 
 print <<END
 
@@ -817,8 +1047,6 @@ print <<END
                                                <input type='checkbox' name='ENABLE_IDS' $checked{'ENABLE_IDS'}{'on'}>&nbsp;$Lang::tr{'ids enable'}
                                        </td>
 
-                                       <td class='base' colspan='2'>
-                                               <input type='checkbox' name='MONITOR_TRAFFIC_ONLY' $checked{'MONITOR_TRAFFIC_ONLY'}{'on'}>&nbsp;$Lang::tr{'ids monitor traffic only'}
                                </td>
                                </tr>
 
@@ -877,16 +1105,6 @@ print <<END
                                <tr>
                                        <td colspan='4'><b>$Lang::tr{'ids automatic rules update'}</b></td>
                                </tr>
-
-                               <tr>
-                                       <td>
-                                               <select name='AUTOUPDATE_INTERVAL'>
-                                                       <option value='off' $selected{'AUTOUPDATE_INTERVAL'}{'off'} >- $Lang::tr{'Disabled'} -</option>
-                                                       <option value='daily' $selected{'AUTOUPDATE_INTERVAL'}{'daily'} >$Lang::tr{'Daily'}</option>
-                                                       <option value='weekly' $selected{'AUTOUPDATE_INTERVAL'}{'weekly'} >$Lang::tr{'Weekly'}</option>
-                                               </select>
-                                       </td>
-                               </tr>
                        </table>
 
                        <br><br>
@@ -904,74 +1122,144 @@ END
 
        &Header::closebox();
 
-       # Draw elements for ruleset configuration.
-       &Header::openbox('100%', 'center', $Lang::tr{'ids ruleset settings'});
+       #
+       # Used Ruleset Providers section.
+       #
+       &Header::openbox('100%', 'center', $Lang::tr{'ids ruleset settings'});
+
+print <<END;
+       <table width='100%' border='0'>
+               <tr>
+                       <td class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'ids provider'}</b></td>
+                       <td class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'date'}</b></td>
+                       <td class='base' bgcolor='$color{'color20'}' align='center'><b>$Lang::tr{'ids autoupdates'}</b></td>
+                       <td class='base' bgcolor='$color{'color20'}' align='center'><b>$Lang::tr{'action'}</b></td>
+                       <td class='base' colspan='3' bgcolor='$color{'color20'}'></td>
+               </tr>
+END
+               my $line = 1;
+
+               # Check if some providers has been configured.
+               if (keys (%used_providers)) {
+                       my $col = "";
+
+                       # Loop through all entries of the hash.
+                       foreach my $id (sort keys(%used_providers)) {
+                               # Assign data array positions to some nice variable names.
+                               my $provider = $used_providers{$id}[0];
+                               my $provider_name = &get_provider_name($provider);
+                               my $rulesetdate = &IDS::get_ruleset_date($provider);
+
+                               my $subscription_code = $used_providers{$id}[1];
+                               my $autoupdate_status = $used_providers{$id}[2];
+                               my $status  = $used_providers{$id}[3];
 
-print <<END
-       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <table width='100%' border='0'>
-                       <tr>
-                               <td><b>$Lang::tr{'ids rules update'}</b></td>
-                               <td><b>$Lang::tr{'ids automatic rules update'}</b></td>
-                       </tr>
+                               # Check if the item number is even or not.
+                               if ($line % 2) {
+                                       $col="bgcolor='$color{'color22'}'";
+                               } else {
+                                       $col="bgcolor='$color{'color20'}'";
+                               }
 
-                       <tr>
-                               <td><select name='RULES' id='RULES'>
-END
-;
-                               # Get all available ruleset providers.
-                               my @ruleset_providers = &IDS::get_ruleset_providers();
+                               # Choose icons for the checkboxes.
+                               my $status_gif;
+                               my $status_gdesc;
+                               my $autoupdate_status_gif;
+                               my $autoupdate_status_gdesc;
 
-                               # Loop throgh the list of providers.
-                               foreach my $provider (@ruleset_providers) {
-                                       # Call get_provider_name function to obtain the provider name.
-                                       my $option_string = &get_provider_name($provider);
+                               # Check if the status is enabled and select the correct image and description.
+                               if ($status eq 'enabled' ) {
+                                       $status_gif = 'on.gif';
+                                       $status_gdesc = $Lang::tr{'click to disable'};
+                               } else {
+                                       $status_gif = 'off.gif';
+                                       $status_gdesc = $Lang::tr{'click to enable'};
+                               }
 
-                                       # Print option.
-                                       print "<option value='$provider' $selected{'RULES'}{$provider}>$option_string</option>\n";
+                               # Check if the autoupdate status is enabled and select the correct image and description.
+                               if ($autoupdate_status eq 'enabled') {
+                                       $autoupdate_status_gif = 'on.gif';
+                                       $autoupdate_status_gdesc = $Lang::tr{'click to disable'};
+                               } else {
+                                       $autoupdate_status_gif = 'off.gif';
+                                       $autoupdate_status_gdesc = $Lang::tr{'click to enable'};
                                }
-print <<END;
-                               </select>
-                               </td>
 
-                               <td>
-                                       <select name='AUTOUPDATE_INTERVAL'>
-                                               <option value='off' $selected{'AUTOUPDATE_INTERVAL'}{'off'} >- $Lang::tr{'Disabled'} -</option>
-                                               <option value='daily' $selected{'AUTOUPDATE_INTERVAL'}{'daily'} >$Lang::tr{'Daily'}</option>
-                                               <option value='weekly' $selected{'AUTOUPDATE_INTERVAL'}{'weekly'} >$Lang::tr{'Weekly'}</option>
-                                       </select>
-                               </td>
-                       </tr>
+print <<END;
+                               <tr>
+                                       <td width='33%' class='base' $col>$provider_name</td>
+                                       <td width='30%' class='base' $col>$rulesetdate</td>
 
-                       <tr>
-                               <td colspan='2'><br><br></td>
-                       </tr>
+                                       <td align='center' $col>
+                                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='AUTOUPDATE' value='$Lang::tr{'toggle enable disable'}' />
+                                                       <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$autoupdate_status_gif' alt='$autoupdate_status_gdesc' title='$autoupdate_status_gdesc' />
+                                                       <input type='hidden' name='ID' value='$id' />
+                                               </form>
+                                       </td>
 
-                       <tr style='display:none' id='code'>
-                               <td colspan='2'>Oinkcode:&nbsp;<input type='text' size='40' name='OINKCODE' value='$rulessettings{'OINKCODE'}'></td>
-                       </tr>
+                                       <td align='center' $col>
+                                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='PROVIDERS' value='$Lang::tr{'toggle enable disable'}'>
+                                                       <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$status_gif' alt='$status_gdesc' title='$status_gdesc'>
+                                                       <input type='hidden' name='ID' value='$id'>
+                                               </form>
+                                       </td>
 
-                       <tr>
-                               <td>&nbsp;</td>
+                                       <td align='center' $col>
+                                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='PROVIDERS' value='$Lang::tr{'edit'}'>
+                                                       <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}'>
+                                                       <input type='hidden' name='ID' value='$id'>
+                                               </form>
+                                       </td>
 
-                               <td align='right'>
+                                       <td align='center' $col>
+                                               <form method='post' name='$provider' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}'>
+                                                       <input type='hidden' name='ID' value='$id'>
+                                                       <input type='hidden' name='PROVIDERS' value='$Lang::tr{'remove'}'>
+                                               </form>
+                                       </td>
+                               </tr>
 END
-;
-                               # Show the "Update Ruleset"-Button only if a ruleset has been downloaded yet and automatic updates are disabled.
-                               if ((%idsrules) && ($rulessettings{'AUTOUPDATE_INTERVAL'} eq "off")) {
-                                       # Display button to update the ruleset.
-                                       print"<input type='submit' name='RULESET' value='$Lang::tr{'update ruleset'}'>\n";
+                       # Increment lines value.
+                       $line++;
+
                        }
+
+               } else {
+                       # Print notice that currently no hosts are ignored.
+                       print "<tr>\n";
+                       print "<td class='base' colspan='2'>$Lang::tr{'guardian no entries'}</td>\n";
+                       print "</tr>\n";
+               }
+
+       print "</table>\n";
+
+       # Section to add new elements or edit existing ones.
 print <<END;
-                                       <input type='submit' name='RULESET' value='$Lang::tr{'ids customize ruleset'}'>
-                                       <input type='submit' name='RULESET' value='$Lang::tr{'save'}'>
-                               </td>
+       <br>
+       <hr>
+       <br>
 
-                       </tr>
+       <div align='right'>
+               <table width='100%'>
+                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <tr>
+END
+
+                                       # Only show this button if a ruleset provider is configured.
+                                       if (%used_providers) {
+                                               print "<input type='submit' name='RULESET' value='$Lang::tr{'ids customize ruleset'}'>\n";
+                                       }
+print <<END;
+                                       <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'>
+                               </tr>
+                       </form>
                </table>
-       </form>
+       </div>
 END
-;
 
        &Header::closebox();
 
@@ -1028,17 +1316,17 @@ print <<END;
 
                                        <td align='center' $col>
                                                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                       <input type='hidden' name='WHITELIST' value='$Lang::tr{'toggle enable disable'}' />
-                                                       <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$gdesc' title='$gdesc' />
-                                                       <input type='hidden' name='ID' value='$key' />
+                                                       <input type='hidden' name='WHITELIST' value='$Lang::tr{'toggle enable disable'}'>
+                                                       <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$gdesc' title='$gdesc'>
+                                                       <input type='hidden' name='ID' value='$key'>
                                                </form>
                                        </td>
 
                                        <td align='center' $col>
                                                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                       <input type='hidden' name='WHITELIST' value='$Lang::tr{'edit'}' />
-                                                       <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />
-                                                       <input type='hidden' name='ID' value='$key' />
+                                                       <input type='hidden' name='WHITELIST' value='$Lang::tr{'edit'}'>
+                                                       <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}'>
+                                                       <input type='hidden' name='ID' value='$key'>
                                                </form>
                                        </td>
 
@@ -1066,7 +1354,7 @@ print <<END;
                <br>
                <hr>
                <br>
-       
+
                <div align='center'>
                        <table width='100%'>
 END
@@ -1120,7 +1408,7 @@ sub show_customize_ruleset() {
        print"var hide = \"$Lang::tr{'ids hide'}\"\;\n";
 
 print <<END
-       // Tiny java script function to show/hide the rules
+       // Tiny javascript function to show/hide the rules
        // of a given category.
        function showhide(tblname) {
                \$("#" + tblname).toggle();
@@ -1138,97 +1426,97 @@ print <<END
 END
 ;
        &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";
+       print"<form method='POST' action='$ENV{'SCRIPT_NAME'}'>\n";
 
-               # Loop over each rule file
-               foreach my $rulefile (sort keys(%idsrules)) {
-                       my $rulechecked = '';
+       # Output display table for rule files
+       print "<table width='100%'>\n";
 
-                       # Check if rule file is enabled
-                       if ($idsrules{$rulefile}{'Rulefile'}{'State'} eq 'on') {
-                               $rulechecked = 'CHECKED';
-                       }
-
-                       # Convert rulefile name into category name.
-                       my $categoryname = &_rulefile_to_category($rulefile);
+       # Loop over each rule file
+       foreach my $rulefile (sort keys(%idsrules)) {
+               my $rulechecked = '';
 
-                       # 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('$categoryname')\"><span id='span_$categoryname'>$Lang::tr{'ids show'}</span></a>\n";
-                       print"</td>\n";
-                       print"</tr>\n";
+               # Check if rule file is enabled
+               if ($idsrules{$rulefile}{'Rulefile'}{'State'} eq 'on') {
+                       $rulechecked = 'CHECKED';
+               }
 
-                       # Rows which will be hidden per default and will contain the single rules.
-                       print"<tr  style='display:none' id='$categoryname'>\n";
-                       print"<td colspan='3'>\n";
+               # Convert rulefile name into category name.
+               my $categoryname = &_rulefile_to_category($rulefile);
+
+               # 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('$categoryname')\"><span id='span_$categoryname'>$Lang::tr{'ids show'}</span></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='$categoryname'>\n";
+               print"<td colspan='3'>\n";
+
+               # Local vars
+               my $lines;
+               my $rows;
+               my $col;
+
+               # New table for the single rules.
+               print "<table width='100%'>\n";
 
+               # Loop over rule file rules
+               foreach my $sid (sort {$a <=> $b} keys(%{$idsrules{$rulefile}})) {
                        # Local vars
-                       my $lines;
-                       my $rows;
-                       my $col;
-
-                       # New table for the single rules.
-                       print "<table width='100%'>\n";
-
-                       # Loop over rule file rules
-                       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";
+                       my $ruledefchecked = '';
 
-                                       # Increase rows by once.
-                                       $rows++;
-                               }
-
-                               # Colour lines.
-                               if ($rows % 2) {
-                                       $col="bgcolor='$color{'color20'}'";
-                               } else {
-                                       $col="bgcolor='$color{'color22'}'";
-                               }
+                       # Skip rulefile itself.
+                       next if ($sid eq "Rulefile");
 
-                               # Set rule state
-                               if ($idsrules{$rulefile}{$sid}{'State'} eq 'on') {
-                                       $ruledefchecked = 'CHECKED';
-                               }
+                       # If 2 rules have been displayed, start a new row
+                       if (($lines % 2) == 0) {
+                               print "</tr><tr>\n";
 
-                               # 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>$idsrules{$rulefile}{$sid}{'Description'}</td>";
+                               # Increase rows by once.
+                               $rows++;
+                       }
 
-                               # Increment rule count
-                               $lines++;
+                       # Colour lines.
+                       if ($rows % 2) {
+                               $col="bgcolor='$color{'color20'}'";
+                       } else {
+                               $col="bgcolor='$color{'color22'}'";
                        }
 
-                       # If do not have a second rule for row, create empty cell
-                       if (($lines % 2) != 0) {
-                               print "<td class='base'></td>";
+                       # Set rule state
+                       if ($idsrules{$rulefile}{$sid}{'State'} eq 'on') {
+                               $ruledefchecked = 'CHECKED';
                        }
 
-                       # Close display table
-                       print "</tr></table></td></tr>";
+                       # 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>$idsrules{$rulefile}{$sid}{'Description'}</td>";
+
+                       # Increment rule count
+                       $lines++;
+               }
+
+               # If do not have a second rule for row, create empty cell
+               if (($lines % 2) != 0) {
+                       print "<td class='base'></td>";
                }
 
                # Close display table
-               print "</table>";
+               print "</tr></table></td></tr>";
+       }
 
-               print <<END
+       # Close display table
+       print "</table>";
+
+       print <<END
 <table width='100%'>
 <tr>
        <td width='100%' align='right'>
@@ -1240,8 +1528,282 @@ END
 </form>
 END
 ;
-               &Header::closebox();
+       &Header::closebox();
+}
+
+#
+## Function to show section for add/edit a provider.
+#
+sub show_add_provider() {
+       my %used_providers = ();
+       my @subscription_providers;
+
+       # Read -in providers settings file.
+       &General::readhasharray("$IDS::providers_settings_file", \%used_providers);
+
+       # Get all supported ruleset providers.
+       my @ruleset_providers = &IDS::get_ruleset_providers();
+
+       ### Java Script ###
+       print "<script>\n";
+
+       # Generate Java Script Object which contains the URL of the providers.
+       print "\t// Object, which contains the webpages of the ruleset providers.\n";
+       print "\tvar url = {\n";
+
+       # Loop through the array of supported providers.
+       foreach my $provider (@ruleset_providers) {
+               # Check if the provider requires a subscription.
+               if ($IDS::Ruleset::Providers{$provider}{'requires_subscription'} eq "True") {
+                       # Add the provider to the array of subscription_providers.
+                       push(@subscription_providers, $provider);
+               }
+
+               # Grab the URL for the provider.
+               my $url = $IDS::Ruleset::Providers{$provider}{'website'};
+
+               # Print the URL to the Java Script Object.
+               print "\t\t$provider: \"$url\"\,\n";
+       }
+
+       # Close the Java Script Object declaration.
+       print "\t}\;\n\n";
+
+       # Generate Java Script Array which contains the provider that requires a subscription.
+       my $line = "";
+       $line = join("', '", @subscription_providers);
+
+       print "\t// Array which contains the providers that requires a subscription.\n";
+       print "\tsubscription_provider = ['$line']\;\n\n";
+
+print <<END
+       // Java Script function to swap the text input field for
+       // entering a subscription code.
+       var update_provider = function() {
+               if(inArray(\$('#PROVIDER').val(), subscription_provider)) {
+                       \$('.subscription_code').show();
+               } else {
+                       \$('.subscription_code').hide();
+               }
+
+               // Call function to change the website url.
+               change_url(\$('#PROVIDER').val());
+       };
+
+       // Java Script function to check if a given value is part of
+       // an array.
+       function inArray(value,array) {
+               var count=array.length;
+
+               for(var i=0;i<count;i++) {
+                       if(array[i]===value){
+                               return true;
+                       }
+               }
+
+               return false;
+       }
+
+       // Tiny function to change the website url based on the selected element in the "PROVIDERS"
+       // dropdown menu.
+       function change_url(provider) {
+               // Get and change the href to the corresponding url.
+               document.getElementById("website").href = url[provider];
+       }
+
+       // JQuery function to call corresponding function when
+       // the ruleset provider is changed or the page is loaded for showing/hiding
+       // the subscription_code area.
+       \$(document).ready(function() {
+               \$('#PROVIDER').change(update_provider);
+                       update_provider();
+       });
+
+       </script>
+END
+;
+
+       # Check if an existing provider should be edited.
+       if($cgiparams{'PROVIDERS'} eq "$Lang::tr{'edit'}") {
+               # Check if autoupdate is enabled for this provider.
+               if ($used_providers{$cgiparams{'ID'}}[2] eq "enabled") {
+                       # Set the checkbox to be checked.
+                       $checked{'ENABLE_AUTOUPDATE'} = "checked='checked'";
+               }
+
+               # Check if the monitor traffic only mode is set for this provider.
+               if ($used_providers{$cgiparams{'ID'}}[4] eq "IDS") {
+                       # Set the checkbox to be checked.
+                       $checked{'MONITOR_TRAFFIC_ONLY'} = "checked='checked'";
+               }
+
+               # Display section to force an rules update and to reset the provider.
+               &show_additional_provider_actions();
+
+       } elsif ($cgiparams{'PROVIDERS'} eq "$Lang::tr{'ids add provider'}") {
+               # Set the autoupdate to true as default.
+               $checked{'ENABLE_AUTOUPDATE'} = "checked='checked'";
+       }
+
+       &Header::openbox('100%', 'center', $Lang::tr{'ids provider settings'});
+
+print <<END
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <table width='100%' border='0'>
+                       <tr>
+                               <td colspan='2'><b>$Lang::tr{'ids provider'}</b></td>
+                       </tr>
+
+                       <tr>
+                               <td width='40%'>
+                                       <input type='hidden' name='ID' value='$cgiparams{'ID'}'>
+END
+;
+                                       # Value to allow disabling the dropdown menu.
+                                       my $disabled;
+
+                                       # Check if we are in edit mode.
+                                       if ($cgiparams{'PROVIDERS'} eq "$Lang::tr{'edit'}") {
+                                               $disabled = "disabled";
+
+                                               # Add hidden input with the provider because the disable select does not provider
+                                               # this.
+                                               print "<input type='hidden' name='PROVIDER' value='$used_providers{$cgiparams{'ID'}}[0]'>\n";
+                                       }
+
+                                       print "<select name='PROVIDER' id='PROVIDER' $disabled>\n";
+                                               # Temporary hash to store the provier names and their handles.
+                                               my %tmphash = ();
+
+                                               # Loop through the array of ruleset providers.
+                                               foreach my $handle (@ruleset_providers) {
+                                                       # Get the provider name.
+                                                       my $name = &get_provider_name($handle);
+
+                                                       # Add the grabbed provider  name and handle to the
+                                                       # temporary hash.
+                                                       $tmphash{$name} = "$handle";
+                                               }
+
+                                               # Sort and loop through the temporary hash.
+                                               foreach my $provider_name ( sort keys %tmphash ) {
+                                                       # Grab the provider handle.
+                                                       my $provider = $tmphash{$provider_name};
+
+                                                       # Pre-select the provider if one is given.
+                                                       if (($used_providers{$cgiparams{'ID'}}[0] eq "$provider") || ($cgiparams{'PROVIDER'} eq "$provider")) {
+                                                               $selected{$provider} = "selected='selected'";
+                                                       }
+
+                                                       # Add the provider to the dropdown menu.
+                                                       print "<option value='$provider' $selected{$provider}>$provider_name</option>\n";
+                                               }
+print <<END
+                                       </select>
+                               </td>
+
+                               <td width='60%'>
+                                       <b><a id="website" target="_blank" href="#">$Lang::tr{'ids visit provider website'}</a></b>
+                               </td>
+                       </tr>
+
+                       <tr>
+                               <td colspan='2'><br><br></td>
+                       </tr>
+
+                       <tr class='subscription_code' style='display:none' id='subscription_code'>
+                               <td colspan='2'>
+                                       <table border='0'>
+                                               <tr>
+                                                       <td>
+                                                               <b>$Lang::tr{'subscription code'}</b>
+                                                       </td>
+                                               </tr>
+
+                                               <tr>
+                                                       <td>
+                                                               <input type='text' size='40' name='SUBSCRIPTION_CODE' value='$used_providers{$cgiparams{'ID'}}[1]'>
+                                                       </td>
+                                               </tr>
+
+                                               <tr>
+                                                       <td><br><br></td>
+                                               </tr>
+                                       </table>
+                               </td>
+                       </tr>
+
+                       <tr>
+                               <td>
+                                       <input type='checkbox' name='ENABLE_AUTOUPDATE' $checked{'ENABLE_AUTOUPDATE'}>&nbsp;$Lang::tr{'ids enable automatic updates'}
+                               </td>
+
+                               <td>
+                                       <input type='checkbox' name='MONITOR_TRAFFIC_ONLY' $checked{'MONITOR_TRAFFIC_ONLY'}>&nbsp;$Lang::tr{'ids monitor traffic only'}
+                               </td>
+                       </tr>
+
+                       <tr>
+                               <td colspan='2' align='right'>
+                                       <input type='submit' value='$Lang::tr{'back'}'>
+END
+;
+                               # Check if a provider should be added or edited.
+                               if ($cgiparams{'PROVIDERS'} eq "$Lang::tr{'edit'}") {
+                                       # Display button for updating the existing provider.
+                                       print "<input type='submit' name='PROVIDERS' value='$Lang::tr{'update'}'>\n";
+                               } else {
+                                       # Display button to add the new provider.
+                                       print "<input type='submit' name='PROVIDERS' value='$Lang::tr{'add'}'>\n";
+                               }
+print <<END
+                               </td>
+                       </tr>
+               </table>
+       </form>
+END
+;
+       &Header::closebox();
+}
+
+#
+## Function to show the area where additional provider actions can be done.
+#
+sub show_additional_provider_actions() {
+       my $disabled;
+       my %used_providers = ();
+
+       # Read-in providers settings file.
+       &General::readhasharray("$IDS::providers_settings_file", \%used_providers);
+
+       # Assign variable for provider handle.
+       my $provider = "$used_providers{$cgiparams{'ID'}}[0]";
+
+       # Call function to get the path and name for the given provider
+       # ruleset modifications file.
+       my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
+
+       # Disable the reset provider button if no provider modified sids file exists.
+       unless (-f $modifications_file) {
+               $disabled = "disabled";
        }
+
+       &Header::openbox('100%', 'center', "");
+       print <<END
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                       <table width='100%' border="0">
+                               <tr>
+                                       <td align='center'>
+                                               <input type='hidden' name='PROVIDER' value='$provider'>
+                                               <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids reset provider'}' $disabled>
+                                               <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids force ruleset update'}'>
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
+END
+;
+       &Header::closebox();
 }
 
 #
@@ -1251,6 +1813,16 @@ END
 sub working_notice ($) {
        my ($message) = @_;
 
+       &_open_working_notice ($message);
+       &_close_working_notice();
+}
+
+#
+## Private function to lock the page and tell the user what is going on.
+#
+sub _open_working_notice ($) {
+       my ($message) = @_;
+
        &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
        &Header::openbigbox('100%', 'left', '', $errormessage);
        &Header::openbox( 'Waiting', 1,);
@@ -1260,13 +1832,78 @@ sub working_notice ($) {
                                        <td><img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' /></td>
                                        <td>$message</td>
                                </tr>
-                       </table>
 END
+}
+
+#
+## Private function to close a working notice.
+#
+sub _close_working_notice () {
+       print "</table>\n";
+
        &Header::closebox();
        &Header::closebigbox();
        &Header::closepage();
 }
 
+#
+## Function which locks the webpage and basically does the same as the
+## oinkmaster function, but provides a lot of HTML formated status output.
+#
+sub oinkmaster_web () {
+       my @enabled_providers = &IDS::get_enabled_providers();
+
+       # Lock the webpage and print message.
+        &_open_working_notice("$Lang::tr{'ids apply ruleset changes'}");
+
+        # Check if the files in rulesdir have the correct permissions.
+        &IDS::_check_rulesdir_permissions();
+
+       print "<tr><td><br><br></td></tr>\n";
+
+        # Cleanup the rules directory before filling it with the new rulests.
+        &_add_to_notice("$Lang::tr{'ids remove rule structures'}");
+        &IDS::_cleanup_rulesdir();
+
+        # Loop through the array of enabled providers.
+        foreach my $provider (@enabled_providers) {
+                &_add_to_notice("$Lang::tr{'ids extract ruleset'} $provider");
+                # Call the extractruleset function.
+                &IDS::extractruleset($provider);
+        }
+
+        # Call function to process the ruleset and do all modifications.
+        &_add_to_notice("$Lang::tr{'ids adjust ruleset'}");
+        &IDS::process_ruleset(@enabled_providers);
+
+        # Call function to merge the classification files.
+        &_add_to_notice("$Lang::tr{'ids merge classifications'}");
+        &IDS::merge_classifications(@enabled_providers);
+
+        # Call function to merge the sid to message mapping files.
+        &_add_to_notice("$Lang::tr{'ids merge sid files'}");
+        &IDS::merge_sid_msg(@enabled_providers);
+
+        # Cleanup temporary directory.
+        &_add_to_notice("$Lang::tr{'ids cleanup tmp dir'}");
+        &IDS::cleanup_tmp_directory();
+
+       # Finished - print a notice.
+        &_add_to_notice("$Lang::tr{'ids finished'}");
+
+       # Close the working notice.
+       &_close_working_notice();
+}
+
+#
+## Tiny private function to add a given message to a notice table.
+#
+sub _add_to_notice ($) {
+       my ($message) = @_;
+
+       print "<tr><td colspan='2'><li><b>$message</b></li></td></tr>\n";
+}
+
 #
 ## A tiny function to perform a reload of the webpage after one second.
 #
@@ -1308,7 +1945,7 @@ sub readrulesfile ($) {
                my $msg;
 
                # Gather rule sid and message from the ruleline.
-               if ($line =~ m/.*msg:\"(.*?)\"\; .* sid:(.*?); /) {
+               if ($line =~ m/.*msg:\s*\"(.*?)\"\;.*sid:\s*(.*?); /) {
                        $msg = $1;
                        $sid = $2;
 
@@ -1370,54 +2007,21 @@ sub get_memory_usage($) {
 }
 
 #
-## Function to read-in the given enabled or disables sids file.
+## Function to get the provider handle by a given ID.
 #
-sub read_enabled_disabled_sids_file($) {
-       my ($file) = @_;
-
-       # Temporary hash to store the sids and their state. It will be
-       # returned at the end of this function.
-       my %temphash;
-
-       # Open the given filename.
-       open(FILE, "$file") or die "Could not open $file. $!\n";
-
-       # Loop through the file.
-       while(<FILE>) {
-               # Remove newlines.
-               chomp $_;
-
-               # Skip blank lines.
-               next if ($_ =~ /^\s*$/);
-
-               # Skip coments.
-               next if ($_ =~ /^\#/);
-
-               # Splitt line into sid and state part.
-               my ($state, $sid) = split(" ", $_);
-
-               # Skip line if the sid is not numeric.
-               next unless ($sid =~ /\d+/ );
-
-               # Check if the sid was enabled.
-               if ($state eq "enablesid") {
-                       # Add the sid and its state as enabled to the temporary hash.
-                       $temphash{$sid} = "enabled";
-               # Check if the sid was disabled.
-               } elsif ($state eq "disablesid") {
-                       # Add the sid and its state as disabled to the temporary hash.
-                       $temphash{$sid} = "disabled";
-               # Invalid state - skip the current sid and state.
-               } else {
-                       next;
-               }
-       }
+sub get_provider_handle($) {
+       my ($id) = @_;
+
+       my %used_providers = ();
 
-       # Close filehandle.
-       close(FILE);
+       # Read-in provider settings file.
+       &General::readhasharray($IDS::providers_settings_file, \%used_providers);
 
-       # Return the hash.
-       return %temphash;
+       # Obtain the provider handle for the given ID.
+       my $provider_handle = $used_providers{$cgiparams{'ID'}}[0];
+
+       # Return the handle.
+       return $provider_handle;
 }
 
 #
@@ -1443,6 +2047,24 @@ sub get_provider_name($) {
        return $provider_name;
 }
 
+#
+## Function to remove a provider by a given ID.
+#
+sub remove_provider($) {
+       my ($id) = @_;
+
+       my %used_providers = ();
+
+       # Read-in provider settings file.
+       &General::readhasharray($IDS::providers_settings_file, \%used_providers);
+
+       # Drop entry from the hash.
+       delete($used_providers{$id});
+
+       # Write the changed hash to the provider settings file.
+       &General::writehasharray($IDS::providers_settings_file, \%used_providers);
+}
+
 #
 ## Private function to convert a given rulefile to a category name.
 ## ( No file extension anymore and if the name contained a dot, it