0e6b3b1811
按 ROADMAP §3.1 治理批次推进的后端设计审查整改:
- 批次 0(安全):/api/status/{task_id} 补 JWT 鉴权与任务归属校验;
pythonocc_available 真实探测;bcrypt 超 72 字节显式拒绝;
SECRET_KEY/RUSTFS_* 惰性校验,代码侧弱默认移除
- 批次 1(部署正确性):主处理链路改走 RustFS(分派入参 stp_file_id 化,
worker 按 object_key 下载);AUTO_MIGRATE 开关 + 迁移目录 alembic/→migrations/
修复包遮蔽(自动迁移此前从未真正生效);OCC 镜像改 conda 原生执行 +
基础镜像 tag 锁定;compose 关键项改 ${VAR:?} 强制显式配置
- 批次 2(任务一致性):删除 Redis 进程内存回退,PG 为任务状态单一事实源;
批量元数据入库(processing_tasks.batch_id,迁移 a3f8c2d91e47);
型腔失败任务标 failed 不再静默 completed;事务边界收口
(数据本体写 flush-only、失败先回滚再置 failed、进度更新保留即时 commit)
- 批次 3(API 与代码结构):592 行 advanced_router 拆为 design/cost/machining/
export 四子路由,请求体全量 Pydantic 化;ROUTE_MODULES + route_registry
(/api/health 呈现 degraded,DEBUG fail fast);纯计算端点统一 to_thread;
StorageIntegrationService 按职责三拆;MAX_FILE_SIZE 接线生效、
celery 复用 Settings.redis_url;管理员重置密码改 JSON body(端到端断裂修复);
openapi.json 重导出(76 paths)+ 前端 gen:api
- 批次 4(架构演进):共享 ORM 按模块拆分(shared/models/base.py + identity.py、
moldinsight/models/、inventory/models/,删除三条无使用方的跨模块
relationship,跨模块桥接收敛为裸 FK 硬规则,无兼容 facade);
OCC executor 重建补 cancel_futures=True(消除旧队列被慢恢复线程
并行消化的数据竞争);OCC 吞吐方案设计先行
(docs/topics/performance/OCC_THROUGHPUT.md);顺手清偿 D15
(vite.config.ts 未用参数致 npm run build 失败)
测试基线:125 passed, 2 skipped(pytest + sqlite+aiosqlite;归属边界、
路由契约、配置治理、鉴权回归等随批新增)
文档同步:STATUS / TECH_DEBT / ROADMAP / ARCHITECTURE / API_CONTRACT /
OPERATIONS / AGENTS
Co-Authored-By: Claude Code <noreply@anthropic.com>
184 lines
6.3 KiB
Python
184 lines
6.3 KiB
Python
from datetime import datetime, timedelta
|
|
from typing import Optional
|
|
from jose import JWTError, ExpiredSignatureError, jwt
|
|
import bcrypt
|
|
from fastapi import Depends, HTTPException, status, Request
|
|
from fastapi.security import OAuth2PasswordBearer
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy import select
|
|
from sqlalchemy.orm import selectinload
|
|
|
|
from shared.config.settings import settings
|
|
from shared.database.database import get_db_session
|
|
from shared.models.identity import User, UserRole
|
|
from shared.utils.logger import get_logger
|
|
|
|
logger = get_logger(__name__)
|
|
|
|
pwd_context = bcrypt
|
|
|
|
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/login", auto_error=False)
|
|
|
|
|
|
def _require_secret_key() -> str:
|
|
"""SECRET_KEY 惰性校验:未配置时给出明确错误,而不是让 jwt.encode/decode 报晦涩 TypeError。"""
|
|
if not settings.SECRET_KEY:
|
|
raise RuntimeError("SECRET_KEY 未配置:请在 .env 中设置后重启服务(认证功能不可用)")
|
|
return settings.SECRET_KEY
|
|
|
|
|
|
def verify_password(plain_password: str, hashed_password: str) -> bool:
|
|
# 比较侧按 bcrypt 语义截断到 72 字节:兼容历史上被截断存储的口令,
|
|
# 且避免 checkpw 对超长输入直接抛 ValueError(登录会变 500);
|
|
# 新口令的超长拒绝在 get_password_hash 中完成
|
|
password_bytes = plain_password.encode('utf-8')[:72]
|
|
try:
|
|
return pwd_context.checkpw(password_bytes, hashed_password.encode('utf-8'))
|
|
except ValueError:
|
|
return False
|
|
|
|
|
|
def get_password_hash(password: str) -> str:
|
|
# bcrypt 算法上限 72 字节:超长密码必须显式拒绝,静默截断会改变有效密码
|
|
if len(password.encode('utf-8')) > 72:
|
|
raise ValueError("密码长度超过 72 字节限制,请使用更短的密码")
|
|
return pwd_context.hashpw(password.encode('utf-8'), pwd_context.gensalt()).decode('utf-8')
|
|
|
|
|
|
def create_access_token(data: dict, expires_delta: Optional[timedelta] = None) -> str:
|
|
to_encode = data.copy()
|
|
if expires_delta:
|
|
expire = datetime.utcnow() + expires_delta
|
|
else:
|
|
expire = datetime.utcnow() + timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
|
|
to_encode.update({"exp": expire})
|
|
encoded_jwt = jwt.encode(to_encode, _require_secret_key(), algorithm=settings.ALGORITHM)
|
|
return encoded_jwt
|
|
|
|
|
|
async def get_current_user(
|
|
token: Optional[str] = Depends(oauth2_scheme),
|
|
db_session: AsyncSession = Depends(get_db_session)
|
|
) -> Optional[User]:
|
|
if not token:
|
|
return None
|
|
|
|
try:
|
|
payload = jwt.decode(token, _require_secret_key(), algorithms=[settings.ALGORITHM])
|
|
username: str = payload.get("sub")
|
|
if username is None:
|
|
logger.warning(f"[AUTH] Token 中缺少 sub 字段")
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Token 格式无效:缺少用户标识",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
except ExpiredSignatureError:
|
|
logger.warning(f"[AUTH] Token 已过期")
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="登录已过期,请重新登录",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
except JWTError as e:
|
|
logger.warning(f"[AUTH] Token 验证失败: {type(e).__name__}")
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Token 无效,请重新登录",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
|
|
result = await db_session.execute(
|
|
select(User).options(selectinload(User.user_roles).selectinload(UserRole.role)).where(User.username == username)
|
|
)
|
|
user = result.scalar_one_or_none()
|
|
|
|
if user is None:
|
|
logger.warning(f"[AUTH] Token 有效但用户不存在: {username}")
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="用户账户不存在,请重新登录",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
if not user.is_active:
|
|
logger.warning(f"[AUTH] 用户已被禁用: {username}")
|
|
raise HTTPException(status_code=400, detail="用户已被禁用")
|
|
|
|
return user
|
|
|
|
|
|
async def get_current_active_user(
|
|
current_user: Optional[User] = Depends(get_current_user)
|
|
) -> User:
|
|
if not current_user:
|
|
logger.warning("[AUTH] 未提供认证信息,拒绝访问")
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="请先登录",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
return current_user
|
|
|
|
|
|
async def get_current_admin_user(
|
|
current_user: User = Depends(get_current_active_user)
|
|
) -> User:
|
|
if not current_user.is_superuser:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_403_FORBIDDEN,
|
|
detail="需要管理员权限"
|
|
)
|
|
return current_user
|
|
|
|
|
|
async def authenticate_user(db_session: AsyncSession, username: str, password: str) -> Optional[User]:
|
|
result = await db_session.execute(
|
|
select(User).options(selectinload(User.user_roles).selectinload(UserRole.role)).where(User.username == username)
|
|
)
|
|
user = result.scalar_one_or_none()
|
|
|
|
if not user:
|
|
return None
|
|
if not verify_password(password, user.hashed_password):
|
|
return None
|
|
|
|
user.last_login = datetime.utcnow()
|
|
await db_session.commit()
|
|
|
|
return user
|
|
|
|
|
|
async def create_user(
|
|
db_session: AsyncSession,
|
|
username: str,
|
|
email: str,
|
|
password: str,
|
|
full_name: Optional[str] = None
|
|
) -> User:
|
|
hashed_password = get_password_hash(password)
|
|
user = User(
|
|
username=username,
|
|
email=email,
|
|
hashed_password=hashed_password,
|
|
full_name=full_name,
|
|
is_active=True
|
|
)
|
|
db_session.add(user)
|
|
await db_session.commit()
|
|
await db_session.refresh(user)
|
|
return user
|
|
|
|
|
|
async def get_user_by_username(db_session: AsyncSession, username: str) -> Optional[User]:
|
|
result = await db_session.execute(
|
|
select(User).where(User.username == username)
|
|
)
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def get_user_by_email(db_session: AsyncSession, email: str) -> Optional[User]:
|
|
result = await db_session.execute(
|
|
select(User).where(User.email == email)
|
|
)
|
|
return result.scalar_one_or_none()
|