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 74d22201705fcb0c209058affdb8d02ef8324842..a15accfa03a0c021de6674195abe9202a1d5cb91 100644 (file)
--- 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): (.*)$/) {