From: Rob Brewer <rob.brewer@ipfire.org>
Date: Sat, 5 Mar 2022 21:18:42 +0000 (+0000)
Subject: showrequestfromblocklist.dat: Modify regex for added space in
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80a456334fb24059e1d3585b26318b1e6124aa6f;p=people%2Fstevee%2Fipfire-2.x.git

showrequestfromblocklist.dat: Modify regex for added space in
log-prefix.

Signed-off-by: Rob Brewer <rob.brewer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/logs.cgi/showrequestfromblocklist.dat b/html/cgi-bin/logs.cgi/showrequestfromblocklist.dat
index d189a78d46..4f8264acec 100755
--- a/html/cgi-bin/logs.cgi/showrequestfromblocklist.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromblocklist.dat
@@ -161,8 +161,8 @@ my $blaoklist = $cgiparams{blocklist};
 if (!$skip)
 {
 	while (<FILE>) {
-		if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)IN=.*/) {
-			if($1 eq $blocklist){
+		if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)\s?IN=.*/) {
+			if($1 eq $blacklist){
 				$log[$lines] = $_;
 				$lines++;
 			}
@@ -186,8 +186,8 @@ if ($multifile) {
 	}
 	if (!$skip) {
 		while (<FILE>) {
-			if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)IN=.*/) {
-				if($1 eq $blocklist){
+			if (/^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*BLKLST_(\w+)\s?IN=.*/) {
+				if($1 eq $blacklist){
 					$log[$lines] = $_;
 					$lines++;
 				}
@@ -308,9 +308,8 @@ $lines = 0;
 foreach $_ (@slice) {
 	$a = $_;
 	# Check whether valid ipv4 or ipv6 address
-	if (($_ =~ /BLKLST_(\w+)IN=/)) {
-		if($1 eq $blocklist) {
-
+	if (($_ =~ /BLKLST_(\w+)\s?IN=/)) {
+		if($1 eq $blacklist) {
 			my $in = '-'; my $out = '-';
 			my $srcaddr = ''; my $dstaddr = '';
 			my $protostr = '';