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

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4241 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  83809af1fb7bb648851547b7589171d326766eaa (commit)
       via  637885839b5a2d6baeffb7fb37967c5b1bf7f84f (commit)
       via  8fad3a5941a1a0553bc3cbd0ad577d9067f3dd6b (commit)
       via  fefb5173cf02c6b94f2f199bb342df550752ade0 (commit)
       via  d0db7550edb51ced239c640dada40db8fa1eacc1 (commit)
       via  29abc2d07cf297b5ccf32798d6c3cd7dbecef6b2 (commit)
       via  e896a9bd3de5b254340c03f7dcbced73c6721c50 (commit)
       via  413f84e9883e7c9b6d74aad74c01aa0325d3180a (commit)
       via  a96bcf413ac96d9df1ff883e3daeb7cdb4911b57 (commit)
      from  333125abf850085611922634e31b714a35b31383 (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 83809af1fb7bb648851547b7589171d326766eaa
Merge: 333125abf 637885839
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 26 17:23:54 2019 +0200

    Merge branch 'master' into next

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

Summary of changes:
 config/cfgroot/ids-functions.pl        |  3 +++
 config/rootfiles/oldcore/132/update.sh |  2 ++
 html/cgi-bin/vulnerabilities.cgi       | 10 ++++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 5530da11e..88734a3ca 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -572,6 +572,9 @@ sub _cleanup_rulesdir() {
 		# Skip element if it has config as file extension.
 		next if ($file =~ m/\.config$/);
 
+		# Skip rules file for whitelisted hosts.
+		next if ("$rulespath/$file" eq $whitelist_file);
+
 		# Delete the current processed file, if not, exit this function
 		# and return an error message.
 		unlink("$rulespath/$file") or return "Could not delete $rulespath/$file. $!\n";
diff --git a/config/rootfiles/oldcore/132/update.sh b/config/rootfiles/oldcore/132/update.sh
index 982a9d964..fa4553625 100644
--- a/config/rootfiles/oldcore/132/update.sh
+++ b/config/rootfiles/oldcore/132/update.sh
@@ -90,6 +90,8 @@ ldconfig
 
 # create main/security file
 touch /var/ipfire/main/security
+chmod 644 /var/ipfire/main/security
+chown nobody:nobody /var/ipfire/main/security
 
 # Update Language cache
 /usr/local/bin/update-lang-cache
diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi
index 74d222017..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 = $Lang::tr{'not affected'};
 		$colour = "white";
-		$bgcolour = ${Header::colourblack};
+		$bgcolour = ${Header::colourgreen};
 
 	# Vulnerable
 	} elsif ($status eq "Vulnerable") {
@@ -129,7 +129,7 @@ for my $vuln (sort keys %VULNERABILITIES) {
 	} elsif ($status eq "Mitigation") {
 		$status_message = $Lang::tr{'mitigated'};
 		$colour = "white";
-		$bgcolour = ${Header::colourgreen};
+		$bgcolour = ${Header::colourblue};
 
 	# Unknown report from kernel
 	} else {
@@ -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): (.*)$/) {


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