745bf4324e
AUTH_TEST_PLAN test 7.5.8 expects junk cookies to be rejected with 401. The previous middleware behaviour was "presence-only": check that some access_token cookie exists, then pass through. In combination with my Task-12 decision to skip @require_auth decorators on routes, this created a gap where a request with any cookie-shaped string (e.g. access_token=not-a-jwt) would bypass authentication on routes that do not touch the repository (/api/models, /api/mcp/config, /api/memory, /api/skills, …). Fix: middleware now calls get_current_user_from_request() strictly and catches the resulting HTTPException to render a 401 with the proper fine-grained error code (token_invalid, token_expired, user_not_found, …). On success it stamps request.state.user and the contextvar so repository-layer owner filters work downstream. The 4 old "_with_cookie_passes" tests in test_auth_middleware.py were written for the presence-only behaviour; they asserted that a junk cookie would make the handler return 200. They are renamed to "_with_junk_cookie_rejected" and their assertions flipped to 401. The negative path (no cookie → 401 not_authenticated) is unchanged. Verified: no cookie → 401 not_authenticated junk cookie → 401 token_invalid (the fixed bug) expired cookie → 401 token_expired Tests: 284 passed (auth + persistence + isolation) Lint: clean
223 lines
6.1 KiB
Python
223 lines
6.1 KiB
Python
"""Tests for the global AuthMiddleware (fail-closed safety net)."""
|
|
|
|
import pytest
|
|
from starlette.testclient import TestClient
|
|
|
|
from app.gateway.auth_middleware import AuthMiddleware, _is_public
|
|
|
|
# ── _is_public unit tests ─────────────────────────────────────────────────
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"path",
|
|
[
|
|
"/health",
|
|
"/health/",
|
|
"/docs",
|
|
"/docs/",
|
|
"/redoc",
|
|
"/openapi.json",
|
|
"/api/v1/auth/login/local",
|
|
"/api/v1/auth/register",
|
|
"/api/v1/auth/logout",
|
|
"/api/v1/auth/setup-status",
|
|
],
|
|
)
|
|
def test_public_paths(path: str):
|
|
assert _is_public(path) is True
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"path",
|
|
[
|
|
"/api/models",
|
|
"/api/mcp/config",
|
|
"/api/memory",
|
|
"/api/skills",
|
|
"/api/threads/123",
|
|
"/api/threads/123/uploads",
|
|
"/api/agents",
|
|
"/api/channels",
|
|
"/api/runs/stream",
|
|
"/api/threads/123/runs",
|
|
"/api/v1/auth/me",
|
|
"/api/v1/auth/change-password",
|
|
],
|
|
)
|
|
def test_protected_paths(path: str):
|
|
assert _is_public(path) is False
|
|
|
|
|
|
# ── Trailing slash / normalization edge cases ─────────────────────────────
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"path",
|
|
[
|
|
"/api/v1/auth/login/local/",
|
|
"/api/v1/auth/register/",
|
|
"/api/v1/auth/logout/",
|
|
"/api/v1/auth/setup-status/",
|
|
],
|
|
)
|
|
def test_public_auth_paths_with_trailing_slash(path: str):
|
|
assert _is_public(path) is True
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"path",
|
|
[
|
|
"/api/models/",
|
|
"/api/v1/auth/me/",
|
|
"/api/v1/auth/change-password/",
|
|
],
|
|
)
|
|
def test_protected_paths_with_trailing_slash(path: str):
|
|
assert _is_public(path) is False
|
|
|
|
|
|
def test_unknown_api_path_is_protected():
|
|
"""Fail-closed: any new /api/* path is protected by default."""
|
|
assert _is_public("/api/new-feature") is False
|
|
assert _is_public("/api/v2/something") is False
|
|
assert _is_public("/api/v1/auth/new-endpoint") is False
|
|
|
|
|
|
# ── Middleware integration tests ──────────────────────────────────────────
|
|
|
|
|
|
def _make_app():
|
|
"""Create a minimal FastAPI app with AuthMiddleware for testing."""
|
|
from fastapi import FastAPI
|
|
|
|
app = FastAPI()
|
|
app.add_middleware(AuthMiddleware)
|
|
|
|
@app.get("/health")
|
|
async def health():
|
|
return {"status": "ok"}
|
|
|
|
@app.get("/api/v1/auth/me")
|
|
async def auth_me():
|
|
return {"id": "1", "email": "test@test.com"}
|
|
|
|
@app.get("/api/v1/auth/setup-status")
|
|
async def setup_status():
|
|
return {"needs_setup": False}
|
|
|
|
@app.get("/api/models")
|
|
async def models_get():
|
|
return {"models": []}
|
|
|
|
@app.put("/api/mcp/config")
|
|
async def mcp_put():
|
|
return {"ok": True}
|
|
|
|
@app.delete("/api/threads/abc")
|
|
async def thread_delete():
|
|
return {"ok": True}
|
|
|
|
@app.patch("/api/threads/abc")
|
|
async def thread_patch():
|
|
return {"ok": True}
|
|
|
|
@app.post("/api/threads/abc/runs/stream")
|
|
async def stream():
|
|
return {"ok": True}
|
|
|
|
@app.get("/api/future-endpoint")
|
|
async def future():
|
|
return {"ok": True}
|
|
|
|
return app
|
|
|
|
|
|
@pytest.fixture
|
|
def client():
|
|
return TestClient(_make_app())
|
|
|
|
|
|
def test_public_path_no_cookie(client):
|
|
res = client.get("/health")
|
|
assert res.status_code == 200
|
|
|
|
|
|
def test_public_auth_path_no_cookie(client):
|
|
"""Public auth endpoints (login/register) pass without cookie."""
|
|
res = client.get("/api/v1/auth/setup-status")
|
|
assert res.status_code == 200
|
|
|
|
|
|
def test_protected_auth_path_no_cookie(client):
|
|
"""/auth/me requires cookie even though it's under /api/v1/auth/."""
|
|
res = client.get("/api/v1/auth/me")
|
|
assert res.status_code == 401
|
|
|
|
|
|
def test_protected_path_no_cookie_returns_401(client):
|
|
res = client.get("/api/models")
|
|
assert res.status_code == 401
|
|
body = res.json()
|
|
assert body["detail"]["code"] == "not_authenticated"
|
|
|
|
|
|
def test_protected_path_with_junk_cookie_rejected(client):
|
|
"""Junk cookie → 401. Middleware strictly validates the JWT now
|
|
(AUTH_TEST_PLAN test 7.5.8); it no longer silently passes bad
|
|
tokens through to the route handler."""
|
|
res = client.get("/api/models", cookies={"access_token": "some-token"})
|
|
assert res.status_code == 401
|
|
|
|
|
|
def test_protected_post_no_cookie_returns_401(client):
|
|
res = client.post("/api/threads/abc/runs/stream")
|
|
assert res.status_code == 401
|
|
|
|
|
|
# ── Method matrix: PUT/DELETE/PATCH also protected ────────────────────────
|
|
|
|
|
|
def test_protected_put_no_cookie(client):
|
|
res = client.put("/api/mcp/config")
|
|
assert res.status_code == 401
|
|
|
|
|
|
def test_protected_delete_no_cookie(client):
|
|
res = client.delete("/api/threads/abc")
|
|
assert res.status_code == 401
|
|
|
|
|
|
def test_protected_patch_no_cookie(client):
|
|
res = client.patch("/api/threads/abc")
|
|
assert res.status_code == 401
|
|
|
|
|
|
def test_put_with_junk_cookie_rejected(client):
|
|
"""Junk cookie on PUT → 401 (strict JWT validation in middleware)."""
|
|
client.cookies.set("access_token", "tok")
|
|
res = client.put("/api/mcp/config")
|
|
assert res.status_code == 401
|
|
|
|
|
|
def test_delete_with_junk_cookie_rejected(client):
|
|
"""Junk cookie on DELETE → 401 (strict JWT validation in middleware)."""
|
|
client.cookies.set("access_token", "tok")
|
|
res = client.delete("/api/threads/abc")
|
|
assert res.status_code == 401
|
|
|
|
|
|
# ── Fail-closed: unknown future endpoints ─────────────────────────────────
|
|
|
|
|
|
def test_unknown_endpoint_no_cookie_returns_401(client):
|
|
"""Any new /api/* endpoint is blocked by default without cookie."""
|
|
res = client.get("/api/future-endpoint")
|
|
assert res.status_code == 401
|
|
|
|
|
|
def test_unknown_endpoint_with_junk_cookie_rejected(client):
|
|
"""New endpoints are also protected by strict JWT validation."""
|
|
client.cookies.set("access_token", "tok")
|
|
res = client.get("/api/future-endpoint")
|
|
assert res.status_code == 401
|