vpnmain.cgi: remove wrongh "shift-space"

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / vulnerabilities.cgi

diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi
index b7e11c7100e2f1aad8a00aa1ee0665368123282f..a8746c30c89908a5ca1a576d2f132064420ecc5a 100644 (file)
--- a/html/cgi-bin/vulnerabilities.cgi
+++ b/html/cgi-bin/vulnerabilities.cgi
@@ -117,7 +117,7 @@ for my $vuln (sort keys %VULNERABILITIES) {
        if ($status eq "Not affected") {
                $status_message = $Lang::tr{'not affected'};
                $colour = "white";
-               $bgcolour = ${Header::colourblack};
+               $bgcolour = ${Header::colourgreen};
 
        # Vulnerable
        } elsif ($status eq "Vulnerable") {
@@ -125,17 +125,11 @@ for my $vuln (sort keys %VULNERABILITIES) {
                $colour = "white";
                $bgcolour = ${Header::colourred};
 
-       # Mitigated but smt is enabled
-       } elsif ($status eq "Mitigation-SMT") {
-               $status_message = $Lang::tr{'mitigated'};
-               $colour = "white";
-               $bgcolour = ${Header::colourred};
-
        # Mitigated
        } elsif ($status eq "Mitigation") {
                $status_message = $Lang::tr{'mitigated'};
                $colour = "white";
-               $bgcolour = ${Header::colourgreen};
+               $bgcolour = ${Header::colourblue};
 
        # Unknown report from kernel
        } else {
@@ -156,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>";
        }
@@ -233,8 +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 ("Mitigation-SMT", $2);
+               return ("Vulnerable", $status);
        }
 
        if ($status =~ /^(Vulnerable|Mitigation): (.*)$/) {