Private
Public Access
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>
140 lines
4.1 KiB
Python
140 lines
4.1 KiB
Python
import uuid
|
|
|
|
from sqlalchemy import func, select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.models import Room, RoomMembership, RoomRole, User
|
|
from app.security import hash_password
|
|
from app.services.audit import record_audit_log
|
|
|
|
|
|
class UserNotFoundError(Exception):
|
|
pass
|
|
|
|
|
|
class RoomNotFoundError(Exception):
|
|
pass
|
|
|
|
|
|
class CannotActOnSelfError(Exception):
|
|
pass
|
|
|
|
|
|
class TargetNotRoomMemberError(Exception):
|
|
pass
|
|
|
|
|
|
async def _get_user(db: AsyncSession, user_id: uuid.UUID) -> User:
|
|
user = await db.get(User, user_id)
|
|
if user is None:
|
|
raise UserNotFoundError()
|
|
return user
|
|
|
|
|
|
async def _get_room(db: AsyncSession, room_id: uuid.UUID) -> Room:
|
|
room = await db.get(Room, room_id)
|
|
if room is None:
|
|
raise RoomNotFoundError()
|
|
return room
|
|
|
|
|
|
async def _get_membership(
|
|
db: AsyncSession, room_id: uuid.UUID, user_id: uuid.UUID
|
|
) -> RoomMembership:
|
|
result = await db.execute(
|
|
select(RoomMembership).where(
|
|
RoomMembership.room_id == room_id, RoomMembership.user_id == user_id
|
|
)
|
|
)
|
|
membership = result.scalar_one_or_none()
|
|
if membership is None:
|
|
raise TargetNotRoomMemberError()
|
|
return membership
|
|
|
|
|
|
async def list_users(db: AsyncSession) -> list[User]:
|
|
result = await db.execute(select(User).order_by(User.created_at))
|
|
return list(result.scalars().all())
|
|
|
|
|
|
async def set_user_active(
|
|
db: AsyncSession, actor: User, target_user_id: uuid.UUID, active: bool
|
|
) -> User:
|
|
if target_user_id == actor.id:
|
|
raise CannotActOnSelfError()
|
|
user = await _get_user(db, target_user_id)
|
|
user.is_active = active
|
|
record_audit_log(db, actor, "user.activate" if active else "user.deactivate", "user", user.id)
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return user
|
|
|
|
|
|
async def reset_user_password(
|
|
db: AsyncSession, actor: User, target_user_id: uuid.UUID, new_password: str
|
|
) -> None:
|
|
user = await _get_user(db, target_user_id)
|
|
user.password_hash = hash_password(new_password)
|
|
record_audit_log(db, actor, "user.reset_password", "user", user.id)
|
|
await db.commit()
|
|
|
|
|
|
async def set_user_site_admin(
|
|
db: AsyncSession, actor: User, target_user_id: uuid.UUID, is_admin: bool
|
|
) -> User:
|
|
if target_user_id == actor.id:
|
|
raise CannotActOnSelfError()
|
|
user = await _get_user(db, target_user_id)
|
|
user.is_site_admin = is_admin
|
|
record_audit_log(db, actor, "user.promote" if is_admin else "user.demote", "user", user.id)
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return user
|
|
|
|
|
|
async def list_rooms_admin(db: AsyncSession) -> list[tuple[Room, int]]:
|
|
result = await db.execute(
|
|
select(Room, func.count(RoomMembership.user_id))
|
|
.outerjoin(RoomMembership, RoomMembership.room_id == Room.id)
|
|
.group_by(Room.id)
|
|
.order_by(Room.created_at)
|
|
)
|
|
return [(room, count) for room, count in result.all()]
|
|
|
|
|
|
async def set_room_archived(
|
|
db: AsyncSession, actor: User, room_id: uuid.UUID, archived: bool
|
|
) -> Room:
|
|
room = await _get_room(db, room_id)
|
|
room.is_archived = archived
|
|
record_audit_log(db, actor, "room.archive" if archived else "room.unarchive", "room", room.id)
|
|
await db.commit()
|
|
await db.refresh(room)
|
|
return room
|
|
|
|
|
|
async def transfer_ownership_admin(
|
|
db: AsyncSession, actor: User, room_id: uuid.UUID, new_owner_id: uuid.UUID
|
|
) -> Room:
|
|
room = await _get_room(db, room_id)
|
|
# Same invariant as the member-initiated room_service.transfer_ownership
|
|
# (new owner must already be a member) -- this is the admin override for
|
|
# the "acting user must currently be the owner" gate, not for that one.
|
|
new_owner_membership = await _get_membership(db, room_id, new_owner_id)
|
|
current_owner_membership = await _get_membership(db, room_id, room.owner_id)
|
|
|
|
new_owner_membership.role = RoomRole.owner
|
|
current_owner_membership.role = RoomRole.admin
|
|
room.owner_id = new_owner_id
|
|
record_audit_log(
|
|
db,
|
|
actor,
|
|
"room.transfer_ownership",
|
|
"room",
|
|
room.id,
|
|
{"new_owner_id": str(new_owner_id)},
|
|
)
|
|
await db.commit()
|
|
await db.refresh(room)
|
|
return room
|