Acked-by: Peter Müller peter.mueller@ipfire.org
In some situations or if an error happened, the lock file could be keep on the system. In such a case the IDS page would be locked forever until user interaction or reboot of the system.
Now the script checks if it has created such a lock and release it when the script exists.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
src/scripts/update-ids-ruleset | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset index 10a270907..c2970d20b 100644 --- a/src/scripts/update-ids-ruleset +++ b/src/scripts/update-ids-ruleset @@ -26,6 +26,9 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/ids-functions.pl"; require "${General::swroot}/lang.pl";
+# Variable to store if the process has written a lockfile. +my $locked;
# Hash to store the configured providers. my %providers = ();
@@ -77,6 +80,9 @@ if(&IDS::checkdiskspace()) { # Lock the IDS page. &IDS::lock_ids_page();
+# The script has requested a lock, so set locket to "1". +$locked = "1";
# Grab the configured providers. &General::readhasharray("$IDS::providers_settings_file", %providers);
@@ -114,13 +120,20 @@ foreach my $id (keys %providers) { # Set correct ownership for the rulesdir and files. &IDS::set_ownership("$IDS::rulespath");
-# Unlock the IDS page. -&IDS::unlock_ids_page();
# Check if the IDS is running. if(&IDS::ids_is_running()) { # Call suricatactrl to perform a reload. &IDS::call_suricatactrl("reload"); }
+# Custom END declaration to release a IDS page lock +# when the script has created one. +END {
- # Check if a lock has been requested.
- if ($locked) {
# Unlock the IDS page.&IDS::unlock_ids_page();- }
+}
1;