ZacharyZhang-NY/omarchycn
3
4
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Merge remote-tracking branch 'origin/quattro' into harden-notification-exec-argv

Browse Source 
# Conflicts:
#	test/shell.d/notification-send-test.sh
This commit is contained in:
Ryan Hughes
2026-08-23 18:31:42 -04:00
parent 8f245e59dc 7e469f962d
commit 3b0d9b5734
5 changed files with 163 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/shell.d/notification-send-test.sh
+15
View File
@@ -78,6 +78,21 @@ load
[[ ${args[9]} == "42" ]] || fail "notification wrapper sets replaces_id from -r" "${args[9]}"
pass "notification wrapper supports -p (print id) and -r (replace id)"
# Options may follow the headline and description (Taildrop appends -u critical
# and -g after the two positionals); they still land on the call, and urgency
# stays a single hint rather than doubling.
: >"$args_file"
send "Received photo.png" "Saved to ~/Downloads" -u critical -g K >/dev/null
load
[[ ${args[11]} == "Received photo.png" ]] || fail "notification wrapper keeps the summary before trailing options" "${args[11]}"
[[ ${args[12]} == "Saved to ~/Downloads" ]] || fail "notification wrapper keeps the body before trailing options" "${args[12]}"
[[ $(hint_value urgency) == "2" ]] || fail "notification wrapper reads an urgency that follows the description" "$(hint_value urgency)"
[[ $(hint_value omarchy-glyph) == "K" ]] || fail "notification wrapper reads a glyph that follows the description"
urgency_hits=0
for ((i = 15; i < 15 + 3 * ${args[14]}; i += 3)); do [[ ${args[i]} == urgency ]] && urgency_hits=$((urgency_hits + 1)); done
((urgency_hits == 1)) || fail "notification wrapper sets the urgency once" "$urgency_hits"
pass "notification wrapper reads options that follow the headline and description"
# The --flag=value form works too (the acceptance suite uses --expire-time=15000).
: >"$args_file"
send "Acceptance" "Body" --expire-time=15000 >/dev/null
test/shell.d/tailscale-receive-test.sh
+6 -1
View File
@@ -52,10 +52,15 @@ notifications=$(<"$WORKDIR/notifications")
fail "taildrop receive saves incoming files" "$(ls "$downloads")"
pass "taildrop receive saves incoming files"
grep -qF -- "Received photo.png Saved to $downloads --image $downloads/photo.png" <<<"$notifications" ||
grep -qF -- "Received photo.png Saved to $downloads -u critical --image $downloads/photo.png" <<<"$notifications" ||
fail "taildrop receive previews received images" "$notifications"
pass "taildrop receive previews received images"
while IFS= read -r line; do
[[ $line == *"-u critical"* ]] || fail "taildrop receive announcements wait to be answered" "$line"
done <<<"$notifications"
pass "taildrop receive announcements wait to be answered"
grep -q "^Received notes with space.pdf .* -g " <<<"$notifications" ||
fail "taildrop receive announces other files with a glyph" "$notifications"
pass "taildrop receive announces other files with a glyph"