Skip to content

fix(linux): label a control-char path control_chars_refused before the metachar check #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hivecommons-hive merged 1 commit into from
Oct 9, 2026
Merged

fix(linux): label a control-char path control_chars_refused before the metachar check #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions linux/hotshot-capture.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,12 @@ has_shell_metachars() {
return 1
}

# --- 3. injection safety checks (control chars before shell metachars) --------
if [ "$DO_TYPE" = 1 ] && has_control_chars "$SHOT_PATH"; then
log_event WARN injection.control_chars_refused "screenshot saved"
DO_TYPE=0
fi

case "$CLI" in
plain) TEXT="$(shell_escape "$SHOT_PATH") " ;;
*)
Expand All @@ -274,10 +280,6 @@ case "$CLI" in
esac

# --- 4. typed injection ------------------------------------------------------
if [ "$DO_TYPE" = 1 ] && has_control_chars "$SHOT_PATH"; then
log_event WARN injection.control_chars_refused "screenshot saved"
DO_TYPE=0
fi
if [ "$DO_TYPE" = 1 ]; then
if [ "$SESSION" = "x11" ]; then
if have xdotool; then
Expand Down
16 changes: 16 additions & 0 deletions linux/tests/hotshot-capture.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,22 @@ check "e2e metachar dir: refusal warning printed" $?
grep -q -- "-t image/png -i $out" "$CLIPLOG"
check "e2e metachar dir: clipboard still loaded" $?

# Control-char + shell-metachar in the directory -> control char label takes priority.
root="$(spawn_tree claude)"
both_dir="$TMP/shots;rm
dir"
out="$(run_e2e "$root" --full --dir "$both_dir" 2>"$TMP/e2e-both.err")"
rc=$?
assert_eq "e2e both-char dir: exit 0" "0" "$rc"
[ -s "$out" ]
check "e2e both-char dir: screenshot still created" $?
[ ! -e "$TYPELOG" ]
check "e2e both-char dir: nothing typed" $?
grep -q "injection.control_chars_refused" "$TMP/e2e-both.err"
check "e2e both-char dir: control chars label used" $?
! grep -q "injection.shell_metachars_refused" "$TMP/e2e-both.err"
check "e2e both-char dir: shell metachars label not used" $?

# No HOTSHOT_DIR / --dir -> SHOT_DIR resolves through xdg-user-dir (issue #174).
# run_e2e always pins HOTSHOT_DIR, so these runs set the environment directly;
# the stub sits ahead of the capture stubs so the lookup never depends on
Expand Down
Loading