From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 20 Mar 2022 15:11:12 +0000 (+0100)
Subject: ids.cgi: Use new backend to store the ruleset modifications of a
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f353f8518b93fb1b4f76663088d36d321e8e3f2;p=people%2Fstevee%2Fipfire-2.x.git

ids.cgi: Use new backend to store the ruleset modifications of a
provider.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 76c2b99a98..8a52876de1 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -339,12 +339,6 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 		}
 	}
 
-	# 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 +347,11 @@ 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);
+		# Get name of the file which holds the ruleset modification of the provider.
+		my $modifications_file = &IDS::get_provider_ruleset_modifications_file($provider);
 
-		# 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);
-		}
+		# 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) {
@@ -409,39 +400,11 @@ 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.
 	#