]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/ids.cgi
ids.cgi: Keep IDS/IPS mode settings when enabling/disabling a provider
[ipfire-2.x.git] / html / cgi-bin / ids.cgi
index 161464d0d9990998ad23bcd67c826611a3d5065f..3a2e492b93bac765ce488a54dc466eecfb315adb 100644 (file)
@@ -103,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'})) {
@@ -165,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];
@@ -199,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'}});
@@ -298,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) {
@@ -315,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();
 
@@ -353,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 = &IDS::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) {
@@ -373,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.
@@ -409,68 +391,16 @@ 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);
-                       }
-
-                       # 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'}");
@@ -480,14 +410,8 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 
        # 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.
@@ -540,44 +464,46 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 
 # 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'}");
 
-       # Create new empty file for used rulefiles
-       # for this provider.
-       &IDS::write_used_provider_rulefiles_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);
 
-       # Call function to get the path and name for the given providers
-       # oinkmaster modified sids file.
-       my $provider_modified_sids_file = &IDS::get_oinkmaster_provider_modified_sids_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 $provider_modified_sids_file) {
+       if (-f $modifications_file) {
                # Remove the file, as requested.
-               unlink("$provider_modified_sids_file");
+               unlink("$modifications_file");
        }
 
-       # Alter the oinkmaster provider includes file and remove the provider.
-       &IDS::alter_oinkmaster_provider_includes_file("remove", $provider);
+       # Write used rulesfiles file.
+       &IDS::write_used_rulefiles_file(@enabled_providers);
 
        # Regenerate ruleset.
        &IDS::oinkmaster();
 
        # Check if the IDS is running.
        if(&IDS::ids_is_running()) {
-               # Get enabled providers.
-               my @enabled_providers = &IDS::get_enabled_providers();
-
                # 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");
+                       &IDS::call_suricatactrl("reload");
 
                # Stop suricata if no enabled provider remains.
                } else {
@@ -619,7 +545,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++;
@@ -653,24 +579,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 at least one provider is enabled.
-               if (@enabled_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.
@@ -718,7 +626,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);
@@ -736,6 +644,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
        my $provider = $cgiparams{'PROVIDER'};
        my $subscription_code = $cgiparams{'SUBSCRIPTION_CODE'};
        my $status_autoupdate;
+       my $mode;
 
        # Handle autoupdate checkbox.
        if ($cgiparams{'ENABLE_AUTOUPDATE'} eq "on") {
@@ -744,6 +653,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.
@@ -806,7 +722,7 @@ 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);
@@ -847,14 +763,13 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 
                                        # Cleanup temporary directory.
                                        &IDS::cleanup_tmp_directory();
-
-                                       # Create new empty file for used rulefiles
-                                       # for this provider.
-                                       &IDS::write_used_provider_rulefiles_file($provider);
                                }
 
                                # Perform a reload of the page.
                                &reload();
+                       } else {
+                               # Remove the configured provider again.
+                               &remove_provider($id);
                        }
                }
 
@@ -906,7 +821,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]", "$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);
@@ -915,11 +830,7 @@ 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);
-
-               # 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);
+               &IDS::write_used_rulefiles_file(@enabled_providers);
 
                # Check if oinkmaster has to be executed.
                if ($oinkmaster eq "True") {
@@ -976,24 +887,21 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
        &IDS::drop_dl_rulesfile($provider);
 
        # Get the name of the provider rulessets include file.
-       my $provider_used_rulefile = &IDS::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
-       # oinkmaster modified sids file.
-       my $provider_modified_sids_file = &IDS::get_oinkmaster_provider_modified_sids_file($provider);
+       # ruleset modifications file..
+       my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
 
        # Check if the file exists.
-       if (-f $provider_modified_sids_file) {
+       if (-f $modifications_file) {
                # Remove the file, which is not longer needed.
-               unlink("$provider_modified_sids_file");
+               unlink("$modifications_file");
        }
 
-       # Alter the oinkmaster provider includes file and remove the provider.
-       &IDS::alter_oinkmaster_provider_includes_file("remove", $provider);
-
        # Regenerate ruleset.
        &IDS::oinkmaster();
 
@@ -1001,7 +909,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
        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()) {
@@ -1019,7 +927,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
                        &IDS::call_suricatactrl("stop");
                }
        }
-       
+
        # Undefine providers flag.
        undef($cgiparams{'PROVIDERS'});
 
@@ -1071,14 +979,11 @@ sub show_mainpage() {
        }
 
        # 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'} = '';
@@ -1149,8 +1054,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>
 
@@ -1247,7 +1150,7 @@ 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
@@ -1468,7 +1371,7 @@ print <<END;
                <br>
                <hr>
                <br>
-       
+
                <div align='center'>
                        <table width='100%'>
 END
@@ -1522,7 +1425,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();
@@ -1540,97 +1443,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';
-                       }
+       # Loop over each rule file
+       foreach my $rulefile (sort keys(%idsrules)) {
+               my $rulechecked = '';
 
-                       # 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";
+               # 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;
+                       my $ruledefchecked = '';
 
-                       # New table for the single rules.
-                       print "<table width='100%'>\n";
+                       # Skip rulefile itself.
+                       next if ($sid eq "Rulefile");
 
-                       # Loop over rule file rules
-                       foreach my $sid (sort {$a <=> $b} keys(%{$idsrules{$rulefile}})) {
-                               # Local vars
-                               my $ruledefchecked = '';
+                       # If 2 rules have been displayed, start a new row
+                       if (($lines % 2) == 0) {
+                               print "</tr><tr>\n";
 
-                               # 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++;
-                               }
-
-                               # 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'>
@@ -1642,8 +1545,7 @@ END
 </form>
 END
 ;
-               &Header::closebox();
-       }
+       &Header::closebox();
 }
 
 #
@@ -1746,6 +1648,12 @@ END
                        $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();
 
@@ -1843,9 +1751,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>
@@ -1884,12 +1796,12 @@ sub show_additional_provider_actions() {
        # Assign variable for provider handle.
        my $provider = "$used_providers{$cgiparams{'ID'}}[0]";
 
-       # Call function to get the path and name for the given providers
-       # oinkmaster modified sids file.
-       my $provider_modified_sids_file = &IDS::get_oinkmaster_provider_modified_sids_file($provider);
+       # 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 $provider_modified_sids_file) {
+       unless (-f $modifications_file) {
                $disabled = "disabled";
        }
 
@@ -1905,7 +1817,7 @@ sub show_additional_provider_actions() {
                                        </td>
                                </tr>
                        </table>
-               </form>                 
+               </form>
 END
 ;
        &Header::closebox();