完成手动续期后台任务及权限隔离并更新回归进度
保留管理与业务续期调度,增加系统级幂等任务、取消传播和统计审计原子收尾;前端跟踪真实任务状态。原生 Linux 全后端、静态检查、相关专项二十次重复及前端二百七十二项测试和生产构建通过,未进行正式生产部署。
This commit is contained in:
1 parent
4ab3f93beb
commit
413a0e66a9
25 files changed
+739
-107
No files matched your search
@@ -7,10 +7,11 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
ScopeProject = "project"
|
||||
ScopeSystem = "system"
|
||||
ScopeUnknown = "unknown"
|
||||
ManagementResourceID = "management-certificate"
|
||||
ScopeProject = "project"
|
||||
ScopeSystem = "system"
|
||||
ScopeUnknown = "unknown"
|
||||
ManagementResourceID = "management-certificate"
|
||||
RenewalCheckResourceID = "global-renewal-check"
|
||||
)
|
||||
|
||||
// HistoryScope 保存事件发生时的范围,资源或项目删除后仍保留;不是项目授权凭证。
|
||||
|
||||
@@ -26,6 +26,9 @@ func (r *SQLProjectMemberRepository) ListVisibleAuditLogs(ctx context.Context, a
|
||||
logs.scope_type, logs.project_id, logs.task_id, logs.operator_id
|
||||
FROM audit_logs logs WHERE EXISTS (
|
||||
SELECT 1 FROM users actor WHERE actor.id = ? AND actor.status = 'active'
|
||||
AND (actor.role = 'super_admin' OR NOT EXISTS (
|
||||
SELECT 1 FROM tasks restricted_task WHERE restricted_task.id = logs.task_id
|
||||
AND restricted_task.task_type = 'renewal_check'))
|
||||
AND (actor.role IN ('super_admin', 'admin') OR (actor.role = 'user'
|
||||
AND logs.scope_type = 'project' AND EXISTS (
|
||||
SELECT 1 FROM project_members member
|
||||
|
||||
@@ -48,6 +48,7 @@ func taskVisibilityPredicate(alias string, permission domain.ProjectPermission)
|
||||
return `EXISTS (
|
||||
SELECT 1 FROM users task_actor
|
||||
WHERE task_actor.id = ? AND task_actor.status = 'active'
|
||||
AND (` + alias + `.task_type <> 'renewal_check' OR task_actor.role = 'super_admin')
|
||||
AND (task_actor.role IN ('super_admin', 'admin') OR (
|
||||
task_actor.role = 'user' AND ` + alias + `.scope_type = 'project'
|
||||
AND EXISTS (SELECT 1 FROM project_members task_member
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestRenewalCheckScopeVisibilityAndCompletion(t *testing.T) {
|
||||
repo, db := newTaskRepositoryTest(t)
|
||||
defer db.Close()
|
||||
ctx := t.Context()
|
||||
for _, role := range []string{UserRoleSuperAdmin, UserRoleAdmin, UserRoleUser} {
|
||||
if _, err := db.ExecContext(ctx, `INSERT INTO users (id, username, password_hash, role, status) VALUES (?, ?, 'test-hash', ?, 'active')`, role, role, role); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
task := Task{ID: "global-check", DomainID: RenewalCheckResourceID, TaskType: "renewal_check", Status: "queued", Stage: "queued", OperatorID: UserRoleSuperAdmin}
|
||||
for _, forged := range []Task{
|
||||
{ID: "forged-domain", DomainID: "domain-1", TaskType: "renewal_check", Status: "queued", Stage: "queued"},
|
||||
{ID: "forged-management", DomainID: ManagementResourceID, TaskType: "renewal_check", Status: "queued", Stage: "queued"},
|
||||
{ID: "forged-type", DomainID: RenewalCheckResourceID, TaskType: "certificate_issue", Status: "queued", Stage: "queued"},
|
||||
{ID: "forged-project", DomainID: RenewalCheckResourceID, TaskType: "renewal_check", Status: "queued", Stage: "queued", HistoryScope: HistoryScope{ScopeType: ScopeProject, ProjectID: "default"}},
|
||||
} {
|
||||
if err := repo.CreateTask(ctx, forged); err == nil {
|
||||
t.Fatalf("接受了伪造范围:%+v", forged)
|
||||
}
|
||||
}
|
||||
if err := repo.CreateTask(ctx, task); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
duplicate := task
|
||||
duplicate.ID = "duplicate-check"
|
||||
if err := repo.CreateTask(ctx, duplicate); !errors.Is(err, ErrTaskAlreadyRunning) {
|
||||
t.Fatalf("未拒绝重复检查:%v", err)
|
||||
}
|
||||
if err := repo.CreateAttempt(ctx, TaskAttempt{ID: "check-attempt", TaskID: task.ID, AttemptNumber: 1, Status: "running", Stage: "renewal_check"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, role := range []string{UserRoleAdmin, UserRoleUser} {
|
||||
if _, err := repo.GetVisibleTask(ctx, role, task.ID); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatalf("全局任务越权可见:%s %v", role, err)
|
||||
}
|
||||
if err := repo.RequestCancelVisibleTask(ctx, role, task.ID); !errors.Is(err, ErrProjectAccessDenied) {
|
||||
t.Fatalf("全局任务越权取消:%s %v", role, err)
|
||||
}
|
||||
}
|
||||
if stored, err := repo.GetVisibleTask(ctx, UserRoleSuperAdmin, task.ID); err != nil || stored.ScopeType != ScopeSystem || stored.ProjectID != "" {
|
||||
t.Fatalf("系统范围丢失:%+v %v", stored, err)
|
||||
}
|
||||
completion := TaskCompletion{TaskID: task.ID, AttemptID: "check-attempt", Status: "success", Stage: "renewal_check", Message: "续期检查完成:检查 2 项,成功 1 项", FinishedAt: time.Now().UTC(), AuditAction: "renewal_check"}
|
||||
if _, err := db.ExecContext(ctx, `CREATE TRIGGER reject_renewal_audit BEFORE INSERT ON audit_logs BEGIN SELECT RAISE(ABORT, 'injected failure'); END`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repo.FinishTaskAttempt(ctx, completion); err == nil {
|
||||
t.Fatal("审计失败未回滚")
|
||||
}
|
||||
stored, err := repo.GetTask(ctx, task.ID)
|
||||
if err != nil || stored.Status != "queued" {
|
||||
t.Fatalf("审计失败仍保存任务成功:%+v %v", stored, err)
|
||||
}
|
||||
attempts, err := repo.ListAttempts(ctx, task.ID)
|
||||
if err != nil || len(attempts) != 1 || attempts[0].Status != "running" {
|
||||
t.Fatalf("审计失败仍保存尝试成功:%+v %v", attempts, err)
|
||||
}
|
||||
if _, err := db.ExecContext(ctx, `DROP TRIGGER reject_renewal_audit`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := repo.FinishTaskAttempt(ctx, completion); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var scope, resourceType, resourceID, message string
|
||||
if err := db.QueryRowContext(ctx, `SELECT scope_type, resource_type, resource_id, message FROM audit_logs WHERE task_id = ?`, task.ID).Scan(&scope, &resourceType, &resourceID, &message); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if scope != ScopeSystem || resourceType != "task" || resourceID != task.ID || message != completion.Message {
|
||||
t.Fatalf("全局检查被伪装为管理证书或未记录摘要:%s %s %s %s", scope, resourceType, resourceID, message)
|
||||
}
|
||||
for _, role := range []string{UserRoleSuperAdmin, UserRoleAdmin, UserRoleUser} {
|
||||
logs, err := NewSQLProjectMemberRepository(db).ListVisibleAuditLogs(ctx, role, 10)
|
||||
want := 0
|
||||
if role == UserRoleSuperAdmin {
|
||||
want = 1
|
||||
}
|
||||
if err != nil || len(logs) != want {
|
||||
t.Fatalf("全局续期审计可见性错误:%s %+v %v", role, logs, err)
|
||||
}
|
||||
}
|
||||
if _, _, err := repo.RetryVisibleTask(ctx, UserRoleSuperAdmin, task.ID, nil); !errors.Is(err, ErrTaskNotRetryable) {
|
||||
t.Fatalf("全局检查不应通用重试:%v", err)
|
||||
}
|
||||
}
|
||||
@@ -14,8 +14,8 @@ func (r *SQLTaskRepository) recordCompletionAudit(ctx context.Context, tx *sql.T
|
||||
}
|
||||
result, err := tx.ExecContext(ctx, r.query(`INSERT INTO audit_logs
|
||||
(action, resource_type, resource_id, status, message, created_at, scope_type, project_id, task_id, operator_id)
|
||||
SELECT ?, CASE WHEN scope_type = 'system' THEN 'management_certificate' ELSE 'domain' END,
|
||||
domain_id, ?, ?, ?, scope_type, project_id, id, operator_id
|
||||
SELECT ?, CASE WHEN task_type = 'renewal_check' THEN 'task' WHEN scope_type = 'system' THEN 'management_certificate' ELSE 'domain' END,
|
||||
CASE WHEN task_type = 'renewal_check' THEN id ELSE domain_id END, ?, ?, ?, scope_type, project_id, id, operator_id
|
||||
FROM tasks WHERE id = ?`), completion.AuditAction, status, completion.Message,
|
||||
completion.FinishedAt.UTC(), completion.TaskID)
|
||||
if err != nil {
|
||||
|
||||
@@ -110,8 +110,12 @@ func (r *SQLTaskRepository) CreateTask(ctx context.Context, item Task) error {
|
||||
}
|
||||
insertQuery := `INSERT INTO tasks
|
||||
(id, domain_id, task_type, status, stage, message, operator_id, certificate_version_id, idempotency_key, started_at, finished_at, created_at, updated_at, scope_type, project_id) `
|
||||
if item.TaskType == "management_renewal" {
|
||||
if item.DomainID != ManagementResourceID || !item.HistoryScope.matches(HistoryScope{ScopeType: ScopeSystem}) {
|
||||
if item.TaskType == "management_renewal" || item.TaskType == "renewal_check" {
|
||||
resourceID := ManagementResourceID
|
||||
if item.TaskType == "renewal_check" {
|
||||
resourceID = RenewalCheckResourceID
|
||||
}
|
||||
if item.DomainID != resourceID || !item.HistoryScope.matches(HistoryScope{ScopeType: ScopeSystem}) {
|
||||
return errors.New("管理证书任务范围无效")
|
||||
}
|
||||
tx, err := r.db.BeginTx(ctx, nil)
|
||||
@@ -139,7 +143,7 @@ func (r *SQLTaskRepository) CreateTask(ctx context.Context, item Task) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if item.DomainID == ManagementResourceID || (item.ScopeType != "" && item.ScopeType != ScopeProject) {
|
||||
if item.DomainID == ManagementResourceID || item.DomainID == RenewalCheckResourceID || (item.ScopeType != "" && item.ScopeType != ScopeProject) {
|
||||
return errors.New("业务任务必须归属于实际域名项目")
|
||||
}
|
||||
|
||||
@@ -441,6 +445,7 @@ func (r *SQLTaskRepository) CreateAttempt(ctx context.Context, item TaskAttempt)
|
||||
SELECT ?, id, ?, ?, ?, ?, ?, ?, ? FROM tasks t WHERE id = ?
|
||||
AND (? = '' OR scope_type = ?) AND (? = '' OR project_id = ?)
|
||||
AND ((t.scope_type = 'system' AND t.task_type = 'management_renewal' AND t.domain_id = 'management-certificate')
|
||||
OR (t.scope_type = 'system' AND t.task_type = 'renewal_check' AND t.domain_id = 'global-renewal-check')
|
||||
OR (t.scope_type = 'project' AND EXISTS (SELECT 1 FROM domains d JOIN projects p ON p.id = d.project_id
|
||||
WHERE d.id = t.domain_id AND d.project_id = t.project_id)))`), item.ID, item.AttemptNumber, item.Stage, item.Status, item.Message,
|
||||
nullableTime(item.StartedAt), nullableTime(item.FinishedAt), item.CreatedAt.UTC(), item.TaskID,
|
||||
|
||||
Reference in new issue
Block a user