mirror of
https://github.com/PrefectHQ/fastmcp.git
synced 2026-08-27 07:50:43 +02:00
Scope tasks to authorization context, not session (#3800)
* Scope tasks to authorization context, not session Tasks were keyed by the transport-layer Mcp-Session-Id, which is server-assigned and changes on reconnect — so clients lost access to their running tasks after any connection interruption. The MCP spec says tasks should be bound to authorization context, not session. This replaces session_id with task_scope (derived from AccessToken.client_id, URL-encoded) in all task data Redis keys and Docket task keys. When no auth is configured, a "_" sentinel is used and security comes from UUID task ID entropy per the spec. Session ID is still used for transport-level concerns (notification queues, subscriber registration) and is now stored in the TaskContextSnapshot payload so background workers can still deliver notifications. Also extracts all the task context infrastructure (TaskContextInfo, TaskContextSnapshot, snapshot loading, session/server registries) from server/dependencies.py into a new server/tasks/context.py to keep the DI module from sprawling further. Closes #3758 🤖 Generated with Claude Code Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Rename _redis_key to _snapshot_redis_key Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Document in-process session registry as an optimization Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Tidy imports and docstrings Hoist imports where safe, keep subscriptions/notifications deferred in handlers.py since they pull in docket at module level. Sharpen docstrings on keys.py and context.py so each module owns its lane. Clean up the re-export block in dependencies.py. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Fix misleading comment on re-export block Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Tighten task scope: include sub claim, partition keyspaces Addresses review feedback on #3800: - Compose task scope from client_id and the JWT sub claim (when present) so fixed-OAuth deployments isolate per user, not just per client. - Replace the "_" anonymous sentinel with a tagged keyspace partition. Docket keys are now auth:{enc_scope}:... or anon:..., and Redis keys use fastmcp:task:auth:{enc_scope}:... or fastmcp:task:anon:..., routed through a single task_redis_prefix() helper. - get_task_scope() returns the raw scope (or None); encoding happens once at the keys.py boundary, collapsing the previous double-quote invariant. - Drop the dormant fallback in notifications.py that routed input_required relays into the anon keyspace when task_scope was missing -- log and skip instead. - Add comprehensive parser/encoder tests in test_task_keys.py covering round-trips, malformed keys, and adversarial scopes ("anon", "_", and scopes containing : / | %). - Add cross-scope rejection tests: distinct client_ids, distinct sub claims under a shared client_id, and authenticated vs anonymous. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
a6bd66aca8
commit
9a063963f4
11 changed files with 954 additions and 511 deletions
|
|
@ -1,22 +1,27 @@
|
|||
"""
|
||||
Tests for session-based task ID isolation (CRITICAL SECURITY).
|
||||
Tests for authorization-based task isolation (CRITICAL SECURITY).
|
||||
|
||||
Ensures that tasks are properly scoped to sessions and clients cannot
|
||||
access each other's tasks.
|
||||
Ensures that tasks are properly scoped to authorization identity and clients
|
||||
cannot access each other's tasks.
|
||||
"""
|
||||
|
||||
import pytest
|
||||
from mcp.server.auth.middleware.auth_context import (
|
||||
auth_context_var,
|
||||
)
|
||||
from mcp.server.auth.middleware.bearer_auth import AuthenticatedUser
|
||||
|
||||
from fastmcp import FastMCP
|
||||
from fastmcp.client import Client
|
||||
from fastmcp.server.auth import AccessToken
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
async def task_server():
|
||||
def task_server():
|
||||
"""Create a server with background tasks enabled."""
|
||||
mcp = FastMCP("security-test-server")
|
||||
|
||||
@mcp.tool(task=True) # Enable background execution
|
||||
@mcp.tool(task=True)
|
||||
async def secret_tool(data: str) -> str:
|
||||
"""A tool that processes sensitive data."""
|
||||
return f"Secret result: {data}"
|
||||
|
|
@ -24,24 +29,121 @@ async def task_server():
|
|||
return mcp
|
||||
|
||||
|
||||
async def test_same_session_can_access_all_its_tasks(task_server):
|
||||
"""A single session can access all tasks it created."""
|
||||
async def test_same_client_can_access_all_its_tasks(task_server: FastMCP):
|
||||
"""A single authenticated client can access all tasks it created."""
|
||||
token = AccessToken(
|
||||
token="token-a",
|
||||
client_id="client-a",
|
||||
scopes=["read"],
|
||||
)
|
||||
reset = auth_context_var.set(AuthenticatedUser(token))
|
||||
try:
|
||||
async with Client(task_server) as client:
|
||||
task1 = await client.call_tool(
|
||||
"secret_tool", {"data": "first"}, task=True, task_id="task-1"
|
||||
)
|
||||
task2 = await client.call_tool(
|
||||
"secret_tool", {"data": "second"}, task=True, task_id="task-2"
|
||||
)
|
||||
|
||||
await task1.wait(timeout=2.0)
|
||||
await task2.wait(timeout=2.0)
|
||||
|
||||
result1 = await task1.result()
|
||||
result2 = await task2.result()
|
||||
|
||||
assert "first" in str(result1.data)
|
||||
assert "second" in str(result2.data)
|
||||
finally:
|
||||
auth_context_var.reset(reset)
|
||||
|
||||
|
||||
async def test_unauthenticated_client_can_access_its_tasks(task_server: FastMCP):
|
||||
"""An unauthenticated client can access tasks it created (by task ID)."""
|
||||
async with Client(task_server) as client:
|
||||
# Submit multiple tasks
|
||||
task1 = await client.call_tool(
|
||||
"secret_tool", {"data": "first"}, task=True, task_id="task-1"
|
||||
)
|
||||
task2 = await client.call_tool(
|
||||
"secret_tool", {"data": "second"}, task=True, task_id="task-2"
|
||||
task = await client.call_tool(
|
||||
"secret_tool", {"data": "hello"}, task=True, task_id="my-task"
|
||||
)
|
||||
await task.wait(timeout=2.0)
|
||||
result = await task.result()
|
||||
assert "hello" in str(result.data)
|
||||
|
||||
# Wait for both to complete
|
||||
await task1.wait(timeout=2.0)
|
||||
await task2.wait(timeout=2.0)
|
||||
|
||||
# Should be able to access both
|
||||
result1 = await task1.result()
|
||||
result2 = await task2.result()
|
||||
def _set_auth(client_id: str, sub: str | None = None):
|
||||
"""Install an auth context for a given client_id/sub. Returns the reset token."""
|
||||
claims = {"sub": sub} if sub else {}
|
||||
token = AccessToken(
|
||||
token=f"token-{client_id}-{sub or ''}",
|
||||
client_id=client_id,
|
||||
scopes=["read"],
|
||||
claims=claims,
|
||||
)
|
||||
return auth_context_var.set(AuthenticatedUser(token))
|
||||
|
||||
assert "first" in str(result1.data)
|
||||
assert "second" in str(result2.data)
|
||||
|
||||
async def _submit_task_id(client: Client, data: str) -> str:
|
||||
"""Submit a background task and return its server-assigned task id."""
|
||||
task = await client.call_tool("secret_tool", {"data": data}, task=True)
|
||||
await task.wait(timeout=2.0)
|
||||
return task.task_id
|
||||
|
||||
|
||||
async def test_distinct_clients_cannot_access_each_others_tasks(
|
||||
task_server: FastMCP,
|
||||
):
|
||||
"""Two distinct authenticated clients live in disjoint scopes — looking up
|
||||
a peer's task id returns 'not found'."""
|
||||
reset = _set_auth("client-a")
|
||||
try:
|
||||
async with Client(task_server) as client_a:
|
||||
task_id = await _submit_task_id(client_a, "client-a-secret")
|
||||
finally:
|
||||
auth_context_var.reset(reset)
|
||||
|
||||
reset = _set_auth("client-b")
|
||||
try:
|
||||
async with Client(task_server) as client_b:
|
||||
with pytest.raises(Exception, match="not found"):
|
||||
await client_b.get_task_status(task_id)
|
||||
finally:
|
||||
auth_context_var.reset(reset)
|
||||
|
||||
|
||||
async def test_distinct_subs_same_client_id_cannot_access_each_others_tasks(
|
||||
task_server: FastMCP,
|
||||
):
|
||||
"""Fixed-OAuth case: two users share a client_id but have distinct ``sub``
|
||||
claims. The ``sub``-aware scope must still isolate them."""
|
||||
shared_client = "shared-oauth-app"
|
||||
|
||||
reset = _set_auth(shared_client, sub="user-alice")
|
||||
try:
|
||||
async with Client(task_server) as alice:
|
||||
task_id = await _submit_task_id(alice, "alice-secret")
|
||||
finally:
|
||||
auth_context_var.reset(reset)
|
||||
|
||||
reset = _set_auth(shared_client, sub="user-bob")
|
||||
try:
|
||||
async with Client(task_server) as bob:
|
||||
with pytest.raises(Exception, match="not found"):
|
||||
await bob.get_task_status(task_id)
|
||||
finally:
|
||||
auth_context_var.reset(reset)
|
||||
|
||||
|
||||
async def test_authenticated_and_anonymous_keyspaces_are_disjoint(
|
||||
task_server: FastMCP,
|
||||
):
|
||||
"""An anonymous client must not be able to read an authenticated client's
|
||||
tasks (and vice versa) even when colliding on task id."""
|
||||
reset = _set_auth("client-a")
|
||||
try:
|
||||
async with Client(task_server) as authed:
|
||||
authed_task_id = await _submit_task_id(authed, "authed-secret")
|
||||
finally:
|
||||
auth_context_var.reset(reset)
|
||||
|
||||
async with Client(task_server) as anon:
|
||||
with pytest.raises(Exception, match="not found"):
|
||||
await anon.get_task_status(authed_task_id)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue