ids.cgi: Lock page while autoupdate script is running

[ipfire-2.x.git] / html / cgi-bin / ids.cgi

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 717e49882bd1d7ce28fc5e644549197ccc2c5a2d..82d79a369b9b0e254535c5961d475731640b8325 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -210,6 +210,22 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq
        }
 }
 
+# Check if the page is locked, in this case, the ids_page_lock_file exists.
+if (-e $IDS::ids_page_lock_file) {
+       # Lock the webpage and print notice about autoupgrade of the ruleset
+       # is in progess.
+       &working_notice("$Lang::tr{'ids ruleset autoupdate in progress'}");
+
+       # Loop and check if the file still exists.
+       while(-e $IDS::ids_page_lock_file) {
+               # Sleep for a second and re-check.
+               sleep 1;
+       }
+
+       # Page has been unlocked, perform a reload.
+       &reload();
+}
+
 # Check if any error has been stored.
 if (-e $IDS::storederrorfile) {
         # Open file to read in the stored error message.
@@ -296,18 +312,32 @@ if(-f $IDS::used_rulefiles_file) {
 # Save ruleset configuration.
 if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
        my %oldsettings;
+       my %rulesetsources;
 
        # Read-in current (old) IDS settings.
        &General::readhash("$IDS::rules_settings_file", \%oldsettings);
 
+       # Get all available ruleset locations.
+       &General::readhash("$IDS::rulesetsourcesfile", \%rulesetsources);
+
        # Prevent form name from been stored in conf file.
        delete $cgiparams{'RULESET'};
 
-       # Check if an oinkcode has been provided.
-       if ($cgiparams{'OINKCODE'}) {
-               # Check if the oinkcode contains unallowed chars.
-               unless ($cgiparams{'OINKCODE'} =~ /^[a-z0-9]+$/) {
-                       $errormessage = $Lang::tr{'invalid input for oink code'};
+       # Grab the URL based on the choosen vendor.
+       my $url = $rulesetsources{$cgiparams{'RULES'}};
+
+       # Check if the choosen vendor (URL) requires an subscription/oinkcode.
+       if ($url =~ /\<oinkcode\>/ ) {
+               # Check if an subscription/oinkcode has been provided.
+               if ($cgiparams{'OINKCODE'}) {
+                       # Check if the oinkcode contains unallowed chars.
+                       unless ($cgiparams{'OINKCODE'} =~ /^[a-z0-9]+$/) {
+                               $errormessage = $Lang::tr{'invalid input for oink code'};
+                       }
+               } else {
+                       # Print an error message, that an subsription/oinkcode is required for this
+                       # vendor.
+                       $errormessage = $Lang::tr{'ids oinkcode required'};
                }
        }
 
@@ -888,8 +918,8 @@ print <<END
                        <td align='right'>
 END
 ;
-                       # Check if a ruleset has been downloaded yet.
-                       if (%idsrules) {
+                       # Show the "Update Ruleset"-Button only if a ruleset has been downloaded yet and automatic updates are disabled.
+                       if ((%idsrules) && ($rulessettings{'AUTOUPDATE_INTERVAL'} eq "off")) {
                                # Display button to update the ruleset.
                                print"<input type='submit' name='RULESET' value='$Lang::tr{'update ruleset'}'>\n";
                }