```
feat(core): 添加多API密钥支持和配置字段 添加了api_keys、audit_api_keys、approval_api_keys等字段用于支持多个服务密钥, 新增masked_response_fields用于配置响应掩码字段,以及legacy相关配置项。 feat(core): 增强响应数据掩码功能 扩展mask_configured函数支持域名参数,实现更精确的敏感字段掩码控制, 添加自定义掩码字段配置验证器。 feat(scheduler): 添加遗留系统同步调度任务 集成遗留项目和任务同步到定时调度器中,支持通过配置启用或禁用同步功能, 并可设置不同的执行时间计划。 feat(security): 实现多服务密钥认证机制 重构API密钥验证逻辑,支持单个主密钥和多个配置密钥的混合验证模式, 增加服务密钥启用状态检查和角色映射功能。 feat(task_queue): 扩展现有队列任务处理 为日常简报和周报推送任务添加Celery异步处理支持,新增遗留项目和任务同步任务, 统一任务分发接口。 feat(business): 扩展业务模型字段 为工作任务模型添加外部系统标识和外部ID字段,为风险事件模型增加分配、解决、关闭 等相关字段,并创建风险事件操作记录表。 feat(legacy_mysql): 实现遗留任务同步功能 添加遗留任务查询和同步路由,支持从旧MySQL数据库同步任务数据到内部系统, 包括同步结果统计和运行记录。 refactor(dashboard): 更新仪表板统计数据 增加未分配风险和失败推送运行统计,在概览中显示最新的推送和同步运行记录, 完善数据序列化展示。 fix(feishu): 修复审批事件重复处理 实现审批卡片操作事件的唯一性检查,防止重复审批操作,添加事件审计日志记录。 ```
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
from dataclasses import dataclass
|
||||
from secrets import compare_digest
|
||||
from typing import Any
|
||||
|
||||
from fastapi import Header, HTTPException, status
|
||||
|
||||
@@ -20,17 +21,23 @@ def require_api_key(
|
||||
"""Validate the internal API key header and return its service principal."""
|
||||
|
||||
settings = get_settings()
|
||||
if not settings.api_key:
|
||||
if not settings.api_key and not _has_enabled_keys(settings.api_keys):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
|
||||
detail=SecurityErrorDetail.API_KEY_REQUIRED,
|
||||
)
|
||||
if not x_api_key or not compare_digest(x_api_key, settings.api_key):
|
||||
principal = _match_service_key(
|
||||
x_api_key,
|
||||
settings.api_key,
|
||||
settings.api_actor,
|
||||
settings.api_keys,
|
||||
)
|
||||
if principal is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail=SecurityErrorDetail.INVALID_API_KEY,
|
||||
)
|
||||
return ApiPrincipal(actor=settings.api_actor)
|
||||
return principal
|
||||
|
||||
|
||||
def require_approval_api_key(
|
||||
@@ -42,20 +49,23 @@ def require_approval_api_key(
|
||||
"""Validate the approval API key and return the approval principal."""
|
||||
|
||||
settings = get_settings()
|
||||
if not settings.approval_api_key:
|
||||
if not settings.approval_api_key and not _has_enabled_keys(settings.approval_api_keys):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
|
||||
detail=SecurityErrorDetail.APPROVAL_API_KEY_REQUIRED,
|
||||
)
|
||||
if (
|
||||
not x_approval_api_key
|
||||
or not compare_digest(x_approval_api_key, settings.approval_api_key)
|
||||
):
|
||||
principal = _match_service_key(
|
||||
x_approval_api_key,
|
||||
settings.approval_api_key,
|
||||
settings.approval_api_actor,
|
||||
settings.approval_api_keys,
|
||||
)
|
||||
if principal is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail=SecurityErrorDetail.INVALID_APPROVAL_API_KEY,
|
||||
)
|
||||
return ApiPrincipal(actor=settings.approval_api_actor)
|
||||
return principal
|
||||
|
||||
|
||||
def require_audit_api_key(
|
||||
@@ -67,14 +77,50 @@ def require_audit_api_key(
|
||||
"""Validate the audit API key and return the audit principal."""
|
||||
|
||||
settings = get_settings()
|
||||
if not settings.audit_api_key:
|
||||
if not settings.audit_api_key and not _has_enabled_keys(settings.audit_api_keys):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
|
||||
detail=SecurityErrorDetail.AUDIT_API_KEY_REQUIRED,
|
||||
)
|
||||
if not x_audit_api_key or not compare_digest(x_audit_api_key, settings.audit_api_key):
|
||||
principal = _match_service_key(
|
||||
x_audit_api_key,
|
||||
settings.audit_api_key,
|
||||
settings.audit_api_actor,
|
||||
settings.audit_api_keys,
|
||||
)
|
||||
if principal is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail=SecurityErrorDetail.INVALID_AUDIT_API_KEY,
|
||||
)
|
||||
return ApiPrincipal(actor=settings.audit_api_actor)
|
||||
return principal
|
||||
|
||||
|
||||
def _has_enabled_keys(configured_keys: list[dict[str, Any]]) -> bool:
|
||||
return any(_key_enabled(item) and item.get("key") for item in configured_keys)
|
||||
|
||||
|
||||
def _match_service_key(
|
||||
provided_key: str | None,
|
||||
legacy_key: str | None,
|
||||
legacy_actor: str,
|
||||
configured_keys: list[dict[str, Any]],
|
||||
) -> ApiPrincipal | None:
|
||||
if not provided_key:
|
||||
return None
|
||||
if legacy_key and compare_digest(provided_key, legacy_key):
|
||||
return ApiPrincipal(actor=legacy_actor)
|
||||
for item in configured_keys:
|
||||
key = item.get("key")
|
||||
if not key or not _key_enabled(item):
|
||||
continue
|
||||
if compare_digest(provided_key, str(key)):
|
||||
return ApiPrincipal(actor=str(item.get("actor") or legacy_actor))
|
||||
return None
|
||||
|
||||
|
||||
def _key_enabled(item: dict[str, Any]) -> bool:
|
||||
value = item.get("enabled", True)
|
||||
if isinstance(value, bool):
|
||||
return value
|
||||
return str(value).strip().lower() not in {"0", "false", "no", "off", "disabled"}
|
||||
|
||||
Reference in New Issue
Block a user