[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b23db9b97b897b40daf2da7d94b655f58d54fe27

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2410 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  b23db9b97b897b40daf2da7d94b655f58d54fe27 (commit)
      from  716f00b1165d492479e7ec24a6b3cf14ea17b89d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b23db9b97b897b40daf2da7d94b655f58d54fe27
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed May 22 10:22:53 2019 +0200

    vulnerablities.cgi: add colours for vuln,smt and unknown output.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/vulnerabilities.cgi | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi
index 371ffa547..91db2f4c3 100644
--- a/html/cgi-bin/vulnerabilities.cgi
+++ b/html/cgi-bin/vulnerabilities.cgi
@@ -125,14 +125,22 @@ 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 = "black";
+		$bgcolour = ${Header::colourorange};
+
 	# Mitigated
 	} elsif ($status eq "Mitigation") {
 		$status_message = $Lang::tr{'mitigated'};
 		$colour = "black";
-		$bgcolour = ${Header::colourorange};
+		$bgcolour = ${Header::colouryellow};
 
 	} else {
-		next;
+		$status_message = $status;
+		$colour = "white";
+		$bgcolour = ${Header::colourblue};
 	}
 
 	my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
@@ -224,6 +232,14 @@ sub check_status($) {
 	my $status = <FILE>;
 	close(FILE);
 
+	if ($status =~ /^(Vulnerable): (.*)$/) {
+		return ($1, $2);
+	}
+
+	if ($status =~ /^(Mitigation): (.*vulnerable.*)$/) {
+		return ("Mitigation-SMT", $2);
+	}
+
 	if ($status =~ /^(Mitigation): (.*)$/) {
 		return ($1, $2);
 	} 


hooks/post-receive
--
IPFire 2.x development tree