Ryan Hughes
eb988b42e6
A free-form shell-string --exec sitting next to the safe --exec-arg is a standing invitation for the next caller to interpolate untrusted data and reintroduce the RCE. Remove it: omarchy-notification-send --exec now errors and points at --exec-arg, and the shell drops the omarchy-exec string hint and its bash -lc execution path, leaving only the argv path. Migrate the remaining string callers (the first-run invitation hooks, wifi and welcome prompts) to --exec-arg, and update their notification mocks. Trim the verbose security comments added along the way.
64 lines
2.2 KiB
Bash
64 lines
2.2 KiB
Bash
#!/bin/bash
|
|
|
|
source "$(dirname "$0")/base-test.sh"
|
|
|
|
test_home=$(mktemp -d)
|
|
test_bin=$(mktemp -d)
|
|
log_file=$(mktemp)
|
|
hook_path="$test_home/.config/omarchy/hooks/post-update.d/setup-agent.hook"
|
|
|
|
cleanup() {
|
|
rm -rf "$test_home" "$test_bin"
|
|
rm -f "$log_file"
|
|
}
|
|
trap cleanup EXIT
|
|
|
|
mkdir -p "$(dirname "$hook_path")"
|
|
|
|
cat >"$test_bin/omarchy-notification-send" <<'EOF'
|
|
#!/bin/bash
|
|
echo notification >>"$TEST_LOG"
|
|
exec_args=()
|
|
while (($# > 0)); do
|
|
[[ $1 == "--exec-arg" ]] && exec_args+=("$2")
|
|
shift
|
|
done
|
|
((${#exec_args[@]})) && echo "exec:${exec_args[*]}" >>"$TEST_LOG"
|
|
EOF
|
|
chmod +x "$test_bin/omarchy-notification-send"
|
|
|
|
run_invitation_hook() {
|
|
cp "$ROOT/install/user/first-run/setup-agent.hook" "$hook_path"
|
|
HOME="$test_home" PATH="$test_bin:$ROOT/bin:$PATH" TEST_LOG="$log_file" bash "$hook_path"
|
|
}
|
|
|
|
run_invitation_hook
|
|
|
|
[[ -f $test_home/.local/state/omarchy/done/agent-setup-invitation ]] || fail "agent invitation records completion"
|
|
[[ -f $hook_path ]] || fail "agent invitation keeps its hook installed"
|
|
[[ $(grep -c '^notification$' "$log_file") -eq 1 ]] || fail "agent invitation sends one notification"
|
|
grep -qx 'exec:omarchy menu summon setup.default.agent' "$log_file" ||
|
|
fail "agent invitation opens the agent defaults menu"
|
|
|
|
run_invitation_hook
|
|
[[ $(grep -c '^notification$' "$log_file") -eq 1 ]] || fail "completed agent invitation does not notify again"
|
|
|
|
pass "agent invitation only runs once"
|
|
|
|
# Someone who already chose an agent has nothing to be invited to, and must not
|
|
# burn the marker either -- otherwise clearing the choice later leaves them with
|
|
# no invitation and no default.
|
|
fresh_home=$(mktemp -d)
|
|
mkdir -p "$fresh_home/.config/omarchy/defaults"
|
|
printf 'claude\n' >"$fresh_home/.config/omarchy/defaults/agent"
|
|
: >"$log_file"
|
|
cp "$ROOT/install/user/first-run/setup-agent.hook" "$hook_path"
|
|
HOME="$fresh_home" PATH="$test_bin:$ROOT/bin:$PATH" TEST_LOG="$log_file" bash "$hook_path"
|
|
|
|
[[ ! -s $log_file ]] || fail "agent invitation stays quiet when a default is already set"
|
|
[[ ! -f $fresh_home/.local/state/omarchy/done/agent-setup-invitation ]] ||
|
|
fail "agent invitation leaves its marker unset when a default is already set"
|
|
rm -rf "$fresh_home"
|
|
|
|
pass "agent invitation skips anyone who already chose an agent"
|