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
23 lines
774 B
Lua
23 lines
774 B
Lua
-- Shared path constants for Omarchy's Hyprland Lua modules.
|
|
-- Lua files loaded with require() have separate local scopes, so modules that
|
|
-- need these paths import this table instead of repeating os.getenv() lookups.
|
|
|
|
local home = os.getenv("HOME")
|
|
|
|
-- A variable that is set but empty means "unset" (XDG Base Directory spec);
|
|
-- bash's ${VAR:-fallback} in the sibling tools treats it the same way.
|
|
local function env_or(name, fallback)
|
|
local value = os.getenv(name)
|
|
if value == nil or value == "" then
|
|
return fallback
|
|
end
|
|
return value
|
|
end
|
|
|
|
return {
|
|
home = home,
|
|
config_home = env_or("XDG_CONFIG_HOME", home .. "/.config"),
|
|
state_home = env_or("XDG_STATE_HOME", home .. "/.local/state"),
|
|
omarchy_path = env_or("OMARCHY_PATH", "/usr/share/omarchy"),
|
|
}
|