From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 25 May 2019 04:54:35 +0000 (+0200)
Subject: vulnerabilities.cgi fix string handling
X-Git-Tag: v2.23-core133~68^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e896a9bd3de5b254340c03f7dcbced73c6721c50;p=ipfire-2.x.git

vulnerabilities.cgi fix string handling

remove lf at the end for correct matching
and not strip "Mitigated:" if it was not full working and still
vulnerable.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi
index 74d2220170..a15accfa03 100644
--- a/html/cgi-bin/vulnerabilities.cgi
+++ b/html/cgi-bin/vulnerabilities.cgi
@@ -150,7 +150,7 @@ for my $vuln (sort keys %VULNERABILITIES) {
 				<font color="$colour">
 END
 	if ($message) {
-		print "<strong>$status_message</strong>: $message";
+		print "<strong>$status_message</strong> - $message";
 	} else {
 		print "<strong>$status_message</strong>";
 	}
@@ -227,9 +227,11 @@ sub check_status($) {
 	my $status = <FILE>;
 	close(FILE);
 
+	chomp($status);
+
 	# Fix status when something has been mitigated, but not fully, yet
 	if ($status =~ /^(Mitigation): (.*vulnerable.*)$/) {
-		return ("Vulnerable", $2);
+		return ("Vulnerable", $status);
 	}
 
 	if ($status =~ /^(Vulnerable|Mitigation): (.*)$/) {