&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()) {
&reload();
} else {
# Call subfunction to launch oinkmaster.
- &IDS::oinkmaster();
+ &oinkmaster_web();
# 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 {
}
}
+ # 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);
}
# 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'});
<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>
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,);
<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.
#
projects / ipfire-2.x.git / blobdiff