```
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:
@@ -42,6 +42,7 @@ from app.modules.reports.constants import (
|
||||
LifecycleResponseKey,
|
||||
LifecycleSection,
|
||||
MetricKey,
|
||||
ReportPushStatus,
|
||||
ReportTitle,
|
||||
ReportType,
|
||||
)
|
||||
@@ -179,6 +180,29 @@ def test_api_key_and_feishu_webhook_fail_closed(monkeypatch) -> None:
|
||||
get_settings.cache_clear()
|
||||
|
||||
|
||||
def test_service_key_rotation_config(monkeypatch) -> None:
|
||||
monkeypatch.setenv("API_KEY", "")
|
||||
monkeypatch.setenv(
|
||||
"API_KEYS",
|
||||
json.dumps(
|
||||
[
|
||||
{"key": "disabled-key", "actor": "disabled", "enabled": False},
|
||||
{"key": "rotated-key", "actor": "rotated-api", "enabled": True},
|
||||
]
|
||||
),
|
||||
)
|
||||
get_settings.cache_clear()
|
||||
try:
|
||||
assert require_api_key("rotated-key").actor == "rotated-api"
|
||||
with pytest.raises(HTTPException) as exc_info:
|
||||
require_api_key("disabled-key")
|
||||
assert exc_info.value.status_code == 401
|
||||
finally:
|
||||
monkeypatch.setenv("API_KEY", "test-key")
|
||||
monkeypatch.delenv("API_KEYS", raising=False)
|
||||
get_settings.cache_clear()
|
||||
|
||||
|
||||
def test_config_and_pagination_guardrails() -> None:
|
||||
settings = Settings(cors_origins='["https://app.example.com", "https://admin.example.com"]')
|
||||
|
||||
@@ -227,6 +251,37 @@ def test_dashboard_and_response_masking() -> None:
|
||||
assert "metrics" in dashboard_response.json()
|
||||
|
||||
|
||||
def test_configured_domain_response_masking(monkeypatch) -> None:
|
||||
monkeypatch.setenv("MASKED_RESPONSE_FIELDS", json.dumps(["expenses.amount"]))
|
||||
get_settings.cache_clear()
|
||||
try:
|
||||
response = client.post(
|
||||
"/api/v1/business/expenses",
|
||||
headers=headers,
|
||||
json={
|
||||
"data": {
|
||||
"code": "EXP-MASK-CONFIG-001",
|
||||
"expense_type": "测试",
|
||||
"amount": 123,
|
||||
},
|
||||
},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["data"]["amount"] == "[MASKED]"
|
||||
|
||||
list_response = client.get("/api/v1/business/expenses", headers=headers)
|
||||
assert list_response.status_code == 200
|
||||
item = next(
|
||||
item
|
||||
for item in list_response.json()["items"]
|
||||
if item["code"] == "EXP-MASK-CONFIG-001"
|
||||
)
|
||||
assert item["amount"] == "[MASKED]"
|
||||
finally:
|
||||
monkeypatch.delenv("MASKED_RESPONSE_FIELDS", raising=False)
|
||||
get_settings.cache_clear()
|
||||
|
||||
|
||||
def test_approval_gate_for_high_risk_update() -> None:
|
||||
create_payload = {
|
||||
"code": "FUND-SMOKE-001",
|
||||
@@ -420,6 +475,24 @@ def test_feishu_approval_card_action_approves_ticket() -> None:
|
||||
assert callback_response.json()["result"]["status"] == "approved"
|
||||
assert callback_response.json()["result"]["approver"] == "ou_card_approver"
|
||||
|
||||
duplicate_response = client.post(
|
||||
"/api/v1/integrations/feishu/approval-card-action",
|
||||
json={
|
||||
"token": "test-feishu-token",
|
||||
"operator": {"operator_id": {"open_id": "ou_card_approver"}},
|
||||
"action": {
|
||||
"value": {
|
||||
"ticket_id": ticket_id,
|
||||
"decision": "approve",
|
||||
"comment": "approved from card",
|
||||
}
|
||||
},
|
||||
},
|
||||
)
|
||||
assert duplicate_response.status_code == 200
|
||||
assert duplicate_response.json()["duplicate"] is True
|
||||
assert duplicate_response.json()["result"]["status"] == "approved"
|
||||
|
||||
|
||||
def test_new_ledgers_reports_and_risk_events() -> None:
|
||||
domains_response = client.get("/api/v1/business/domains", headers=headers)
|
||||
@@ -684,6 +757,148 @@ def test_work_report_counts_pending_approval_backlog_outside_period() -> None:
|
||||
assert metrics["expenses_pending"] == 1
|
||||
|
||||
|
||||
def test_legacy_task_sync_creates_and_updates_internal_tasks(monkeypatch) -> None:
|
||||
rows = [
|
||||
{
|
||||
"id": 9001,
|
||||
"task_name": "Legacy task one",
|
||||
"project_code": "P-SMOKE-001",
|
||||
"owner": "legacy-owner",
|
||||
"status": "待办",
|
||||
}
|
||||
]
|
||||
|
||||
def fake_execute_allowed_query(self, query_name, params=None, limit=100):
|
||||
return {"columns": list(rows[0]), "rows": rows, "row_count": len(rows)}
|
||||
|
||||
monkeypatch.setattr(
|
||||
LegacyMySQLService,
|
||||
"execute_allowed_query",
|
||||
fake_execute_allowed_query,
|
||||
)
|
||||
|
||||
response = client.post(
|
||||
"/api/v1/integrations/mysql/tasks/sync",
|
||||
headers=headers,
|
||||
json={
|
||||
"dry_run": False,
|
||||
"field_map": {"title": "task_name"},
|
||||
},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["created"] == 1
|
||||
assert response.json()["items"][0]["task"]["external_id"] == "9001"
|
||||
|
||||
rows[0]["task_name"] = "Legacy task one updated"
|
||||
second_response = client.post(
|
||||
"/api/v1/integrations/mysql/tasks/sync",
|
||||
headers=headers,
|
||||
json={
|
||||
"dry_run": False,
|
||||
"field_map": {"title": "task_name"},
|
||||
},
|
||||
)
|
||||
assert second_response.status_code == 200
|
||||
assert second_response.json()["updated"] == 1
|
||||
|
||||
tasks_response = client.get("/api/v1/business/tasks", headers=headers)
|
||||
assert tasks_response.status_code == 200
|
||||
item = next(
|
||||
item for item in tasks_response.json()["items"] if item["external_id"] == "9001"
|
||||
)
|
||||
assert item["title"] == "Legacy task one updated"
|
||||
|
||||
|
||||
def test_risk_event_workflow_records_actions() -> None:
|
||||
create_response = client.post(
|
||||
"/api/v1/business/risk-events",
|
||||
headers=headers,
|
||||
json={
|
||||
"data": {
|
||||
"code": "RISK-FLOW-001",
|
||||
"title": "Workflow risk",
|
||||
"risk_type": "manual",
|
||||
"risk_level": "medium",
|
||||
"source_domain": "projects",
|
||||
"source_record_id": "P-SMOKE-001",
|
||||
"status": "open",
|
||||
},
|
||||
},
|
||||
)
|
||||
assert create_response.status_code == 200
|
||||
event_id = create_response.json()["data"]["id"]
|
||||
|
||||
assign_response = client.post(
|
||||
f"/api/v1/risks/events/{event_id}/assign",
|
||||
headers=headers,
|
||||
json={"assigned_to": "risk-owner", "comment": "please handle"},
|
||||
)
|
||||
assert assign_response.status_code == 200
|
||||
assert assign_response.json()["risk_event"]["assigned_to"] == "risk-owner"
|
||||
|
||||
comment_response = client.post(
|
||||
f"/api/v1/risks/events/{event_id}/comment",
|
||||
headers=headers,
|
||||
json={"comment": "working on it", "payload": {"step": 1}},
|
||||
)
|
||||
assert comment_response.status_code == 200
|
||||
|
||||
resolve_response = client.post(
|
||||
f"/api/v1/risks/events/{event_id}/resolve",
|
||||
headers=headers,
|
||||
json={"comment": "resolved"},
|
||||
)
|
||||
assert resolve_response.status_code == 200
|
||||
assert resolve_response.json()["risk_event"]["status"] == "resolved"
|
||||
|
||||
close_response = client.post(
|
||||
f"/api/v1/risks/events/{event_id}/close",
|
||||
headers=headers,
|
||||
json={"closed_reason": "verified", "review_summary": "handled"},
|
||||
)
|
||||
assert close_response.status_code == 200
|
||||
assert close_response.json()["risk_event"]["status"] == "closed"
|
||||
assert close_response.json()["risk_event"]["closed_reason"] == "verified"
|
||||
|
||||
reopen_response = client.post(
|
||||
f"/api/v1/risks/events/{event_id}/reopen",
|
||||
headers=headers,
|
||||
json={"comment": "recheck"},
|
||||
)
|
||||
assert reopen_response.status_code == 200
|
||||
assert reopen_response.json()["risk_event"]["status"] == "open"
|
||||
|
||||
actions_response = client.get(
|
||||
f"/api/v1/risks/events/{event_id}/actions",
|
||||
headers=headers,
|
||||
)
|
||||
assert actions_response.status_code == 200
|
||||
assert len(actions_response.json()["items"]) >= 5
|
||||
|
||||
|
||||
def test_report_push_failure_is_recorded() -> None:
|
||||
response = client.post(
|
||||
"/api/v1/reports/daily-brief/push",
|
||||
headers=headers,
|
||||
json={"receive_id": "oc_missing_config"},
|
||||
)
|
||||
assert response.status_code == 503
|
||||
|
||||
runs_response = client.get(
|
||||
f"/api/v1/reports/push-runs?status={ReportPushStatus.FAILED}",
|
||||
headers=headers,
|
||||
)
|
||||
assert runs_response.status_code == 200
|
||||
assert any(
|
||||
item["title"] == ReportTitle.DAILY_BRIEF
|
||||
for item in runs_response.json()["items"]
|
||||
)
|
||||
|
||||
dashboard_response = client.get("/api/v1/dashboard/summary", headers=headers)
|
||||
assert dashboard_response.status_code == 200
|
||||
assert dashboard_response.json()["metrics"]["failed_push_runs"] >= 1
|
||||
|
||||
|
||||
def test_ai_noop_provider() -> None:
|
||||
response = client.post(
|
||||
"/api/v1/ai/ask",
|
||||
|
||||
Reference in New Issue
Block a user