mirror of
https://github.com/speed47/spectre-meltdown-checker.git
synced 2026-04-09 10:13:18 +02:00
chore: fix github workflow check with new --batch output
This commit is contained in:
73
.github/workflows/build.yml
vendored
73
.github/workflows/build.yml
vendored
@@ -25,21 +25,81 @@ jobs:
|
|||||||
mv spectre-meltdown-checker.sh dist/
|
mv spectre-meltdown-checker.sh dist/
|
||||||
- name: check direct execution
|
- name: check direct execution
|
||||||
run: |
|
run: |
|
||||||
|
set -x
|
||||||
expected=$(cat .github/workflows/expected_cve_count)
|
expected=$(cat .github/workflows/expected_cve_count)
|
||||||
cd dist
|
cd dist
|
||||||
nb=$(sudo ./spectre-meltdown-checker.sh --batch json | jq '.[]|.CVE' | wc -l)
|
|
||||||
|
json=$(sudo ./spectre-meltdown-checker.sh --batch json || true)
|
||||||
|
|
||||||
|
# Validate JSON is well-formed (and show it if not)
|
||||||
|
echo "$json" | jq . >/dev/null || {
|
||||||
|
echo "Invalid JSON produced by spectre-meltdown-checker.sh"
|
||||||
|
echo "$json"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Validate required keys exist
|
||||||
|
for key in meta system cpu cpu_microcode vulnerabilities; do
|
||||||
|
echo "$json" | jq -e ".$key" >/dev/null || {
|
||||||
|
echo "Missing top-level key: $key"
|
||||||
|
echo "$json" | jq .
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
done
|
||||||
|
|
||||||
|
# Use -r to get raw scalars (no quotes)
|
||||||
|
fmtver=$(echo "$json" | jq -r '.meta.format_version // empty')
|
||||||
|
if [ "$fmtver" != "1" ]; then
|
||||||
|
echo "Unexpected format_version: $fmtver"
|
||||||
|
echo "$json" | jq .
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
run_as_root=$(echo "$json" | jq -r '.meta.run_as_root // empty')
|
||||||
|
if [ "$run_as_root" != "true" ]; then
|
||||||
|
echo "Expected run_as_root=true, got: $run_as_root"
|
||||||
|
echo "$json" | jq .
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
mocked=$(echo "$json" | jq -r '.meta.mocked // "false"')
|
||||||
|
if [ "$mocked" = "true" ]; then
|
||||||
|
echo "mocked=true must never appear in production"
|
||||||
|
echo "$json" | jq .
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Count CVEs robustly (as a number)
|
||||||
|
nb=$(echo "$json" | jq -r '[.vulnerabilities[].cve] | length')
|
||||||
if [ "$nb" -ne "$expected" ]; then
|
if [ "$nb" -ne "$expected" ]; then
|
||||||
echo "Invalid number of CVEs reported: $nb instead of $expected"
|
echo "Invalid number of CVEs reported: $nb instead of $expected"
|
||||||
|
echo "$json" | jq '.vulnerabilities[].cve'
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
echo "OK $nb CVEs reported"
|
echo "OK $nb CVEs reported"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Validate json-terse backward compatibility
|
||||||
|
nb_terse=$(sudo ./spectre-meltdown-checker.sh --batch json-terse | jq -r 'map(.CVE) | length')
|
||||||
|
if [ "$nb_terse" -ne "$expected" ]; then
|
||||||
|
echo "json-terse backward compat broken: $nb_terse CVEs instead of $expected"
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
echo "OK json-terse backward compat: $nb_terse CVEs"
|
||||||
|
fi
|
||||||
- name: check docker compose run execution
|
- name: check docker compose run execution
|
||||||
run: |
|
run: |
|
||||||
expected=$(cat .github/workflows/expected_cve_count)
|
expected=$(cat .github/workflows/expected_cve_count)
|
||||||
cd dist
|
cd dist
|
||||||
docker compose build
|
docker compose build
|
||||||
nb=$(docker compose run --rm spectre-meltdown-checker --batch json | jq '.[]|.CVE' | wc -l)
|
json=$(docker compose run --rm spectre-meltdown-checker --batch json || true)
|
||||||
|
echo "$json" | jq . > /dev/null
|
||||||
|
fmtver=$(echo "$json" | jq '.meta.format_version')
|
||||||
|
if [ "$fmtver" != "1" ]; then
|
||||||
|
echo "Unexpected format_version: $fmtver"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
nb=$(echo "$json" | jq '.vulnerabilities[].cve' | wc -l)
|
||||||
if [ "$nb" -ne "$expected" ]; then
|
if [ "$nb" -ne "$expected" ]; then
|
||||||
echo "Invalid number of CVEs reported: $nb instead of $expected"
|
echo "Invalid number of CVEs reported: $nb instead of $expected"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -51,7 +111,14 @@ jobs:
|
|||||||
expected=$(cat .github/workflows/expected_cve_count)
|
expected=$(cat .github/workflows/expected_cve_count)
|
||||||
cd dist
|
cd dist
|
||||||
docker build -t spectre-meltdown-checker .
|
docker build -t spectre-meltdown-checker .
|
||||||
nb=$(docker run --rm --privileged -v /boot:/boot:ro -v /dev/cpu:/dev/cpu:ro -v /lib/modules:/lib/modules:ro spectre-meltdown-checker --batch json | jq '.[]|.CVE' | wc -l)
|
json=$(docker run --rm --privileged -v /boot:/boot:ro -v /dev/cpu:/dev/cpu:ro -v /lib/modules:/lib/modules:ro spectre-meltdown-checker --batch json || true)
|
||||||
|
echo "$json" | jq . > /dev/null
|
||||||
|
fmtver=$(echo "$json" | jq '.meta.format_version')
|
||||||
|
if [ "$fmtver" != "1" ]; then
|
||||||
|
echo "Unexpected format_version: $fmtver"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
nb=$(echo "$json" | jq '.vulnerabilities[].cve' | wc -l)
|
||||||
if [ "$nb" -ne "$expected" ]; then
|
if [ "$nb" -ne "$expected" ]; then
|
||||||
echo "Invalid number of CVEs reported: $nb instead of $expected"
|
echo "Invalid number of CVEs reported: $nb instead of $expected"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
Reference in New Issue
Block a user