Private
Public Access
ksmithandClaude Sonnet 5
0ab23c44a7
Bot accounts (User rows with is_bot=True), scoped API tokens (read:messages, write:messages, manage:rooms) authenticated via Authorization: Bearer on both REST and the WS handshake, live bot WebSocket access on the same /ws/chat endpoint humans use, message editing (WS "edit" envelope -> message_update broadcast, fans out cross-instance for free via the existing broadcaster), incoming webhooks (room-scoped, no auth beyond the URL token), and outgoing webhooks/event subscriptions (HMAC-SHA256 signed, backgrounded delivery, creation-time SSRF validation against private/loopback/link-local targets). Token auth is additive, not a parallel system: a bearer-token-authenticated bot goes through the exact same room-membership/role checks a session- authenticated human does everywhere; only read:messages/write:messages are separately scope-gated (the two message endpoints). manage:rooms scope enforcement, full per-delivery SSRF re-validation, and bot API rate limiting were explicitly scoped out (confirmed with the repo owner) as disproportionate to this phase -- documented as known gaps in backend/README.md rather than silently skipped. Admin portal gains a Bots tab (create bots, issue/revoke scoped tokens, cross-room webhook visibility); RoomInfoPanel gains room-scoped webhook/ subscription management, mirroring how invites already work there. The chat UI also gets a minimal "edit your own message" affordance -- not asked for by the issue, but the only practical way to exercise the edit pipeline by hand instead of only via a scripted bot client. Along the way: fixed a real bug caught while writing the incoming-webhook test -- offline-push notification relied on the sender being "connected" to exclude themselves, true for WS-originated messages but not for the new webhook path, which has no WS connection for the attributed sender at all. Now explicitly excluded. Also discovered the REST-only test fixture never triggered ASGI lifespan, so app.state.broadcaster/presence didn't exist for it; moved their construction out of the lifespan into create_app() itself (Redis client construction is synchronous/lazy) so both the WS and REST-only paths always have them. New tests/test_bots.py, test_message_edit.py, test_webhooks.py (full suite now 78/78, stable across repeated runs) plus a scripted end-to-end smoke test (bot WS join/post/edit, incoming webhook, SSRF rejection, outgoing delivery) and a full browser walkthrough of the new admin/room UI. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
92 lines
2.8 KiB
Python
92 lines
2.8 KiB
Python
import uuid
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.database import get_db
|
|
from app.dependencies import get_current_user, require_site_admin
|
|
from app.models import User
|
|
from app.schemas.bot import ApiTokenCreate, ApiTokenCreated, ApiTokenRead, BotCreate, BotRead
|
|
from app.services.bot_service import (
|
|
BotNotFoundError,
|
|
DuplicateBotError,
|
|
InvalidScopeError,
|
|
TokenNotFoundError,
|
|
create_api_token,
|
|
create_bot,
|
|
list_api_tokens,
|
|
list_bots,
|
|
revoke_api_token,
|
|
)
|
|
|
|
router = APIRouter(prefix="/api/admin/bots", tags=["bots"])
|
|
|
|
|
|
@router.post("", response_model=BotRead, status_code=201)
|
|
async def create_bot_endpoint(
|
|
data: BotCreate,
|
|
current_user: User = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
require_site_admin(current_user)
|
|
try:
|
|
return await create_bot(db, current_user, data.username)
|
|
except DuplicateBotError:
|
|
raise HTTPException(status_code=409, detail="A user with this username already exists")
|
|
|
|
|
|
@router.get("", response_model=list[BotRead])
|
|
async def list_bots_endpoint(
|
|
current_user: User = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
require_site_admin(current_user)
|
|
return await list_bots(db)
|
|
|
|
|
|
@router.post("/{bot_id}/tokens", response_model=ApiTokenCreated, status_code=201)
|
|
async def create_token_endpoint(
|
|
bot_id: uuid.UUID,
|
|
data: ApiTokenCreate,
|
|
current_user: User = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
require_site_admin(current_user)
|
|
try:
|
|
token, plaintext = await create_api_token(db, current_user, bot_id, data.scopes)
|
|
except BotNotFoundError:
|
|
raise HTTPException(status_code=404, detail="Bot not found")
|
|
except InvalidScopeError:
|
|
raise HTTPException(status_code=400, detail="Unrecognized scope")
|
|
return ApiTokenCreated(
|
|
id=token.id,
|
|
owner_id=token.owner_id,
|
|
scopes=token.scopes,
|
|
last_used_at=token.last_used_at,
|
|
created_at=token.created_at,
|
|
token=plaintext,
|
|
)
|
|
|
|
|
|
@router.get("/{bot_id}/tokens", response_model=list[ApiTokenRead])
|
|
async def list_tokens_endpoint(
|
|
bot_id: uuid.UUID,
|
|
current_user: User = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
require_site_admin(current_user)
|
|
return await list_api_tokens(db, bot_id)
|
|
|
|
|
|
@router.delete("/tokens/{token_id}", status_code=204)
|
|
async def revoke_token_endpoint(
|
|
token_id: uuid.UUID,
|
|
current_user: User = Depends(get_current_user),
|
|
db: AsyncSession = Depends(get_db),
|
|
):
|
|
require_site_admin(current_user)
|
|
try:
|
|
await revoke_api_token(db, current_user, token_id)
|
|
except TokenNotFoundError:
|
|
raise HTTPException(status_code=404, detail="Token not found")
|