This commit is contained in:
@@ -20,6 +20,11 @@ class TokenInput(BaseModel):
|
||||
scopes: list[str] = Field(default_factory=lambda: ["research:read"], max_length=len(SCOPES))
|
||||
|
||||
|
||||
class TokenPermissionsInput(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid")
|
||||
scopes: list[str] = Field(max_length=len(SCOPES))
|
||||
|
||||
|
||||
def token_output(row, account):
|
||||
"""Return public metadata only, including whether the current binding is usable."""
|
||||
def timestamp(value):
|
||||
@@ -69,6 +74,26 @@ async def issue_token(body: TokenInput, request: Request):
|
||||
return {**result, "token": secret}
|
||||
|
||||
|
||||
@router.patch("/{token_id}")
|
||||
async def update_token_permissions(token_id: str, body: TokenPermissionsInput, request: Request):
|
||||
"""Update owned active-token scopes without rotating or revealing its secret."""
|
||||
scopes = set(body.scopes)
|
||||
if not scopes <= SCOPES or "research:read" not in scopes:
|
||||
raise HTTPException(422, "权限无效;所有令牌必须包含 research:read")
|
||||
async with request.app.state.sessions.begin() as db:
|
||||
row = await db.scalar(select(MCPToken).where(
|
||||
MCPToken.id == token_id, MCPToken.admin_id == 1, MCPToken.account_id == 1,
|
||||
).with_for_update())
|
||||
if not row:
|
||||
raise HTTPException(404, "MCP Key 不存在")
|
||||
account = await db.get(Account, 1)
|
||||
if token_output(row, account)["status"] != "active":
|
||||
raise HTTPException(409, "仅有效的 MCP Key 可以编辑权限")
|
||||
row.scopes = sorted(scopes)
|
||||
result = token_output(row, account)
|
||||
return result
|
||||
|
||||
|
||||
@router.post("/{token_id}/revoke")
|
||||
async def revoke_token(token_id: str, request: Request):
|
||||
async with request.app.state.sessions.begin() as db:
|
||||
|
||||
@@ -76,3 +76,37 @@ async def test_token_browser_security_and_validation(app, logged_in):
|
||||
row = await db.scalar(select(MCPToken))
|
||||
row.expires_at = now() - timedelta(days=1)
|
||||
assert (await client.get("/api/v1/mcp-tokens")).json()["items"][0]["status"] == "expired"
|
||||
|
||||
|
||||
async def test_edit_token_permissions(app, logged_in):
|
||||
async with app.state.sessions.begin() as db:
|
||||
(await db.get(Account, 1)).wq_user_id = "synthetic-user"
|
||||
token = (await logged_in.post("/api/v1/mcp-tokens", json={"name": "editable"})).json()
|
||||
path = f'/api/v1/mcp-tokens/{token["id"]}'
|
||||
for scopes in [["research:read", "research:write", "backtests:execute"], ["research:read"]]:
|
||||
response = await logged_in.patch(path, json={"scopes": scopes})
|
||||
assert response.status_code == 200
|
||||
result = response.json()
|
||||
assert result["scopes"] == sorted(scopes)
|
||||
assert result["expires_at"] == token["expires_at"]
|
||||
assert result["name"] == token["name"]
|
||||
assert "token" not in result and "token_hash" not in result
|
||||
async with app.state.sessions() as db:
|
||||
assert (await authenticate(db, token["token"])).scopes == frozenset(scopes)
|
||||
for body in [{"scopes": []}, {"scopes": ["admin", "research:read"]}, {"scopes": ["research:write"]}, {"scopes": ["research:read"], "admin_id": 2}, {}]:
|
||||
assert (await logged_in.patch(path, json=body)).status_code == 422
|
||||
body = {"scopes": ["research:read", "research:write"]}
|
||||
assert (await logged_in.patch(path, json=body, headers={"X-WQ-Request": ""})).status_code == 403
|
||||
assert (await logged_in.patch(path, json=body, headers={"Origin": "https://evil.test"})).status_code == 403
|
||||
async with httpx.AsyncClient(transport=httpx.ASGITransport(app=app), base_url="http://testserver") as outsider:
|
||||
assert (await outsider.patch(path, json=body, headers={"Authorization": f'Bearer {token["token"]}', "X-WQ-Request": "1"})).status_code == 401
|
||||
assert (await logged_in.patch("/api/v1/mcp-tokens/missing", json=body)).status_code == 404
|
||||
async with app.state.sessions.begin() as db:
|
||||
(await db.get(Account, 1)).wq_user_id = "changed-user"
|
||||
assert (await logged_in.patch(path, json=body)).status_code == 409
|
||||
async with app.state.sessions.begin() as db:
|
||||
(await db.get(Account, 1)).wq_user_id = "synthetic-user"
|
||||
(await db.get(MCPToken, token["id"])).expires_at = now() - timedelta(days=1)
|
||||
assert (await logged_in.patch(path, json=body)).status_code == 409
|
||||
await logged_in.post(path + "/revoke")
|
||||
assert (await logged_in.patch(path, json=body)).status_code == 409
|
||||
|
||||
Reference in New Issue
Block a user