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) { END if ($message) { - print "$status_message: $message"; + print "$status_message - $message"; } else { print "$status_message"; } @@ -227,9 +227,11 @@ sub check_status($) { my $status = ; 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): (.*)$/) {