mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +00:00
* fix(errors): record the exception's own stack trace record_error() called traceback.format_exc(), which only sees an exception while its except block is running. plugin_executor records exceptions caught on a worker thread after that block has ended, so every trace on /errors read "NoneType: None". The trace is now built from the exception's __traceback__. The executor's log call had the same problem with exc_info=True and now passes the exception. record_error() also merged LEDMatrixError context into the caller's dict in place; it now works on a copy. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(wifi): point at configure_wifi_permissions.sh instead of a sudoers list The module docstring told users to grant NOPASSWD sudo on iptables and ip. configure_wifi_permissions.sh refuses those grants on purpose: a wildcard rule for either runs an arbitrary program as root. Point at the script and say why it leaves them out. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): disconnect finds the saved profile by SSID disconnect_from_network() asked `nmcli -f NAME,802-11-wireless.ssid connection show` for the profile to take down, but nmcli rejects that column for `connection show`, so the lookup always failed and only the device was disconnected. The per-profile lookup _connect_nmcli() already used is now _find_profile_for_ssid(), and both callers share it. It also splits terse output on the last colon and unescapes "\:", so a profile name containing a colon is found. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): write wifi_config.json atomically and report a failed save _save_config() opened the file for writing in place and swallowed any error, so a wifi_config.json left owned by root made the web toggle for auto-enabling AP mode report success while nothing was saved, and a crash mid-write could truncate the file. It now uses atomic_write_json, which also keeps the file's owner and shared group when root saves it, and returns False on failure. POST /wifi/ap/auto-enable answers 500 in that case. The file is now written with indent=4, like the other config files. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(fonts): resolve plugin:// fonts in the plugin's own directory FontManager looked for a plugin's bundled fonts under Path("plugins") / plugin_id: relative to the process cwd, and not the default install directory (plugin-repos/), so a manifest's plugin:// fonts never loaded. register_plugin_fonts() takes an optional plugin_dir, and PluginManager passes the directory it loaded the plugin from. Callers that omit it get a lookup in the configured plugin_system.plugins_directory, then plugins/, resolved against the install root. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(api-helper): cache responses for the requested cache_ttl APIHelper.get(cache_ttl=...) and set_cache(ttl=...) dropped the ttl on the claim that CacheManager does not support one, but CacheManager.set() takes a ttl, stores it with the entry, and both cache tiers honour it over a reader's max_age. Without it every response expired after the 300-second default read age, whatever the plugin asked for. The ttl is now passed through, and the cache read passes cache_ttl as max_age for entries written without one. The class docstring describes what the helper actually does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(style): one scale range for the schema, element_scale and LogoHelper The generated Scale field allowed 0.1 to 10, element_style's reader capped at 10 with no floor, and LogoHelper accepted 0.05 to 8 and reset anything else to 1.0. A logo scale of 9, which the form accepts, drew at the shipped size. MIN_ELEMENT_SCALE / MAX_ELEMENT_SCALE (0.1, 10.0) in src.element_style are now the schema bounds and the clamp every reader applies through coerce_scale(): a positive number outside the range is clamped, and anything that is not a finite positive number means the default. That also stops element_scale() passing NaN through, since min(nan, 10.0) is nan. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(logos): placeholder lands at the requested path; empty logos list download_missing_logo() wrote its fallback placeholder to <normalize_abbreviation(abbr)>.png in the logo directory rather than to the logo_path the caller passed, so it could return True while nothing existed where the plugin looks (e.g. "TA&M.png" vs "TAANDM.png"). create_placeholder_logo() takes an optional filepath, and download_missing_logo passes the requested one. download_missing_logo_for_team() only caught KeyError, so a team whose "logos" list is empty raised IndexError; it now treats KeyError, IndexError and TypeError as "no logo URL". The placeholder is drawn with PLACEHOLDER_SIZE / PLACEHOLDER_BG, the constants is_placeholder_logo() recognises it by, instead of repeated literals. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(fonts): resolve bundled font paths against the install root TextHelper's default font_dir, the logo placeholder's font and FontManager's font_overrides.json were all relative to the process cwd, so a process started anywhere but the install root (the plugin safety harness, a manual run, a unit without WorkingDirectory) drew with PIL's default face and read no overrides. They now go through font_layout.resolve_asset_path; the overrides file sits in the install root's config/. The resolver docstrings described an order the code does not follow: resolve_asset_path never consults the cwd, and sports_shared's _resolve_font_path tries the cwd first. Both docstrings now say what the code does, and _resolve_font_path calls resolve_asset_path instead of probing FontManager for it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(sync): the web UI reads the sync status file the display writes sync_manager writes its status to tempfile.gettempdir(), but GET /api/v3/sync/status read a hardcoded /tmp/led_matrix_sync_status.json and defaulted the port to a literal 5765. Wherever TMPDIR is set (or on any non-/tmp host) the page only ever showed "starting". The endpoint now uses sync_manager.STATUS_FILE and SYNC_PORT. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(http): the rankings resolver sends the project's User-Agent DynamicTeamResolver fetched ESPN rankings with a bare requests.get, so it sent python-requests' default User-Agent, which ESPN rejects; the AP_TOP_N favourites then resolved to nothing. It now sends DEFAULT_HTTP_HEADERS. BaseOddsManager carried its own copy of the User-Agent string and now uses the same shared headers (which also adds Accept-Language). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(backup): record the core release and read the configured plugin dir The manifest's ledmatrix_version came from a VERSION file that does not exist, then from .git/HEAD: a 12-character sha, or "ref: refs/he" when the branch's ref was packed. It is now src.__version__. list_installed_plugins() scanned a hardcoded plugin-repos/, so on an install whose plugin_system.plugins_directory points elsewhere, plugins missing from plugin_state.json were left out of the backup. It now reads the configured directory from config/config.json, defaulting to plugin-repos. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(startup): report a missing display section once A config without a display section produced three errors for the one problem ("Missing required configuration key: display", "Display configuration is missing or empty" and "Display configuration is missing"), and an empty one produced two. _validate_config now reports it once, as a missing key or an empty section, and _validate_display_config leaves it to that. The module docstring said the validator fails fast; nothing in the display service calls raise_on_errors(), so it now says the errors are reported and startup continues. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(wifi): share the copied blocks and name the AP constants - _parse_nmcli_wifi_list() is the one parser behind _scan_nmcli and _scan_nmcli_cached. - _verify_connected(), _wait_for_device_idle(), _failsafe_ap() and _mark_forced() replace blocks that were pasted two or three times in the connect and enable-AP paths. The device-idle wait now checks before its first one-second sleep instead of after it. - _check_command() calls _find_command_path() instead of repeating it. - AP_IP, PORTAL_PORT, AP_PROFILE_NAME and AP_PROFILE_NAMES name values that were spelled out 14, 12, 8 and 2 times; the two deletion loops now walk the same tuple. The iwconfig status path compares the AP address exactly: startswith() also skipped 192.168.4.10-19. - Dropped a second WIFI.SIGNAL query that repeated the first, a no-op "if ssid: continue", the try/except around _connect_wpa_supplicant's constant return, and a second save of a scan scan_networks already saves. - _ensure_wifi_radio_enabled's docstring says it returns True when the radio state cannot be read at all. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(config): drop dead branches and history comments in ConfigManager - The module docstring pointed plugin authors at update_plugin_config(), which does not exist; it now names save_config_atomic() and save_raw_file_content(). - load_config's FileNotFoundError handler tested the message for "config_secrets.json", but a missing secrets file is handled where it is read, so only config.json reaches it; the check is gone. - save_raw_file_content's `file_type == "main" or "secrets"` guard was always true (anything else raised earlier). - get_raw_file_content('secrets') already returns {} for a missing file, so the os.path.exists() in front of two calls to it is gone. - Comments that narrated earlier behaviour are rewritten as what the code does now. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(background-data): present-tense comments, drop unused API - Comments that told the history of each fix (what "used to" happen, "the old per-delivery release") now state the invariant the code keeps. - get_statistics() no longer reports a constant 'queue_size': 0, and the uncalled clear_completed_requests() is gone (_cleanup_completed_requests does that job on every completion). Neither is referenced in core, the web UI or the plugin monorepo. shutdown_background_service() has no production caller either, but it is the only way to tear down the get_background_service() singleton, which the tests rely on, so it stays. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(odds): drop the unread cache_ttl and merge the odds_data branches BaseOddsManager loaded base_odds_manager.cache_ttl from config and never used it: cached odds live for the update interval (get_odds' ttl=interval). No core or monorepo code reads the attribute, so it is gone along with its log line. The two consecutive `if odds_data:` blocks are one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(backup): one table for the single-file sections config, secrets, wifi and ytm_auth were each spelled out in create, preview, validate and restore. _SINGLE_FILE_SECTIONS lists them once, with the RestoreOptions flag that restores each, and all four walk it. Restore error messages keep their wording ("Failed to restore <file name>"). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(fonts): drop FontManager's write-only state and duplicate logs - fonts_config, font_metadata and font_dependencies were written and never read; the performance_stats keys font_load_times, render_times, total_renders and the per-call "resolve" timings (_record_performance_metric) likewise. get_performance_stats() reads only the counters that remain. Nothing in core or the plugin monorepo references any of them. - A failed BDF load was logged twice, by _load_bdf_font and again by get_font; get_font's line is the one kept. - Removed "NEW:" and commented-out cozette entries, the "Copy font to assets/fonts" comment on code that copies nothing, and local imports of names the module already imports. The deprecated add_font() now resolves assets/fonts against the install root. The @deprecated methods stay. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(text-helper): cache loaded fonts; drop the pre-textlength fallback TextHelper declared _font_cache, cleared it and reported its size, but never stored anything in it. load_fonts() now keeps each (file, size) it loads there, so clear_font_cache() and get_font_cache_stats() mean what they say and repeated load_fonts() calls reuse the fonts. get_text_width() no longer catches AttributeError for Pillow releases without ImageDraw.textlength; requirements.txt pins Pillow>=12.2. The class docstring describes what the helper does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(common): fix wrong docstrings in api_helper, permission_utils, snapshot_policy - permission_utils called 0o2775 "sticky bit"; the 2 is setgid, which is what makes new files take the directory's group. - snapshot_policy pointed at web_interface/blueprints/api_v3.py, which is a package now; the health check is in api_v3/misc.py. - APIHelper.clear_cache() lost a history note and a fallback to a clear() method that neither CacheManager nor the testing MockCacheManager has. The session headers are built from DEFAULT_HTTP_HEADERS instead of a copy of them, and the module docstring says what the module offers. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(sports): present-tense comments in the shared scoreboard renderers - sports_scroll and sports_game_renderer comments that referred to "this PR", "the old flat 128px card" or what the renderer "previously" did now describe the current behaviour and its reason. - The block explaining why non-finite settings are rejected sat above _score_reserve_width; it describes _center_gap_width and now lives in it. - unshare_element_fonts wrapped its import of font_layout.load_truetype in an `except ImportError` that cannot fire inside core; the import stays at call time so tests can spy on the pinned loader. - sports_card docstrings that told the history of a fix say what the code does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sports-shared): drop dead code, name the ESPN limit - _get_weeks_data asked for limit=1000, which fetch_espn_scoreboard clamps to ESPN_MAX_LIMIT anyway; it now names that constant. Its unused `immediate_events = []` is gone. - _get_season_schedule_dates() returned ("", "") and has no caller in core or the plugin monorepo. - _should_log keeps its warning_type parameter (part of the inherited signature, though nothing in core or the monorepo calls it) and its docstring says the cooldown is shared across types. - An unused ImageFont import is gone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sync): one follower-mode switch, shared panel defaults - The class docstring said the leader sends PNG frames. Frames go over UDP as raw RGB; PNG is only the Vegas scroll image sent over TCP. It now describes both paths. - _enter_follower_mode() replaces the two copies of "note the leader, switch from standalone to follower, log, write status" in the frame and scroll-position handlers. - The rows/cols fallbacks use DEFAULT_ROWS / DEFAULT_COLS from src.display_geometry, as chain_length already did. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(style): drop _layout_axis, name the layout group title - ElementStyleResolver._layout_axis() had no caller in core or the plugin monorepo. - _element_block_from_spec checked spec['size'] was a dict again after size_spec already had; it reads size_spec. - The "Layout Offsets" title written into three generated schema blocks is _LAYOUT_TITLE. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(logo-helper): say what the placeholder draws; name the 1.5 box factor - _create_placeholder_logo's docstring said it draws the team abbreviation; it draws an outlined grey box and nothing else. The docstring says so, and the "in a real implementation you'd want text" comments are gone. - The 1.5 x panel default logo box, written out six times, is DEFAULT_LOGO_BOX_FACTOR. - ImageDraw is imported with Image at the top of the module. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(logos): drop dead code and a duplicate regex in logo_downloader - _SAFE_LEAGUE_CODE_RE was the same pattern as _SAFE_LEAGUE_RE; both checks use the one. - get_logo_filename_variations reassigned the TA&M case to the list it already had; the function returns the two names directly. - _get_team_name_variations() had no caller in core or the plugin monorepo. - fetch_single_team's docstring was copied from fetch_teams_data; a log message read "for{team_id}". Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor: drop the Pillow<9.1 resample shim and a catch-and-reraise - adaptive_images fell back to Image.LANCZOS/NEAREST for Pillow < 9.1; requirements.txt pins Pillow>=12.2. RESAMPLE_LANCZOS and RESAMPLE_NEAREST keep their names (src.common re-exports them). - CacheManager.save_cache caught CacheError only to re-raise it; the disk write is now called directly, with the same result. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(api-helper): stop the real CacheManager's cleanup thread The cache-lifetime tests built a CacheManager and left its cleanup thread's class-wide claim on the directory in place, which broke test_cache_cleanup_thread_ownership when it ran later in the session. The fixture now stops the thread on teardown. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): core-common Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
486 lines
20 KiB
Python
486 lines
20 KiB
Python
"""
|
|
Unit tests for WiFi AP mode — src.wifi_manager.
|
|
|
|
Each test exercises logic that can be verified through the subprocess calls the
|
|
manager emits, without requiring root access, hardware, or a running Pi.
|
|
|
|
Scenarios covered:
|
|
1. nmcli AP profile is created with no security parameters (open/passwordless).
|
|
2. iptables PREROUTING and INPUT rules are added when the nmcli AP starts.
|
|
3. iptables rules and ip_forward are reverted when the AP is torn down.
|
|
4. LED matrix message includes the SSID, 'No password', and the setup URL.
|
|
5. Known AP profile names are deleted before the new profile is created.
|
|
6. Wi-Fi passwords are not written to wifi_config.json, and old ones are scrubbed.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from src.wifi_manager import WiFiManager
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Helpers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _ok(stdout: str = "", stderr: str = "") -> MagicMock:
|
|
r = MagicMock()
|
|
r.returncode = 0
|
|
r.stdout = stdout
|
|
r.stderr = stderr
|
|
return r
|
|
|
|
|
|
def _fail(stdout: str = "", stderr: str = "error") -> MagicMock:
|
|
r = MagicMock()
|
|
r.returncode = 1
|
|
r.stdout = stdout
|
|
r.stderr = stderr
|
|
return r
|
|
|
|
|
|
def _find_path_side_effect(name: str) -> str:
|
|
"""Deterministic fake for _find_command_path."""
|
|
return {"iptables": "/usr/sbin/iptables", "sysctl": "/usr/sbin/sysctl"}.get(
|
|
name, f"/usr/bin/{name}"
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Fixtures
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.fixture()
|
|
def wifi_config(tmp_path: Path) -> Path:
|
|
"""Minimal wifi_config.json in a temporary directory."""
|
|
cfg_dir = tmp_path / "config"
|
|
cfg_dir.mkdir()
|
|
cfg = {
|
|
"ap_ssid": "LEDMatrix-Setup",
|
|
"ap_channel": 7,
|
|
"auto_enable_ap_mode": True,
|
|
}
|
|
p = cfg_dir / "wifi_config.json"
|
|
p.write_text(json.dumps(cfg))
|
|
return p
|
|
|
|
|
|
@pytest.fixture()
|
|
def manager(wifi_config: Path, tmp_path: Path) -> WiFiManager:
|
|
"""
|
|
WiFiManager with all system calls stubbed out during construction and the
|
|
ip_forward save file redirected to a per-test temporary path.
|
|
"""
|
|
with patch("src.wifi_manager.subprocess.run", return_value=_ok(stdout="wlan0\n")):
|
|
mgr = WiFiManager(config_path=wifi_config)
|
|
|
|
# Force clean, deterministic state regardless of what __init__ inferred
|
|
mgr._wifi_interface = "wlan0"
|
|
mgr.has_nmcli = True
|
|
mgr.has_hostapd = False
|
|
mgr.has_dnsmasq = False
|
|
mgr.has_iwlist = False
|
|
# Redirect the ip_forward save file to tmp so tests never share state
|
|
mgr._IP_FORWARD_SAVE_PATH = tmp_path / "ip_fwd_saved"
|
|
return mgr
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 1. AP profile is open (no password)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.mark.unit
|
|
def test_nmcli_ap_profile_has_no_security_params(manager: WiFiManager) -> None:
|
|
"""
|
|
The 'nmcli connection add' command must not include key-mgmt, psk, or any
|
|
WPA-related parameter. On Bookworm/Trixie, NM creates a WPA2-protected
|
|
hotspot even when those values are set to 'none'/empty via a later
|
|
'connection modify', so the profile must be created without a security
|
|
section from the start.
|
|
"""
|
|
captured: list[list[str]] = []
|
|
|
|
def _run(cmd, **kw):
|
|
captured.append(list(cmd))
|
|
return _ok()
|
|
|
|
with patch("src.wifi_manager.subprocess.run", side_effect=_run), \
|
|
patch.object(manager, "disconnect_from_network", return_value=(True, "ok")), \
|
|
patch.object(manager, "_setup_iptables_redirect", return_value=True), \
|
|
patch.object(manager, "_get_ap_status_nmcli",
|
|
return_value={"active": True, "ip": "192.168.4.1"}), \
|
|
patch.object(manager, "_show_led_message"):
|
|
|
|
success, _ = manager._enable_ap_mode_nmcli_hotspot()
|
|
|
|
assert success, "AP enable should report success"
|
|
|
|
add_calls = [c for c in captured if "nmcli" in c and "connection" in c and "add" in c]
|
|
assert add_calls, "Expected at least one 'nmcli connection add' invocation"
|
|
|
|
add_str = " ".join(add_calls[0])
|
|
assert "key-mgmt" not in add_str, "AP profile must not set key-mgmt"
|
|
assert "psk" not in add_str, "AP profile must not include a PSK/password"
|
|
assert "wpa" not in add_str.lower(), "AP profile must not reference WPA"
|
|
assert "802-11-wireless.mode" in add_str, "AP profile must declare wireless mode"
|
|
# Verify the value for 802-11-wireless.mode is exactly "ap" — check the element
|
|
# that immediately follows the key in the command list, not a loose substring match.
|
|
cmd = add_calls[0]
|
|
try:
|
|
mode_idx = cmd.index("802-11-wireless.mode")
|
|
assert cmd[mode_idx + 1] == "ap", \
|
|
f"802-11-wireless.mode value must be exactly 'ap', got {cmd[mode_idx + 1]!r}"
|
|
except ValueError:
|
|
pytest.fail("802-11-wireless.mode not found as a list element in nmcli command")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 2. iptables NAT rules are added when the AP starts
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.mark.unit
|
|
def test_iptables_nat_rules_added_on_ap_start(manager: WiFiManager) -> None:
|
|
"""
|
|
_setup_iptables_redirect must add:
|
|
- a PREROUTING REDIRECT rule that maps incoming TCP port 80 to port 5000, and
|
|
- an INPUT ACCEPT rule for port 5000 (the post-redirect destination port,
|
|
NOT port 80 which never hits the INPUT chain after PREROUTING rewrites it).
|
|
"""
|
|
captured: list[list[str]] = []
|
|
|
|
def _run(cmd, **kw):
|
|
captured.append(list(cmd))
|
|
# iptables -C (check) → rc=1 so the -A (add) branch executes
|
|
if "iptables" in " ".join(str(x) for x in cmd) and "-C" in cmd:
|
|
return _fail()
|
|
return _ok()
|
|
|
|
# Patch Path.read_text so /proc/sys/net/ipv4/ip_forward is readable on any OS
|
|
with patch("src.wifi_manager.subprocess.run", side_effect=_run), \
|
|
patch.object(manager, "_find_command_path", side_effect=_find_path_side_effect), \
|
|
patch("pathlib.Path.read_text", return_value="0\n"):
|
|
|
|
result = manager._setup_iptables_redirect()
|
|
|
|
assert result, "_setup_iptables_redirect must return True on success"
|
|
|
|
prerouting_adds = [c for c in captured if "iptables" in " ".join(c) and "-A" in c and "PREROUTING" in c]
|
|
assert prerouting_adds, "Expected 'iptables -A PREROUTING' invocation"
|
|
pr_str = " ".join(prerouting_adds[0])
|
|
assert "--dport" in pr_str and "80" in pr_str, "PREROUTING rule must match dport 80"
|
|
assert "5000" in pr_str, "PREROUTING rule must redirect to port 5000"
|
|
assert "REDIRECT" in pr_str, "PREROUTING rule must use REDIRECT target"
|
|
|
|
input_adds = [c for c in captured if "iptables" in " ".join(c) and "-A" in c and "INPUT" in c]
|
|
assert input_adds, "Expected 'iptables -A INPUT' invocation"
|
|
in_str = " ".join(input_adds[0])
|
|
assert "5000" in in_str, "INPUT rule must accept port 5000 (post-PREROUTING destination)"
|
|
assert "ACCEPT" in in_str, "INPUT rule must use ACCEPT target"
|
|
|
|
# Port 80 must NOT be used in the INPUT rule (it is already redirected by PREROUTING)
|
|
input_80 = [c for c in captured if "iptables" in " ".join(c) and "INPUT" in c and "--dport" in c and "80" in c]
|
|
assert not input_80, "INPUT rule must target port 5000, not port 80"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 3a. iptables rules and ip_forward reverted on teardown
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.mark.unit
|
|
def test_iptables_rules_and_ip_forward_reverted_on_teardown(manager: WiFiManager) -> None:
|
|
"""
|
|
_teardown_iptables_redirect must:
|
|
- remove the PREROUTING and INPUT iptables rules, and
|
|
- restore ip_forward to the exact value recorded in the save file.
|
|
"""
|
|
original_fwd = "0"
|
|
manager._IP_FORWARD_SAVE_PATH.write_text(original_fwd)
|
|
# Teardown dispatches on the backend recorded during setup
|
|
manager._redirect_backend = "iptables"
|
|
|
|
captured: list[list[str]] = []
|
|
|
|
with patch("src.wifi_manager.subprocess.run",
|
|
side_effect=lambda cmd, **kw: (captured.append(list(cmd)) or _ok())), \
|
|
patch.object(manager, "_find_command_path", side_effect=_find_path_side_effect):
|
|
|
|
manager._teardown_iptables_redirect()
|
|
|
|
assert [c for c in captured if "iptables" in " ".join(c) and "-D" in c and "PREROUTING" in c], \
|
|
"Expected 'iptables -D PREROUTING' invocation"
|
|
|
|
assert [c for c in captured if "iptables" in " ".join(c) and "-D" in c and "INPUT" in c], \
|
|
"Expected 'iptables -D INPUT' invocation"
|
|
|
|
restore_calls = [
|
|
c for c in captured
|
|
if "sysctl" in " ".join(c) and f"ip_forward={original_fwd}" in " ".join(c)
|
|
]
|
|
assert restore_calls, f"Expected sysctl to restore ip_forward to {original_fwd!r}"
|
|
|
|
assert not manager._IP_FORWARD_SAVE_PATH.exists(), \
|
|
"Save file must be removed after successful teardown"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 3b. ip_forward untouched when no save file exists
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.mark.unit
|
|
def test_ip_forward_not_restored_when_save_file_absent(manager: WiFiManager) -> None:
|
|
"""
|
|
When the save file is missing (setup never wrote it, e.g. because /proc was
|
|
unreadable or the write failed), teardown must NOT call sysctl so it does not
|
|
accidentally clobber ip_forward state owned by a VPN or NetworkManager.
|
|
"""
|
|
assert not manager._IP_FORWARD_SAVE_PATH.exists()
|
|
|
|
captured: list[list[str]] = []
|
|
|
|
with patch("src.wifi_manager.subprocess.run",
|
|
side_effect=lambda cmd, **kw: (captured.append(list(cmd)) or _ok())), \
|
|
patch.object(manager, "_find_command_path", side_effect=_find_path_side_effect):
|
|
|
|
manager._teardown_iptables_redirect()
|
|
|
|
sysctl_calls = [
|
|
c for c in captured
|
|
if "sysctl" in " ".join(c) and "ip_forward" in " ".join(c)
|
|
]
|
|
assert not sysctl_calls, \
|
|
"sysctl must not be called when no ip_forward save file exists"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 4. LED message content
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.mark.unit
|
|
def test_led_message_shows_ssid_no_password_and_url(manager: WiFiManager) -> None:
|
|
"""
|
|
When the nmcli AP activates, the LED message must include:
|
|
- the AP SSID ('LEDMatrix-Setup')
|
|
- the string 'No password'
|
|
- the AP IP address (192.168.4.1) and Flask port (5000)
|
|
"""
|
|
led_messages: list[str] = []
|
|
|
|
with patch("src.wifi_manager.subprocess.run", return_value=_ok()), \
|
|
patch.object(manager, "disconnect_from_network", return_value=(True, "ok")), \
|
|
patch.object(manager, "_setup_iptables_redirect", return_value=True), \
|
|
patch.object(manager, "_get_ap_status_nmcli",
|
|
return_value={"active": True, "ip": "192.168.4.1"}), \
|
|
patch.object(manager, "_show_led_message",
|
|
side_effect=lambda msg, **kw: led_messages.append(msg)):
|
|
|
|
success, _ = manager._enable_ap_mode_nmcli_hotspot()
|
|
|
|
assert success, "AP enable should report success"
|
|
assert led_messages, "Expected at least one _show_led_message call"
|
|
|
|
combined = "\n".join(led_messages)
|
|
assert "No password" in combined, "LED message must say 'No password'"
|
|
assert "LEDMatrix-Setup" in combined, "LED message must include the AP SSID"
|
|
assert "192.168.4.1" in combined, "LED message must include the AP IP address"
|
|
assert "5000" in combined, "LED message must include the Flask port"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 5. Stale AP profiles deleted before the new one is created
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.mark.unit
|
|
def test_existing_ap_profiles_deleted_before_new_profile_created(manager: WiFiManager) -> None:
|
|
"""
|
|
Before 'nmcli connection add', the manager must issue
|
|
'nmcli connection down/delete' for every known AP profile name so stale
|
|
profiles (from a previous crash or partial setup) cannot block the new one.
|
|
"""
|
|
captured: list[list[str]] = []
|
|
|
|
def _run(cmd, **kw):
|
|
captured.append(list(cmd))
|
|
return _ok()
|
|
|
|
with patch("src.wifi_manager.subprocess.run", side_effect=_run), \
|
|
patch.object(manager, "disconnect_from_network", return_value=(True, "ok")), \
|
|
patch.object(manager, "_setup_iptables_redirect", return_value=True), \
|
|
patch.object(manager, "_get_ap_status_nmcli",
|
|
return_value={"active": True, "ip": "192.168.4.1"}), \
|
|
patch.object(manager, "_show_led_message"):
|
|
|
|
success, _ = manager._enable_ap_mode_nmcli_hotspot()
|
|
|
|
assert success
|
|
|
|
cmd_strs = [" ".join(c) for c in captured]
|
|
|
|
for profile in ("LEDMatrix-Setup-AP", "Hotspot", "TickerSetup-AP"):
|
|
assert any("connection delete" in s and profile in s for s in cmd_strs), \
|
|
f"Expected 'nmcli connection delete {profile}' before creating the new profile"
|
|
|
|
add_indices = [i for i, s in enumerate(cmd_strs) if "connection add" in s]
|
|
del_indices = [i for i, s in enumerate(cmd_strs) if "connection delete" in s]
|
|
|
|
assert add_indices, "Expected 'nmcli connection add' call"
|
|
assert del_indices, "Expected 'nmcli connection delete' calls"
|
|
assert max(del_indices) < min(add_indices), \
|
|
"All connection deletions must complete before the new profile is created"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 6. Wi-Fi passwords are not kept in wifi_config.json
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.mark.unit
|
|
def test_loading_scrubs_plaintext_saved_networks(wifi_config: Path) -> None:
|
|
"""Older versions wrote every joined network's password to the config in
|
|
plaintext and never read it back. Loading must remove it from disk."""
|
|
cfg = json.loads(wifi_config.read_text())
|
|
cfg["saved_networks"] = [
|
|
{"ssid": "HomeNet", "password": "hunter22", "saved_at": 0},
|
|
]
|
|
wifi_config.write_text(json.dumps(cfg))
|
|
|
|
with patch("src.wifi_manager.subprocess.run", return_value=_ok(stdout="wlan0\n")):
|
|
mgr = WiFiManager(config_path=wifi_config)
|
|
|
|
assert "saved_networks" not in mgr.config
|
|
assert "hunter22" not in wifi_config.read_text()
|
|
on_disk = json.loads(wifi_config.read_text())
|
|
assert "saved_networks" not in on_disk
|
|
# Everything else survives the scrub.
|
|
assert on_disk["ap_ssid"] == "LEDMatrix-Setup"
|
|
assert on_disk["auto_enable_ap_mode"] is True
|
|
|
|
|
|
@pytest.mark.unit
|
|
def test_default_config_has_no_saved_networks(tmp_path: Path) -> None:
|
|
config_path = tmp_path / "config" / "wifi_config.json"
|
|
config_path.parent.mkdir()
|
|
|
|
with patch("src.wifi_manager.subprocess.run", return_value=_ok(stdout="wlan0\n")):
|
|
WiFiManager(config_path=config_path)
|
|
|
|
assert "saved_networks" not in json.loads(config_path.read_text())
|
|
|
|
|
|
@pytest.mark.unit
|
|
def test_save_config_reports_a_failed_write(manager: WiFiManager, tmp_path: Path) -> None:
|
|
# A directory where the file should be: every write to it fails, as one
|
|
# to a root-owned wifi_config.json does for the web user.
|
|
blocked = tmp_path / "blocked.json"
|
|
blocked.mkdir()
|
|
manager.config_path = blocked
|
|
|
|
assert manager._save_config() is False
|
|
assert list(tmp_path.glob(".blocked.json.tmp.*")) == []
|
|
|
|
|
|
@pytest.mark.unit
|
|
def test_save_config_round_trips(manager: WiFiManager) -> None:
|
|
manager.config["auto_enable_ap_mode"] = False
|
|
|
|
assert manager._save_config() is True
|
|
assert json.loads(manager.config_path.read_text())["auto_enable_ap_mode"] is False
|
|
|
|
|
|
@pytest.mark.unit
|
|
def test_connecting_does_not_store_the_password(manager: WiFiManager) -> None:
|
|
commands = []
|
|
|
|
def fake_run(cmd, *args, **kwargs):
|
|
commands.append(cmd)
|
|
# No existing profile for the SSID, so a new connection is created.
|
|
if cmd[:3] == ["nmcli", "connection", "show"] and "HomeNet" in cmd:
|
|
return _fail()
|
|
return _ok(stdout="")
|
|
|
|
with patch("src.wifi_manager.subprocess.run", side_effect=fake_run), \
|
|
patch("src.wifi_manager.time.sleep"), \
|
|
patch.object(manager, "_show_led_message"):
|
|
manager._connect_nmcli("HomeNet", "hunter22")
|
|
|
|
assert ["nmcli", "device", "wifi", "connect", "HomeNet", "password", "hunter22"] in commands, \
|
|
"the new-connection path was not reached"
|
|
assert "hunter22" not in json.dumps(manager.config)
|
|
assert "hunter22" not in manager.config_path.read_text()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 7. Disconnect takes the saved profile down
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _profile_nmcli(profiles: dict):
|
|
"""A fake subprocess.run for `nmcli connection show` over ``profiles``
|
|
(profile name -> SSID), recording every command it is given."""
|
|
commands = []
|
|
|
|
def fake_run(cmd, *args, **kwargs):
|
|
commands.append(cmd)
|
|
if cmd == ["nmcli", "-t", "-f", "NAME,TYPE", "connection", "show"]:
|
|
lines = [name.replace(":", "\\:") + ":802-11-wireless" for name in profiles]
|
|
lines.append("Wired connection 1:802-3-ethernet")
|
|
return _ok(stdout="\n".join(lines) + "\n")
|
|
if cmd[:4] == ["nmcli", "-g", "802-11-wireless.ssid", "connection"]:
|
|
return _ok(stdout=profiles.get(cmd[-1], "") + "\n")
|
|
if cmd[:3] == ["nmcli", "connection", "show"]:
|
|
return _ok() if cmd[3] in profiles else _fail()
|
|
# nmcli rejects 802-11-wireless.ssid as a `connection show -f` column.
|
|
if "802-11-wireless.ssid" in cmd:
|
|
return _fail(stderr="Error: invalid field '802-11-wireless.ssid'")
|
|
return _ok()
|
|
|
|
return fake_run, commands
|
|
|
|
|
|
@pytest.mark.unit
|
|
def test_find_profile_for_ssid_matches_by_ssid_not_name(manager: WiFiManager) -> None:
|
|
fake_run, _ = _profile_nmcli({"home: upstairs": "HomeNet", "Office": "OfficeNet"})
|
|
with patch("src.wifi_manager.subprocess.run", side_effect=fake_run):
|
|
assert manager._find_profile_for_ssid("HomeNet") == "home: upstairs"
|
|
assert manager._find_profile_for_ssid("OfficeNet") == "Office"
|
|
assert manager._find_profile_for_ssid("Elsewhere") is None
|
|
|
|
|
|
@pytest.mark.unit
|
|
def test_disconnect_takes_the_profile_down(manager: WiFiManager) -> None:
|
|
from src.wifi_manager import WiFiStatus
|
|
|
|
fake_run, commands = _profile_nmcli({"Home profile": "HomeNet"})
|
|
with patch("src.wifi_manager.subprocess.run", side_effect=fake_run), \
|
|
patch("src.wifi_manager.time.sleep"), \
|
|
patch.object(manager, "get_wifi_status",
|
|
return_value=WiFiStatus(connected=True, ssid="HomeNet")):
|
|
ok, _ = manager.disconnect_from_network(skip_ap_check=True)
|
|
|
|
assert ok
|
|
assert ["nmcli", "connection", "down", "Home profile"] in commands
|
|
assert ["nmcli", "device", "disconnect", "wlan0"] in commands
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 8. The nmcli Wi-Fi list parser both scan paths share
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.mark.unit
|
|
def test_nmcli_wifi_list_parsing() -> None:
|
|
out = (
|
|
"HomeNet:40:WPA2:2437 MHz\n"
|
|
"Cafe:80::5180 MHz\n"
|
|
"HomeNet:90:WPA2:5180 MHz\n" # duplicate SSID: first line wins
|
|
":70:WPA2:2412 MHz\n" # hidden network
|
|
"Broken:notanumber:WPA2:2412 MHz\n"
|
|
"Modern:60:WPA3 SAE:5745 MHz\n"
|
|
)
|
|
networks = WiFiManager._parse_nmcli_wifi_list(out)
|
|
assert [(n.ssid, n.signal, n.security, n.frequency) for n in networks] == [
|
|
("Cafe", 80, "open", 5180.0),
|
|
("Modern", 60, "wpa3", 5745.0),
|
|
("HomeNet", 40, "wpa2", 2437.0),
|
|
]
|