mirror of
https://github.com/kuhyx/steam-backlog-enforcer.git
synced 2026-11-11 21:13:48 +01:00
The enforce service runs as root (no User=) but sets DISPLAY=:0, so any GUI
it starts lands on the desktop session. Two resolvers disagreed about who to
drop privileges to:
library_hider._resolve_desktop_user() read STEAM_ENFORCER_DESKTOP_USER
game_install._get_real_user() read only SUDO_USER or USER
systemd sets neither of the latter, so _get_real_user() returned None under
the service and every `geteuid() == 0 and real_user and ...` guard fell
through to running as root. Steam answered with a zenity modal ("Cannot run
as root user", /usr/lib/steam/steam:261) on screen.
Confirmed from the live process tree: root `bash /usr/lib/steam/steam
-cef-disable-gpu ... steam://install/618510` with a root zenity child. It
never reached the journal, because that text goes to zenity and _run_as_user
sends child output to DEVNULL.
- _desktop_env: add resolve_desktop_user/desktop_uid/desktop_user_cmd. Only
the argv builder is shared, never the spawn call: tests/_no_subprocess.py
patches subprocess per module by name, so a spawn site in an unpatched
module could fire a real `sudo -u kuhy steam`.
- game_install._get_real_user: delegate to the shared resolver. This alone
also fixes the root `steam -silent` in _ensure_steam_running and the
no-op os.chown on new appmanifests.
- _trigger_steam_install / enforcer.send_notification: drop privileges.
send_notification had no DBUS_SESSION_BUS_ADDRESS, so it silently reached
nobody for all six of its callers.
- _run_as_user: fail closed. Running unchanged as root when no desktop user
resolves is what put the modal on screen; refuse and log instead.
Also stop the retry storm behind it. steamapps does not exist (Steam has
never completed sign-in), so is_game_installed() was always False and the
loop re-triggered every allowed game every pass: 1656 attempts in 30
minutes, service RSS 1.5 GB (peak 4.3 GB), a FileNotFoundError traceback
each time. Guard install_game and _reinstall_missing_allowed on
steam_library_ready() -- a missing library means no install can succeed by
any route, so this is a correctness check rather than a tuned retry limit.
The module splits here are forced by the pre-commit 250-line gate, which
blocks any commit touching an over-cap file: game_install, library_hider and
_enforce_loop were already over before this change. They are split by
responsibility (_cdp transport, _steam_launch lifecycle, _steam_process
spawning, _steam_errors, _steam_client, _game_names, game_uninstall,
_enforce_steps, _owned_apps_cache, _echo, _protected_apps). game_install and
library_hider re-export their old public names, so the 15 modules that
import from them are untouched by this commit.
Verified as real root under the unit's environment: argv is now
`sudo -u kuhy env DISPLAY=:0 ... xdg-open steam://install/...` for both the
installer and notify-send; three enforce passes spawn no process and log
once; _run_as_user refuses with no desktop user. After restart: 0 retries,
0 tracebacks, 0 root-owned files under ~/.local/share/Steam, RSS 342 MB.
1311 tests pass. _desktop_env and _steam_state at 100% branch coverage.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016A1EYiv7e7HGhET84oa9M3
102 lines
3.0 KiB
Python
102 lines
3.0 KiB
Python
"""Game-name normalisation and the protected-name check.
|
|
|
|
Split out of :mod:`steam_backlog_enforcer.game_install` to keep it under the
|
|
250-line cap. Pure string handling with no filesystem or Steam knowledge, so
|
|
it stays a leaf module.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import difflib
|
|
import logging
|
|
import re
|
|
|
|
# _allowed_games, not _actions: _actions imports game_uninstall, which
|
|
# imports this module. The leaf module has the same function and no cycle.
|
|
from steam_backlog_enforcer._allowed_games import allowed_games
|
|
from steam_backlog_enforcer.config import State
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
_NAME_FUZZY_MATCH_THRESHOLD = 0.82
|
|
|
|
_NUMBER_WORDS = {
|
|
"one": "1",
|
|
"two": "2",
|
|
"three": "3",
|
|
"four": "4",
|
|
"five": "5",
|
|
"six": "6",
|
|
"seven": "7",
|
|
"eight": "8",
|
|
"nine": "9",
|
|
"ten": "10",
|
|
}
|
|
|
|
_ROMAN_NUMERALS = {
|
|
"i": "1",
|
|
"ii": "2",
|
|
"iii": "3",
|
|
"iv": "4",
|
|
"v": "5",
|
|
"vi": "6",
|
|
"vii": "7",
|
|
"viii": "8",
|
|
"ix": "9",
|
|
"x": "10",
|
|
}
|
|
|
|
|
|
def _normalize_game_name(name: str) -> str:
|
|
"""Canonicalize a game/folder name for fuzzy comparison.
|
|
|
|
Splits into alphanumeric words, maps spelled-out numbers ("two") and
|
|
roman numerals ("II") to digits, then joins with no separators. Makes
|
|
"Kingdom Come: Deliverance II", "KingdomComeDeliverance2", and "kingdom
|
|
come deliverance two" all normalize to the same string.
|
|
"""
|
|
words = re.findall(r"[A-Za-z0-9]+", name.lower())
|
|
mapped = [_NUMBER_WORDS.get(w) or _ROMAN_NUMERALS.get(w) or w for w in words]
|
|
return "".join(mapped)
|
|
|
|
|
|
def _protected_name_stems() -> list[str]:
|
|
"""Every name of every currently-allowed game, for the deletion safety net.
|
|
|
|
Returns [] (protects nothing extra beyond exact matches already checked
|
|
by callers) if state can't be loaded -- this is a best-effort safety net,
|
|
not a hard dependency.
|
|
"""
|
|
try:
|
|
return [name for _, name in allowed_games(State.load()) if name]
|
|
except Exception:
|
|
logger.exception("Could not load allowed games for the deletion safety net")
|
|
return []
|
|
|
|
|
|
def _is_protected_name(candidate: str) -> bool:
|
|
"""True if *candidate* plausibly names one of the currently-allowed games.
|
|
|
|
Errs toward over-matching on purpose: a false positive here just skips a
|
|
deletion that can be done manually; a false negative deletes real files.
|
|
"""
|
|
normalized_candidate = _normalize_game_name(candidate)
|
|
if not normalized_candidate:
|
|
return False
|
|
for protected in _protected_name_stems():
|
|
normalized_protected = _normalize_game_name(protected)
|
|
if not normalized_protected:
|
|
continue
|
|
if normalized_candidate == normalized_protected:
|
|
return True
|
|
ratio = difflib.SequenceMatcher(
|
|
None, normalized_candidate, normalized_protected
|
|
).ratio()
|
|
if ratio >= _NAME_FUZZY_MATCH_THRESHOLD:
|
|
return True
|
|
return False
|
|
|
|
|
|
# Real Steam directory — used as a safety check to block destructive
|
|
# operations that leak through during testing.
|