aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Downing <marcus@bang-on.net>2018-01-10 11:57:45 +0000
committerMarcus Downing <marcus@bang-on.net>2018-01-10 11:57:45 +0000
commit7c5cfbb8c3cb6ecf57171b835bd8f27ee9376911 (patch)
tree0ab59dac621721fb53c90f737b1a3ee1eb6fa7c6
parent381038ecebb6ad4da5adad6f64ca33492733df20 (diff)
downloadspectre-meltdown-checker-7c5cfbb8c3cb6ecf57171b835bd8f27ee9376911.tar.lz
spectre-meltdown-checker-7c5cfbb8c3cb6ecf57171b835bd8f27ee9376911.tar.xz
spectre-meltdown-checker-7c5cfbb8c3cb6ecf57171b835bd8f27ee9376911.zip
batch nrpe
-rwxr-xr-xspectre-meltdown-checker.sh29
1 files changed, 16 insertions, 13 deletions
diff --git a/spectre-meltdown-checker.sh b/spectre-meltdown-checker.sh
index b707f46..4b314b0 100755
--- a/spectre-meltdown-checker.sh
+++ b/spectre-meltdown-checker.sh
@@ -35,7 +35,7 @@ show_usage()
--no-color Don't use color codes
-v, --verbose Increase verbosity level
--batch Produce machine readable output
- --nrpe Produce output formatted for NRPE monitoring
+ --batch nrpe Produce machine readable output formatted for NRPE
IMPORTANT:
A false sense of security is worse than no security at all.
@@ -77,8 +77,9 @@ opt_live_explicit=0
opt_live=1
opt_no_color=0
opt_batch=0
-opt_nrpe=0
+opt_batch_format="text"
opt_verbose=1
+
nrpe_critical=0
nrpe_unknown=0
nrpe_vuln=""
@@ -241,11 +242,9 @@ while [ -n "$1" ]; do
opt_batch=1
opt_verbose=0
shift
- elif [ "$1" = "--nrpe" ]; then
- opt_nrpe=1
- opt_batch=0
- opt_verbose=0
- shift
+ case "$1" in
+ text|nrpe) opt_batch_format="$1"; shift;;
+ esac
elif [ "$1" = "-v" -o "$1" = "--verbose" ]; then
opt_verbose=$(expr $opt_verbose + 1)
shift
@@ -290,11 +289,15 @@ pstatus()
# Arguments are: CVE UNK/OK/VULN description
pvulnstatus()
{
- [ "$opt_batch" = 1 ] && _echo 0 "$1: $2 ($3)"
- if [ "$opt_nrpe" = 1 ]; then
- case "$2" in
- UKN) nrpe_unknown="1";;
- VULN) nrpe_critical="1"; nrpe_vuln="$nrpe_vuln $1";;
+ if [ "$opt_batch" = 1 ]; then
+ case "$opt_batch_format" in
+ text) _echo 0 "$1: $2 ($3)";;
+ nrpe)
+ case "$2" in
+ UKN) nrpe_unknown="1";;
+ VULN) nrpe_critical="1"; nrpe_vuln="$nrpe_vuln $1";;
+ esac
+ ;;
esac
fi
@@ -746,7 +749,7 @@ _info "A false sense of security is worse than no security at all, see --disclai
[ -n "$dumped_config" ] && rm -f "$dumped_config"
-if [ "$opt_nrpe" = 1 ]; then
+if [ "$opt_batch" = 1 -a "$opt_batch_format" = "nrpe" ]; then
if [ ! -z "$nrpe_vuln" ]; then
echo "Vulnerable:$nrpe_vuln"
else