mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +00:00
* feat(tools): manage the MQTT bridge and Pixlet editor from the Tools tab PR #544's change, ported onto the api_v3 package split (#553). Identical behaviour; only the placement of the new code differs. The original added 508 lines to web_interface/blueprints/api_v3.py, which #553 deletes, so every hunk of it would conflict irreconcilably. Ported by AST: 26 new top-level items sorted to where the split puts each kind -- __init__.py 2 imports, 11 constants, 7 helpers starlark.py 4 routes (/starlark/editor/{apps,status,start,stop}) misc.py 2 routes (/integrations/mqtt-bridge{,/config}) Everything outside api_v3.py -- the Tools partial, the installer scripts, the JS tests -- applied unchanged. Routes: 111 from the split plus these 6 = 117, and the url-map snapshot is regenerated to match, which is exactly what test_api_v3_url_map.py is designed to make you do when routes are added. Full Python suite: 4,278 passed, 68 skipped, 0 failed. The JS tests this PR ships could not be run here -- node is not installed on this machine -- so test/js/dom/test_tools_sections.js is unverified. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014RRtqXDCnvnY6EQwhT5CV9 * fix(starlark): don't crash the pixlet editor's start/stop routes, and honor an operator-set PIXLET_EDITOR_HOST The AST-based port of #544 onto the api_v3 package split dropped `time` from starlark.py's import list. start_pixlet_editor() and stop_pixlet_editor() both call time.time()/time.sleep() directly, so every start (NameError building `state['started_at']`) and every stop that has to wait out the EXIT trap crashed with a 500. No test caught it because the route's own tests mock subprocess.Popen but never actually invoked it before now. Also carries over #544's later fix that this port branched before: env['PIXLET_EDITOR_HOST'] = '0.0.0.0' unconditionally overrode an operator who had already pinned PIXLET_EDITOR_HOST to loopback, forcing the unauthenticated `pixlet serve` process onto the LAN regardless (CodeQL CWE-1188). Switched to env.setdefault(...), same as api_v3.starlark.py's siblings already do for _pkg-owned names. Both fixes route the shared _pkg.time reference the rest of the package's route modules already use for anything a test might need to patch, rather than a bare `import time` local to this file. Ported the existing regression test from #544 (TestPixletEditorHostDefaultsButDoesNotOverride) onto this branch's module layout (web_interface.blueprints.api_v3.starlark instead of the old monolithic api_v3 module), which is what caught the NameError. Full suite: 4330 passed, 62 skipped, 2 failed -- identical on this branch and on origin/main (missing tzdata package breaks two timezone-alias tests in test_onboarding_checklist.py, unrelated to this change). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(api-v3): clear the six lint errors this rebase introduced All six were introduced by rebasing this branch onto the merged blueprint split, not by the split itself. Confirmed by diffing pyflakes output against main with line numbers normalised -- everything else it reports is present on main too and is the package's deliberate re-export pattern. starlark.py used _STARLARK_APPS_DIR three times without importing it (F821). The rebase resolved an import-list conflict as a union of both sides, and that symbol was on neither side of the conflict hunk, so it was silently lost. It is defined in __init__.py and is now imported like its neighbours. This was the only one of the six that would fail at runtime rather than merely lint. __init__.py imported contextlib twice (F811): the cherry-pick added one next to the existing import. Removed the duplicate; the original at line 19 is used. __init__.py imported signal purely to re-export it to starlark.py, so pyflakes saw it as unused (F401). signal is stdlib and does not need routing through the blueprint package, so starlark.py imports it directly and __init__.py no longer does. contextlib stays re-exported because this module genuinely uses it. _read_mqtt_bridge_config()'s local `config` shadowed the `config` submodule this module imports at the bottom for its route side effects (F811). Renamed to `settings`, with a comment saying why, since the name is otherwise the obvious one to reach for. Verified: pyflakes now reports nothing on this branch that main does not, the package imports, all nine route modules load, and 117 routes register, matching the pinned URL-map snapshot. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(api-v3): reject MQTT bridge bodies the endpoint cannot apply Two CodeRabbit findings on the bridge settings endpoint, both of which returned 200 while doing something other than what the caller asked. `request.get_json(silent=True) or {}` turned a missing or unparseable body -- and the JSON literals null, [] and false -- into an empty dict, which then satisfied the isinstance(data, dict) guard on the very next line. The guard was there to reject exactly those bodies. Dropping the `or {}` lets None fail it. The same `or {}` on /errors/clear is left alone: its docstring documents the body as optional, so an absent body legitimately means "use the defaults". The difference is that saving settings has nothing sensible to do with no body. `if data.get('clear_password'):` accepted any truthy value, and the string "false" is truthy in Python -- so a client echoing the field back as a string wiped a password it meant to keep. Now coerced through the package's existing _coerce_to_bool, which already maps 'true'/'on'/'1'/'yes' and nothing else. test_mqtt_bridge_config_endpoint.py covers both: five unusable body shapes plus a missing body, and clear_password across truthy and falsy spellings. Verified against the unfixed code -- reverting the body guard fails 5, reverting the coercion fails 3. Not changed here: CodeRabbit also asks this endpoint to reject MQTT credentials when TLS is off (CWE-319). That is a policy decision about the feature rather than a defect -- unencrypted MQTT on a trusted LAN is common and often deliberate -- so it is raised on the PR for a maintainer call instead. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix: work through the remaining review findings on the editor and bridge allow_insecure_mqtt (CWE-319, requested): a password with TLS disabled crosses the network in cleartext. Refused now rather than merely warned about -- but refused, not forbidden, because unencrypted MQTT on a trusted LAN is a normal deliberate setup. allow_insecure_mqtt is the explicit acknowledgement, defaults false, and is coerced like the other booleans so the string "false" cannot switch the guard off. starlark.py:796 -- the supported service runs Flask threaded, so two start requests could each see running=False, each launch an editor, and the second state write replace the first PID, orphaning a process that holds the display down with nothing recording it. The check-launch-write sequence now takes a module-level lock. starlark.py:848 -- if the state write failed the route returned success with an editor running and no PID recorded: status and stop both reported no session while the display stayed down until the timeout expired. It now terminates the process group and returns an error. starlark.py:890 -- SIGKILL gives the script's EXIT trap no chance to run, so nothing hands the display back, yet the response said "the display is restarting". After an escalation the display is now restarted explicitly, and a failure to do so returns an error naming the manual step instead of a success. pixlet_config_editor.sh:184 -- find_pixlet supports Darwin but macOS ships no timeout(1); GNU coreutils installs it as gtimeout. Resolved up front so the failure lands before the display is stopped rather than after. pixlet_config_editor.sh:154 -- wildcard, loopback and an explicit interface address are three cases, not two. Collapsing the last two printed a URL saying "localhost" whenever PIXLET_EDITOR_HOST named a LAN address. tools.html:1254 -- escHtml does not encode single quotes, and the app id was interpolated into an inline onclick="startPixletEditor('...')", so a directory containing an apostrophe could break out of the JS string and run script. The handler binds with addEventListener and reads the id from dataset, where it is only ever parsed as an HTML attribute. Tests: test_mqtt_bridge_config_endpoint.py grows to 23 cases covering the opt-in in both directions. The tools DOM suite gains three guards asserting the edit buttons carry no inline onclick and pass the id via dataset -- those need jsdom and did not run here, so CI verifies them. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(api-v3): log the traceback on the editor state-write failure The 848 fix answers 500 when the session state cannot be written, and logged that at error level -- but without exc_info, so the traceback never reached the log. test_web_error_detail.py guards exactly this: a handler returning 5xx must write an error-level record *with* the traceback and return the sanitized detail, because checking that merely something was logged is too weak. Caught by Core unit tests on the previous commit, not locally: the guard parses every module under web_interface/blueprints/api_v3 as one source, so it only fires once the whole package is read together. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
517 lines
21 KiB
Python
517 lines
21 KiB
Python
"""Routes with no larger group of their own: errors, integrations,
|
|
cache, sync, skins, logs, health and hardware.
|
|
|
|
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 (
|
|
_coerce_to_bool,
|
|
ErrorCode, Path, _JOURNALCTL, _MQTT_BRIDGE_CONFIG, _MQTT_BRIDGE_DEFAULTS,
|
|
_MQTT_BRIDGE_DIR, _SUDO, _coerce_mqtt_bridge_value,
|
|
_get_display_service_status, _mqtt_bridge_service_state,
|
|
_read_mqtt_bridge_config, api_v3, contextlib, describe_exception,
|
|
error_response, get_error_aggregator, json, jsonify, logger, os, request,
|
|
subprocess, success_response, tempfile,
|
|
)
|
|
import web_interface.blueprints.api_v3 as _pkg
|
|
# Read through the module rather than bound by value: tests patch these
|
|
# as module attributes, and a value binding would not see the patch.
|
|
# Several are also called from helpers that live in __init__, so the
|
|
# package is the only patch point that covers every caller.
|
|
|
|
|
|
@api_v3.route('/health', methods=['GET'])
|
|
def get_health():
|
|
"""Get system health status"""
|
|
try:
|
|
health_status = {
|
|
'status': 'healthy',
|
|
'timestamp': _pkg.time.time(),
|
|
'services': {},
|
|
'checks': {}
|
|
}
|
|
|
|
# Check web interface service
|
|
# Stamp the start _pkg.time before measuring against it -- reading it with a
|
|
# fallback of _pkg.time.time() and only assigning afterwards made the very
|
|
# first call subtract two separate clock reads, reporting a small
|
|
# negative uptime.
|
|
if not hasattr(get_health, '_start_time'):
|
|
get_health._start_time = _pkg.time.time()
|
|
health_status['services']['web_interface'] = {
|
|
'status': 'running',
|
|
'uptime_seconds': _pkg.time.time() - get_health._start_time
|
|
}
|
|
|
|
# Check display service
|
|
display_service_status = _get_display_service_status()
|
|
health_status['services']['display_service'] = {
|
|
'status': 'active' if display_service_status.get('active') else 'inactive',
|
|
'details': display_service_status
|
|
}
|
|
|
|
# Check config file accessibility
|
|
try:
|
|
if api_v3.config_manager:
|
|
test_config = api_v3.config_manager.load_config()
|
|
health_status['checks']['config_file'] = {
|
|
'status': 'accessible',
|
|
'readable': True
|
|
}
|
|
else:
|
|
health_status['checks']['config_file'] = {
|
|
'status': 'unknown',
|
|
'readable': False
|
|
}
|
|
except Exception as e:
|
|
health_status['checks']['config_file'] = {
|
|
'status': 'error',
|
|
'readable': False,
|
|
'error': 'see logs for details'
|
|
}
|
|
|
|
# Check plugin system
|
|
try:
|
|
if api_v3.plugin_manager:
|
|
# Try to discover plugins (lightweight check)
|
|
plugin_count = len(api_v3.plugin_manager.get_available_plugins()) if hasattr(api_v3.plugin_manager, 'get_available_plugins') else 0
|
|
health_status['checks']['plugin_system'] = {
|
|
'status': 'operational',
|
|
'plugin_count': plugin_count
|
|
}
|
|
else:
|
|
health_status['checks']['plugin_system'] = {
|
|
'status': 'not_initialized'
|
|
}
|
|
except Exception as e:
|
|
health_status['checks']['plugin_system'] = {
|
|
'status': 'error',
|
|
'error': 'see logs for details'
|
|
}
|
|
|
|
# Check hardware connectivity (if display manager available)
|
|
try:
|
|
snapshot_path = "/tmp/led_matrix_preview.png"
|
|
if os.path.exists(snapshot_path):
|
|
# Check if snapshot is recent (updated in last 60 seconds)
|
|
mtime = os.path.getmtime(snapshot_path)
|
|
age_seconds = _pkg.time.time() - mtime
|
|
health_status['checks']['hardware'] = {
|
|
'status': 'connected' if age_seconds < 60 else 'stale',
|
|
'snapshot_age_seconds': round(age_seconds, 1)
|
|
}
|
|
else:
|
|
health_status['checks']['hardware'] = {
|
|
'status': 'no_snapshot',
|
|
'note': 'Display service may not be running'
|
|
}
|
|
except Exception as e:
|
|
health_status['checks']['hardware'] = {
|
|
'status': 'unknown',
|
|
'error': 'see logs for details'
|
|
}
|
|
|
|
# Determine overall health
|
|
all_healthy = all(
|
|
check.get('status') in ['accessible', 'operational', 'connected', 'running', 'active']
|
|
for check in health_status['checks'].values()
|
|
)
|
|
|
|
if not all_healthy:
|
|
health_status['status'] = 'degraded'
|
|
|
|
return jsonify({'status': 'success', 'data': health_status})
|
|
except Exception as e:
|
|
logger.error("%s failed", request.path, exc_info=True)
|
|
return jsonify({
|
|
'status': 'error',
|
|
'message': 'An error occurred; see logs for details',
|
|
'details': describe_exception(e),
|
|
'data': {'status': 'unhealthy'}
|
|
}), 500
|
|
@api_v3.route('/hardware/status', methods=['GET'])
|
|
def get_hardware_status():
|
|
"""Return LED matrix hardware initialization status written by display_manager at startup."""
|
|
status_path = "/tmp/led_matrix_hw_status.json" # nosec B108
|
|
try:
|
|
with open(status_path) as f:
|
|
hw_data = json.load(f)
|
|
return jsonify({"status": "success", "data": hw_data})
|
|
except FileNotFoundError:
|
|
return jsonify({"status": "success", "data": {"ok": None, "error": "Display service not yet started"}})
|
|
except PermissionError:
|
|
logger.warning("Permission denied reading hardware status file; display service may be running as a different user")
|
|
return jsonify({"status": "success", "data": {"ok": False, "error": "Hardware status temporarily unavailable"}})
|
|
except json.JSONDecodeError:
|
|
logger.error("Failed to parse hardware status file", exc_info=True)
|
|
return jsonify({"status": "success", "data": {"ok": False, "error": "Hardware status file corrupted"}})
|
|
except Exception:
|
|
logger.error("Unexpected error reading hardware status", exc_info=True)
|
|
return jsonify({"status": "error", "message": "Unable to read hardware status"}), 500
|
|
@api_v3.route('/skins', methods=['GET'])
|
|
def list_skins():
|
|
"""List installed visual skins (docs/SKIN_SYSTEM.md).
|
|
|
|
Optional ?plugin_id=... filters to skins matching that plugin.
|
|
"""
|
|
try:
|
|
from src.skin_system import skin_runtime
|
|
|
|
plugin_id = request.args.get('plugin_id')
|
|
if plugin_id:
|
|
skins = skin_runtime.skins_for_plugin(plugin_id)
|
|
else:
|
|
# The discovery cache self-invalidates on directory/manifest
|
|
# mtime changes, so no force_refresh — keeps Pi disk I/O down.
|
|
skins = skin_runtime.discover_skins()
|
|
|
|
payload = []
|
|
for skin_id, manifest in sorted(skins.items()):
|
|
skin_dir = Path(manifest['_skin_dir'])
|
|
preview = manifest.get('preview')
|
|
payload.append({
|
|
'id': skin_id,
|
|
'name': manifest.get('name', skin_id),
|
|
'version': manifest.get('version'),
|
|
'author': manifest.get('author'),
|
|
'description': manifest.get('description', ''),
|
|
'skin_api_version': manifest.get('skin_api_version'),
|
|
'targets': manifest.get('targets', {}),
|
|
'modes': manifest.get('modes', []),
|
|
'has_preview': bool(preview and (skin_dir / preview).is_file()),
|
|
})
|
|
return jsonify({'status': 'success', 'data': {'skins': payload}})
|
|
except Exception as e:
|
|
logger.error('Error in list_skins', exc_info=True)
|
|
return jsonify({'status': 'error', 'message': 'An error occurred; see logs for details', 'details': describe_exception(e)}), 500
|
|
@api_v3.route('/logs', methods=['GET'])
|
|
def get_logs():
|
|
"""Get system logs from journalctl"""
|
|
try:
|
|
if not _JOURNALCTL:
|
|
return jsonify({'status': 'error', 'message': 'journalctl not found on this system'}), 503
|
|
# Get recent logs from journalctl
|
|
_cmd = ([_SUDO, _JOURNALCTL] if _SUDO else [_JOURNALCTL]) + [
|
|
'-u', 'ledmatrix.service', '-u', 'ledmatrix-web.service',
|
|
'-n', '100', '--no-pager', '--output=short-iso']
|
|
result = subprocess.run(
|
|
_cmd,
|
|
capture_output=True,
|
|
text=True,
|
|
timeout=5
|
|
)
|
|
|
|
if result.returncode == 0:
|
|
logs_text = result.stdout.strip()
|
|
return jsonify({
|
|
'status': 'success',
|
|
'data': {
|
|
'logs': logs_text if logs_text else 'No logs available from ledmatrix or ledmatrix-web service'
|
|
}
|
|
})
|
|
else:
|
|
return jsonify({
|
|
'status': 'error',
|
|
'message': f'Failed to get logs: {result.stderr}'
|
|
}), 500
|
|
|
|
except subprocess.TimeoutExpired:
|
|
return jsonify({
|
|
'status': 'error',
|
|
'message': 'Timeout while fetching logs'
|
|
}), 500
|
|
except Exception as e:
|
|
logger.error("%s failed", request.path, exc_info=True)
|
|
return jsonify({
|
|
'status': 'error',
|
|
'message': 'An error occurred; see logs for details',
|
|
'details': describe_exception(e)
|
|
}), 500
|
|
# Multi-Display Sync Endpoints
|
|
@api_v3.route('/sync/status', methods=['GET'])
|
|
def get_sync_status():
|
|
"""Return live multi-display sync status written by the display process."""
|
|
import os as _os
|
|
status_file = "/tmp/led_matrix_sync_status.json"
|
|
# Also surface config so the UI can show the configured role even before
|
|
# the display process has written a status file.
|
|
cfg_role = "standalone"
|
|
cfg_port = 5765
|
|
if api_v3.config_manager:
|
|
try:
|
|
cfg = api_v3.config_manager.load_config().get("sync", {})
|
|
cfg_role = cfg.get("role", "standalone")
|
|
cfg_port = int(cfg.get("port", 5765))
|
|
except Exception:
|
|
pass
|
|
|
|
if _os.path.exists(status_file):
|
|
try:
|
|
with open(status_file) as f:
|
|
live = json.load(f)
|
|
return jsonify({"status": "success", "data": live})
|
|
except Exception:
|
|
pass
|
|
|
|
# Status file not yet written — return config-only placeholder
|
|
return jsonify({
|
|
"status": "success",
|
|
"data": {
|
|
"role": cfg_role,
|
|
"port": cfg_port,
|
|
"state": "starting",
|
|
}
|
|
})
|
|
@api_v3.route('/cache/list', methods=['GET'])
|
|
def list_cache_files():
|
|
"""List all cache files with metadata"""
|
|
try:
|
|
if not api_v3.cache_manager:
|
|
# Initialize cache manager if not already initialized
|
|
from src.cache_manager import CacheManager
|
|
api_v3.cache_manager = CacheManager()
|
|
|
|
cache_files = api_v3.cache_manager.list_cache_files()
|
|
cache_dir = api_v3.cache_manager.get_cache_dir()
|
|
|
|
return jsonify({
|
|
'status': 'success',
|
|
'data': {
|
|
'cache_files': cache_files,
|
|
'cache_dir': cache_dir,
|
|
'total_files': len(cache_files)
|
|
}
|
|
})
|
|
except Exception as e:
|
|
logger.error('Error in list_cache_files', exc_info=True)
|
|
return jsonify({'status': 'error', 'message': 'An error occurred; see logs for details', 'details': describe_exception(e)}), 500
|
|
@api_v3.route('/cache/delete', methods=['POST'])
|
|
def delete_cache_file():
|
|
"""Delete a specific cache file by key"""
|
|
try:
|
|
if not api_v3.cache_manager:
|
|
# Initialize cache manager if not already initialized
|
|
from src.cache_manager import CacheManager
|
|
api_v3.cache_manager = CacheManager()
|
|
|
|
data = request.get_json(silent=True)
|
|
if not data or 'key' not in data:
|
|
return jsonify({'status': 'error', 'message': 'cache key is required'}), 400
|
|
|
|
cache_key = data['key']
|
|
|
|
# Delete the cache file
|
|
api_v3.cache_manager.clear_cache(cache_key)
|
|
|
|
return jsonify({
|
|
'status': 'success',
|
|
'message': f'Cache file for key "{cache_key}" deleted successfully'
|
|
})
|
|
except Exception as e:
|
|
logger.error('Error in delete_cache_file', exc_info=True)
|
|
return jsonify({'status': 'error', 'message': 'An error occurred; see logs for details', 'details': describe_exception(e)}), 500
|
|
@api_v3.route('/errors/summary', methods=['GET'])
|
|
def get_error_summary():
|
|
"""
|
|
Get summary of all errors for monitoring and debugging.
|
|
|
|
Returns error counts, detected patterns, and recent errors.
|
|
"""
|
|
try:
|
|
aggregator = get_error_aggregator()
|
|
summary = aggregator.get_error_summary()
|
|
return success_response(data=summary, message="Error summary retrieved")
|
|
except Exception as e:
|
|
logger.error(f"Error getting error summary: {e}", exc_info=True)
|
|
return error_response(
|
|
error_code=ErrorCode.SYSTEM_ERROR,
|
|
message="Failed to retrieve error summary",
|
|
status_code=500
|
|
)
|
|
@api_v3.route('/errors/plugin/<plugin_id>', methods=['GET'])
|
|
def get_plugin_errors(plugin_id):
|
|
"""
|
|
Get error health status for a specific plugin.
|
|
|
|
Args:
|
|
plugin_id: Plugin identifier
|
|
|
|
Returns health status and error statistics for the plugin.
|
|
"""
|
|
try:
|
|
aggregator = get_error_aggregator()
|
|
health = aggregator.get_plugin_health(plugin_id)
|
|
return success_response(data=health, message="Plugin health retrieved")
|
|
except Exception as e:
|
|
logger.error(f"Error getting plugin health for {plugin_id}: {e}", exc_info=True)
|
|
return error_response(
|
|
error_code=ErrorCode.SYSTEM_ERROR,
|
|
message=f"Failed to retrieve health for plugin {plugin_id}",
|
|
status_code=500
|
|
)
|
|
@api_v3.route('/errors/clear', methods=['POST'])
|
|
def clear_old_errors():
|
|
"""
|
|
Clear error records older than specified age.
|
|
|
|
Request body (optional):
|
|
max_age_hours: Maximum age in hours (default: 24, max: 8760 = 1 year)
|
|
"""
|
|
try:
|
|
data = request.get_json(silent=True) or {}
|
|
raw_max_age = data.get('max_age_hours', 24)
|
|
|
|
# Validate and coerce max_age_hours
|
|
try:
|
|
max_age_hours = int(raw_max_age)
|
|
if max_age_hours < 1:
|
|
return error_response(
|
|
error_code=ErrorCode.INVALID_INPUT,
|
|
message="max_age_hours must be at least 1",
|
|
context={'provided_value': raw_max_age},
|
|
status_code=400
|
|
)
|
|
if max_age_hours > 8760: # 1 year max
|
|
return error_response(
|
|
error_code=ErrorCode.INVALID_INPUT,
|
|
message="max_age_hours cannot exceed 8760 (1 year)",
|
|
context={'provided_value': raw_max_age},
|
|
status_code=400
|
|
)
|
|
except (ValueError, TypeError, OverflowError):
|
|
return error_response(
|
|
error_code=ErrorCode.INVALID_INPUT,
|
|
message="max_age_hours must be a valid integer",
|
|
context={'provided_value': str(raw_max_age)},
|
|
status_code=400
|
|
)
|
|
|
|
aggregator = get_error_aggregator()
|
|
cleared_count = aggregator.clear_old_records(max_age_hours=max_age_hours)
|
|
|
|
return success_response(
|
|
data={'cleared_count': cleared_count},
|
|
message=f"Cleared {cleared_count} error records older than {max_age_hours} hours"
|
|
)
|
|
except Exception as e:
|
|
logger.error(f"Error clearing old errors: {e}", exc_info=True)
|
|
return error_response(
|
|
error_code=ErrorCode.SYSTEM_ERROR,
|
|
message="Failed to clear old errors",
|
|
status_code=500
|
|
)
|
|
|
|
|
|
@api_v3.route('/integrations/mqtt-bridge', methods=['GET'])
|
|
def get_mqtt_bridge():
|
|
"""Bridge service state and its settings, minus the password."""
|
|
try:
|
|
config = _read_mqtt_bridge_config()
|
|
password = config.get('mqtt_password')
|
|
safe = {key: config.get(key, default)
|
|
for key, default in _MQTT_BRIDGE_DEFAULTS.items()}
|
|
return jsonify({
|
|
'status': 'success',
|
|
'data': {
|
|
'service': _mqtt_bridge_service_state(),
|
|
'config_exists': _MQTT_BRIDGE_CONFIG.is_file(),
|
|
'config_path': str(_MQTT_BRIDGE_CONFIG),
|
|
'config': safe,
|
|
# Enough to render "a password is set" without disclosing it.
|
|
'password_set': bool(password),
|
|
'env_override_prefix': 'LEDMATRIX_MQTT_',
|
|
}
|
|
})
|
|
except Exception as e:
|
|
logger.exception('Error reading MQTT bridge settings')
|
|
return jsonify({'status': 'error', 'message': 'Could not read bridge settings',
|
|
'details': describe_exception(e)}), 500
|
|
|
|
@api_v3.route('/integrations/mqtt-bridge/config', methods=['PUT'])
|
|
def update_mqtt_bridge_config():
|
|
"""Write bridge_config.json.
|
|
|
|
The password is write-only: omit it to leave whatever is stored alone, send
|
|
a value to replace it, or send clear_password to remove it. It is never
|
|
returned by the GET above, so a form that round-tripped it would otherwise
|
|
have to blank it on every save.
|
|
"""
|
|
try:
|
|
# No `or {}` here: get_json(silent=True) returns None for a missing or
|
|
# unparseable body, and `None or {}` produced an empty dict that then
|
|
# satisfied the isinstance check below -- so malformed JSON, `null`,
|
|
# `[]` and `false` all reported success while applying nothing.
|
|
data = request.get_json(silent=True)
|
|
if not isinstance(data, dict):
|
|
return jsonify({'status': 'error', 'message': 'Body must be a JSON object'}), 400
|
|
|
|
config = _read_mqtt_bridge_config()
|
|
existing_password = config.get('mqtt_password')
|
|
|
|
updates = {}
|
|
for key in _MQTT_BRIDGE_DEFAULTS:
|
|
if key not in data:
|
|
continue
|
|
value, err = _coerce_mqtt_bridge_value(key, data[key])
|
|
if err:
|
|
return jsonify({'status': 'error', 'message': err}), 400
|
|
updates[key] = value
|
|
|
|
config.update(updates)
|
|
|
|
# Coerced, not merely truthy: the string "false" is truthy in Python,
|
|
# so a client echoing the field back as a string would have wiped a
|
|
# stored password it meant to keep.
|
|
if _coerce_to_bool(data.get('clear_password')):
|
|
config['mqtt_password'] = None
|
|
elif 'mqtt_password' in data and str(data['mqtt_password']) != '':
|
|
new_password = str(data['mqtt_password'])
|
|
if len(new_password) > 300:
|
|
return jsonify({'status': 'error', 'message': 'Password is too long'}), 400
|
|
config['mqtt_password'] = new_password
|
|
else:
|
|
config['mqtt_password'] = existing_password
|
|
|
|
# CWE-319: a password with TLS off is sent in the clear. On a trusted
|
|
# LAN that is a normal, deliberate setup, so this is refused rather
|
|
# than forbidden -- allow_insecure_mqtt is the explicit acknowledgement.
|
|
insecure = bool(config.get('mqtt_password')) and not config.get('mqtt_tls')
|
|
if insecure and not config.get('allow_insecure_mqtt'):
|
|
return jsonify({
|
|
'status': 'error',
|
|
'message': 'MQTT credentials would cross the network in cleartext '
|
|
'with TLS disabled. Enable mqtt_tls, or set '
|
|
'allow_insecure_mqtt to accept that on a trusted network.'
|
|
}), 400
|
|
if insecure:
|
|
logger.warning('MQTT bridge: a password is set without TLS and '
|
|
'allow_insecure_mqtt is on; credentials will cross the '
|
|
'network in cleartext')
|
|
|
|
_MQTT_BRIDGE_DIR.mkdir(parents=True, exist_ok=True)
|
|
# Write via a temp file in the same directory so a crash mid-write
|
|
# cannot leave a half-written config the bridge would refuse to load.
|
|
fd, tmp_path = tempfile.mkstemp(dir=str(_MQTT_BRIDGE_DIR), prefix='.bridge_config.')
|
|
try:
|
|
with os.fdopen(fd, 'w', encoding='utf-8') as handle:
|
|
json.dump(config, handle, indent=2, sort_keys=True)
|
|
handle.write('\n')
|
|
os.chmod(tmp_path, 0o600)
|
|
os.replace(tmp_path, _MQTT_BRIDGE_CONFIG)
|
|
except Exception:
|
|
with contextlib.suppress(OSError):
|
|
os.unlink(tmp_path)
|
|
raise
|
|
|
|
service = _mqtt_bridge_service_state()
|
|
message = 'Bridge settings saved.'
|
|
if service['active']:
|
|
message += ' Restart the bridge for them to take effect.'
|
|
return jsonify({'status': 'success', 'message': message,
|
|
'data': {'password_set': bool(config.get('mqtt_password')),
|
|
'restart_required': service['active']}})
|
|
except Exception as e:
|
|
logger.exception('Error saving MQTT bridge settings')
|
|
return jsonify({'status': 'error', 'message': 'Could not save bridge settings',
|
|
'details': describe_exception(e)}), 500
|