sync update from LAN repo (source master @ ca48c4ec)
This commit is contained in:
1 parent
8bc8b0e082
commit
ea9dcff9c0
873 files changed
+107866
-14011
No files matched your search
@@ -10,7 +10,7 @@ import httpx
|
||||
import pytest
|
||||
import pytest_asyncio
|
||||
from fastapi import FastAPI
|
||||
from sqlalchemy import update
|
||||
from sqlalchemy import event, select, update
|
||||
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
|
||||
|
||||
from app.gateway import deps, langgraph_auth
|
||||
@@ -25,7 +25,7 @@ from app.gateway.auth.repositories.base import CredentialConflictError
|
||||
from app.gateway.auth.repositories.sqlite import SQLiteUserRepository
|
||||
from app.gateway.auth_middleware import AuthMiddleware
|
||||
from app.gateway.csrf_middleware import CSRFMiddleware
|
||||
from app.gateway.routers import auth, parallel_agents, system_settings
|
||||
from app.gateway.routers import auth, parallel_agents, service_tokens, system_settings
|
||||
from deerflow.config import system_settings as settings
|
||||
from deerflow.config.login_config import AuthLoginConfig
|
||||
from deerflow.persistence.user.model import AuthInitializationRow, AuthUsernameRow, UserRow
|
||||
@@ -44,6 +44,7 @@ async def ctx(monkeypatch, tmp_path):
|
||||
provider = LocalAuthProvider(repository)
|
||||
monkeypatch.setattr(settings, "runtime_home", lambda: tmp_path)
|
||||
monkeypatch.setattr(auth, "get_local_provider", lambda: provider)
|
||||
monkeypatch.setattr(service_tokens, "get_local_provider", lambda: provider)
|
||||
monkeypatch.setattr(deps, "get_local_provider", lambda: provider)
|
||||
monkeypatch.setattr(langgraph_auth, "get_local_provider", lambda: provider)
|
||||
monkeypatch.setattr(auth_config, "_auth_config", auth_config.AuthConfig(jwt_secret="test-auth-key-with-sufficient-entropy-0123456789"))
|
||||
@@ -57,19 +58,159 @@ async def ctx(monkeypatch, tmp_path):
|
||||
monkeypatch.setattr(auth, "_SETUP_STATUS_COOLDOWN", {})
|
||||
app = FastAPI()
|
||||
app.include_router(auth.router)
|
||||
app.include_router(service_tokens.router)
|
||||
app.include_router(system_settings.router)
|
||||
app.include_router(parallel_agents.router)
|
||||
app.add_middleware(CSRFMiddleware)
|
||||
app.add_middleware(AuthMiddleware)
|
||||
counter = SimpleNamespace(count_owned=AsyncMock(return_value=0))
|
||||
app.state.skill_store = counter
|
||||
app.state.agent_store = counter
|
||||
app.dependency_overrides[deps.get_skill_store] = lambda: counter
|
||||
app.dependency_overrides[deps.get_agent_store] = lambda: counter
|
||||
monkeypatch.setattr(auth, "get_run_store", lambda _: SimpleNamespace(count_by_user=AsyncMock(return_value={})))
|
||||
async with httpx.AsyncClient(transport=httpx.ASGITransport(app=app), base_url="http://test") as client:
|
||||
yield SimpleNamespace(client=client, provider=provider, repository=repository, sf=sf, login_config=login_config)
|
||||
yield SimpleNamespace(client=client, app=app, provider=provider, repository=repository, sf=sf, login_config=login_config)
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_service_exchange_requires_shared_token(ctx):
|
||||
user = await ctx.provider.create_user("alice@cm.com", password=PASSWORD)
|
||||
|
||||
denied = await ctx.client.post(
|
||||
"/api/v1/auth/service/exchange",
|
||||
json={"username": "alice", "scope": ["llmwiki:sync"]},
|
||||
)
|
||||
assert denied.status_code == 401
|
||||
assert denied.json()["detail"] == "Invalid service token"
|
||||
|
||||
wrong = await ctx.client.post(
|
||||
"/api/v1/auth/service/exchange",
|
||||
json={"username": "alice", "scope": ["llmwiki:sync"]},
|
||||
headers={"X-Service-Token": "wrong-token"},
|
||||
)
|
||||
assert wrong.status_code == 401
|
||||
|
||||
response = await ctx.client.post(
|
||||
"/api/v1/auth/service/exchange",
|
||||
json={"username": "alice", "scope": ["llmwiki:sync"]},
|
||||
headers={"X-Service-Token": service_tokens._SERVICE_TOKEN_SECRET},
|
||||
)
|
||||
assert response.status_code == 200, response.text
|
||||
token = decode_token(response.json()["access_token"])
|
||||
assert token.sub == str(user.id)
|
||||
assert token.auth_method == "service"
|
||||
assert token.client_id is None
|
||||
assert token.scope == ["llmwiki:sync"]
|
||||
assert response.json()["expires_in"] == 300
|
||||
|
||||
repeated = await ctx.client.post(
|
||||
"/api/v1/auth/service/exchange",
|
||||
json={"username": "alice", "scope": ["llmwiki:sync"]},
|
||||
headers={"X-Service-Token": service_tokens._SERVICE_TOKEN_SECRET},
|
||||
)
|
||||
assert repeated.status_code == 200
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_service_exchange_rejects_unsupported_scope(ctx):
|
||||
response = await ctx.client.post(
|
||||
"/api/v1/auth/service/exchange",
|
||||
json={"username": "alice", "scope": ["admin"]},
|
||||
headers={"X-Service-Token": service_tokens._SERVICE_TOKEN_SECRET},
|
||||
)
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_user_owner_lookup_batches_ids(ctx):
|
||||
first = await ctx.provider.create_user("first-owner@cm.com", password=PASSWORD)
|
||||
second = await ctx.provider.create_user("second-owner@cm.com", password=PASSWORD)
|
||||
|
||||
users = await ctx.provider.get_users_by_ids([
|
||||
str(first.id), str(second.id), str(first.id), "missing-user",
|
||||
])
|
||||
|
||||
assert {str(user.id) for user in users} == {str(first.id), str(second.id)}
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_username_login_uses_exact_indexed_key_and_backfills_legacy_rows(ctx):
|
||||
user = await ctx.provider.create_user("quick-login@legacy-domain.com", password=PASSWORD)
|
||||
statements: list[str] = []
|
||||
engine = ctx.sf.kw["bind"]
|
||||
|
||||
def capture_sql(_conn, _cursor, statement, _parameters, _context, _executemany):
|
||||
if statement.lstrip().upper().startswith("SELECT") and "users" in statement.lower():
|
||||
statements.append(statement.lower())
|
||||
|
||||
event.listen(engine.sync_engine, "before_cursor_execute", capture_sql)
|
||||
try:
|
||||
found = await ctx.provider.find_user_by_email_local_part("quick-login")
|
||||
finally:
|
||||
event.remove(engine.sync_engine, "before_cursor_execute", capture_sql)
|
||||
assert found is not None and found.id == user.id
|
||||
assert statements and "username_key =" in statements[0]
|
||||
assert "lower(users.email)" not in statements[0]
|
||||
|
||||
async with ctx.sf() as session:
|
||||
await session.execute(update(UserRow).where(UserRow.id == str(user.id)).values(username_key=None))
|
||||
await session.commit()
|
||||
found_after_legacy_fallback = await ctx.provider.find_user_by_email_local_part("QUICK-LOGIN")
|
||||
assert found_after_legacy_fallback is not None and found_after_legacy_fallback.id == user.id
|
||||
async with ctx.sf() as session:
|
||||
saved_key = await session.scalar(select(UserRow.username_key).where(UserRow.id == str(user.id)))
|
||||
assert saved_key == "quick-login"
|
||||
@pytest.mark.parametrize(
|
||||
("method", "path", "allowed"),
|
||||
[
|
||||
("GET", "/api/llmwiki/knowledge-bases", True),
|
||||
("POST", "/api/llmwiki/knowledge-bases/kb/documents", True),
|
||||
("POST", "/api/llmwiki/knowledge-bases/kb/documents/manual", True),
|
||||
("POST", "/api/llmwiki/search", False),
|
||||
("POST", "/api/threads/thread/runs", False),
|
||||
("GET", "/api/v1/auth/me", False),
|
||||
],
|
||||
)
|
||||
def test_service_scope_path_allowlist(method, path, allowed):
|
||||
from app.gateway.auth_middleware import _is_llmwiki_sync_request
|
||||
|
||||
assert _is_llmwiki_sync_request(method, path) is allowed
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("scopes", "method", "path", "all_requested", "allowed"),
|
||||
[
|
||||
(["recommended-questions:read"], "GET", "/api/recommended-questions", False, True),
|
||||
(["recommended-questions:read"], "GET", "/api/recommended-questions", True, False),
|
||||
(["recommended-questions:read"], "POST", "/api/recommended-questions", False, False),
|
||||
(["recommended-questions:read"], "GET", "/api/recommended-questions-reorder", False, False),
|
||||
(["recommended-questions:read"], "GET", "/api/llmwiki/knowledge-bases", False, False),
|
||||
(["llmwiki:sync"], "GET", "/api/recommended-questions", False, False),
|
||||
],
|
||||
)
|
||||
def test_recommended_question_service_scope_is_read_only(scopes, method, path, all_requested, allowed):
|
||||
from app.gateway.auth_middleware import _is_service_scope_request
|
||||
|
||||
assert _is_service_scope_request(scopes, method, path, all_requested=all_requested) is allowed
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_service_token_is_rejected_outside_llmwiki_sync(ctx):
|
||||
user = await ctx.provider.create_user("alice@cm.com", password=PASSWORD)
|
||||
token = create_access_token(
|
||||
str(user.id),
|
||||
expires_delta=service_tokens.timedelta(seconds=300),
|
||||
token_version=user.token_version,
|
||||
auth_method="service",
|
||||
client_id="surfsense",
|
||||
scope=["llmwiki:sync"],
|
||||
)
|
||||
response = await ctx.client.get("/api/v1/auth/me", headers={"Authorization": f"Bearer {token}"})
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
def enable_registration():
|
||||
current = settings.load_system_settings()
|
||||
settings.save_system_settings(current.model_copy(update={"authentication": settings.AuthenticationSettings(password_login_enabled=True, registration_enabled=True)}))
|
||||
@@ -83,6 +224,65 @@ async def make_admin(ctx, *, password=PASSWORD):
|
||||
return await ctx.provider.create_user("operator@cm.com", password=password, system_role="admin")
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_login_identity_and_user_management_do_not_use_checkpointer(ctx, monkeypatch):
|
||||
def forbidden(*args, **kwargs):
|
||||
raise AssertionError("Authentication accessed the chat checkpoint backend")
|
||||
|
||||
monkeypatch.setattr(deps, "get_checkpointer", forbidden)
|
||||
ctx.app.state.checkpointer = SimpleNamespace(aget_tuple=forbidden, alist=forbidden, aput=forbidden)
|
||||
user = await make_admin(ctx)
|
||||
ctx.login_config.token_login.enabled = True
|
||||
ctx.login_config.token_login.mock_tokens = {"audit-token": "operator"}
|
||||
assert (await ctx.client.get("/api/v1/auth/options")).status_code == 200
|
||||
for route, kwargs in [
|
||||
("local", {"data": {"username": "operator", "password": PASSWORD}}),
|
||||
("username", {"json": {"username": "operator"}, "params": {"password": PASSWORD}}),
|
||||
("token", {"params": {"token": "audit-token"}}),
|
||||
]:
|
||||
response = await ctx.client.post(f"/api/v1/auth/login/{route}", **kwargs)
|
||||
assert response.status_code == 200, response.text
|
||||
headers = {"Authorization": f"Bearer {response.json()['access_token']}"}
|
||||
assert (await ctx.client.get("/api/v1/auth/me", headers=headers)).json()["id"] == str(user.id)
|
||||
assert (await ctx.client.get("/api/v1/auth/users", headers=headers)).status_code == 200
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_list_users_paged_shape_and_search(ctx):
|
||||
"""传 limit → UserListPage(items/total/approved_count);不传 → 旧全量列表。"""
|
||||
admin = await make_admin(ctx)
|
||||
for name in ("bob@cm.com", "carol@cm.com"):
|
||||
await ctx.provider.create_user(name, password=PASSWORD)
|
||||
await ctx.provider.create_user("dave@cm.com", password=PASSWORD) # 将被取消放行
|
||||
dave = await ctx.provider.get_user_by_email("dave@cm.com")
|
||||
dave.approved = False
|
||||
await ctx.provider.update_user(dave)
|
||||
headers = bearer(admin)
|
||||
|
||||
legacy = await ctx.client.get("/api/v1/auth/users", headers=headers)
|
||||
assert legacy.status_code == 200
|
||||
assert isinstance(legacy.json(), list) and len(legacy.json()) == 4
|
||||
|
||||
paged = await ctx.client.get("/api/v1/auth/users", headers=headers, params={"limit": 2, "offset": 0, "include_counts": "false"})
|
||||
assert paged.status_code == 200, paged.text
|
||||
body = paged.json()
|
||||
assert body["total"] == 4 and body["approved_count"] == 3 # admin+bob+carol 可登录,dave 被拦
|
||||
assert body["limit"] == 2 and body["offset"] == 0
|
||||
assert len(body["items"]) == 2
|
||||
assert all(item["qa_count"] == 0 and item["skill_count"] == 0 for item in body["items"])
|
||||
|
||||
page2 = await ctx.client.get("/api/v1/auth/users", headers=headers, params={"limit": 2, "offset": 2})
|
||||
assert page2.status_code == 200 and len(page2.json()["items"]) == 2
|
||||
|
||||
searched = await ctx.client.get("/api/v1/auth/users", headers=headers, params={"limit": 10, "q": "dave"})
|
||||
assert searched.status_code == 200
|
||||
assert searched.json()["total"] == 1 and searched.json()["items"][0]["email"] == "dave@cm.com"
|
||||
assert searched.json()["approved_count"] == 0 # 搜索范围内唯一用户已被取消放行
|
||||
|
||||
miss = await ctx.client.get("/api/v1/auth/users", headers=headers, params={"limit": 10, "offset": 999})
|
||||
assert miss.status_code == 200 and miss.json()["items"] == [] and miss.json()["total"] == 4
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_anonymous_options_defaults_and_closed_registration(ctx):
|
||||
settings.save_system_settings(settings.SystemSettings())
|
||||
@@ -172,9 +372,13 @@ async def test_policy_admin_only_and_lockout_protection(ctx):
|
||||
for path, kwargs in [
|
||||
("/api/v1/auth/login/username", {"json": {"username": "newbie"}}),
|
||||
("/api/v1/auth/login/token", {"params": {"token": "upstream"}}),
|
||||
("/api/parallel-agents/auth/token", {"json": {"username": "newbie"}}),
|
||||
]:
|
||||
assert (await ctx.client.post(path, **kwargs)).status_code == 403
|
||||
# Detail integrations use the legacy token endpoint as an unconditional
|
||||
# preflight. Policy rejection returns a non-JWT compatibility value.
|
||||
compat = await ctx.client.post("/api/parallel-agents/auth/token", json={"username": "newbie"})
|
||||
assert compat.status_code == 200
|
||||
assert compat.json()["access_token"] == "force-situation-detail-compat-newbie"
|
||||
assert await ctx.provider.count_users() == 2
|
||||
assert (await ctx.client.get("/api/v1/auth/oauth/github", headers=bearer(admin))).status_code == 403
|
||||
|
||||
@@ -247,13 +451,31 @@ async def test_historical_plaintext_passphrase_wins_and_changes_without_old_hash
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_parallel_token_endpoint_cannot_bypass_personal_password(ctx):
|
||||
async def test_parallel_token_endpoint_returns_non_jwt_compat_value_when_login_is_rejected(ctx):
|
||||
await ctx.provider.create_user("alice@cm.com", password=PASSWORD)
|
||||
endpoint = "/api/parallel-agents/auth/token"
|
||||
assert (await ctx.client.post(endpoint, json={"username": "alice"})).status_code == 401
|
||||
fallback = await ctx.client.post(endpoint, json={"username": "alice"})
|
||||
assert fallback.status_code == 200
|
||||
assert fallback.json()["access_token"] == "force-situation-detail-compat-alice"
|
||||
assert (await ctx.client.post(endpoint, params={"password": PASSWORD}, json={"username": "alice"})).status_code == 200
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_parallel_token_endpoint_returns_compat_value_for_any_rejected_detail_preflight(ctx):
|
||||
"""Every old detail client passes its preflight without a real login session."""
|
||||
from app.gateway.auth import TokenError, decode_token
|
||||
|
||||
endpoint = "/api/parallel-agents/auth/token"
|
||||
for username in ("fs-collect", "fs-detail-read", "fs-detail-submit", "fs-detail-update", "task-detail-agent"):
|
||||
response = await ctx.client.post(endpoint, json={"username": username})
|
||||
assert response.status_code == 200
|
||||
payload = response.json()
|
||||
assert payload["access_token"] == f"force-situation-detail-compat-{username}"
|
||||
assert payload["user_id"] == f"external:{username}"
|
||||
# The compatibility value cannot authenticate unrelated APIs.
|
||||
assert isinstance(decode_token(payload["access_token"]), TokenError)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_approval_gate_applies_to_password_login(ctx):
|
||||
await ctx.provider.create_user("blocked@cm.com", password=PASSWORD, approved=False)
|
||||
@@ -313,6 +535,19 @@ async def test_concurrent_registration_email_domains_cannot_claim_same_username(
|
||||
assert await ctx.provider.count_users() == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_username_login_accepts_form_body(ctx):
|
||||
response = await ctx.client.post(
|
||||
"/api/v1/auth/login/username",
|
||||
data={"username": "firefox-legacy"},
|
||||
params={"password": "123ewq"},
|
||||
)
|
||||
assert response.status_code == 200, response.text
|
||||
assert response.json()["username"] == "firefox-legacy"
|
||||
blank = await ctx.client.post("/api/v1/auth/login/username", data={"username": ""})
|
||||
assert blank.status_code == 422
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_username_sso_rechecks_password_if_registration_won_a_race(ctx, monkeypatch):
|
||||
await ctx.provider.create_user("alice@cm.com", password=PASSWORD)
|
||||
@@ -371,8 +606,10 @@ async def test_first_personal_password_requires_current_shared_passphrase(ctx):
|
||||
async def test_enabled_password_login_blocks_bare_username_and_parallel_logins(ctx):
|
||||
await ctx.provider.create_user("legacy@cm.com")
|
||||
for username in ("legacy", "not-created"):
|
||||
for endpoint in ("/api/v1/auth/login/username", "/api/parallel-agents/auth/token"):
|
||||
assert (await ctx.client.post(endpoint, json={"username": username})).status_code == 401
|
||||
assert (await ctx.client.post("/api/v1/auth/login/username", json={"username": username})).status_code == 401
|
||||
compat = await ctx.client.post("/api/parallel-agents/auth/token", json={"username": username})
|
||||
assert compat.status_code == 200
|
||||
assert compat.json()["access_token"] == f"force-situation-detail-compat-{username}"
|
||||
assert await ctx.provider.count_users() == 1
|
||||
|
||||
|
||||
@@ -536,3 +773,54 @@ async def test_first_account_login_obeys_single_session_setting(ctx, method):
|
||||
assert second.status_code == 200
|
||||
assert decode_token(second.json()["access_token"]).ver == 2
|
||||
assert (await ctx.client.get("/api/v1/auth/me", headers={"Authorization": f"Bearer {old_token}"})).status_code == 401
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_whitelist_is_independent_of_statistics_stores(ctx, monkeypatch):
|
||||
admin = await make_admin(ctx)
|
||||
def forbidden(*args, **kwargs):
|
||||
raise AssertionError("Whitelist must not resolve statistics stores")
|
||||
for name in ("get_skill_store", "get_agent_store", "get_run_store"):
|
||||
monkeypatch.setattr(auth, name, forbidden)
|
||||
response = await ctx.client.get("/api/v1/auth/users", headers=bearer(admin), params={"limit": 20, "include_counts": "false"})
|
||||
assert response.status_code == 200, response.text
|
||||
assert response.json()["total"] == 1
|
||||
assert response.json()["items"][0]["login_password"] is None
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@pytest.mark.parametrize("method", ["list_users_page", "count_users_filtered"])
|
||||
async def test_whitelist_timeout_cancels_account_queries(ctx, monkeypatch, method):
|
||||
admin = await make_admin(ctx)
|
||||
cancelled = asyncio.Event()
|
||||
async def stalled(*args, **kwargs):
|
||||
try:
|
||||
await asyncio.Event().wait()
|
||||
finally:
|
||||
cancelled.set()
|
||||
monkeypatch.setattr(ctx.provider, method, stalled)
|
||||
monkeypatch.setattr(auth, "_USER_LIST_TIMEOUT_SECONDS", 0.05)
|
||||
response = await asyncio.wait_for(ctx.client.get("/api/v1/auth/users", headers=bearer(admin), params={"limit": 20, "include_counts": "false"}), 5)
|
||||
assert response.status_code == 503
|
||||
assert "超时" in response.json()["detail"]
|
||||
assert cancelled.is_set()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_whitelist_paged_is_admin_only(ctx):
|
||||
user = await ctx.provider.create_user("normal-whitelist@cm.com", password=PASSWORD)
|
||||
params = {"limit": 20, "include_counts": "false"}
|
||||
assert (await ctx.client.get("/api/v1/auth/users", headers=bearer(user), params=params)).status_code == 403
|
||||
assert (await ctx.client.get("/api/v1/auth/users", params=params)).status_code == 401
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_whitelist_loads_when_resource_stores_unavailable(ctx):
|
||||
admin = await make_admin(ctx)
|
||||
del ctx.app.state.skill_store
|
||||
del ctx.app.state.agent_store
|
||||
response = await ctx.client.get("/api/v1/auth/users", headers=bearer(admin), params={"limit": 20, "include_counts": "false"})
|
||||
assert response.status_code == 200
|
||||
assert response.json()["total"] == 1
|
||||
# The full statistics endpoint still requires the resource stores.
|
||||
assert (await ctx.client.get("/api/v1/auth/users", headers=bearer(admin))).status_code == 503
|
||||
Reference in new issue
Block a user