chenxin
ba502297ac
- 认证：Web Session（__Host- Cookie、HttpOnly/Secure/SameSite=Lax、CSPRNG opaque token 数据库只存哈希）、CSRF 双提交、Origin 校验、dev 登录/登出端点；未认证 401、缺 CSRF 403
- 中间件：Hunjing-Request-ID 回显/生成（request_ UUIDv4）+ W3C traceparent 校验透传；JSON 结构化日志与敏感头脱敏
- 迁移 2：conversation/branch/message/run/idempotency_record 五表（含检查约束与复合索引）；Session 补 token/csrf 哈希列
- 垂直切片：POST /v1/conversations/{id}/messages 按 Idempotency-Key 幂等（同键同体 200 重放、异体 409），同事务原子写 Message+Run+Audit+Outbox+幂等记录；ContentBlock text/markdown 判别联合（未知类型 422）
- SSE：GET /v1/runs/{id}/events 返回快照与终止状态事件 envelope
- 测试 26 项全绿：IDOR 跨域 404 fail-closed、失败注入回滚无孤儿（Run 崩溃后 message/run/audit/outbox/幂等全零）、SSE 事件序、auth 边界；ruff/mypy strict 干净
- 修复真实问题：asyncpg 跨事件循环（anyio/pytest-asyncio 双 loop、模块级 engine 改为 app 实例持有）、httpx 拒存 http 下 Secure Cookie
251 lines
10 KiB
Python
251 lines
10 KiB
Python
"""首批领域模型：身份、会话、服务账号、审计与 Outbox（WP-01）。
|
||
|
||
- 主键为带前缀的 UUIDv7 文本（ADR-015）；Session ID 为 CSPRNG opaque（秘密不用 UUID）。
|
||
- 命名约定见 app/db/base.py（pk_/uq_/ix_/fk_，AGENTS.md 8.6）。
|
||
- AuditEvent 与 OutboxEvent 不可变：无 updated_at，修正写新记录（契约第 4.4 节）。
|
||
"""
|
||
|
||
from datetime import datetime
|
||
from typing import Any
|
||
|
||
from sqlalchemy import CheckConstraint, DateTime, ForeignKey, Index, String, func
|
||
from sqlalchemy.dialects.postgresql import JSONB
|
||
from sqlalchemy.orm import Mapped, mapped_column
|
||
|
||
from app.core.ids import new_id
|
||
from app.db.base import Base
|
||
|
||
|
||
class User(Base):
|
||
__tablename__ = "user"
|
||
|
||
id: Mapped[str] = mapped_column(String, primary_key=True, default=lambda: new_id("user_"))
|
||
email: Mapped[str] = mapped_column(String, nullable=False, unique=True)
|
||
display_name: Mapped[str] = mapped_column(String, nullable=False)
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
updated_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now()
|
||
)
|
||
|
||
|
||
class PersonalDomain(Base):
|
||
__tablename__ = "personal_domain"
|
||
|
||
id: Mapped[str] = mapped_column(
|
||
String, primary_key=True, default=lambda: new_id("domain_")
|
||
)
|
||
user_id: Mapped[str] = mapped_column(
|
||
ForeignKey("user.id", ondelete="restrict"), nullable=False, index=True
|
||
)
|
||
name: Mapped[str] = mapped_column(String, nullable=False)
|
||
# 区域驻留（ADR-024 之前的数据驻留决策）：默认区域，迁移走正式协议
|
||
data_region: Mapped[str] = mapped_column(String, nullable=False, default="default")
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
|
||
|
||
class Session(Base):
|
||
"""Web 会话：ID 为 CSPRNG opaque value，数据库只存校验值（ADR-015）。"""
|
||
|
||
__tablename__ = "session"
|
||
|
||
id: Mapped[str] = mapped_column(String, primary_key=True)
|
||
user_id: Mapped[str] = mapped_column(
|
||
ForeignKey("user.id", ondelete="cascade"), nullable=False, index=True
|
||
)
|
||
token_hash: Mapped[str] = mapped_column(String, nullable=False, unique=True)
|
||
csrf_token_hash: Mapped[str] = mapped_column(String, nullable=False)
|
||
expires_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, index=True
|
||
)
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
revoked_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
||
|
||
|
||
class ServiceAccount(Base):
|
||
"""自动化账号：API key 明文只显示一次，只保存哈希、前缀、scope 与撤销状态。"""
|
||
|
||
__tablename__ = "service_account"
|
||
|
||
id: Mapped[str] = mapped_column(
|
||
String, primary_key=True, default=lambda: new_id("service_account_")
|
||
)
|
||
domain_id: Mapped[str] = mapped_column(
|
||
ForeignKey("personal_domain.id", ondelete="cascade"), nullable=False
|
||
)
|
||
name: Mapped[str] = mapped_column(String, nullable=False)
|
||
key_prefix: Mapped[str] = mapped_column(String, nullable=False, index=True)
|
||
key_hash: Mapped[str] = mapped_column(String, nullable=False)
|
||
scopes: Mapped[list[str]] = mapped_column(JSONB, nullable=False, default=list)
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
revoked_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
||
|
||
__table_args__ = (Index("uq_service_account_domain_name", "domain_id", "name", unique=True),)
|
||
|
||
|
||
class AuditEvent(Base):
|
||
"""不可变审计链：状态与 Outbox 在同一事务提交（契约第 4.4 节）。"""
|
||
|
||
__tablename__ = "audit_event"
|
||
|
||
id: Mapped[str] = mapped_column(String, primary_key=True, default=lambda: new_id("audit_"))
|
||
occurred_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
actor_type: Mapped[str] = mapped_column(String, nullable=False)
|
||
actor_id: Mapped[str] = mapped_column(String, nullable=False)
|
||
action: Mapped[str] = mapped_column(String, nullable=False)
|
||
aggregate_type: Mapped[str] = mapped_column(String, nullable=False)
|
||
aggregate_id: Mapped[str] = mapped_column(String, nullable=False)
|
||
payload: Mapped[dict[str, Any] | None] = mapped_column(JSONB, nullable=True)
|
||
trace_id: Mapped[str | None] = mapped_column(String, nullable=True)
|
||
|
||
__table_args__ = (
|
||
# 聚合时间线是审计的主要查询路径（最左前缀覆盖聚合定位）
|
||
Index("ix_audit_event_aggregate", "aggregate_type", "aggregate_id", "occurred_at"),
|
||
Index("ix_audit_event_occurred_at", "occurred_at"),
|
||
)
|
||
|
||
|
||
class OutboxEvent(Base):
|
||
"""Transactional Outbox：已提交领域事实的可靠投递队列。"""
|
||
|
||
__tablename__ = "outbox_event"
|
||
|
||
id: Mapped[str] = mapped_column(String, primary_key=True, default=lambda: new_id("event_"))
|
||
occurred_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
aggregate_type: Mapped[str] = mapped_column(String, nullable=False)
|
||
aggregate_id: Mapped[str] = mapped_column(String, nullable=False)
|
||
event_type: Mapped[str] = mapped_column(String, nullable=False)
|
||
payload: Mapped[dict[str, Any]] = mapped_column(JSONB, nullable=False)
|
||
status: Mapped[str] = mapped_column(String, nullable=False, default="pending")
|
||
attempts: Mapped[int] = mapped_column(nullable=False, default=0)
|
||
delivered_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
||
|
||
__table_args__ = (
|
||
CheckConstraint(
|
||
"status IN ('pending', 'delivered', 'failed')",
|
||
name="status_values",
|
||
),
|
||
# 投递循环按状态+时间扫描待处理事件
|
||
Index("ix_outbox_event_status_occurred", "status", "occurred_at"),
|
||
Index("ix_outbox_event_aggregate", "aggregate_type", "aggregate_id"),
|
||
)
|
||
|
||
|
||
class Conversation(Base):
|
||
"""对话容器：归属个人域（垂直切片 WP-03 最小集）。"""
|
||
|
||
__tablename__ = "conversation"
|
||
|
||
id: Mapped[str] = mapped_column(
|
||
String, primary_key=True, default=lambda: new_id("conversation_")
|
||
)
|
||
personal_domain_id: Mapped[str] = mapped_column(
|
||
ForeignKey("personal_domain.id", ondelete="cascade"), nullable=False, index=True
|
||
)
|
||
title: Mapped[str] = mapped_column(String, nullable=False, default="未命名对话")
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
updated_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now()
|
||
)
|
||
|
||
|
||
class Branch(Base):
|
||
"""对话分支：创建会话时生成默认主分支。"""
|
||
|
||
__tablename__ = "branch"
|
||
|
||
id: Mapped[str] = mapped_column(String, primary_key=True, default=lambda: new_id("branch_"))
|
||
conversation_id: Mapped[str] = mapped_column(
|
||
ForeignKey("conversation.id", ondelete="cascade"), nullable=False, index=True
|
||
)
|
||
title: Mapped[str] = mapped_column(String, nullable=False, default="主脉")
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
|
||
|
||
class Message(Base):
|
||
"""消息：content 为 canonical ContentBlock JSON（本切片为 Text/Markdown 子集）。"""
|
||
|
||
__tablename__ = "message"
|
||
|
||
id: Mapped[str] = mapped_column(String, primary_key=True, default=lambda: new_id("message_"))
|
||
conversation_id: Mapped[str] = mapped_column(
|
||
ForeignKey("conversation.id", ondelete="cascade"), nullable=False, index=True
|
||
)
|
||
branch_id: Mapped[str] = mapped_column(
|
||
ForeignKey("branch.id", ondelete="cascade"), nullable=False, index=True
|
||
)
|
||
role: Mapped[str] = mapped_column(String, nullable=False)
|
||
content: Mapped[list[dict[str, Any]]] = mapped_column(JSONB, nullable=False)
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
|
||
__table_args__ = (
|
||
CheckConstraint("role IN ('user', 'assistant', 'system', 'tool')", name="role_values"),
|
||
)
|
||
|
||
|
||
class Run(Base):
|
||
"""Agent 执行：状态机见 Agent 运行时第 3 节；本切片空转即完成。"""
|
||
|
||
__tablename__ = "run"
|
||
|
||
id: Mapped[str] = mapped_column(String, primary_key=True, default=lambda: new_id("run_"))
|
||
personal_domain_id: Mapped[str] = mapped_column(
|
||
ForeignKey("personal_domain.id", ondelete="cascade"), nullable=False, index=True
|
||
)
|
||
conversation_id: Mapped[str | None] = mapped_column(
|
||
ForeignKey("conversation.id", ondelete="cascade"), nullable=True, index=True
|
||
)
|
||
status: Mapped[str] = mapped_column(String, nullable=False, default="queued")
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
completed_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
||
|
||
__table_args__ = (
|
||
CheckConstraint(
|
||
"status IN ('queued', 'running', 'waiting_approval', "
|
||
"'completed', 'failed', 'cancelled')",
|
||
name="status_values",
|
||
),
|
||
Index("ix_run_domain_status", "personal_domain_id", "status"),
|
||
)
|
||
|
||
|
||
class IdempotencyRecord(Base):
|
||
"""幂等键记录：按 认证主体+路由+键 隔离，保存请求哈希与结果引用（契约第 6 节）。"""
|
||
|
||
__tablename__ = "idempotency_record"
|
||
|
||
key: Mapped[str] = mapped_column(String, primary_key=True)
|
||
owner_domain_id: Mapped[str] = mapped_column(
|
||
ForeignKey("personal_domain.id", ondelete="cascade"), nullable=False
|
||
)
|
||
route: Mapped[str] = mapped_column(String, nullable=False)
|
||
request_hash: Mapped[str] = mapped_column(String, nullable=False)
|
||
response_status: Mapped[int] = mapped_column(nullable=False)
|
||
resource_ids: Mapped[dict[str, Any]] = mapped_column(JSONB, nullable=False, default=dict)
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
|
||
__table_args__ = (
|
||
Index("uq_idempotency_owner_route_key", "owner_domain_id", "route", "key", unique=True),
|
||
)
|