&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()) {
unless ($errormessage) {
# Lock the webpage and print notice about downloading
# a new ruleset.
- &working_notice("$Lang::tr{'ids download new ruleset'}");
+ &_open_working_notice("$Lang::tr{'ids download new ruleset'}");
# Call subfunction to download the ruleset.
- if(&IDS::downloadruleset($provider)) {
- $errormessage = "$provider - $Lang::tr{'could not download latest updates'}";
+ my $return = &IDS::downloadruleset($provider);
+
+ # Check if the download function gives a return code.
+ if ($return) {
+ # Handle different return codes.
+ if ($return eq "not modified") {
+ $errormessage = "$provider - $Lang::tr{'ids ruleset is up to date'}";
+ } else {
+ $errormessage = "$provider - $Lang::tr{'could not download latest updates'}: $return";
+ }
# Call function to store the errormessage.
&IDS::_store_error_message($errormessage);
+ # Close the working notice.
+ &_close_working_notice();
+
# Preform a reload of the page.
&reload();
} else {
# Call subfunction to launch oinkmaster.
- &IDS::oinkmaster();
+ &oinkmaster_web("nolock");
+
+ # Close the working notice.
+ &_close_working_notice();
# Check if the IDS is running.
if(&IDS::ids_is_running()) {
&IDS::write_used_rulefiles_file(@enabled_providers);
# Regenerate ruleset.
- &IDS::oinkmaster();
+ &oinkmaster_web();
# Check if the IDS is running.
if(&IDS::ids_is_running()) {
&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();
my $subscription_code = $cgiparams{'SUBSCRIPTION_CODE'};
my $status_autoupdate;
my $mode;
+ my $regenerate_ruleset_required;
# Handle autoupdate checkbox.
if ($cgiparams{'ENABLE_AUTOUPDATE'} eq "on") {
# 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 {
&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'}";
+ my $return = &IDS::downloadruleset($provider);
+
+ # Check if the downloader returned a code.
+ if ($return) {
+ $errormessage = "$Lang::tr{'ids could not add provider'} - $Lang::tr{'ids unable to download the ruleset'}: $return";
# Call function to store the errormessage.
&IDS::_store_error_message($errormessage);
}
}
+ # 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.
# Check if oinkmaster has to be executed.
if ($oinkmaster eq "True") {
- # Lock the webpage and print message.
- &working_notice("$Lang::tr{'ids apply ruleset changes'}");
-
# Launch oinkmaster.
- &IDS::oinkmaster();
+ &oinkmaster_web();
}
# Check if the IDS is running.
# Undef the given ID.
undef($cgiparams{'ID'});
- # Lock the webpage and print message.
- &working_notice("$Lang::tr{'ids apply ruleset changes'}");
-
# Drop the stored ruleset file.
&IDS::drop_dl_rulesfile($provider);
+ # Remove may stored etag data.
+ &IDS::remove_from_etags($provider);
+
# Get the name of the provider rulessets include file.
my $provider_used_rulefile = &IDS::get_provider_used_rulesfiles_file($provider);
}
# Regenerate ruleset.
- &IDS::oinkmaster();
+ &oinkmaster_web();
# Gather all enabled providers.
my @enabled_providers = &IDS::get_enabled_providers();
&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::ignored_file", \%ignored) if (-e $IDS::ignored_file);
$checked{'ENABLE_IDS'}{'off'} = '';
$checked{'ENABLE_IDS'}{'on'} = '';
$checked{'ENABLE_IDS'}{$idssettings{'ENABLE_IDS'}} = "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'});
print <<END
</tr>
-
- <tr>
- <td><br><br></td>
- <td><br><br></td>
- <td><br><br></td>
- <td><br><br></td>
- </tr>
-
- <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>
my $subscription_code = $used_providers{$id}[1];
my $autoupdate_status = $used_providers{$id}[2];
my $status = $used_providers{$id}[3];
+ my $unsupported;
# Check if the item number is even or not.
if ($line % 2) {
$col="bgcolor='$color{'color20'}'";
}
+ # Handle providers which are not longer supported.
+ unless ($IDS::Ruleset::Providers{$provider}{'dl_url'}) {
+ $col = "bgcolor='$Header::colouryellow'";
+ $unsupported = $Lang::tr{'ids provider eol'};
+ }
+
# Choose icons for the checkboxes.
my $status_gif;
my $status_gdesc;
print <<END;
<tr>
- <td width='33%' class='base' $col>$provider_name</td>
+ <td width='33%' class='base' $col>$provider_name $unsupported</td>
<td width='30%' class='base' $col>$rulesetdate</td>
<td align='center' $col>
print "</table>\n";
# Section to add new elements or edit existing ones.
-print <<END;
+ print <<END;
<br>
<hr>
<br>
- <div align='right'>
- <table width='100%'>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <tr>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <div align='right'>
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";
- }
+ # 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>
- </div>
+ <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids add provider'}'>
+ </div>
+ </form>
END
&Header::closebox();
# Grab the provider handle.
my $provider = $tmphash{$provider_name};
+ # Check if we are not in edit mode.
+ if ($cgiparams{'PROVIDERS'} ne "$Lang::tr{'edit'}") {
+ # Skip unsupported ruleset provider.
+ next unless(exists($IDS::Ruleset::Providers{$provider}{"dl_url"}));
+ }
+
# Pre-select the provider if one is given.
if (($used_providers{$cgiparams{'ID'}}[0] eq "$provider") || ($cgiparams{'PROVIDER'} eq "$provider")) {
$selected{$provider} = "selected='selected'";
## Function to show the area where additional provider actions can be done.
#
sub show_additional_provider_actions() {
- my $disabled;
+ my $disabled_reset;
+ my $disabled_update;
my %used_providers = ();
# Read-in providers settings file.
# Disable the reset provider button if no provider modified sids file exists.
unless (-f $modifications_file) {
- $disabled = "disabled";
+ $disabled_reset = "disabled";
+ }
+
+ # Disable the manual update button if the provider is not longer supported.
+ unless ($IDS::Ruleset::Providers{$provider}{"dl_url"}) {
+ $disabled_update = "disabled";
}
&Header::openbox('100%', 'center', "");
<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'}'>
+ <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids reset provider'}' $disabled_reset>
+ <input type='submit' name='PROVIDERS' value='$Lang::tr{'ids force ruleset update'}' $disabled_update>
</td>
</tr>
</table>
&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 ($nolock) = @_;
+
+ my @enabled_providers = &IDS::get_enabled_providers();
+
+ # Lock the webpage and print message.
+ unless ($nolock) {
+ &_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.
+ unless ($nolock) {
+ &_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.
#
my ($handle) = @_;
my $provider_name;
+ # Early exit if the given provider does not longer exist.
+ return unless ($IDS::Ruleset::Providers{$handle});
+
# Get the required translation string for the given provider handle.
my $tr_string = $IDS::Ruleset::Providers{$handle}{'tr_string'};
projects / ipfire-2.x.git / blobdiff