OmarchybotandClaude Opus 5
c7af36d0aa
Backport of the sudoless Docker follow-up (PR #8098, merged to quattro as
06a3dbca) onto the v4-0-1 release branch, on top of the #8056 and #8080
backports it follows.
Group membership only takes effect on a fresh session, and in practice a logout
or newgrp is not enough -- only a reboot reliably applies it. The setup and
remove commands now flag the reboot and offer to do it right away with a gum
confirm, the same shape as the GPU toggle, and their notices say "after a
reboot" instead of pointing at logout or newgrp. The existing-user migration
reuses the removal command inside omarchy update, so it passes
OMARCHY_DEFER_REBOOT to skip the prompt there and lets omarchy-update-restart
handle the reboot once the whole update has finished.
Setup > Security showed Sudoless Docker under both Setup and Remove, and the
guards tested the running session's groups, which do not change until the
reboot: after enabling sudoless Docker the menu still offered Setup, the one
action that could no longer do anything, while Remove stayed hidden. Add
omarchy-sudo-docker as the single answer to both questions that differ in that
window -- by default whether this session can reach the socket, which is what
decides if a command must elevate, and with --configured whether the account is
set up for it, which is what the menu and the toggles need. It succeeds when
sudo is needed, so the Setup entry appears while sudoless Docker is off and
Remove once it is on. lazydocker and the Windows VM keep prompting until the
reboot lands.
Clean cherry-pick on top of the earlier backports: every file is byte-identical
to quattro except default/omarchy/omarchy-menu.jsonc, which merged into this
branch's menu and whose two Sudoless Docker lines match quattro exactly.
test/shell passes: 188 files, including the two this adds. test/cli passes, so
the new command's metadata is well-formed. Exercised the helper here: with no
socket it reports sudo is needed, and --configured answers from the account's
groups.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018DEMYa9UWtroz93DhMTtcV
90 lines
3.8 KiB
Bash
90 lines
3.8 KiB
Bash
#!/bin/bash
|
|
#
|
|
# The docker-group opt-in migration must remove an existing install's user from
|
|
# the root-equivalent docker group (only when they are in it), flag a reboot so
|
|
# the group change actually takes effect (group membership is fixed at login),
|
|
# refresh the stale Docker launcher entry, and stay idempotent on reruns.
|
|
#
|
|
# The real omarchy-remove-security-sudoless-docker and omarchy-state run here
|
|
# (from the repo bin); only the privileged/system calls are stubbed, so the whole
|
|
# chain — including the reboot flag — is exercised.
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(dirname "${BASH_SOURCE[0]}")/base-test.sh"
|
|
|
|
migration="$ROOT/migrations/1787580187.sh"
|
|
test_dir=$(mktemp -d)
|
|
trap 'rm -rf "$test_dir"' EXIT
|
|
|
|
home="$test_dir/home"
|
|
omarchy_path="$test_dir/omarchy"
|
|
stub_bin="$test_dir/bin"
|
|
mkdir -p "$home/.local/share/applications" "$omarchy_path/applications" "$stub_bin"
|
|
|
|
printf 'NEW-LAUNCHER\n' >"$omarchy_path/applications/Docker.desktop"
|
|
printf 'OLD-LAUNCHER\n' >"$home/.local/share/applications/Docker.desktop"
|
|
|
|
# id reports a controllable group set; sudo just drops the prefix; gpasswd
|
|
# records its call instead of touching the real system.
|
|
cat >"$stub_bin/id" <<'STUB'
|
|
#!/bin/bash
|
|
printf '%s\n' "${STUB_GROUPS:-wheel input}"
|
|
STUB
|
|
cat >"$stub_bin/sudo" <<'STUB'
|
|
#!/bin/bash
|
|
exec "$@"
|
|
STUB
|
|
cat >"$stub_bin/gpasswd" <<'STUB'
|
|
#!/bin/bash
|
|
echo "$@" >>"${GPASSWD_CALLS:?}"
|
|
STUB
|
|
# gum confirm always says yes, and reboot records that it fired: the migration
|
|
# must still NOT reboot (it defers to omarchy-update-restart), so neither should
|
|
# be reached.
|
|
cat >"$stub_bin/gum" <<'STUB'
|
|
#!/bin/bash
|
|
[[ $1 == confirm ]] && exit 0
|
|
exit 0
|
|
STUB
|
|
cat >"$stub_bin/omarchy-system-reboot" <<'STUB'
|
|
#!/bin/bash
|
|
touch "${REBOOT_CALLED:?}"
|
|
STUB
|
|
chmod +x "$stub_bin/id" "$stub_bin/sudo" "$stub_bin/gpasswd" "$stub_bin/gum" "$stub_bin/omarchy-system-reboot"
|
|
|
|
reboot_flag="$home/.local/state/omarchy/reboot-required"
|
|
gpasswd_calls="$test_dir/gpasswd-calls"
|
|
reboot_called="$test_dir/reboot-called"
|
|
launcher="$home/.local/share/applications/Docker.desktop"
|
|
|
|
run_migration() {
|
|
rm -f "$gpasswd_calls" "$reboot_flag" "$reboot_called"
|
|
HOME="$home" OMARCHY_PATH="$omarchy_path" USER="tester" STUB_GROUPS="$1" \
|
|
GPASSWD_CALLS="$gpasswd_calls" REBOOT_CALLED="$reboot_called" \
|
|
PATH="$stub_bin:$ROOT/bin:$PATH" \
|
|
bash -euo pipefail "$migration" >/dev/null 2>&1
|
|
}
|
|
|
|
# In the docker group: user removed, reboot flagged, launcher refreshed.
|
|
run_migration "wheel input docker" || fail "migration runs when the user is in the docker group"
|
|
grep -q -- "-d tester docker" "$gpasswd_calls" || fail "migration removes the user from the docker group"
|
|
[[ -f $reboot_flag ]] || fail "migration flags a reboot so the group change takes effect"
|
|
[[ ! -f $reboot_called ]] || fail "migration must defer the reboot (not reboot mid-update)"
|
|
[[ $(cat "$launcher") == "NEW-LAUNCHER" ]] || fail "migration refreshes the stale Docker launcher entry"
|
|
pass "migration removes the group, flags a reboot, and refreshes the launcher"
|
|
|
|
# Not in the docker group (fresh install, or already migrated): nothing changes.
|
|
printf 'OLD-LAUNCHER\n' >"$launcher"
|
|
run_migration "wheel input" || fail "migration runs when the user is not in the docker group"
|
|
[[ ! -f $gpasswd_calls ]] || fail "migration must not touch the group when the user is not in it"
|
|
[[ ! -f $reboot_flag ]] || fail "migration must not flag a reboot when nothing changed"
|
|
[[ $(cat "$launcher") == "NEW-LAUNCHER" ]] || fail "migration still refreshes the launcher when the group is already absent"
|
|
pass "migration is a no-op on the group and reboot when already out"
|
|
|
|
# No launcher entry present: the refresh is skipped without error.
|
|
rm -f "$launcher"
|
|
run_migration "wheel input" || fail "migration tolerates a missing launcher entry"
|
|
[[ ! -e $launcher ]] || fail "migration does not create a launcher entry that was not there"
|
|
pass "migration skips the launcher refresh when no entry exists"
|