Adrian RangelandClaude Opus 5
2e989e35e5
Backport of the input-device name fix (PR #8129 by @acrogenesis, merged to
quattro as 9285b19d) onto the v4-0-1 release branch.
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. XF86TouchpadToggle is bound with
locked = true, so a malicious USB name reached Lua execution from the lock
screen as the logged-in user, and a persisted disable made it run on every
start. Publicly reported by Jorrit Jongma / Chainfire.
The disable is no longer executable Lua anywhere. The device name is stored as
plain-text data in a *-disabled-name sidecar and read back by a packaged module,
default/hypr/disabled-input-device.lua, on every reload; the live hyprctl eval
Lua-quotes the name and rejects control characters outright. The reload loader
excludes the two legacy filenames, so a leftover generated *-disabled.lua on a
not-yet-migrated install can never be sourced as code again, and a migration
recovers the device name from it and deletes it, sanitizing installs that ran
the vulnerable version. All four monitor scripts validate an output name against
a plain-connector-name pattern before writing it as Lua, closing the same latent
pattern in the siblings, and paths.lua treats a set-but-empty XDG_STATE_HOME as
unset to match the bash side.
Clean cherry-pick: all fourteen files are byte-identical to quattro, so merging
v4-0-1 into quattro resolves without a conflict. This branch ships no leftover
*-disabled.lua template of its own -- the tracked "disabled" files are the same
two quattro has -- so the migration is the only path that has to sanitize
anything here.
test/shell passes: 192 files, including the three this adds. The toggle suite's
public-PoC case passes here, as do the monitor scripts' accept/reject cases and
the XDG path cases. test/cli passes.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018DEMYa9UWtroz93DhMTtcV
24 lines
883 B
Lua
24 lines
883 B
Lua
local paths = require("default.hypr.paths")
|
|
local require_all = require("default.hypr.require_all")
|
|
|
|
local toggles_dir = paths.state_home .. "/omarchy/toggles/hypr"
|
|
package.path = toggles_dir .. "/?.lua;" .. package.path
|
|
|
|
-- touchpad-disabled.lua / touchscreen-disabled.lua were generated Lua in older
|
|
-- versions and could carry an injected USB device name. They must never be loaded
|
|
-- as code again: exclude them so a not-yet-migrated install cannot execute a
|
|
-- leftover payload on reload. The migration recovers the name and deletes them.
|
|
require_all.files(toggles_dir, nil, {
|
|
reload = true,
|
|
exclude = {
|
|
["touchpad-disabled"] = true,
|
|
["touchscreen-disabled"] = true,
|
|
},
|
|
})
|
|
|
|
local disabled_input_device = require("default.hypr.disabled-input-device")
|
|
disabled_input_device("touchpad")
|
|
disabled_input_device("touchscreen")
|
|
|
|
require("default.hypr.workspace-layouts")
|