From ff87584980dfb6a8015e1bccaa2c757ee3e544e6 Mon Sep 17 00:00:00 2001 From: codex Date: Sat, 21 Nov 2026 20:27:46 +0000 Subject: [PATCH] Correct shell guard for every workflow runner label --- infra/runner/test-runner-config.sh | 194 +---------------------------- 1 file changed, 4 insertions(+), 190 deletions(-) diff --git a/infra/runner/test-runner-config.sh b/infra/runner/test-runner-config.sh index 19cad44..e47cf9d 100644 --- a/infra/runner/test-runner-config.sh +++ b/infra/runner/test-runner-config.sh @@ -64,200 +64,14 @@ grep -Fq 'usermod "${subid_args[@]}" "$runner_user"' "$installer" grep -Fq 'subid_args+=(--add-subuids "$subid_range")' "$installer" assert_absent 'usermod.*(sudo|docker)|/var/run/docker.sock|/etc/sudoers' "$installer" for workflow in .gitea/workflows/*.yaml; do - grep -Eq '^ +runs-on: akyldash-local-ci -grep -Fq 'test ! -S /var/run/docker.sock' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/production.env' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/review_secret' .gitea/workflows/runner-smoke.yaml -assert_absent '(^|[[:space:]])(docker|docker-compose|deploy)([[:space:]]|$)|production.env=|review_secret=' .gitea/workflows/runner-smoke.yaml - -fixture=$(mktemp) -fixture_g=$(mktemp) -trap 'rm -f "$fixture" "$fixture_g"' EXIT -printf 'production.env\n' >"$fixture" -if assert_absent 'deploy|production.env|review_secret|docker.sock' "$fixture" 2>/dev/null; then - echo 'Negative guard regression: prohibited fixture was accepted' >&2 - exit 1 -fi -printf 'codex:100000:65536\n' >"$fixture" -printf 'codex:165000:1000\n' >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 231072-296607 ]] -: >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 165536-231071 ]] -: >"$fixture" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 100000-165535 ]] -printf 'broken\n' >"$fixture_g" -if awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g" >/dev/null 2>&1; then - echo 'Malformed subordinate ID allocation was accepted' >&2 - exit 1 -fi -echo 'runner configuration guards passed' - "$workflow" - if grep -E '^ +runs-on:' "$workflow" | grep -Evq '^ +runs-on: akyldash-local-ci + labels=$(sed -n 's/^ *runs-on: *//p' "$workflow" | sort -u) + [[ $labels == akyldash-local-ci ]] || { echo "Unexpected runner in $workflow" >&2; exit 1; } done desktop=infra/runner/desktop/runner.yaml grep -Fq 'akyldash-local-ci:docker://docker.gitea.com/runner-images:ubuntu-24.04' "$desktop" grep -Fq 'docker_host: "-"' "$desktop" -grep -Eq '^ privileged: false -grep -Fq 'test ! -S /var/run/docker.sock' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/production.env' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/review_secret' .gitea/workflows/runner-smoke.yaml -assert_absent '(^|[[:space:]])(docker|docker-compose|deploy)([[:space:]]|$)|production.env=|review_secret=' .gitea/workflows/runner-smoke.yaml - -fixture=$(mktemp) -fixture_g=$(mktemp) -trap 'rm -f "$fixture" "$fixture_g"' EXIT -printf 'production.env\n' >"$fixture" -if assert_absent 'deploy|production.env|review_secret|docker.sock' "$fixture" 2>/dev/null; then - echo 'Negative guard regression: prohibited fixture was accepted' >&2 - exit 1 -fi -printf 'codex:100000:65536\n' >"$fixture" -printf 'codex:165000:1000\n' >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 231072-296607 ]] -: >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 165536-231071 ]] -: >"$fixture" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 100000-165535 ]] -printf 'broken\n' >"$fixture_g" -if awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g" >/dev/null 2>&1; then - echo 'Malformed subordinate ID allocation was accepted' >&2 - exit 1 -fi -echo 'runner configuration guards passed' - "$desktop" -grep -Eq '^ valid_volumes: \[\] -grep -Fq 'test ! -S /var/run/docker.sock' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/production.env' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/review_secret' .gitea/workflows/runner-smoke.yaml -assert_absent '(^|[[:space:]])(docker|docker-compose|deploy)([[:space:]]|$)|production.env=|review_secret=' .gitea/workflows/runner-smoke.yaml - -fixture=$(mktemp) -fixture_g=$(mktemp) -trap 'rm -f "$fixture" "$fixture_g"' EXIT -printf 'production.env\n' >"$fixture" -if assert_absent 'deploy|production.env|review_secret|docker.sock' "$fixture" 2>/dev/null; then - echo 'Negative guard regression: prohibited fixture was accepted' >&2 - exit 1 -fi -printf 'codex:100000:65536\n' >"$fixture" -printf 'codex:165000:1000\n' >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 231072-296607 ]] -: >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 165536-231071 ]] -: >"$fixture" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 100000-165535 ]] -printf 'broken\n' >"$fixture_g" -if awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g" >/dev/null 2>&1; then - echo 'Malformed subordinate ID allocation was accepted' >&2 - exit 1 -fi -echo 'runner configuration guards passed' - "$desktop" -grep -Fq 'test ! -S /var/run/docker.sock' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/production.env' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/review_secret' .gitea/workflows/runner-smoke.yaml -assert_absent '(^|[[:space:]])(docker|docker-compose|deploy)([[:space:]]|$)|production.env=|review_secret=' .gitea/workflows/runner-smoke.yaml - -fixture=$(mktemp) -fixture_g=$(mktemp) -trap 'rm -f "$fixture" "$fixture_g"' EXIT -printf 'production.env\n' >"$fixture" -if assert_absent 'deploy|production.env|review_secret|docker.sock' "$fixture" 2>/dev/null; then - echo 'Negative guard regression: prohibited fixture was accepted' >&2 - exit 1 -fi -printf 'codex:100000:65536\n' >"$fixture" -printf 'codex:165000:1000\n' >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 231072-296607 ]] -: >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 165536-231071 ]] -: >"$fixture" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 100000-165535 ]] -printf 'broken\n' >"$fixture_g" -if awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g" >/dev/null 2>&1; then - echo 'Malformed subordinate ID allocation was accepted' >&2 - exit 1 -fi -echo 'runner configuration guards passed' -; then exit 1; fi -done -desktop=infra/runner/desktop/runner.yaml -grep -Fq 'akyldash-local-ci:docker://docker.gitea.com/runner-images:ubuntu-24.04' "$desktop" -grep -Fq 'docker_host: "-"' "$desktop" -grep -Eq '^ privileged: false -grep -Fq 'test ! -S /var/run/docker.sock' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/production.env' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/review_secret' .gitea/workflows/runner-smoke.yaml -assert_absent '(^|[[:space:]])(docker|docker-compose|deploy)([[:space:]]|$)|production.env=|review_secret=' .gitea/workflows/runner-smoke.yaml - -fixture=$(mktemp) -fixture_g=$(mktemp) -trap 'rm -f "$fixture" "$fixture_g"' EXIT -printf 'production.env\n' >"$fixture" -if assert_absent 'deploy|production.env|review_secret|docker.sock' "$fixture" 2>/dev/null; then - echo 'Negative guard regression: prohibited fixture was accepted' >&2 - exit 1 -fi -printf 'codex:100000:65536\n' >"$fixture" -printf 'codex:165000:1000\n' >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 231072-296607 ]] -: >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 165536-231071 ]] -: >"$fixture" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 100000-165535 ]] -printf 'broken\n' >"$fixture_g" -if awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g" >/dev/null 2>&1; then - echo 'Malformed subordinate ID allocation was accepted' >&2 - exit 1 -fi -echo 'runner configuration guards passed' - "$desktop" -grep -Eq '^ valid_volumes: \[\] -grep -Fq 'test ! -S /var/run/docker.sock' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/production.env' .gitea/workflows/runner-smoke.yaml -grep -Fq 'test ! -e /etc/akyldash/review_secret' .gitea/workflows/runner-smoke.yaml -assert_absent '(^|[[:space:]])(docker|docker-compose|deploy)([[:space:]]|$)|production.env=|review_secret=' .gitea/workflows/runner-smoke.yaml - -fixture=$(mktemp) -fixture_g=$(mktemp) -trap 'rm -f "$fixture" "$fixture_g"' EXIT -printf 'production.env\n' >"$fixture" -if assert_absent 'deploy|production.env|review_secret|docker.sock' "$fixture" 2>/dev/null; then - echo 'Negative guard regression: prohibited fixture was accepted' >&2 - exit 1 -fi -printf 'codex:100000:65536\n' >"$fixture" -printf 'codex:165000:1000\n' >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 231072-296607 ]] -: >"$fixture_g" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 165536-231071 ]] -: >"$fixture" -range=$(awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g") -[[ $range == 100000-165535 ]] -printf 'broken\n' >"$fixture_g" -if awk -f infra/runner/find-free-subid-range.awk "$fixture" "$fixture_g" >/dev/null 2>&1; then - echo 'Malformed subordinate ID allocation was accepted' >&2 - exit 1 -fi -echo 'runner configuration guards passed' - "$desktop" +grep -Fxq ' privileged: false' "$desktop" +grep -Fxq ' valid_volumes: []' "$desktop" grep -Fq 'test ! -S /var/run/docker.sock' .gitea/workflows/runner-smoke.yaml grep -Fq 'test ! -e /etc/akyldash/production.env' .gitea/workflows/runner-smoke.yaml grep -Fq 'test ! -e /etc/akyldash/review_secret' .gitea/workflows/runner-smoke.yaml