mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 06:15:09 +00:00
* docs: add ARCHITECTURE and PERMISSIONS guides ARCHITECTURE.md maps the processes, the state the display and web services share through the cache, the display loop, the plugin system, the web UI and the update path, with links into the code and a where-to-start table. PERMISSIONS.md lists who owns what after install, both sudoers files (and why iptables is not granted), the polkit rule, and which scripts/fix_perms script to run as which user. Both are linked from the docs index, along with the MQTT bridge README and src/common/README.md. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs: correct stale setup, service and troubleshooting claims - README: quick actions run systemctl on ledmatrix.service (run.py), not display_controller.py; use_short_date_format has no effect; the installer uses system pip with --break-system-packages, not a venv. - CONFIG_DEBUGGING: LEDMATRIX_DEBUG must be "true"; logs are in journald. - GETTING_STARTED, WEB_INTERFACE_GUIDE, TROUBLESHOOTING: enabling a plugin, plugin settings, brightness and Vegas settings apply without a restart; matrix hardware settings still need one. - TROUBLESHOOTING: install dependencies with sudo so the root service sees them; point permission problems at PERMISSIONS.md instead of a project-wide chown. - ADVANCED_FEATURES: real BackgroundDataService stats keys; Vegas hooks return VegasDisplayMode and None falls back to capture; cache files are 0660; fix_web_permissions.sh runs as the web user and does not touch sudoers. - STARLARK_APPS_GUIDE: only the linux-arm64 pixlet binary is downloaded. - HOW_TO_RUN_TESTS: test class examples that exist. - CLAUDE.md: PluginStoreManager, plugin_dirs.py, monorepo installs via the Trees API with ZIP fallback, requirements.txt is optional. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs: mark deprecated plugin APIs and state manifest fields once Methods @deprecated("3.7.0") (the set pinned in test_deprecation.py) were shown as current API in the quick reference, API reference, advanced guide, development guide and FONT_MANAGER. Each is now marked deprecated with its replacement. FONT_MANAGER is rewritten around the current API; the override editor is gone and override methods are deprecated. Required manifest fields were stated three different ways. The API reference now has one section: the 7 schema-required fields, the 4 the store refuses without, class_name for the loader, and the 8 to set. The other guides link to it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs: document every src/common module and every widget - src/common/README.md covered 7 of 17 modules. It now has a table of all of them (purpose, whether plugins import it, release to floor on), a short entry each, and logging advice that matches the code. - SPORTS_UNIFICATION listed two shared modules and called sports_helpers the first; it now lists all six. - The widgets README lists all 28 registered widgets plus the support files, and absorbs the parts that only docs/widget-guide.md had (x-options.labels, x-advanced, x-display hidden, plugin-file-manager). docs/widget-guide.md is now a pointer to it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(security): fix_web_permissions.sh re-hardens the root sudo helpers The script chowns the whole project to the web user. That included scripts/fix_perms/safe_plugin_rm.sh and safe_pip_install.sh -- the two helpers /etc/sudoers.d/ledmatrix_web lets the web user run as root -- so running it turned both into a root shell for whoever can edit them. It also re-grouped config_secrets.json away from ledmatrix. After the chown it now does what first_time_install.sh's Steps 11 and 11.1 do: helpers back to root:root 755, and config_secrets.json back to the web unit's User=:ledmatrix 640. Each step is non-fatal and prints the manual command if it fails. Also fixes what the script and its docs claimed: it never configured sudoers, its closing hint pointed at ./configure_web_sudo.sh (wrong path), and the README and ADVANCED_FEATURES.md said to run it with sudo, which it refuses. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(security): validate and harden every sudoers drop-in the scripts write configure_wifi_permissions.sh copied its rules into /etc/sudoers.d/ledmatrix_wifi without `visudo -c`. A malformed drop-in makes sudo refuse every command for every user, which on a headless Pi leaves no way back in. It now checks first and leaves the installed file alone when the rules do not parse, as the other two writers do. (It already used mktemp, so that part of the review did not apply.) It also grants the two literal commands wifi_manager.py runs for NetworkManager's shared-mode dnsmasq drop-in -- `cp /tmp/ledmatrix-nm-dnsmasq.conf .../dnsmasq-shared.d/ledmatrix-captive.conf` and `rm -f` of that file. The directory's mkdir was granted, the file was not. Both are pinned in test_sudo_allowlist_covers_calls.py. configure_web_sudo.sh wrote its rules to /tmp/ledmatrix_web_sudoers_$$, a predictable name in a world-writable directory; it now uses mktemp with an EXIT trap, as first_time_install.sh does. It sets mode 440 on the installed file instead of leaving the temp file's mode, and finds visudo in /usr/sbin when that is not on the user's PATH, which skipped the check silently. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(install): escape the project path in the DNS-fix and MQTT unit renderers install_dns_fix.sh and install_mqtt_bridge.sh substituted __PROJECT_ROOT_DIR__ with the raw path, while the other three renderers go through sed_escape_replacement from lib_systemd_render.sh. A checkout under a path containing `&`, `\` or `|` rendered a corrupted unit from these two only. Both now source the helper and use it, and a test checks that every placeholder substitution in scripts/install uses an escaped value. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(install): stop the installer scripts reporting things that are not true - first_time_install.sh printed "Password: ledmatrix123" for the setup access point. wifi_manager creates it as an open network ("No password" on the panel), so it now says so. - Step 10.1 printed "✓ WiFi management permissions configured" straight after its own failure message; install_wifi_monitor.sh printed "✓ Package installation completed" after a failed apt install. The tick now only follows success. - Step 7 printed "Web dependencies already installed ... in Step 5" in the one branch that runs because Step 5 did not install them, then created .web_deps_installed on that basis. It now warns and leaves the marker off so the next run retries, as the comment below it intends. - check_system_compatibility.sh called Debian 12 Bookworm "full compatibility confirmed" while first_time_install.sh refuses anything but Debian 13. Bookworm, older Debian and non-Debian systems are now errors. Its counters used ((X++)), which under `set -e` exits the script at the first warning or error (the expression is 0), so the check never reached its summary on any system with one. - configure_web_sudo.sh and configure_wifi_permissions.sh finished by testing `sudo -n test -f ...` and `sudo -n nmcli device status`, neither of which is granted, so they always reported a failure. They now ask `sudo -n -l` about commands the new rules do grant, which checks the rule without running anything. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(install): print the completion summary before rebooting With -y -- and so for every one-shot `curl | bash` install, which always passes -y -- first_time_install.sh ran `reboot` about 180 lines before its "Installation Complete / Web UI Access" summary. reboot returns at once, so the summary printed while the Pi was going down and the SSH session usually dropped before the web UI address could be read. The reboot block moves, unchanged, to the very end of the script. The interactive prompt now also follows the summary. Because the summary now runs before the -y reboot, its one command that could fail under `set -Eeuo pipefail` (the SSID lookup, when nmcli reports a connected device but no active network line) gets `|| true`; a missing SSID was already handled as "SSID unknown". one-shot-install.sh prints its "Next steps" after the installer returns, by which time the reboot is under way, so it now says so, and README's Quick Install mentions the automatic reboot. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * chore(scripts): correct wrong comments and messages, drop dead code No behaviour change except the output text noted below. - 2775 is setgid, not the sticky bit (first_time_install.sh Step 3.1, fix_plugin_permissions.sh), and root needs no "PWM hardware access" to plugin files. - The 777 comments in first_time_install.sh Step 3's fallback and fix_assets_permissions.sh said root needs it to write. Root ignores mode bits; the comments now say what 777 actually opens. The 777 itself is unchanged. - apt_remove ends in `|| true`, so Step 12's "Some packages could not be removed" branch could never run; it is gone and the helper stays non-fatal. - detect_web_service_user's comment named Step 8 for the web unit (install_service.sh installs it in Step 7.5) and now says which branch actually runs. - Step 5 described an "already installed" check that does not exist; the ACTUAL_USER comment described the re-exec backwards. - on_error printed a literal "\n" before "Common fixes:". - Dead code: one-shot-install.sh's uncalled fix_tmp_permissions, LEDMATRIX_ELEVATED=1 (never read) on the sudo re-exec, and configure_web_sudo.sh's unused PYTHON_PATH, which also made a missing python3 fatal for rules that never mention it. - start_display.sh / stop_display.sh said "for user: <you>"; the service runs as root. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(fix_perms): fix_cache_permissions.sh uses setup_cache.sh's model There were two models for /var/cache/ledmatrix. setup_cache.sh (the installer's Step 2) and install_web_service.sh share it through the ledmatrix group: root:ledmatrix, 2775, files 660, which is also what DiskCache relies on to give files the directory's group. fix_cache_permissions.sh instead made it 777 and re-grouped it to the invoking user's group, undoing that. It now runs setup_cache.sh for /var/cache/ledmatrix and keeps its own handling of ~/.ledmatrix_cache. Dropped: /var/cache/ledmatrix/ placeholder_logos (nothing reads it) and the checks against the `daemon` user (no service runs as daemon). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * ci: pin actions/checkout in the Claude workflows, drop template comments claude.yml and claude-code-review.yml used actions/checkout@v4 while test.yml and release-version-check.yml pin the v4.2.2 commit SHA; they now pin the same SHA. The commented-out starter-template settings (prompt, claude_args, paths, author filter) are removed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(scripts): index every script and list removal candidates New scripts/README.md gives one line per top-level script and scripts directory, marked keep, dev-only or diagnostic, and lists the eight scripts nothing in the repo refers to as candidates for removal (kept for now). The install, utils and dev READMEs now list the files they were missing. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: tighten two checks that mutation testing showed were too loose - The wifi sudoers check matched `visudo -c -f "$TEMP_SUDOERS"` in the error report too, so replacing the check with `if false` still passed. It now requires the command as the condition. - The summary test never had the setup access point up, so reinstating the bogus "Password: ledmatrix123" line went unnoticed. A case with hostapd active now checks the AP is described as open. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(permissions): describe the repaired fix_perms scripts and new WiFi grants Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): docs-scripts Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
160 lines
6.7 KiB
Python
160 lines
6.7 KiB
Python
"""The captive portal's fixed-argument sudo calls must be granted.
|
|
|
|
The installers write two allow-lists, /etc/sudoers.d/ledmatrix_web and
|
|
ledmatrix_wifi. A sudo call absent from both needs a password, which a service
|
|
cannot supply, so it fails.
|
|
|
|
Four such calls were ungranted, all of them captive-portal teardown/setup:
|
|
|
|
sysctl -w net.ipv4.ip_forward=0|1 wifi_manager.py:788, 883
|
|
nft add|delete table ip ledmatrix wifi_manager.py:835, 895
|
|
rfkill unblock wifi wifi_manager.py:1811
|
|
mkdir -p .../dnsmasq-shared.d wifi_manager.py:922
|
|
|
|
The drop-in written into that directory was missing too: the literal
|
|
`cp /tmp/ledmatrix-nm-dnsmasq.conf .../dnsmasq-shared.d/ledmatrix-captive.conf`
|
|
and `rm -f` of the same file, so the directory was granted but not the file.
|
|
|
|
It goes unnoticed because a stock Raspberry Pi image ships
|
|
/etc/sudoers.d/010_pi-nopasswd granting the default user
|
|
`ALL=(ALL) NOPASSWD: ALL`, which satisfies every gap in both files. It only
|
|
bites once that blanket rule is removed or the service runs as another user.
|
|
|
|
Scope, deliberately narrow: this pins the commands above, each of which
|
|
can be written out literally. The portal makes further sudo calls whose
|
|
arguments are built at runtime -- iptables and nft rules carrying an interface
|
|
name and a port, `ip addr`, `ip link` -- and those cannot be granted safely
|
|
here. A rule covering them needs a trailing wildcard, and
|
|
`iptables --modprobe=/path/to/anything` runs that path as root, so
|
|
`NOPASSWD: iptables *` is a root shell for the web user by another name.
|
|
Closing that half needs a privileged helper that builds the rules itself and
|
|
takes only an interface and a port, granted the way safe_plugin_rm.sh already
|
|
is. That is a design decision, not a one-line grant, and belongs in its own
|
|
change.
|
|
"""
|
|
import re
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
ROOT = Path(__file__).resolve().parent.parent
|
|
INSTALLERS = (
|
|
ROOT / "first_time_install.sh",
|
|
ROOT / "scripts" / "install" / "configure_wifi_permissions.sh",
|
|
# The ledmatrix_web rules, which first_time_install.sh and
|
|
# configure_web_sudo.sh both take from here.
|
|
ROOT / "scripts" / "install" / "lib_sudoers.sh",
|
|
)
|
|
|
|
#: Commands this change grants, each fully literal in the source.
|
|
REQUIRED = (
|
|
("sysctl", "-w", "net.ipv4.ip_forward=0"),
|
|
("sysctl", "-w", "net.ipv4.ip_forward=1"),
|
|
("nft", "add", "table", "ip", "ledmatrix"),
|
|
("nft", "delete", "table", "ip", "ledmatrix"),
|
|
("rfkill", "unblock", "wifi"),
|
|
("mkdir", "-p", "/etc/NetworkManager/dnsmasq-shared.d"),
|
|
# The drop-in that directory exists for, written and removed by
|
|
# _write_nm_dnsmasq_captive_conf / _remove_nm_dnsmasq_captive_conf.
|
|
("cp", "/tmp/ledmatrix-nm-dnsmasq.conf",
|
|
"/etc/NetworkManager/dnsmasq-shared.d/ledmatrix-captive.conf"),
|
|
("rm", "-f", "/etc/NetworkManager/dnsmasq-shared.d/ledmatrix-captive.conf"),
|
|
)
|
|
|
|
#: Tools with an option that executes a program of the caller's choosing.
|
|
#: A trailing wildcard on any of these is a privilege escalation.
|
|
EXEC_CAPABLE = ("iptables", "ip6tables", "nft", "tcpdump", "find", "awk",
|
|
"sed", "perl", "python", "python3", "env")
|
|
|
|
|
|
def _grant_lines():
|
|
lines = []
|
|
for installer in INSTALLERS:
|
|
if not installer.is_file():
|
|
continue
|
|
for line in installer.read_text(encoding="utf-8", errors="replace").splitlines():
|
|
if "NOPASSWD:" in line:
|
|
lines.append(line.split("NOPASSWD:", 1)[1])
|
|
return lines
|
|
|
|
|
|
def _normalise(rule):
|
|
"""One rule with binary-path variables reduced to bare tool names.
|
|
|
|
Rules are written as `$SYSCTL_PATH -w ...` or `${NFT_PATH} ...`, so
|
|
matching the literal "sysctl" finds nothing and every rule looks absent --
|
|
which is exactly how an earlier version of this test reported six gaps
|
|
that did not exist. Both spellings are handled: shell expands them
|
|
identically, and a check that understood only one silently skipped the
|
|
other.
|
|
"""
|
|
rule = re.sub(r"\$\{?([A-Z][A-Z0-9_]*)_PATH\}?",
|
|
lambda m: m.group(1).lower(), rule)
|
|
return re.sub(r"/usr/(?:s?bin)/", "", rule)
|
|
|
|
|
|
def _granted_commands():
|
|
"""The command each NOPASSWD rule actually grants, normalised.
|
|
|
|
_grant_lines() already returns everything after "NOPASSWD:", so what
|
|
arrives here is the command, possibly preceded by the NOEXEC tag and
|
|
possibly still carrying the closing quote of an `echo "..."` that wrote
|
|
it. Both are stripped so the result is comparable to a plain command.
|
|
"""
|
|
commands = []
|
|
for rule in _grant_lines():
|
|
command = _normalise(rule).strip()
|
|
command = re.sub(r"^NOEXEC:\s*", "", command)
|
|
command = command.rstrip('"').rstrip("'").strip()
|
|
if command:
|
|
commands.append(" ".join(command.split()))
|
|
return commands
|
|
|
|
|
|
def test_the_installers_are_present():
|
|
missing = [str(p.relative_to(ROOT)) for p in INSTALLERS if not p.is_file()]
|
|
assert not missing, f"installer(s) missing: {missing}"
|
|
|
|
|
|
@pytest.mark.parametrize("command", REQUIRED, ids=lambda c: " ".join(c))
|
|
def test_the_command_is_granted(command):
|
|
"""Whole command, not just the binary.
|
|
|
|
Checking only the binary made this far weaker than it looked: with
|
|
`sysctl` present anywhere, deleting the ip_forward=0 grant still passed,
|
|
and the portal would then be unable to restore forwarding on teardown.
|
|
"""
|
|
wanted = " ".join(command)
|
|
granted = _granted_commands()
|
|
# Exact match, not a prefix. A substring search was satisfied by
|
|
# `sysctl -w net.ipv4.ip_forward=0 *`, and that trailing wildcard lets the
|
|
# caller append whatever they like to a command running as root -- a far
|
|
# wider grant than the one this test is meant to be confirming.
|
|
assert wanted in granted, (
|
|
f"no installer grants exactly `{wanted}`; closest matches: "
|
|
+ str([g for g in granted if g.startswith(command[0])])[:200])
|
|
|
|
|
|
def test_no_wildcard_on_a_tool_that_can_exec():
|
|
"""`NOPASSWD: iptables *` hands the web user root.
|
|
|
|
iptables --modprobe=/path runs that path as root. This caught a grant added
|
|
in this very change, which is why it is here.
|
|
"""
|
|
offenders = []
|
|
for rule in _grant_lines():
|
|
rule = rule.strip()
|
|
if not rule.endswith("*"):
|
|
continue
|
|
# Normalised the same way as everything else: `${NFT_PATH} *` left a
|
|
# brace before the tool name, and the word-boundary check below does
|
|
# not treat "{" as a boundary, so that spelling slipped through.
|
|
haystack = _normalise(rule).lower()
|
|
for tool in EXEC_CAPABLE:
|
|
if re.search(rf"(^|/|\s|\$){tool}(\s|$)", haystack):
|
|
offenders.append(rule)
|
|
break
|
|
assert not offenders, (
|
|
"wildcard grant on a tool that can execute another program:\n "
|
|
+ "\n ".join(offenders))
|