From 5f6030568e7f134654f320f720faa364d9586979 Mon Sep 17 00:00:00 2001
From: spacedandy-agents-simplex
 <342056592+spacedandy-agents-simplex@users.noreply.github.com>
Date: Wed, 21 Oct 2026 11:58:27 +0000
Subject: [PATCH] ci: the desktop ui helper presses one key per xdotool call
 and checks its coordinates, so no argument can run another command

xdotool key reads a later argument that names one of its commands, exec among them, as that command, and mousemove takes a single word, so "ui key Return exec <program>" or "ui click restore exec ..." ran a program on the runner. The Claude session on the runner is limited to ui commands, and a program could read its token. Key names and numbers are now checked, and keys are pressed one per call.

Review: R1-D1, R1-D2
---
 scripts/ci/desktop-linux/ui | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/desktop-linux/ui b/scripts/ci/desktop-linux/ui
index dae59bcd70..dd1b230a07 100755
--- a/scripts/ci/desktop-linux/ui
+++ b/scripts/ci/desktop-linux/ui
@@ -156,7 +156,16 @@ shot() {
   log "shot $(basename "$f").png"
 }
 
+number() {
+  if ! [[ "$1" =~ ^[0-9]+$ ]]; then
+    echo "error: \"$1\" is not a number"
+    exit 1
+  fi
+}
+
 click() {
+  number "$1"
+  number "$2"
   xdotool mousemove --sync "$1" "$2" click "${3:-1}"
   sleep 1
 }
@@ -172,6 +181,9 @@ scroll() {
       return 1
       ;;
   esac
+  number "$1"
+  number "$2"
+  number "$4"
   xdotool mousemove --sync "$1" "$2" click --repeat "$4" --delay 100 "$button"
   sleep 1
 }
@@ -260,7 +272,16 @@ case "${1:-}" in
     ;;
   key)
     shift
-    xdotool key --delay 100 -- "$@"
+    for k in "$@"; do
+      if ! [[ "$k" =~ ^[A-Za-z0-9_]+(\+[A-Za-z0-9_]+)*$ ]]; then
+        echo "error: \"$k\" is not a key name"
+        exit 1
+      fi
+    done
+    # one key per call: xdotool key runs any later argument that names one of its commands, such as exec
+    for k in "$@"; do
+      xdotool key --delay 100 -- "$k"
+    done
     log "key $*"
     ;;
   do)