Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/groom/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -836,8 +836,9 @@ agent step dies instead of becoming a green no-op that runs no agent.
`preflight()` takes its idempotent fast path), and the sole remaining side effect
is the `mkdir -p` on the out-dir that the real run performs anyway; the agent
step's own copies of both are then no-ops. Run standalone on a host where the
sandbox is *not* yet usable, the same call will `sudo apt-get install bubblewrap`,
write `/etc/apparmor.d/bwrap`, and as a last resort `sudo sysctl -w
sandbox is *not* yet usable, the same call will `sudo apt-get update` and then
`sudo apt-get install bubblewrap`, write `/etc/apparmor.d/bwrap`, and as a last
resort `sudo sysctl -w
kernel.apparmor_restrict_unprivileged_userns=0` — the bring-up's host-wide
mutations, from a mode named for validation. Pair it with `--preflight-only`, as
groom.yml does, or expect the bring-up.
Expand Down
21 changes: 20 additions & 1 deletion .github/groom/agent-sandbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,26 @@ preflight() {
fi

if ! command -v bwrap >/dev/null 2>&1; then
sudo apt-get install -y bubblewrap >&2
# `apt-get update` FIRST, every time. The runner image ships an apt index
# frozen at image-build time, and noble-updates supersedes packages
# between image rebuilds: installing against the stale index asks the
# pool for a .deb version that has since been withdrawn, so EVERY mirror
# answers 404 and the install fails with a perfectly good package
# sitting there under a newer version. Observed 2026-09-19 — the same
# image (ubuntu-24.04 20260907.300.1) that installed
# bubblewrap 0.9.0-1ubuntu0.1 fine the day before 404'd on it across the
# azure, archive and security mirrors, failing the sweep at preflight.
#
# Both halves tolerate failure so the verdict stays with the selftest
# below rather than with apt's exit code: a transient index refresh
# failure must not skip an install the on-image cache can still satisfy,
# and a failed install must not abort the script before the AppArmor and
# sysctl fallbacks — preflight() is called bare (errexit live) on the
# agent path and as `preflight || exit $?` on the --preflight-only path,
# so without these an apt failure would exit 100 with no `::error::` on
# one path and reach the fail-loud on the other.
sudo apt-get update >&2 || true
sudo apt-get install -y bubblewrap >&2 || true
fi

local restrict=/proc/sys/kernel/apparmor_restrict_unprivileged_userns
Expand Down
41 changes: 41 additions & 0 deletions .github/groom/tests/sandbox-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,47 @@ if PATH="$failbin:$PATH" "$SANDBOX" --preflight-only >/dev/null 2>&1; then
fi
pass "--preflight-only fails loud when the sandbox self-test cannot pass"

# 8c. With bwrap MISSING, the bring-up must refresh the apt index BEFORE it
# installs bubblewrap. The runner image carries an apt index frozen at image
# build time while noble-updates keeps superseding packages, so an install
# against that stale index asks the pool for a withdrawn .deb version, 404s on
# every mirror, and kills the whole sweep at preflight with a working package one
# `apt-get update` away (observed 2026-09-19 on ubuntu-24.04 20260907.300.1,
# bubblewrap 0.9.0-1ubuntu0.1 — installed fine the day before).
#
# PATH is the stub dir ALONE, holding only a `sudo` that logs its argv and
# succeeds plus symlinks to the two binaries the bring-up itself needs (`bash`,
# which the `#!/usr/bin/env bash` shebang resolves through PATH, and `cat`). That
# is what makes bwrap unfindable, so preflight takes the install branch; nothing
# is really installed, so it still fails loud at the end.
aptbin="$work/aptbin"
mkdir -p "$aptbin"
cat > "$aptbin/sudo" <<'STUB'
#!/bin/sh
echo "$@" >> "$SUDO_LOG"
exit 0
STUB
chmod +x "$aptbin/sudo"
ln -s "$(command -v bash)" "$aptbin/bash"
ln -s "$(command -v cat)" "$aptbin/cat"
export SUDO_LOG="$work/sudo-argv.log"
: > "$SUDO_LOG"
if PATH="$aptbin" "$SANDBOX" --preflight-only >/dev/null 2>&1; then
fail "--preflight-only exited 0 with no bwrap and a no-op sudo (nothing was installed, so it must fail loud)"
fi
apt_update_line="$(grep -n -m1 '^apt-get update' "$SUDO_LOG" | cut -d: -f1 || true)"
apt_install_line="$(grep -n -m1 '^apt-get install' "$SUDO_LOG" | cut -d: -f1 || true)"
if [[ -z "$apt_install_line" ]]; then
fail "preflight never attempted the bubblewrap install with bwrap absent from PATH"
fi
if [[ -z "$apt_update_line" ]]; then
fail "preflight installed bubblewrap without refreshing the apt index first — a stale runner index 404s the .deb"
fi
if (( apt_update_line >= apt_install_line )); then
fail "preflight ran \`apt-get update\` AFTER the install — the install still resolves against the stale index"
fi
pass "preflight refreshes the apt index before installing bubblewrap (and still fails loud when it cannot)"

# --- 9. --validate-only: the pre-exec guards, off the billed step (BE-14771) --
# The groom jobs run this in the SAME separate "Preflight the sandbox" step as
# --preflight-only. Everything the wrapper checks before `exec bwrap` is no-spend
Expand Down
Loading