[PATCH] ids-functions.pl: Merge same named rulefiles during extract.

[PATCH] ids-functions.pl: Merge same named rulefiles during extract.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 2069 bytes --]

In case a rulestarball contains several same-named rulefiles
they have been overwritten each time and so only contained the content
from the last extracted one.

Now the content of those files will be merged by appending the content
to the first extracted one for each time.

Fixes #12792.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/cfgroot/ids-functions.pl | 34 +++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 74d55def6..53ca1bdd4 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -572,8 +572,38 @@ sub extractruleset ($) {
 				next;
 			}
 
-			# Extract the file to the temporary directory.
-			$tar->extract_file("$packed_file", "$destination");
+			# Check if the destination file exists.
+			unless(-e "$destination") {
+				# Extract the file to the temporary directory.
+				$tar->extract_file("$packed_file", "$destination");
+			} else {
+				# Load perl module to deal with temporary files.
+				use File::Temp;
+
+				# Generate temporary file name, located in the temporary rules directory and a suffix of ".tmp".
+				my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "$tmp_rules_directory", UNLINK => 0 );
+				my $tmpfile = $tmp->filename();
+
+				# Extract the file to the new temporary file name.
+				$tar->extract_file("$packed_file", "$tmpfile");
+
+				# Open the the existing file.
+				open(DESTFILE, ">>", "$destination") or die "Could not open $destination. $!\n";
+				open(TMPFILE, "<", "$tmpfile") or die "Could not open $tmpfile. $!\n";
+
+				# Loop through the content of the temporary file.
+				while (<TMPFILE>) {
+					# Append the content line by line to the destination file.
+					print DESTFILE "$_";
+				}
+
+				# Close the file handles.
+				close(TMPFILE);
+				close(DESTFILE);
+
+				# Remove the temporary file.
+				unlink("$tmpfile");
+			}
 		}
 	}
 }
-- 
2.30.2

Re: [PATCH] ids-functions.pl: Merge same named rulefiles during extract.

[Bernhard Bitsch]

[-- Attachment #1: Type: text/plain, Size: 2283 bytes --]

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 05.03.2022 um 16:27 schrieb Stefan Schantl:
> In case a rulestarball contains several same-named rulefiles
> they have been overwritten each time and so only contained the content
> from the last extracted one.
> 
> Now the content of those files will be merged by appending the content
> to the first extracted one for each time.
> 
> Fixes #12792.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>   config/cfgroot/ids-functions.pl | 34 +++++++++++++++++++++++++++++++--
>   1 file changed, 32 insertions(+), 2 deletions(-)
> 
> diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
> index 74d55def6..53ca1bdd4 100644
> --- a/config/cfgroot/ids-functions.pl
> +++ b/config/cfgroot/ids-functions.pl
> @@ -572,8 +572,38 @@ sub extractruleset ($) {
>   				next;
>   			}
>   
> -			# Extract the file to the temporary directory.
> -			$tar->extract_file("$packed_file", "$destination");
> +			# Check if the destination file exists.
> +			unless(-e "$destination") {
> +				# Extract the file to the temporary directory.
> +				$tar->extract_file("$packed_file", "$destination");
> +			} else {
> +				# Load perl module to deal with temporary files.
> +				use File::Temp;
> +
> +				# Generate temporary file name, located in the temporary rules directory and a suffix of ".tmp".
> +				my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "$tmp_rules_directory", UNLINK => 0 );
> +				my $tmpfile = $tmp->filename();
> +
> +				# Extract the file to the new temporary file name.
> +				$tar->extract_file("$packed_file", "$tmpfile");
> +
> +				# Open the the existing file.
> +				open(DESTFILE, ">>", "$destination") or die "Could not open $destination. $!\n";
> +				open(TMPFILE, "<", "$tmpfile") or die "Could not open $tmpfile. $!\n";
> +
> +				# Loop through the content of the temporary file.
> +				while (<TMPFILE>) {
> +					# Append the content line by line to the destination file.
> +					print DESTFILE "$_";
> +				}
> +
> +				# Close the file handles.
> +				close(TMPFILE);
> +				close(DESTFILE);
> +
> +				# Remove the temporary file.
> +				unlink("$tmpfile");
> +			}
>   		}
>   	}
>   }