Skip to content

Commit de67bd7

Browse files
committed
fix(auth): avoid Request.user assertion without auth middleware
1 parent a0bbcdf commit de67bd7

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

src/mcp/server/auth/middleware/auth_context.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,16 @@ def _push_auth_context_from_request(request: Request | None) -> Token[Authentica
3131
"""
3232
if request is None:
3333
return None
34-
user = getattr(request, "user", None)
34+
# Avoid Request.user, which asserts AuthenticationMiddleware is installed.
35+
user = None
36+
scope = getattr(request, "scope", None)
37+
if isinstance(scope, dict):
38+
user = scope.get("user")
39+
if user is None:
40+
try:
41+
user = getattr(request, "user", None)
42+
except AssertionError:
43+
user = None
3544
if isinstance(user, AuthenticatedUser):
3645
return auth_context_var.set(user)
3746
return None

0 commit comments

Comments
 (0)