9285b19d6a
* Stop device names from being executed as Hyprland Lua Hyprland input-device and monitor names come from USB descriptors and hyprctl output, so they are attacker-influenceable, yet the toggle and monitor commands interpolated them straight into hyprctl eval and into generated Lua that Hyprland re-executes on every reload. The input-device toggle keys are bound with locked = true, so a malicious USB name reached Lua code execution from the lock screen; a persisted disable made it run on every start. This closes that class everywhere it appeared. - The touchpad/touchscreen disable is now the device name in a plain-text sidecar file, read back by a packaged Lua module on reload, never a generated Lua file. hyprctl eval Lua-quotes the name and control characters are rejected outright. - Dropped the shipped *-disabled.lua templates so nothing seeds a disabled state to /etc/skel, making the name file the single source of truth read from a hardcoded ~/.local/state to match the sibling tools. - The reload loader excludes those two legacy filenames, so a leftover generated *-disabled.lua on a not-yet-migrated install can never be sourced as code again; a migration then recovers the device name from it and deletes it, sanitizing installs that ran the vulnerable version. - All four monitor scripts (internal, mirror, clamshell, scaling) now validate an output name against a plain-connector-name pattern before writing it as Lua, closing the same latent pattern in the siblings. - paths.lua treats a set-but-empty XDG_STATE_HOME as unset, matching the bash side so state is never read from the filesystem root. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0144ZDt44vtxjyF8j9Y88NrM * Let a failing Lua assertion fail the test lua discards the status of a chunk read from stdin, so a blown assert printed its traceback and still exited 0: the surrounding `set -euo pipefail` never fired and the following `pass` printed `ok`. Every Lua block in these two files was unenforced, including the assertion that a quoted `hyprctl eval` cannot reach `os.execute` and the negative control that proves the test can detect the injection at all. Passing the chunk as a script argument makes lua report the failure. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Re-apply a recovered input-device disable to the running session The package hook reloads Hyprland during `omarchy-update-system-pkgs`, before `omarchy-migrate` runs, and at that reload the generated Lua is already excluded while the name file does not exist yet — so a touchpad or touchscreen the user had switched off comes back on, and stays on until their next login. Reload once more once the name has been recovered, which is the same path a login already takes to read it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-Authored-By: Codex XHigh <codex@openai.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Omarchybot <omabot@omarchy.org> Co-authored-by: Codex XHigh <codex@openai.com>
40 lines
1.4 KiB
Bash
40 lines
1.4 KiB
Bash
echo "Store Hyprland input-device names as data instead of generated Lua"
|
|
|
|
# omarchy-toggle-input-device used to interpolate hyprctl device names into
|
|
# hyprctl eval and a generated Lua file. Those names come from USB descriptors,
|
|
# so recover the plain device name as data and delete the generated Lua. A name
|
|
# that could have broken out of the old Lua string literal is discarded, not
|
|
# trusted. The old script wrote to ~/.local/state regardless of XDG_STATE_HOME.
|
|
toggles_dir="$HOME/.local/state/omarchy/toggles/hypr"
|
|
|
|
reapply=0
|
|
|
|
for kind in touchpad touchscreen; do
|
|
state_file="$toggles_dir/$kind-disabled.lua"
|
|
name_file="$toggles_dir/$kind-disabled-name"
|
|
|
|
[[ -f $state_file ]] || continue
|
|
|
|
if [[ ! -f $name_file && -r $state_file ]]; then
|
|
old=$(<"$state_file")
|
|
pattern='^hl\.device\(\{ name = "([^"\\[:cntrl:]]+)", enabled = false \}\)$'
|
|
if [[ $old =~ $pattern ]]; then
|
|
printf '%s\n' "${BASH_REMATCH[1]}" >"$name_file"
|
|
fi
|
|
fi
|
|
|
|
rm -f "$state_file"
|
|
|
|
if [[ -f $name_file ]]; then
|
|
reapply=1
|
|
fi
|
|
done
|
|
|
|
# The package hook reloads Hyprland before migrations run, so this session has
|
|
# already dropped the disable: the generated Lua is no longer loaded and the
|
|
# name file did not exist yet to replace it. Reload once more now that it does,
|
|
# or the device the user switched off stays on until their next login.
|
|
if (( reapply )); then
|
|
hyprctl reload >/dev/null 2>&1 || true
|
|
fi
|