mirror of
https://github.com/jmagar/unraid-mcp.git
synced 2026-03-02 00:04:45 -08:00
**Critical Fixes (7 issues):**
- Fix GraphQL schema field names in users tool (role→roles, remove email)
- Fix GraphQL mutation signatures (addUserInput, deleteUser input)
- Fix dict(None) TypeError guards in users tool (use `or {}` pattern)
- Fix FastAPI version constraint (0.116.1→0.115.0)
- Fix WebSocket SSL context handling (support CA bundles, bool, and None)
- Fix critical disk threshold treated as warning (split counters)
**High Priority Fixes (11 issues):**
- Fix Docker update/remove action response field mapping
- Fix path traversal vulnerability in log validation (normalize paths)
- Fix deleteApiKeys validation (check response before success)
- Fix rclone create_remote validation (check response)
- Fix keys input_data type annotation (dict[str, Any])
- Fix VM domain/domains fallback restoration
**Changes by file:**
- unraid_mcp/tools/docker.py: Response field mapping
- unraid_mcp/tools/info.py: Split critical/warning counters
- unraid_mcp/tools/storage.py: Path normalization for traversal protection
- unraid_mcp/tools/users.py: GraphQL schema + null handling
- unraid_mcp/tools/keys.py: Validation + type annotations
- unraid_mcp/tools/rclone.py: Response validation
- unraid_mcp/tools/virtualization.py: Domain fallback
- unraid_mcp/subscriptions/manager.py: SSL context creation
- pyproject.toml: FastAPI version fix
- tests/*: New tests for all fixes
**Review threads resolved:**
PRRT_kwDOO6Hdxs5uu70L, PRRT_kwDOO6Hdxs5uu70O, PRRT_kwDOO6Hdxs5uu70V,
PRRT_kwDOO6Hdxs5uu70e, PRRT_kwDOO6Hdxs5uu70i, PRRT_kwDOO6Hdxs5uu7zn,
PRRT_kwDOO6Hdxs5uu7z_, PRRT_kwDOO6Hdxs5uu7sI, PRRT_kwDOO6Hdxs5uu7sJ,
PRRT_kwDOO6Hdxs5uu7sK, PRRT_kwDOO6Hdxs5uu7Tk, PRRT_kwDOO6Hdxs5uu7Tn,
PRRT_kwDOO6Hdxs5uu7Tr, PRRT_kwDOO6Hdxs5uu7Ts, PRRT_kwDOO6Hdxs5uu7Tu,
PRRT_kwDOO6Hdxs5uu7Tv, PRRT_kwDOO6Hdxs5uu7Tw, PRRT_kwDOO6Hdxs5uu7Tx
All tests passing.
Co-authored-by: docker-fixer <agent@pr-fixes>
Co-authored-by: info-fixer <agent@pr-fixes>
Co-authored-by: storage-fixer <agent@pr-fixes>
Co-authored-by: users-fixer <agent@pr-fixes>
Co-authored-by: config-fixer <agent@pr-fixes>
Co-authored-by: websocket-fixer <agent@pr-fixes>
Co-authored-by: keys-rclone-fixer <agent@pr-fixes>
Co-authored-by: vm-fixer <agent@pr-fixes>
164 lines
5.2 KiB
Python
164 lines
5.2 KiB
Python
"""User management.
|
|
|
|
Provides the `unraid_users` tool with 8 actions for managing users,
|
|
cloud access, remote access settings, and allowed origins.
|
|
"""
|
|
|
|
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
|
|
|
|
QUERIES: dict[str, str] = {
|
|
"me": """
|
|
query GetMe {
|
|
me { id name description roles }
|
|
}
|
|
""",
|
|
"list": """
|
|
query ListUsers {
|
|
users { id name description roles }
|
|
}
|
|
""",
|
|
"get": """
|
|
query GetUser($id: ID!) {
|
|
user(id: $id) { id name description roles }
|
|
}
|
|
""",
|
|
"cloud": """
|
|
query GetCloud {
|
|
cloud { status error }
|
|
}
|
|
""",
|
|
"remote_access": """
|
|
query GetRemoteAccess {
|
|
remoteAccess { enabled url }
|
|
}
|
|
""",
|
|
"origins": """
|
|
query GetAllowedOrigins {
|
|
allowedOrigins
|
|
}
|
|
""",
|
|
}
|
|
|
|
MUTATIONS: dict[str, str] = {
|
|
"add": """
|
|
mutation AddUser($input: addUserInput!) {
|
|
addUser(input: $input) { id name description roles }
|
|
}
|
|
""",
|
|
"delete": """
|
|
mutation DeleteUser($input: deleteUserInput!) {
|
|
deleteUser(input: $input) { id name }
|
|
}
|
|
""",
|
|
}
|
|
|
|
DESTRUCTIVE_ACTIONS = {"delete"}
|
|
|
|
USER_ACTIONS = Literal[
|
|
"me", "list", "get", "add", "delete", "cloud", "remote_access", "origins",
|
|
]
|
|
|
|
|
|
def register_users_tool(mcp: FastMCP) -> None:
|
|
"""Register the unraid_users tool with the FastMCP instance."""
|
|
|
|
@mcp.tool()
|
|
async def unraid_users(
|
|
action: USER_ACTIONS,
|
|
confirm: bool = False,
|
|
user_id: str | None = None,
|
|
name: str | None = None,
|
|
password: str | None = None,
|
|
role: str | None = None,
|
|
) -> dict[str, Any]:
|
|
"""Manage Unraid users and access settings.
|
|
|
|
Actions:
|
|
me - Get current authenticated user info
|
|
list - List all users
|
|
get - Get a specific user (requires user_id)
|
|
add - Add a new user (requires name, password; optional role)
|
|
delete - Delete a user (requires user_id, confirm=True)
|
|
cloud - Get Unraid Connect cloud status
|
|
remote_access - Get remote access settings
|
|
origins - Get allowed origins
|
|
"""
|
|
all_actions = set(QUERIES) | set(MUTATIONS)
|
|
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.")
|
|
|
|
try:
|
|
logger.info(f"Executing unraid_users action={action}")
|
|
|
|
if action == "me":
|
|
data = await make_graphql_request(QUERIES["me"])
|
|
return data.get("me") or {}
|
|
|
|
if action == "list":
|
|
data = await make_graphql_request(QUERIES["list"])
|
|
users = data.get("users", [])
|
|
return {"users": list(users) if isinstance(users, list) else []}
|
|
|
|
if action == "get":
|
|
if not user_id:
|
|
raise ToolError("user_id is required for 'get' action")
|
|
data = await make_graphql_request(QUERIES["get"], {"id": user_id})
|
|
return data.get("user") or {}
|
|
|
|
if action == "add":
|
|
if not name or not password:
|
|
raise ToolError("add requires name and password")
|
|
input_data: dict[str, Any] = {"name": name, "password": password}
|
|
if role:
|
|
input_data["role"] = role.upper()
|
|
data = await make_graphql_request(
|
|
MUTATIONS["add"], {"input": input_data}
|
|
)
|
|
return {
|
|
"success": True,
|
|
"user": data.get("addUser", {}),
|
|
}
|
|
|
|
if action == "delete":
|
|
if not user_id:
|
|
raise ToolError("user_id is required for 'delete' action")
|
|
data = await make_graphql_request(
|
|
MUTATIONS["delete"], {"input": {"id": user_id}}
|
|
)
|
|
return {
|
|
"success": True,
|
|
"message": f"User '{user_id}' deleted",
|
|
}
|
|
|
|
if action == "cloud":
|
|
data = await make_graphql_request(QUERIES["cloud"])
|
|
return data.get("cloud") or {}
|
|
|
|
if action == "remote_access":
|
|
data = await make_graphql_request(QUERIES["remote_access"])
|
|
return data.get("remoteAccess") or {}
|
|
|
|
if action == "origins":
|
|
data = await make_graphql_request(QUERIES["origins"])
|
|
origins = data.get("allowedOrigins", [])
|
|
return {"origins": list(origins) if isinstance(origins, list) else []}
|
|
|
|
raise ToolError(f"Unhandled action '{action}' — this is a bug")
|
|
|
|
except ToolError:
|
|
raise
|
|
except Exception as e:
|
|
logger.error(f"Error in unraid_users action={action}: {e}", exc_info=True)
|
|
raise ToolError(f"Failed to execute users/{action}: {str(e)}") from e
|
|
|
|
logger.info("Users tool registered successfully")
|