From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 29abc2d07cf297b5ccf32798d6c3cd7dbecef6b2
Date: Sat, 25 May 2019 06:42:02 +0100
Message-ID: <20190525054202.E188E84FDC5@people01.i.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3035795255919836362=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3035795255919836362==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, master has been updated
       via  29abc2d07cf297b5ccf32798d6c3cd7dbecef6b2 (commit)
       via  e896a9bd3de5b254340c03f7dcbced73c6721c50 (commit)
       via  413f84e9883e7c9b6d74aad74c01aa0325d3180a (commit)
       via  a96bcf413ac96d9df1ff883e3daeb7cdb4911b57 (commit)
      from  2f34103d47a490cc9d1b7ef4f067f261fc52250a (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 29abc2d07cf297b5ccf32798d6c3cd7dbecef6b2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat May 25 07:39:38 2019 +0200

    vulnerabilities.cgi: again change colours
   =20
    red - vulnerable
    blue - mitigated
    green - not affected
   =20
    because we not really trust the mitigations so they shound not green.
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit e896a9bd3de5b254340c03f7dcbced73c6721c50
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat May 25 06:54:35 2019 +0200

    vulnerabilities.cgi fix string handling
   =20
    remove lf at the end for correct matching
    and not strip "Mitigated:" if it was not full working and still
    vulnerable.
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 413f84e9883e7c9b6d74aad74c01aa0325d3180a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 22 11:08:43 2019 +0100

    vulnerabilities.cgi: Regard mitigations that only mitigate something stil=
l as vulnerable
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a96bcf413ac96d9df1ff883e3daeb7cdb4911b57
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 22 11:05:20 2019 +0100

    vulnerabilities.cgi: Simplify regexes
   =20
    We can do the split in one.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 html/cgi-bin/vulnerabilities.cgi | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.=
cgi
index 76eb79f82..a8746c30c 100644
--- 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 =3D $Lang::tr{'not affected'};
 		$colour =3D "white";
-		$bgcolour =3D ${Header::colourblack};
+		$bgcolour =3D ${Header::colourgreen};
=20
 	# Vulnerable
 	} elsif ($status eq "Vulnerable") {
@@ -125,17 +125,11 @@ for my $vuln (sort keys %VULNERABILITIES) {
 		$colour =3D "white";
 		$bgcolour =3D ${Header::colourred};
=20
-	# Mitigated but smt is enabled
-	} elsif ($status eq "Mitigation-SMT") {
-		$status_message =3D $Lang::tr{'mitigated'};
-		$colour =3D "white";
-		$bgcolour =3D ${Header::colourred};
-
 	# Mitigated
 	} elsif ($status eq "Mitigation") {
 		$status_message =3D $Lang::tr{'mitigated'};
 		$colour =3D "white";
-		$bgcolour =3D ${Header::colourgreen};
+		$bgcolour =3D ${Header::colourblue};
=20
 	# Unknown report from kernel
 	} else {
@@ -156,7 +150,7 @@ for my $vuln (sort keys %VULNERABILITIES) {
 				<font color=3D"$colour">
 END
 	if ($message) {
-		print "<strong>$status_message</strong>: $message";
+		print "<strong>$status_message</strong> - $message";
 	} else {
 		print "<strong>$status_message</strong>";
 	}
@@ -233,15 +227,14 @@ sub check_status($) {
 	my $status =3D <FILE>;
 	close(FILE);
=20
-	if ($status =3D~ /^(Vulnerable): (.*)$/) {
-		return ($1, $2);
-	}
+	chomp($status);
=20
+	# Fix status when something has been mitigated, but not fully, yet
 	if ($status =3D~ /^(Mitigation): (.*vulnerable.*)$/) {
-		return ("Mitigation-SMT", $2);
+		return ("Vulnerable", $status);
 	}
=20
-	if ($status =3D~ /^(Mitigation): (.*)$/) {
+	if ($status =3D~ /^(Vulnerable|Mitigation): (.*)$/) {
 		return ($1, $2);
 	}=20
=20


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

--===============3035795255919836362==--