From d1565b302604044b8f4a5e7993af13939639b691 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Mon, 16 Nov 2026 23:08:36 +1100 Subject: [PATCH] Require explicit RUNNER_MODE in runner job-started hook --- .../components/iuclabs-k8s/scaleset.yaml | 2 + .../components/iuclabs-release/scaleset.yaml | 4 +- apps/base/iuclabs-runners/job-started.sh | 12 ++-- .../runner-hooks/tag-push-vagrant.json | 3 + ci/test-runner-hooks.sh | 70 +++++++++++-------- 5 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 ci/fixtures/runner-hooks/tag-push-vagrant.json diff --git a/apps/base/iuclabs-runners/components/iuclabs-k8s/scaleset.yaml b/apps/base/iuclabs-runners/components/iuclabs-k8s/scaleset.yaml index ab564db..116f001 100644 --- a/apps/base/iuclabs-runners/components/iuclabs-k8s/scaleset.yaml +++ b/apps/base/iuclabs-runners/components/iuclabs-k8s/scaleset.yaml @@ -45,6 +45,8 @@ spec: value: /hooks/job-started.sh - name: NODE_EXTRA_CA_CERTS value: /etc/vault-ca/ca.crt + - name: RUNNER_MODE + value: default securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/apps/base/iuclabs-runners/components/iuclabs-release/scaleset.yaml b/apps/base/iuclabs-runners/components/iuclabs-release/scaleset.yaml index d1dfc27..11abafc 100644 --- a/apps/base/iuclabs-runners/components/iuclabs-release/scaleset.yaml +++ b/apps/base/iuclabs-runners/components/iuclabs-release/scaleset.yaml @@ -45,8 +45,8 @@ spec: value: /hooks/job-started.sh - name: NODE_EXTRA_CA_CERTS value: /etc/vault-ca/ca.crt - - name: RUNNER_RELEASE_ONLY - value: "true" + - name: RUNNER_MODE + value: release securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/apps/base/iuclabs-runners/job-started.sh b/apps/base/iuclabs-runners/job-started.sh index ae2c2eb..3edc977 100755 --- a/apps/base/iuclabs-runners/job-started.sh +++ b/apps/base/iuclabs-runners/job-started.sh @@ -11,17 +11,17 @@ refuse() { [ -r "${GITHUB_EVENT_PATH:-}" ] || refuse "event payload missing" jq -e 'type == "object"' "${GITHUB_EVENT_PATH}" >/dev/null 2>&1 || refuse "event payload unparseable" -case "${RUNNER_RELEASE_ONLY:-}" in - "") ;; - true) +case "${RUNNER_MODE:-}" in + default) ;; + release) [ "${event}" = push ] || refuse "release runners only run tag pushes" ref=$(jq -r '.ref' "${GITHUB_EVENT_PATH}") || refuse "event payload unreadable" case "${ref}" in - refs/tags/v*) exit 0 ;; - *) refuse "release runners only run v* tag pushes, got '${ref}'" ;; + refs/tags/v[0-9]*) exit 0 ;; + *) refuse "release runners only run v* tag pushes, got '${ref}'" ;; esac ;; - *) refuse "invalid RUNNER_RELEASE_ONLY" ;; + *) refuse "RUNNER_MODE unset or invalid" ;; esac case "${event}" in diff --git a/ci/fixtures/runner-hooks/tag-push-vagrant.json b/ci/fixtures/runner-hooks/tag-push-vagrant.json new file mode 100644 index 0000000..a9b644b --- /dev/null +++ b/ci/fixtures/runner-hooks/tag-push-vagrant.json @@ -0,0 +1,3 @@ +{ + "ref": "refs/tags/vagrant" +} diff --git a/ci/test-runner-hooks.sh b/ci/test-runner-hooks.sh index 9362413..19163f0 100755 --- a/ci/test-runner-hooks.sh +++ b/ci/test-runner-hooks.sh @@ -5,48 +5,56 @@ hook=apps/base/iuclabs-runners/job-started.sh fixtures=ci/fixtures/runner-hooks fail=0 +# check check() { - local want=$1 event=$2 fixture=$3 release=${4:-} got=0 - local -a env=(-u GITHUB_EVENT_NAME -u GITHUB_EVENT_PATH -u RUNNER_RELEASE_ONLY) - [ -z "$release" ] || env+=("RUNNER_RELEASE_ONLY=$release") + local want=$1 mode=$2 event=$3 fixture=$4 got=0 + local -a env=(-u GITHUB_EVENT_NAME -u GITHUB_EVENT_PATH -u RUNNER_MODE) + [ "$mode" = unset ] || env+=("RUNNER_MODE=$mode") [ "$event" = - ] || env+=("GITHUB_EVENT_NAME=$event") [ "$fixture" = - ] || env+=("GITHUB_EVENT_PATH=$fixtures/$fixture") env "${env[@]}" "$hook" >/dev/null 2>&1 || got=1 if [ "$got" -ne "$want" ]; then - echo "FAIL: $event $fixture release=$release exit=$got want=$want" >&2 + echo "FAIL: mode=$mode $event $fixture exit=$got want=$want" >&2 fail=1 fi } -for e in push workflow_dispatch schedule merge_group release; do - check 0 "$e" push.json +for m in unset "" bogus true Default; do + check 1 "$m" push push.json + check 1 "$m" push tag-push.json + check 1 "$m" pull_request pr-member.json done -check 0 pull_request pr-member.json -check 0 pull_request pr-same-repo.json -check 1 pull_request pr-fork-none.json -check 1 pull_request pr-fork-spoofed.json -check 1 pull_request pr-deleted-fork.json -check 1 pull_request push.json -for e in pull_request_target workflow_run pull_request_review pull_request_review_comment issue_comment issues discussion discussion_comment create delete unknown_event; do - check 1 "$e" pr-member.json -done -check 1 pull_request_review pr-fork-none.json -check 1 issue_comment issue-comment.json -check 1 push - -check 1 push missing.json -check 1 push invalid.txt -check 1 - push.json -check 0 push tag-push.json -check 0 push tag-push.json true -check 1 push push.json true -check 1 push tag-push-nov.json true -for e in pull_request workflow_dispatch schedule merge_group release; do - check 1 "$e" tag-push.json true +for e in push workflow_dispatch schedule merge_group release; do + check 0 default "$e" push.json done -check 1 pull_request pr-same-repo.json true -check 1 push - true -check 1 push invalid.txt true -check 1 push tag-push.json yes +check 0 default pull_request pr-member.json +check 0 default pull_request pr-same-repo.json +check 1 default pull_request pr-fork-none.json +check 1 default pull_request pr-fork-spoofed.json +check 1 default pull_request pr-deleted-fork.json +check 1 default pull_request push.json +for e in pull_request_target workflow_run pull_request_review pull_request_review_comment issue_comment issues discussion discussion_comment create delete unknown_event; do + check 1 default "$e" pr-member.json +done +check 1 default pull_request_review pr-fork-none.json +check 1 default issue_comment issue-comment.json +check 1 default push - +check 1 default push missing.json +check 1 default push invalid.txt +check 1 default - push.json +check 0 default push tag-push.json + +check 0 release push tag-push.json +check 1 release push tag-push-vagrant.json +check 1 release push tag-push-nov.json +check 1 release push push.json +for e in pull_request pull_request_target workflow_dispatch schedule merge_group release workflow_run issue_comment create unknown_event; do + check 1 release "$e" tag-push.json +done +check 1 release pull_request pr-same-repo.json +check 1 release - tag-push.json +check 1 release push - +check 1 release push invalid.txt exit "$fail"