mirror of
https://github.com/jmagar/unraid-mcp.git
synced 2026-03-02 00:04:45 -08:00
Addresses all critical, high, medium, and low issues from full codebase review. 494 tests pass, ruff clean, ty type-check clean. Security: - Add tool_error_handler context manager (exceptions.py) — standardised error handling, eliminates 11 bare except-reraise patterns - Remove unused exception subclasses (ConfigurationError, UnraidAPIError, SubscriptionError, ValidationError, IdempotentOperationError) - Harden GraphQL subscription query validator with allow-list and forbidden-keyword regex (diagnostics.py) - Add input validation for rclone create_remote config_data: injection, path-traversal, and key-count limits (rclone.py) - Validate notifications importance enum before GraphQL request (notifications.py) - Sanitise HTTP/network/JSON error messages — no raw exception strings leaked to clients (client.py) - Strip path/creds from displayed API URL via _safe_display_url (health.py) - Enable Ruff S (bandit) rule category in pyproject.toml - Harden container mutations to strict-only matching — no fuzzy/substring for destructive operations (docker.py) Performance: - Token-bucket rate limiter (90 tokens, 9 req/s) with 429 retry backoff (client.py) - Lazy asyncio.Lock init via _get_client_lock() — fixes event-loop module-load crash (client.py) - Double-checked locking in get_http_client() for fast-path (client.py) - Short hex container ID fast-path skips list fetch (docker.py) - Cap resource_data log content to 1 MB / 5,000 lines (manager.py) - Reset reconnect counter after 30 s stable connection (manager.py) - Move tail_lines validation to module level; enforce 10,000 line cap (storage.py, docker.py) - force_terminal=True removed from logging RichHandler (logging.py) Architecture: - Register diagnostic tools in server startup (server.py) - Move ALL_ACTIONS computation to module level in all tools - Consolidate format_kb / format_bytes into shared core/utils.py - Add _safe_get() helper in core/utils.py for nested dict traversal - Extract _analyze_subscription_status() from health.py diagnose handler - Validate required config at startup — fail fast with CRITICAL log (server.py) Code quality: - Remove ~90 lines of dead Rich formatting helpers from logging.py - Remove dead self.websocket attribute from SubscriptionManager - Remove dead setup_uvicorn_logging() wrapper - Move _VALID_IMPORTANCE to module level (N806 fix) - Add slots=True to all three dataclasses (SubscriptionData, SystemHealth, APIResponse) - Fix None rendering as literal "None" string in info.py summaries - Change fuzzy-match log messages from INFO to DEBUG (docker.py) - UTC-aware datetimes throughout (manager.py, diagnostics.py) Infrastructure: - Upgrade base image python:3.11-slim → python:3.12-slim (Dockerfile) - Add non-root appuser (UID/GID 1000) with HEALTHCHECK (Dockerfile) - Add read_only, cap_drop: ALL, tmpfs /tmp to docker-compose.yml - Single-source version via importlib.metadata (pyproject.toml → __init__.py) - Add open_timeout to all websockets.connect() calls Tests: - Update error message matchers to match sanitised messages (test_client.py) - Fix patch targets for UNRAID_API_URL → utils module (test_subscriptions.py) - Fix importance="info" → importance="normal" (test_notifications.py, http_layer) - Fix naive datetime fixtures → UTC-aware (test_subscriptions.py) Co-authored-by: Claude <claude@anthropic.com>
145 lines
4.9 KiB
Python
145 lines
4.9 KiB
Python
"""API key management.
|
|
|
|
Provides the `unraid_keys` tool with 5 actions for listing, viewing,
|
|
creating, updating, and deleting API keys.
|
|
"""
|
|
|
|
from typing import Any, Literal
|
|
|
|
from fastmcp import FastMCP
|
|
|
|
from ..config.logging import logger
|
|
from ..core.client import make_graphql_request
|
|
from ..core.exceptions import ToolError, tool_error_handler
|
|
|
|
|
|
QUERIES: dict[str, str] = {
|
|
"list": """
|
|
query ListApiKeys {
|
|
apiKeys { id name roles permissions createdAt lastUsed }
|
|
}
|
|
""",
|
|
"get": """
|
|
query GetApiKey($id: PrefixedID!) {
|
|
apiKey(id: $id) { id name roles permissions createdAt lastUsed }
|
|
}
|
|
""",
|
|
}
|
|
|
|
MUTATIONS: dict[str, str] = {
|
|
"create": """
|
|
mutation CreateApiKey($input: CreateApiKeyInput!) {
|
|
createApiKey(input: $input) { id name key roles }
|
|
}
|
|
""",
|
|
"update": """
|
|
mutation UpdateApiKey($input: UpdateApiKeyInput!) {
|
|
updateApiKey(input: $input) { id name roles }
|
|
}
|
|
""",
|
|
"delete": """
|
|
mutation DeleteApiKeys($input: DeleteApiKeysInput!) {
|
|
deleteApiKeys(input: $input)
|
|
}
|
|
""",
|
|
}
|
|
|
|
DESTRUCTIVE_ACTIONS = {"delete"}
|
|
ALL_ACTIONS = set(QUERIES) | set(MUTATIONS)
|
|
|
|
KEY_ACTIONS = Literal[
|
|
"list",
|
|
"get",
|
|
"create",
|
|
"update",
|
|
"delete",
|
|
]
|
|
|
|
|
|
def register_keys_tool(mcp: FastMCP) -> None:
|
|
"""Register the unraid_keys tool with the FastMCP instance."""
|
|
|
|
@mcp.tool()
|
|
async def unraid_keys(
|
|
action: KEY_ACTIONS,
|
|
confirm: bool = False,
|
|
key_id: str | None = None,
|
|
name: str | None = None,
|
|
roles: list[str] | None = None,
|
|
permissions: list[str] | None = None,
|
|
) -> dict[str, Any]:
|
|
"""Manage Unraid API keys.
|
|
|
|
Actions:
|
|
list - List all API keys
|
|
get - Get a specific API key (requires key_id)
|
|
create - Create a new API key (requires name; optional roles, permissions)
|
|
update - Update an API key (requires key_id; optional name, roles)
|
|
delete - Delete API keys (requires key_id, confirm=True)
|
|
"""
|
|
if action not in ALL_ACTIONS:
|
|
raise ToolError(f"Invalid action '{action}'. Must be one of: {sorted(ALL_ACTIONS)}")
|
|
|
|
if action in DESTRUCTIVE_ACTIONS and not confirm:
|
|
raise ToolError(f"Action '{action}' is destructive. Set confirm=True to proceed.")
|
|
|
|
with tool_error_handler("keys", action, logger):
|
|
logger.info(f"Executing unraid_keys action={action}")
|
|
|
|
if action == "list":
|
|
data = await make_graphql_request(QUERIES["list"])
|
|
keys = data.get("apiKeys", [])
|
|
return {"keys": list(keys) if isinstance(keys, list) else []}
|
|
|
|
if action == "get":
|
|
if not key_id:
|
|
raise ToolError("key_id is required for 'get' action")
|
|
data = await make_graphql_request(QUERIES["get"], {"id": key_id})
|
|
return dict(data.get("apiKey") or {})
|
|
|
|
if action == "create":
|
|
if not name:
|
|
raise ToolError("name is required for 'create' action")
|
|
input_data: dict[str, Any] = {"name": name}
|
|
if roles is not None:
|
|
input_data["roles"] = roles
|
|
if permissions is not None:
|
|
input_data["permissions"] = permissions
|
|
data = await make_graphql_request(MUTATIONS["create"], {"input": input_data})
|
|
return {
|
|
"success": True,
|
|
"key": data.get("createApiKey", {}),
|
|
}
|
|
|
|
if action == "update":
|
|
if not key_id:
|
|
raise ToolError("key_id is required for 'update' action")
|
|
input_data: dict[str, Any] = {"id": key_id}
|
|
if name:
|
|
input_data["name"] = name
|
|
if roles is not None:
|
|
input_data["roles"] = roles
|
|
data = await make_graphql_request(MUTATIONS["update"], {"input": input_data})
|
|
return {
|
|
"success": True,
|
|
"key": data.get("updateApiKey", {}),
|
|
}
|
|
|
|
if action == "delete":
|
|
if not key_id:
|
|
raise ToolError("key_id is required for 'delete' action")
|
|
data = await make_graphql_request(MUTATIONS["delete"], {"input": {"ids": [key_id]}})
|
|
result = data.get("deleteApiKeys")
|
|
if not result:
|
|
raise ToolError(
|
|
f"Failed to delete API key '{key_id}': no confirmation from server"
|
|
)
|
|
return {
|
|
"success": True,
|
|
"message": f"API key '{key_id}' deleted",
|
|
}
|
|
|
|
raise ToolError(f"Unhandled action '{action}' — this is a bug")
|
|
|
|
logger.info("Keys tool registered successfully")
|