fix(api-v3): address CodeRabbit findings from the blueprint-split review

Fixes to the api_v3 package split (PR #553), one per finding verified
against the actual code:

- __init__.py: _redact_credentials only blanked scalar values under a
  credential-named key; a bare list of secrets under such a key (e.g.
  tokens: ["a", "b"]) passed through untouched, since the list branch
  recursed with no memory that its key looked like a credential. Nested
  dicts still walk normally (a documented, tested behaviour -- a container
  like secrets: {api_key: ..., note: ...} is a section name, not a value to
  blank outright), but any value reached under a credential-shaped key is
  now actually blanked.

- __init__.py: the OAuth helper script's raw stderr/stdout went to
  logger.error unredacted (CWE-532) right next to a comment claiming this
  was deliberate; the HTTP response already used the existing redact_text
  helper. Routed the log line through the same helper.

- __init__.py / starlark.py: the standalone Starlark manifest fallback
  (used when the plugin instance isn't loaded) read-modified-wrote
  manifest.json with no lock, unlike StarlarkAppsPlugin._update_manifest_safe
  (plugin-repos/starlark-apps/manager.py), which already holds an flock for
  the same file when the plugin is loaded. Added _starlark_manifest_lock,
  mirroring that pattern, and wrapped every standalone read-modify-write
  call site in it. The app-config update route also wrote config.json and
  the manifest as two separate, non-transactional writes (a second,
  distinct finding at the same call site); config.json is now rolled back
  if the manifest write that follows it fails.

- backup.py: restore options used bare bool() on values from the request,
  so {"restore_secrets": "false"} restored secrets anyway (bool("false") is
  True). Switched to the existing _coerce_to_bool helper already used for
  this exact purpose elsewhere in the package.

- config.py: an automated import-rewrite mangled four user-facing
  validation strings and their neighbouring comments -- "Invalid start
  time" had become "Invalid start _pkg.time" (and likewise for "end time")
  in both the schedule and dim-schedule per-day validation paths.

- display.py: `import _pkg.time as time_module` -- _pkg is a local alias
  for the package, not a real importable module, so this raised
  ModuleNotFoundError whenever a caller restarted an already-running
  display service via /display/on-demand/start, after the on-demand
  request was already written to cache. Fixed to `import time`. Audited
  the rest of the package for the same `_pkg.<module>` import mistake;
  every other `_pkg.` reference is a legitimate attribute read-through
  (`_pkg.time.time()`, `_pkg._get_starlark_plugin()`, ...), not a broken
  import statement.

- fonts.py: validate_file_upload's max_size_mb parameter is silently
  unused by that helper (it only checks filename/extension) -- the font
  upload route saved arbitrarily large files as a result. Added the same
  seek-and-check pattern already used for the sibling .star upload.

- wifi.py: two ad hoc, inconsistent bool coercions. POST
  /wifi/ap/auto-enable used bare bool(), so a JSON string "false" enabled
  it. POST /wifi/radio's enabled/force parsing recognized real bool and
  some strings but not int 1/0 (1 is True is False in Python). Factored one
  small _parse_bool_ish helper local to this file and used it at all three
  sites.

Not changed: the "unknown/misspelled restore option keys default to True"
half of the backup.py finding -- the file's own comment documents that a
missing key deliberately means "restore everything," matching the
already-existing JSON-parse-failure guard a few lines above it; only the
bool-coercion defect was a real bug.

Added or extended regression tests for every fix, following each area's
existing test conventions. Full suite: 4328 passed, 62 skipped, 2 failed
on both this branch and origin/main (missing tzdata package breaks two
timezone-alias tests in test_onboarding_checklist.py, unrelated to this
change) -- no new failures.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S3bPMESe2TfrGvbs1ef9c5

web_interface/blueprints/api_v3/__init__.py

@@ -16,6 +16,8 @@ The route modules are imported at the *bottom*: they import names from here, so
 everything they need has to exist first.
 """
 from flask import Blueprint, request, jsonify, Response
+import contextlib
+import fcntl
 import json
 import os
 import re
@@ -294,12 +296,31 @@ def _redact_credentials(value):
     that round-trips this response cannot erase a secret it never saw.
     """
     if isinstance(value, dict):
-        return {k: ("" if _looks_like_a_credential(k) and not isinstance(v, (dict, list))
+        return {k: (_blank_credential_value(v) if _looks_like_a_credential(k)
                     else _redact_credentials(v))
                 for k, v in value.items()}
     if isinstance(value, list):
         return [_redact_credentials(item) for item in value]
     return value
+def _blank_credential_value(value):
+    """Blank a value that sits under a credential-shaped key.
+
+    A dict is still walked -- `secrets: {api_key: ..., note: ...}` is a
+    section name, not a value to blank in one go, so sub-fields that are not
+    themselves credential-named survive (see
+    test_a_credential_shaped_container_is_still_walked). A scalar list item
+    has no field name to test, though: `_redact_credentials` previously
+    recursed into a list the same way it recurses into a dict, and a scalar
+    is returned unchanged by the base case, so a credential-named key whose
+    value was a bare list of secrets (e.g. `tokens: ["a", "b"]`) passed
+    through with nothing redacted. Blank every scalar reached under this key,
+    at any depth, instead.
+    """
+    if isinstance(value, dict):
+        return _redact_credentials(value)
+    if isinstance(value, list):
+        return [_blank_credential_value(item) for item in value]
+    return ""
 def _validate_time_format(time_str):
     """Validate time format is HH:MM"""
     try:
@@ -1233,12 +1254,11 @@ def _run_calendar_registration(plugin_dir: Path, stdin_payload: str):
             return payload, None
 
     raw = (result.stderr or result.stdout or '').strip()
-    # The unredacted text goes to the log, where it is worth having in full.
-    # What comes back over HTTP is redacted: this is a script that handles
-    # OAuth client secrets, and its stderr can quote them.
+    # Redacted in the log too: this is a script that handles OAuth client
+    # secrets, and its stderr can quote them verbatim (CWE-532).
     if raw:
         logger.error('calendar_registration.py failed (exit %s): %s',
-                     result.returncode, raw)
+                     result.returncode, redact_text(raw))
     return None, 'Authentication script produced no result%s' % (
         ': %s' % redact_text(raw) if raw else '')
 def _resolve_backup_export_dir() -> Path:
@@ -1321,6 +1341,31 @@ def _find_pixlet_binary(explicit_path: Optional[str] = None) -> Optional[str]:
                     return str(bundled)
                 logger.warning("Pixlet bundled binary still not executable after chmod (%s); falling back to PATH", bundled)
     return shutil.which("pixlet")
+@contextlib.contextmanager
+def _starlark_manifest_lock():
+    """Hold an exclusive lock across a standalone starlark-manifest read-modify-write.
+
+    StarlarkAppsPlugin._update_manifest_safe (plugin-repos/starlark-apps/manager.py)
+    already does this -- fcntl.flock held for the whole read-modify-write cycle --
+    when the plugin instance is loaded. These routes fall back to reading and
+    writing manifest.json directly when it is not, and did so with no lock: each
+    _write_starlark_manifest() call is atomic on its own (temp file + rename), but
+    two concurrent requests can each read the manifest, mutate their own copy, and
+    write it back, and the second write silently discards the first's change.
+
+    Callers should do their read, mutation and _write_starlark_manifest() call
+    entirely inside the `with` block, mirroring the plugin's lock scope.
+    """
+    _STARLARK_APPS_DIR.mkdir(parents=True, exist_ok=True)
+    lock_fd = os.open(str(_STARLARK_MANIFEST_FILE), os.O_CREAT | os.O_RDWR, 0o644)
+    try:
+        fcntl.flock(lock_fd, fcntl.LOCK_EX)
+        try:
+            yield
+        finally:
+            fcntl.flock(lock_fd, fcntl.LOCK_UN)
+    finally:
+        os.close(lock_fd)
 def _read_starlark_manifest() -> Dict[str, Any]:
     """Read the starlark-apps manifest.json directly from disk."""
     try:
@@ -1663,22 +1708,23 @@ def _install_star_file(app_id: str, star_file_path: str, metadata: Dict[str, Any
     with open(config_path, 'w') as f:
         json.dump(default_config, f, indent=2)
 
-    manifest = _read_starlark_manifest()
-    manifest.setdefault('apps', {})[app_id] = {
-        'name': metadata.get('name', app_id),
-        'enabled': True,
-        'render_interval': metadata.get('render_interval', 300),
-        'display_duration': metadata.get('display_duration', 15),
-        'config': metadata.get('config', {}),
-        # The filename, not the full path. Readers join this to the app's own
-        # directory and fall back to a bare '<app_id>.star', so an absolute
-        # value gave the key two meanings -- and Path.__truediv__ discards the
-        # left side when the right is absolute, which pinned the manifest to
-        # whatever PROJECT_ROOT installed it. Moving or redeploying the install
-        # then left the app unable to find its own file.
-        'star_file': dest.name,
-    }
-    return _write_starlark_manifest(manifest)
+    with _starlark_manifest_lock():
+        manifest = _read_starlark_manifest()
+        manifest.setdefault('apps', {})[app_id] = {
+            'name': metadata.get('name', app_id),
+            'enabled': True,
+            'render_interval': metadata.get('render_interval', 300),
+            'display_duration': metadata.get('display_duration', 15),
+            'config': metadata.get('config', {}),
+            # The filename, not the full path. Readers join this to the app's own
+            # directory and fall back to a bare '<app_id>.star', so an absolute
+            # value gave the key two meanings -- and Path.__truediv__ discards the
+            # left side when the right is absolute, which pinned the manifest to
+            # whatever PROJECT_ROOT installed it. Moving or redeploying the install
+            # then left the app unable to find its own file.
+            'star_file': dest.name,
+        }
+        return _write_starlark_manifest(manifest)
 def _starlark_virtual_plugins() -> list:
     """Installed Starlark apps, shaped like plugin entries.
 
@@ -1755,14 +1801,15 @@ def _toggle_starlark_app(app_id: str, enabled: bool):
         # Only now is the in-memory copy allowed to disagree with disk.
         plugin.apps[safe_id].manifest['enabled'] = enabled
     else:
-        manifest = _read_starlark_manifest()
-        app_data = manifest.get('apps', {}).get(safe_id)
-        if not app_data:
-            return jsonify({'status': 'error',
-                            'message': f'Starlark app not found: {safe_id}'}), 404
-        app_data['enabled'] = enabled
-        if not _write_starlark_manifest(manifest):
-            return jsonify({'status': 'error', 'message': 'Failed to save manifest'}), 500
+        with _starlark_manifest_lock():
+            manifest = _read_starlark_manifest()
+            app_data = manifest.get('apps', {}).get(safe_id)
+            if not app_data:
+                return jsonify({'status': 'error',
+                                'message': f'Starlark app not found: {safe_id}'}), 404
+            app_data['enabled'] = enabled
+            if not _write_starlark_manifest(manifest):
+                return jsonify({'status': 'error', 'message': 'Failed to save manifest'}), 500
 
     return jsonify({'status': 'success',
                     'message': f"Starlark app {'enabled' if enabled else 'disabled'}",

web_interface/blueprints/api_v3/backup.py

@@ -4,7 +4,7 @@ Routes decorate the shared `api_v3` Blueprint from ._common, so their
 endpoint names are unchanged by living here.
 """
 from web_interface.blueprints.api_v3 import (
-    PROJECT_ROOT, Path, _safe_backup_path, api_v3,
+    PROJECT_ROOT, Path, _coerce_to_bool, _safe_backup_path, api_v3,
     datetime, json, jsonify, logger, os, plugin_store_manager, request,
     tempfile,
 )
@@ -112,13 +112,17 @@ def backup_restore():
                 'status': 'error',
                 'message': 'Invalid options: expected a JSON object',
             }), 400
+        # _coerce_to_bool (not bare bool()) because a request can send these
+        # as JSON strings: bool("false") is True in Python, so a caller who
+        # explicitly asked to skip secrets would have had them restored
+        # anyway.
         options = RestoreOptions(
-            restore_config=bool(opts_dict.get('restore_config', True)),
-            restore_secrets=bool(opts_dict.get('restore_secrets', True)),
-            restore_wifi=bool(opts_dict.get('restore_wifi', True)),
-            restore_fonts=bool(opts_dict.get('restore_fonts', True)),
-            restore_plugin_uploads=bool(opts_dict.get('restore_plugin_uploads', True)),
-            reinstall_plugins=bool(opts_dict.get('reinstall_plugins', True)),
+            restore_config=_coerce_to_bool(opts_dict.get('restore_config', True)),
+            restore_secrets=_coerce_to_bool(opts_dict.get('restore_secrets', True)),
+            restore_wifi=_coerce_to_bool(opts_dict.get('restore_wifi', True)),
+            restore_fonts=_coerce_to_bool(opts_dict.get('restore_fonts', True)),
+            restore_plugin_uploads=_coerce_to_bool(opts_dict.get('restore_plugin_uploads', True)),
+            reinstall_plugins=_coerce_to_bool(opts_dict.get('reinstall_plugins', True)),
         )
         with tempfile.NamedTemporaryFile(suffix='.zip', delete=False) as tmp:
             tmp_path = tmp.name

web_interface/blueprints/api_v3/config.py

@@ -84,7 +84,7 @@ def save_schedule_config():
             start_time = data.get('start_time', '07:00')
             end_time = data.get('end_time', '23:00')
 
-            # Validate _pkg.time formats
+            # Validate time formats
             is_valid, error_msg = _validate_time_format(start_time)
             if not is_valid:
                 return error_response(
@@ -148,12 +148,12 @@ def save_schedule_config():
                     else:
                         end_time = '23:00'
 
-                    # Validate _pkg.time formats
+                    # Validate time formats
                     is_valid, error_msg = _validate_time_format(start_time)
                     if not is_valid:
                         return error_response(
                             ErrorCode.VALIDATION_ERROR,
-                            f"Invalid start _pkg.time for {day}: {error_msg}",
+                            f"Invalid start time for {day}: {error_msg}",
                             status_code=400
                         )
 
@@ -161,7 +161,7 @@ def save_schedule_config():
                     if not is_valid:
                         return error_response(
                             ErrorCode.VALIDATION_ERROR,
-                            f"Invalid end _pkg.time for {day}: {error_msg}",
+                            f"Invalid end time for {day}: {error_msg}",
                             status_code=400
                         )
 
@@ -313,7 +313,7 @@ def save_dim_schedule_config():
             start_time = data.get('start_time', '20:00')
             end_time = data.get('end_time', '07:00')
 
-            # Validate _pkg.time formats
+            # Validate time formats
             is_valid, error_msg = _validate_time_format(start_time)
             if not is_valid:
                 return error_response(
@@ -365,12 +365,12 @@ def save_dim_schedule_config():
                     start_time = data.get(start_key) or '20:00'
                     end_time = data.get(end_key) or '07:00'
 
-                    # Validate _pkg.time formats
+                    # Validate time formats
                     is_valid, error_msg = _validate_time_format(start_time)
                     if not is_valid:
                         return error_response(
                             ErrorCode.VALIDATION_ERROR,
-                            f"Invalid start _pkg.time for {day}: {error_msg}",
+                            f"Invalid start time for {day}: {error_msg}",
                             status_code=400
                         )
 
@@ -378,7 +378,7 @@ def save_dim_schedule_config():
                     if not is_valid:
                         return error_response(
                             ErrorCode.VALIDATION_ERROR,
-                            f"Invalid end _pkg.time for {day}: {error_msg}",
+                            f"Invalid end time for {day}: {error_msg}",
                             status_code=400
                         )
 

web_interface/blueprints/api_v3/display.py

@@ -227,7 +227,7 @@ def start_on_demand_display():
         
         # Stop the display service first to ensure clean state when we will restart it
         if service_was_running and start_service:
-            import _pkg.time as time_module
+            import time as time_module
             logger.debug("Stopping display service before starting on-demand mode")
             _stop_display_service()
             # Wait a brief moment for the service to fully stop

web_interface/blueprints/api_v3/fonts.py

@@ -168,15 +168,30 @@ def upload_font():
         if font_file.filename == '':
             return jsonify({'status': 'error', 'message': 'No file selected'}), 400
 
-        # Validate filename
+        # Validate filename. validate_file_upload takes max_size_mb but only
+        # checks the filename/extension with it -- it never looks at the
+        # actual upload size, so the size limit below is enforced separately
+        # before the file is saved (same pattern as the .star upload above).
+        MAX_FONT_SIZE_MB = 10
         is_valid, error_msg = validate_file_upload(
             font_file.filename,
-            max_size_mb=10,
+            max_size_mb=MAX_FONT_SIZE_MB,
             allowed_extensions=['.ttf', '.otf', '.bdf']
         )
         if not is_valid:
             return jsonify({'status': 'error', 'message': error_msg}), 400
 
+        # Check file size (stated limit is MAX_FONT_SIZE_MB)
+        font_file.seek(0, 2)  # Seek to end
+        file_size = font_file.tell()
+        font_file.seek(0)  # Reset to beginning
+        max_font_size_bytes = MAX_FONT_SIZE_MB * 1024 * 1024
+        if file_size > max_font_size_bytes:
+            return jsonify({
+                'status': 'error',
+                'message': f'File too large (max {MAX_FONT_SIZE_MB}MB, got {file_size / 1024 / 1024:.1f}MB)'
+            }), 400
+
         font_family = request.form.get('font_family', '')
 
         if not font_family:

web_interface/blueprints/api_v3/starlark.py

@@ -5,7 +5,7 @@ endpoint names are unchanged by living here.
 """
 from web_interface.blueprints.api_v3 import (
     PROJECT_ROOT, Path, _find_pixlet_binary, _install_star_file, _standalone_render_starlark_app,
-    _starlark_github_token, _validate_and_sanitize_app_id,
+    _starlark_github_token, _starlark_manifest_lock, _validate_and_sanitize_app_id,
     _validate_starlark_app_path, _validate_timing_value, api_v3, describe_exception, json, jsonify,
     logger, os, request, shutil, subprocess, tempfile,
 )
@@ -294,9 +294,10 @@ def uninstall_starlark_app(app_id):
             import shutil
             if app_dir.exists():
                 shutil.rmtree(app_dir)
-            manifest = _pkg._read_starlark_manifest()
-            manifest.get('apps', {}).pop(app_id, None)
-            success = _pkg._write_starlark_manifest(manifest)
+            with _starlark_manifest_lock():
+                manifest = _pkg._read_starlark_manifest()
+                manifest.get('apps', {}).pop(app_id, None)
+                success = _pkg._write_starlark_manifest(manifest)
 
         if success:
             return jsonify({'status': 'success', 'message': f'App uninstalled: {app_id}'})
@@ -430,52 +431,70 @@ def update_starlark_app_config(app_id):
             else:
                 return jsonify({'status': 'error', 'message': 'Failed to save configuration'}), 500
 
-        # Standalone: update both config.json and manifest
-        manifest = _pkg._read_starlark_manifest()
-        app_data = manifest.get('apps', {}).get(app_id)
-        if not app_data:
-            return jsonify({'status': 'error', 'message': f'App not found: {app_id}'}), 404
+        # Standalone: update both config.json and manifest. Both live under
+        # the manifest lock (serialized against every other standalone
+        # manifest read-modify-write -- see _starlark_manifest_lock), and if
+        # the manifest write fails after config.json was already written,
+        # config.json is rolled back so the two do not end up out of sync.
+        with _starlark_manifest_lock():
+            manifest = _pkg._read_starlark_manifest()
+            app_data = manifest.get('apps', {}).get(app_id)
+            if not app_data:
+                return jsonify({'status': 'error', 'message': f'App not found: {app_id}'}), 404
 
-        # Extract timing keys (they go in manifest, not config.json)
-        render_interval = data.pop('render_interval', None)
-        display_duration = data.pop('display_duration', None)
+            # Extract timing keys (they go in manifest, not config.json)
+            render_interval = data.pop('render_interval', None)
+            display_duration = data.pop('display_duration', None)
 
-        # Update manifest with timing values
-        if render_interval is not None:
-            app_data['render_interval'] = render_interval
-        if display_duration is not None:
-            app_data['display_duration'] = display_duration
+            # Update manifest with timing values
+            if render_interval is not None:
+                app_data['render_interval'] = render_interval
+            if display_duration is not None:
+                app_data['display_duration'] = display_duration
 
-        # Load current config from config.json. app_dir is the path
-        # _validate_starlark_app_path checked, not a fresh join.
-        config_file = app_dir / "config.json"
-        current_config = {}
-        if config_file.exists():
+            # Load current config from config.json. app_dir is the path
+            # _validate_starlark_app_path checked, not a fresh join.
+            config_file = app_dir / "config.json"
+            existed_before = config_file.exists()
+            previous_config_bytes = None
+            current_config = {}
+            if existed_before:
+                try:
+                    previous_config_bytes = config_file.read_bytes()
+                    current_config = json.loads(previous_config_bytes)
+                except Exception as e:
+                    logger.warning(f"Failed to load config for {app_id}: {e}")
+
+            # Update config with new values (excluding timing keys)
+            current_config.update(data)
+
+            # Write updated config to config.json
             try:
-                with open(config_file, 'r') as f:
-                    current_config = json.load(f)
+                with open(config_file, 'w') as f:
+                    json.dump(current_config, f, indent=2)
             except Exception as e:
-                logger.warning(f"Failed to load config for {app_id}: {e}")
+                logger.error(f"Failed to save config.json for {app_id}: {e}")
+                logger.exception("Failed to save Starlark configuration for %r", app_id)
+                return jsonify({'status': 'error', 'message': 'Failed to save configuration',
+                                'details': describe_exception(e)}), 500
 
-        # Update config with new values (excluding timing keys)
-        current_config.update(data)
+            # Also update manifest for backward compatibility
+            app_data.setdefault('config', {}).update(data)
 
-        # Write updated config to config.json
-        try:
-            with open(config_file, 'w') as f:
-                json.dump(current_config, f, indent=2)
-        except Exception as e:
-            logger.error(f"Failed to save config.json for {app_id}: {e}")
-            logger.exception("Failed to save Starlark configuration for %r", app_id)
-            return jsonify({'status': 'error', 'message': 'Failed to save configuration',
-                            'details': describe_exception(e)}), 500
+            if _pkg._write_starlark_manifest(manifest):
+                return jsonify({'status': 'success', 'message': 'Configuration updated', 'config': current_config})
 
-        # Also update manifest for backward compatibility
-        app_data.setdefault('config', {}).update(data)
-
-        if _pkg._write_starlark_manifest(manifest):
-            return jsonify({'status': 'success', 'message': 'Configuration updated', 'config': current_config})
-        else:
+            # The manifest write failed after config.json was already
+            # written -- roll config.json back rather than leave the two
+            # disagreeing about what was saved.
+            try:
+                if existed_before and previous_config_bytes is not None:
+                    config_file.write_bytes(previous_config_bytes)
+                elif not existed_before:
+                    config_file.unlink(missing_ok=True)
+            except OSError:
+                logger.exception(
+                    "Failed to roll back config.json for %r after manifest write failure", app_id)
             return jsonify({'status': 'error', 'message': 'Failed to save manifest'}), 500
 
     except Exception as e:
@@ -503,19 +522,20 @@ def toggle_starlark_app(app_id):
             return jsonify({'status': 'success', 'message': f"App {'enabled' if enabled else 'disabled'}", 'enabled': enabled})
 
         # Standalone: update manifest directly
-        manifest = _pkg._read_starlark_manifest()
-        app_data = manifest.get('apps', {}).get(app_id)
-        if not app_data:
-            return jsonify({'status': 'error', 'message': f'App not found: {app_id}'}), 404
+        with _starlark_manifest_lock():
+            manifest = _pkg._read_starlark_manifest()
+            app_data = manifest.get('apps', {}).get(app_id)
+            if not app_data:
+                return jsonify({'status': 'error', 'message': f'App not found: {app_id}'}), 404
 
-        enabled = data.get('enabled')
-        if enabled is None:
-            enabled = not app_data.get('enabled', True)
-        app_data['enabled'] = enabled
-        if _pkg._write_starlark_manifest(manifest):
-            return jsonify({'status': 'success', 'message': f"App {'enabled' if enabled else 'disabled'}", 'enabled': enabled})
-        else:
-            return jsonify({'status': 'error', 'message': 'Failed to save'}), 500
+            enabled = data.get('enabled')
+            if enabled is None:
+                enabled = not app_data.get('enabled', True)
+            app_data['enabled'] = enabled
+            if _pkg._write_starlark_manifest(manifest):
+                return jsonify({'status': 'success', 'message': f"App {'enabled' if enabled else 'disabled'}", 'enabled': enabled})
+            else:
+                return jsonify({'status': 'error', 'message': 'Failed to save'}), 500
 
     except Exception as e:
         logger.exception("[Starlark] toggle_starlark_app failed")

web_interface/blueprints/api_v3/wifi.py

@@ -8,6 +8,36 @@ from web_interface.blueprints.api_v3 import (
 )
 
 
+def _parse_bool_ish(value, default=False):
+    """Coerce a JSON value that is supposed to be a boolean.
+
+    A JSON boolean arrives as a real Python bool, but these routes are a
+    public HTTP contract and not every caller sends one. `bool(value)` gets
+    two common cases wrong: `bool("false")` is True (a non-empty string is
+    always truthy), and a plain int does not match an `is True` check
+    (`1 is True` is False, since `True` is a distinct singleton from the int
+    `1`) -- so a caller sending `{"enabled": 1}` was silently treated as
+    False. Recognizes a real bool, "true"/"false"/"1"/"0"/"yes"/"no"
+    case-insensitively, and int 1/0; anything else falls back to `default`.
+    """
+    if isinstance(value, bool):
+        return value
+    if isinstance(value, str):
+        lowered = value.strip().lower()
+        if lowered in ('true', '1', 'yes'):
+            return True
+        if lowered in ('false', '0', 'no'):
+            return False
+        return default
+    if isinstance(value, int):
+        if value == 1:
+            return True
+        if value == 0:
+            return False
+        return default
+    return default
+
+
 # WiFi Management Endpoints
 @api_v3.route('/wifi/status', methods=['GET'])
 def get_wifi_status():
@@ -273,7 +303,7 @@ def set_auto_enable_ap_mode():
                 'message': 'auto_enable_ap_mode is required'
             }), 400
 
-        auto_enable = bool(data['auto_enable_ap_mode'])
+        auto_enable = _parse_bool_ish(data['auto_enable_ap_mode'], default=False)
 
         wifi_manager = WiFiManager()
         wifi_manager.config["auto_enable_ap_mode"] = auto_enable
@@ -330,13 +360,12 @@ def set_wifi_radio():
                 'message': 'enabled is required'
             }), 400
 
-        # Parse defensively: bool("false") is True, so mirror the string-aware
-        # coercion used for `force` — the endpoint is a public contract, not just
-        # the shipped UI (which always sends real JSON booleans).
-        _enabled_raw = data['enabled']
-        enabled = _enabled_raw is True or (isinstance(_enabled_raw, str) and _enabled_raw.lower() in ('true', '1', 'yes'))
-        _force_raw = data.get('force', False)
-        force = _force_raw is True or (isinstance(_force_raw, str) and _force_raw.lower() in ('true', '1', 'yes'))
+        # Parse defensively: bool("false") is True and a plain int never
+        # matches `is True`, so `_parse_bool_ish` handles bool, string and
+        # int 1/0 — the endpoint is a public contract, not just the shipped
+        # UI (which always sends real JSON booleans).
+        enabled = _parse_bool_ish(data['enabled'], default=False)
+        force = _parse_bool_ish(data.get('force', False), default=False)
 
         wifi_manager = WiFiManager()
         success, message, reason = wifi_manager.set_wifi_radio(enabled, force=force)