]> 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 aad0630e6333bf19433598fd2d7895e5104a460f..1d4c3928c1b9393ce8e0a1854d0ffe345502ba39 100644 (file)
@@ -20,6 +20,7 @@
 ###############################################################################
 
 use strict;
+use experimental 'smartmatch';
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -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'}});
@@ -297,7 +298,7 @@ if ($cgiparams{'RULESET'}) {
        # Loop through the array of used providers.
        foreach my $provider (@enabled_providers) {
                # Gather used rulefiles.
-               my @used_rulesfiles = &IDS::read_used_provider_rulesfiles($provider);
+               my @used_rulesfiles = &IDS::get_provider_used_rulesfiles($provider);
 
                # Loop through the array of used rulesfiles.
                foreach my $rulefile (@used_rulesfiles) {
@@ -314,36 +315,6 @@ if ($cgiparams{'RULESET'}) {
 
 # Save ruleset.
 if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
-       # Arrays to store which rulefiles have been enabled and will be used.
-       my @enabled_rulefiles;
-
-       # 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};
-               }
-       }
-
-       # Open oinkmaster main include file for provider modifications.
-       open(OINKM_INCL_FILE, ">", "$IDS::oinkmaster_provider_includes_file") or die "Could not open $IDS::oinkmaster_provider_includes_file. $!\n";
-
-       # Print file header and notice about autogenerated file.
-       print OINKM_INCL_FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
-
        # Get enabled providers.
        my @enabled_providers = &IDS::get_enabled_providers();
 
@@ -352,14 +323,17 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                # Hash to store the used-enabled and disabled sids.
                my %enabled_disabled_sids;
 
-               # Generate modified sids file name for the current processed provider.
-               my $providers_modified_sids_file = &IDS::get_oinkmaster_provider_modified_sids_file($provider);
+               # Hash to store the enabled rulefiles for the current processed provider.
+               my %used_rulefiles;
 
-               # Check if a modified sids file for this provider exists.
-               if (-f $providers_modified_sids_file) {
-                       # Read-in the file for enabled/disabled sids.
-                       %enabled_disabled_sids = &read_enabled_disabled_sids_file($providers_modified_sids_file);
-               }
+               # Get name of the file which holds the ruleset modification of the provider.
+               my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
+
+               # 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);
+
+               # Read-in modifications file, if exists.
+               &General::readhash("$modifications_file", \%enabled_disabled_sids) if (-f "$modifications_file");
 
                # Loop through the hash of idsrules.
                foreach my $rulefile (keys %idsrules) {
@@ -372,6 +346,15 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                        # Skip the rulefile if the vendor is not our current processed provider.
                        next unless ($rulefile_vendor eq $provider);
 
+                       # 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";
+
+                               # Drop item from cgiparams hash.
+                               delete $cgiparams{$rulefile};
+                       }
+
                        # Loop through the single rules of the rulefile.
                        foreach my $sid (keys %{$idsrules{$rulefile}}) {
                                # Skip the current sid if it is not numeric.
@@ -408,95 +391,34 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 
                # Check if the hash for enabled/disabled sids contains any entries.
                if (%enabled_disabled_sids) {
-                       # Open providers modified sids file for writing.
-                       open(PROVIDER_MOD_FILE, ">$providers_modified_sids_file") or die "Could not write to $providers_modified_sids_file. $!\n";
-
-                       # Write header to the files.
-                       print PROVIDER_MOD_FILE "#Autogenerated file. Any custom changes will be overwritten!\n";
-
-                       # 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 PROVIDER_MOD_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 PROVIDER_MOD_FILE "disablesid $sid\n";
-                               # Something strange happende - skip the current sid.
-                               } else {
-                                       next;
-                               }
-                       }
-
-                       # Close file handle for the providers modified sids file.
-                       close(PROVIDER_MOD_FILE);
-
-                       # Add the file to the oinkmasters include file.
-                       print OINKM_INCL_FILE "include $providers_modified_sids_file\n";
+                       # Write the modifications file.
+                       &General::writehash("$modifications_file", \%enabled_disabled_sids);
                }
-       }
-
-       # Close the file handle after writing.
-       close(OINKM_INCL_FILE);
-
-       # Handle enabled / disabled rulefiles.
-       #
-
-       # Loop through the array of enabled providers.
-       foreach my $provider(@enabled_providers) {
-               # Array to store the rulefiles which belong to the current processed provider.
-               my @provider_rulefiles = ();
-
-               # Loop through the array of enabled rulefiles.
-               foreach my $rulesfile (@enabled_rulefiles) {
-                       # Split the rulefile name.
-                       my @filename_parts = split(/-/, "$rulesfile");
 
-                       # Assign vendor name for easy processings.
-                       my $vendor = @filename_parts[0];
-
-                       # Check if the rulesvendor is our current processed enabled provider.
-                       if ("$vendor" eq "$provider") {
-                               # Add the rulesfile to the array of provider rulesfiles.
-                               push(@provider_rulefiles, $rulesfile);
-                       }
-
-                       # Check if any rulesfiles have been found for this provider.
-                       if (@provider_rulefiles) {
-                               # Call function and write the providers used rulesfile file.
-                               &IDS::write_used_provider_rulefiles_file($provider, @provider_rulefiles);
-                       }
-               }
+               # Write the used rulefiles file.
+               &General::writehash("$used_rulefiles_file", \%used_rulefiles);
        }
 
        # Call function to generate and write the used rulefiles file.
-       &IDS::write_main_used_rulefiles_file(@enabled_providers);
+       &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'}";
@@ -514,8 +436,8 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                &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);
@@ -524,7 +446,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                        &reload();
                } else {
                        # Call subfunction to launch oinkmaster.
-                       &IDS::oinkmaster();
+                       &oinkmaster_web();
 
                        # Check if the IDS is running.
                        if(&IDS::ids_is_running()) {
@@ -536,6 +458,63 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                        &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;
@@ -545,15 +524,15 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
        # 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") {
-               # Get enabled providers.
-               my @enabled_providers = &IDS::get_enabled_providers();
-
-               # Check if any ruleset is available. Otherwise abort and display an error.
+               # 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'};
                }
@@ -563,7 +542,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                        # 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++;
@@ -582,12 +561,6 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                &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();
 
@@ -597,24 +570,6 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
        # 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 (%used_providers) {
-                       # 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.
@@ -662,7 +617,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                }
 
                # 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} = ["$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);
@@ -680,6 +635,8 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
        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") {
@@ -688,6 +645,13 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                $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.
@@ -728,6 +692,15 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                        # 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 {
@@ -750,47 +723,79 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                }
 
                # Add/Modify the entry to/in the used providers hash..
-               $used_providers{$id} = ["$provider", "$subscription_code", "$status_autoupdate", "$status"];
+               $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'}) {
-                       # Lock the webpage and print notice about downloading
-                       # a new ruleset.
-                       &working_notice("$Lang::tr{'ids working'}");
+                       # 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'}";
+                       }
 
-                       # Download the ruleset.
-                       &IDS::downloadruleset($provider);
+                       # 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'}";
+                       }
 
-                       # Extract the ruleset
-                       &IDS::extractruleset($provider);
+                       # Check if any errors happend.
+                       unless ($errormessage) {
+                               # Lock the webpage and print notice about downloading
+                               # a new ruleset.
+                               &working_notice("$Lang::tr{'ids working'}");
 
-                       # Move the ruleset.
-                       &IDS::move_tmp_ruleset();
+                               # Download the ruleset.
+                               if(&IDS::downloadruleset($provider)) {
+                                       $errormessage = "$Lang::tr{'ids could not add provider'} - $Lang::tr{'ids unable to download the ruleset'}";
 
-                       # Cleanup temporary directory.
-                       &IDS::cleanup_tmp_directory();
+                                       # Call function to store the errormessage.
+                                       &IDS::_store_error_message($errormessage);
 
-                       # Create new empty file for used rulefiles
-                       # for this provider.
-                       &IDS::write_used_provider_rulefiles_file($provider);
+                                       # 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'});
        }
 
+       # 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.
@@ -819,10 +824,13 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 
                        # 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} = ["$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);
@@ -831,11 +839,13 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                my @enabled_providers = &IDS::get_enabled_providers();
 
                # Write the main providers include file.
-               &IDS::write_main_used_rulefiles_file(@enabled_providers);
+               &IDS::write_used_rulefiles_file(@enabled_providers);
 
-               # Call function to alter the oinkmasters provider includes file and
-               # add or remove the provider.
-               &IDS::alter_oinkmaster_provider_includes_file($provider_includes_action, $provider_handle);
+               # 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()) {
@@ -856,48 +866,53 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 
                # Undefine providers flag.
                undef($cgiparams{'PROVIDERS'});
+
+               # Reload page.
+               &reload();
        }
 
 ## Remove provider from the list of used providers.
 #
 } elsif ($cgiparams{'PROVIDERS'} eq $Lang::tr{'remove'}) {
-       my %used_providers = ();
+       # Assign a nice human-readable variable.
+       my $id = $cgiparams{'ID'};
 
-       # Read-in provider settings file.
-       &General::readhasharray($IDS::providers_settings_file, \%used_providers);
+       # Grab the provider name bevore deleting.
+       my $provider = &get_provider_handle($id);
 
-       # Grab the provider name bevore deleting it from hash.
-       my $provider = $used_providers{$cgiparams{'ID'}}[0];
-
-       # Drop entry from the hash.
-       delete($used_providers{$cgiparams{'ID'}});
+       # Remove the provider.
+       &remove_provider($id);
 
        # Undef the given ID.
        undef($cgiparams{'ID'});
 
-       # Write the changed hash to the provide settings file.
-       &General::writehasharray($IDS::providers_settings_file, \%used_providers);
-
-       # Lock the webpage and print message.
-       &working_notice("$Lang::tr{'ids apply ruleset changes'}");
-
        # Drop the stored ruleset file.
        &IDS::drop_dl_rulesfile($provider);
 
        # Get the name of the provider rulessets include file.
-       my $provider_used_rulefile = &get_used_provider_rulesfile_file($provider);
+       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.
-       &IDS::oinkmaster();
+       &oinkmaster_web();
 
        # Gather all enabled providers.
        my @enabled_providers = &IDS::get_enabled_providers();
 
        # Regenerate main providers include file.
-       &IDS::write_main_used_rulefiles_file(@enabled_providers);
+       &IDS::write_used_rulefiles_file(@enabled_providers);
 
        # Check if the IDS is running.
        if(&IDS::ids_is_running()) {
@@ -915,7 +930,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                        &IDS::call_suricatactrl("stop");
                }
        }
-       
+
        # Undefine providers flag.
        undef($cgiparams{'PROVIDERS'});
 
@@ -960,25 +975,12 @@ sub show_mainpage() {
        &General::readhash("$IDS::ids_settings_file", \%idssettings);
        &General::readhasharray("$IDS::providers_settings_file", \%used_providers);
 
-       # If no autoupdate intervall has been configured yet, set default value.
-       unless(exists($idssettings{'AUTOUPDATE_INTERVAL'})) {
-               # Set default to "weekly".
-               $idssettings{'AUTOUPDATE_INTERVAL'} = 'weekly';
-       }
-
        # 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{'AUTOUPDATE_INTERVAL'}{'off'} = '';
-       $selected{'AUTOUPDATE_INTERVAL'}{'daily'} = '';
-       $selected{'AUTOUPDATE_INTERVAL'}{'weekly'} = '';
-       $selected{'AUTOUPDATE_INTERVAL'}{$idssettings{'AUTOUPDATE_INTERVAL'}} = "selected='selected'";
 
        # Draw current state of the IDS
        &Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system'});
@@ -1045,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>
 
@@ -1105,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>
@@ -1143,10 +1133,12 @@ print <<END;
                        <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'}'></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 = "";
@@ -1163,7 +1155,7 @@ END
                                my $status  = $used_providers{$id}[3];
 
                                # Check if the item number is even or not.
-                               if ($id % 2) {
+                               if ($line % 2) {
                                        $col="bgcolor='$color{'color22'}'";
                                } else {
                                        $col="bgcolor='$color{'color20'}'";
@@ -1231,6 +1223,9 @@ print <<END;
                                        </td>
                                </tr>
 END
+                       # Increment lines value.
+                       $line++;
+
                        }
 
                } else {
@@ -1359,7 +1354,7 @@ print <<END;
                <br>
                <hr>
                <br>
-       
+
                <div align='center'>
                        <table width='100%'>
 END
@@ -1413,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();
@@ -1431,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";
-
-               # Loop over each rule file
-               foreach my $rulefile (sort keys(%idsrules)) {
-                       my $rulechecked = '';
+       print"<form method='POST' action='$ENV{'SCRIPT_NAME'}'>\n";
 
-                       # Check if rule file is enabled
-                       if ($idsrules{$rulefile}{'Rulefile'}{'State'} eq 'on') {
-                               $rulechecked = 'CHECKED';
-                       }
+       # Output display table for rule files
+       print "<table width='100%'>\n";
 
-                       # 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 = '';
+                       my $ruledefchecked = '';
 
-                               # Skip rulefile itself.
-                               next if ($sid eq "Rulefile");
+                       # 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";
-
-                                       # Increase rows by once.
-                                       $rows++;
-                               }
+                       # If 2 rules have been displayed, start a new row
+                       if (($lines % 2) == 0) {
+                               print "</tr><tr>\n";
 
-                               # Colour lines.
-                               if ($rows % 2) {
-                                       $col="bgcolor='$color{'color20'}'";
-                               } else {
-                                       $col="bgcolor='$color{'color22'}'";
-                               }
-
-                               # Set rule state
-                               if ($idsrules{$rulefile}{$sid}{'State'} eq 'on') {
-                                       $ruledefchecked = 'CHECKED';
-                               }
-
-                               # Create rule checkbox and display rule description
-                               print "<td class='base' width='5%' align='right' $col>\n";
-                               print "<input type='checkbox' NAME='$sid' $ruledefchecked>\n";
-                               print "</td>\n";
-                               print "<td class='base' width='45%' $col>$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>";
+       }
+
+       # Close display table
+       print "</table>";
 
-               print <<END
+       print <<END
 <table width='100%'>
 <tr>
        <td width='100%' align='right'>
@@ -1533,8 +1528,7 @@ END
 </form>
 END
 ;
-               &Header::closebox();
-       }
+       &Header::closebox();
 }
 
 #
@@ -1629,8 +1623,6 @@ print <<END
 END
 ;
 
-       &Header::openbox('100%', 'center', $Lang::tr{'ids provider settings'});
-
        # Check if an existing provider should be edited.
        if($cgiparams{'PROVIDERS'} eq "$Lang::tr{'edit'}") {
                # Check if autoupdate is enabled for this provider.
@@ -1638,11 +1630,23 @@ END
                        # 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'>
@@ -1668,10 +1672,23 @@ END
                                        }
 
                                        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 $provider (@ruleset_providers) {
+                                               foreach my $handle (@ruleset_providers) {
                                                        # Get the provider name.
-                                                       my $provider_name = &get_provider_name($provider);
+                                                       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")) {
@@ -1717,9 +1734,13 @@ print <<END
                        </tr>
 
                        <tr>
-                               <td colspan='2'>
+                               <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>
@@ -1745,6 +1766,46 @@ 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();
+}
+
 #
 ## A function to display a notice, to lock the webpage and
 ## tell the user which action currently will be performed.
@@ -1752,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,);
@@ -1761,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.
 #
@@ -1809,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;
 
@@ -1871,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) = @_;
 
-       # Close filehandle.
-       close(FILE);
+       my %used_providers = ();
 
-       # Return the hash.
-       return %temphash;
+       # Read-in provider settings file.
+       &General::readhasharray($IDS::providers_settings_file, \%used_providers);
+
+       # Obtain the provider handle for the given ID.
+       my $provider_handle = $used_providers{$cgiparams{'ID'}}[0];
+
+       # Return the handle.
+       return $provider_handle;
 }
 
 #
@@ -1944,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