From: Adolf Belka <adolf.belka@ipfire.org>
Date: Fri, 22 Dec 2023 12:37:47 +0000 (+0100)
Subject: firewalllog.dat: Fix for bug#13492 - include chain in the exported output
X-Git-Tag: v2.29-core183~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f02adfbc7488c408ad73def2cb59997dfaf7265f;p=ipfire-2.x.git

firewalllog.dat: Fix for bug#13492 - include chain in the exported output

- The regex code does not extract out the chain and so it is missed off from the log output
   when it is exported.
- Changed code tested out on my vm testbed and confirmed to work and include the chain in
   the output.

Fixes: Bug13492
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfre.org>
---

diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index 467d06008f..b07a4262d3 100644
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -211,11 +211,12 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 
 	foreach $_ (@log)
 	{
-		/^... (..) (..:..:..) [\w\-]+ kernel:.*(IN=.*)$/;
+		/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
 		my $day =  $1;
 		$day =~ tr / /0/;
 		my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
-		print "$time $3\r\n";
+		my $chain = $3;
+		print "$time $chain $4\r\n";
 
 	}
 	exit 0;