feat(后端): 添加授权体系、系统监控与试用期计提
按 2026-11-02 需求补齐计划交付后端能力: - 角色授权:权限目录化,接口统一准入校验,未登记默认拒绝; 管理员判断改为按数据库角色重新判定,防止权限码持有者绕过 - 系统监控:单进程采集资源、请求与异常指标,分钟级聚合, 阈值配置化;敏感配置增加 repr 保护,Redis 密码 URL 转义 - 试用期计提:按回款日判定并写入快照,年度结清与调整单联动; 人员模型补试用期、离职日期与工资版本历史字段 - 计提模板:公式骨架受控,页面维护名称与参数绑定 - T+ 采集:自动化配置表与进度查询 内置角色禁停用保护对齐模块注释;核算规则版本提为常量并 补充批量核算失败堆栈日志。 影响范围:后端全部模块、数据库迁移 V22-V28 验证:uv run ruff check 通过;922 个单元测试全部通过; 集成测试因本机 MySQL 数据卷被其他容器锁定暂未运行
这个提交包含在:
1 父节点
02fb06e0af
当前提交
1461a8d113
149 个文件已更改
+8736
-368
没有与搜索条件相匹配的文件
+44
-11
@@ -98,7 +98,7 @@ def _is_digits(value: object) -> bool:
|
||||
return isinstance(value, str) and value.isdigit()
|
||||
|
||||
|
||||
def require_admin(current_user: Annotated[User, Depends(get_current_user)]) -> User:
|
||||
def require_admin(current_user: Annotated[User, Depends(get_current_user)], request: Request) -> User:
|
||||
"""要求当前用户具备管理员角色。
|
||||
|
||||
需求 2.5.1 只定义了「系统管理员(全部权限)」与「普通用户(业务操作)」两个
|
||||
@@ -107,6 +107,9 @@ def require_admin(current_user: Annotated[User, Depends(get_current_user)]) -> U
|
||||
|
||||
:raises ForbiddenError: 已登录但不具备管理员角色(403)
|
||||
"""
|
||||
# 权限码与「仅管理员」是两套语义:部分系统权限(如 system:params:update)
|
||||
# 可授予普通角色,统一入口通过不代表本端点放行,这里不依赖
|
||||
# authorization_checked 短路,每次按数据库角色重新判定。
|
||||
if ROLE_ADMIN not in user_repository.get_role_codes(current_user):
|
||||
raise ForbiddenError("需要管理员权限")
|
||||
return current_user
|
||||
@@ -120,19 +123,14 @@ LoginUser = Annotated[User, Depends(get_current_user)]
|
||||
|
||||
|
||||
def require_payroll_writer(current_user: LoginUser) -> User:
|
||||
from app.services.payroll_access import ensure_payroll_writer
|
||||
|
||||
return ensure_payroll_writer(current_user)
|
||||
"""兼容原写接口注解;操作权限由统一入口校验,制作人限制仅用于工资操作。"""
|
||||
return current_user
|
||||
|
||||
|
||||
PayrollWriter = Annotated[User, Depends(require_payroll_writer)]
|
||||
|
||||
|
||||
def require_workbench_reader(current_user: LoginUser) -> User:
|
||||
from app.services.payroll_access import can_write_payroll
|
||||
|
||||
if ROLE_ADMIN not in user_repository.get_role_codes(current_user) and not can_write_payroll(current_user):
|
||||
raise ForbiddenError("需要管理员或指定工资制作人权限")
|
||||
return current_user
|
||||
|
||||
|
||||
@@ -152,10 +150,45 @@ def require_roles(*role_codes: str, message: str = "无权访问审批管理"):
|
||||
:raises ForbiddenError: 已登录但不具备任一指定角色(403)
|
||||
"""
|
||||
|
||||
def _checker(current_user: Annotated[User, Depends(get_current_user)]) -> User:
|
||||
codes = set(user_repository.get_role_codes(current_user))
|
||||
if not codes & set(role_codes):
|
||||
def _checker(current_user: Annotated[User, Depends(get_current_user)], request: Request) -> User:
|
||||
# 与 require_admin 同理:不依赖统一入口的短路标记,按数据库角色判定。
|
||||
held = set(user_repository.get_role_codes(current_user))
|
||||
if not held & set(role_codes):
|
||||
raise ForbiddenError(message)
|
||||
return current_user
|
||||
|
||||
return _checker
|
||||
|
||||
|
||||
async def authorize_request(request: Request, session: DbSession, credentials: BearerCredentials):
|
||||
"""统一覆盖查询、导出和写入;公开端点以显式白名单处理。"""
|
||||
from app.services import authorization_policy as policy
|
||||
from app.services.authorization_service import require_permission
|
||||
|
||||
endpoint = request.scope["route"].endpoint
|
||||
module = endpoint.__module__.removeprefix("app.api.v1.")
|
||||
name = endpoint.__name__
|
||||
if (module, name) in policy.PUBLIC_ENDPOINTS:
|
||||
return
|
||||
user = get_current_user(credentials, session)
|
||||
body = {}
|
||||
if request.method in ("POST", "PUT", "PATCH") and request.headers.get("content-type", "").split(";", 1)[0] == "application/json":
|
||||
try:
|
||||
value = await request.json()
|
||||
body = value if isinstance(value, dict) else {}
|
||||
except ValueError:
|
||||
body = {}
|
||||
code = policy.permission_for(module, name, request.method, params=request.path_params, body=body)
|
||||
if code is None:
|
||||
raise ForbiddenError("此接口尚未登记权限,操作已拒绝")
|
||||
if code:
|
||||
try:
|
||||
require_permission(session, user, code)
|
||||
except ForbiddenError:
|
||||
from app.services.audit_service import AuditRecord, audit
|
||||
|
||||
with audit(session, operator=user, meta=get_request_meta(request), record=AuditRecord(
|
||||
"权限管理", "权限拒绝", "操作因未授权被拒绝", {"permission_code": code}
|
||||
)):
|
||||
raise
|
||||
request.state.authorization_checked = True
|
||||
在新工单中引用
屏蔽一个用户