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>
58 lines
1.4 KiB
Python
58 lines
1.4 KiB
Python
import uuid
|
|
from datetime import datetime, timezone
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy.orm import selectinload
|
|
|
|
from app.models import Message
|
|
|
|
|
|
class MessageNotFoundError(Exception):
|
|
pass
|
|
|
|
|
|
class NotMessageAuthorError(Exception):
|
|
pass
|
|
|
|
|
|
async def create_message(
|
|
db: AsyncSession, room_id: uuid.UUID, user_id: uuid.UUID, content: str
|
|
) -> Message:
|
|
message = Message(room_id=room_id, user_id=user_id, content=content)
|
|
db.add(message)
|
|
await db.commit()
|
|
await db.refresh(message)
|
|
return message
|
|
|
|
|
|
async def edit_message(
|
|
db: AsyncSession, message_id: uuid.UUID, editor_id: uuid.UUID, content: str
|
|
) -> Message:
|
|
message = await db.get(Message, message_id)
|
|
if message is None:
|
|
raise MessageNotFoundError()
|
|
if message.user_id != editor_id:
|
|
raise NotMessageAuthorError()
|
|
|
|
message.content = content
|
|
message.edited_at = datetime.now(timezone.utc)
|
|
await db.commit()
|
|
await db.refresh(message)
|
|
return message
|
|
|
|
|
|
async def list_recent_messages(
|
|
db: AsyncSession, room_id: uuid.UUID, limit: int = 50
|
|
) -> list[Message]:
|
|
result = await db.execute(
|
|
select(Message)
|
|
.where(Message.room_id == room_id)
|
|
.options(selectinload(Message.user))
|
|
.order_by(Message.created_at.desc())
|
|
.limit(limit)
|
|
)
|
|
messages = list(result.scalars().all())
|
|
messages.reverse()
|
|
return messages
|