开发失败任务重试权限闭环

新增失败证书任务重试接口、事务处理、权限校验、审计记录及前端重试入口,并补充后端测试。
This commit is contained in:
xuans committed 2026-09-29 20:10:13 +08:00
1 parent 35c9d7760c
commit 35260bcc4b
8 files changed
+350 -6

No files matched your search

+1
View File
@@ -217,6 +217,7 @@ func (s *Server) registerRoutes() {
api.GET("/tasks", s.listTasks)
api.GET("/tasks/:id", s.getTask)
api.DELETE("/tasks/:id", s.cancelTask)
api.POST("/tasks/:id/retry", s.retryTask)
api.GET("/tasks/:id/attempts", s.listTaskAttempts)
adminAPI.GET("/settings", s.getSettings)
+77 -4
View File
@@ -116,6 +116,11 @@ func (s *Server) issueDomainAsTask(c *gin.Context) {
s.writeError(c, http.StatusInternalServerError, "创建任务尝试失败", err)
return
}
s.executeCertificateIssueTask(c, task, attempt, "certificate_issue")
}
func (s *Server) executeCertificateIssueTask(c *gin.Context, task repository.Task, attempt repository.TaskAttempt, auditAction string) {
now := time.Now().UTC()
if err := s.tasks.UpdateTask(c.Request.Context(), task.ID, "running", "certificate_issue", "正在申请证书并部署", &now, nil); err != nil {
finished := time.Now().UTC()
failureMessage := "任务启动失败"
@@ -124,7 +129,7 @@ func (s *Server) issueDomainAsTask(c *gin.Context) {
if s.audit != nil {
_ = s.audit.CreateAuditLog(context.Background(), repository.AuditLog{
TaskID: task.ID, OperatorID: task.OperatorID,
Action: "certificate_issue", ResourceType: "domain", ResourceID: domainID,
Action: auditAction, ResourceType: "domain", ResourceID: task.DomainID,
Status: "error", Message: failureMessage,
})
}
@@ -137,7 +142,7 @@ func (s *Server) issueDomainAsTask(c *gin.Context) {
cancel()
s.unregisterTaskCancel(task.ID)
}()
certificateResult, deploymentReport, issueErr := s.issueCertificate(executionCtx, domainID)
certificateResult, deploymentReport, issueErr := s.issueCertificate(executionCtx, task.DomainID)
deploymentReport = sanitizeDeploymentReport(deploymentReport)
finished := time.Now().UTC()
status := "success"
@@ -147,7 +152,7 @@ func (s *Server) issueDomainAsTask(c *gin.Context) {
status = "failed"
message = certificateTaskErrorMessage(issueErr)
if s.logger != nil {
s.logger.Error("证书任务执行失败", "task_id", task.ID, "domain_id", domainID, "error", issueErr)
s.logger.Error("证书任务执行失败", "task_id", task.ID, "domain_id", task.DomainID, "error", issueErr)
}
if errors.Is(issueErr, context.Canceled) {
status = "cancelled"
@@ -178,7 +183,7 @@ func (s *Server) issueDomainAsTask(c *gin.Context) {
}
_ = s.audit.CreateAuditLog(context.Background(), repository.AuditLog{
TaskID: task.ID, OperatorID: task.OperatorID,
Action: "certificate_issue", ResourceType: "domain", ResourceID: domainID, Status: auditStatus, Message: message,
Action: auditAction, ResourceType: "domain", ResourceID: task.DomainID, Status: auditStatus, Message: message,
})
}
response := gin.H{
@@ -295,6 +300,74 @@ func (s *Server) cancelTask(c *gin.Context) {
}
c.JSON(http.StatusOK, gin.H{"task": item})
}
func (s *Server) retryTask(c *gin.Context) {
if s.issueCertificate == nil {
s.writeError(c, http.StatusNotImplemented, "证书申请接口尚未配置", errors.New("证书申请工作流未配置"))
return
}
reader, ok := s.projectTaskReader(c)
if !ok {
return
}
actorID := c.GetString(authenticatedActorKey)
taskID := strings.TrimSpace(c.Param("id"))
item, err := reader.GetVisibleTask(c.Request.Context(), actorID, taskID)
if err != nil {
if errors.Is(err, sql.ErrNoRows) || errors.Is(err, repository.ErrProjectAccessDenied) {
s.writeError(c, http.StatusForbidden, "无权访问此任务", nil)
return
}
s.writeError(c, http.StatusInternalServerError, "读取任务失败", err)
return
}
if item.TaskType != "certificate_issue" {
c.JSON(http.StatusConflict, gin.H{"error": "当前任务类型不支持手动重试", "task": item})
return
}
if item.Status != "failed" && item.Status != "cancelled" {
c.JSON(http.StatusConflict, gin.H{"error": "仅失败或已取消的证书申请任务可以重试", "task": item})
return
}
authorizer, ok := s.projectMembers.(repository.ProjectAuthorizer)
if !ok {
s.writeError(c, http.StatusServiceUnavailable, "任务重试权限服务尚未就绪", errors.New("项目授权服务未配置"))
return
}
projectID := item.ProjectID
for _, permission := range []domain.ProjectPermission{
domain.PermissionTaskRetry,
domain.PermissionCertificateManage,
domain.PermissionDeploymentExecute,
} {
if err := authorizer.AuthorizeProject(c.Request.Context(), actorID, projectID, permission); err != nil {
if errors.Is(err, repository.ErrProjectAccessDenied) {
s.writeError(c, http.StatusForbidden, "无权重试此项目的证书任务", nil)
return
}
s.writeError(c, http.StatusInternalServerError, "检查任务重试权限失败", err)
return
}
}
if !s.authorizeDNSCredentialUse(c, projectID) {
return
}
startedAt := time.Now().UTC()
retryTask, attempt, err := reader.RetryVisibleTask(c.Request.Context(), actorID, taskID, &startedAt)
if err != nil {
switch {
case errors.Is(err, repository.ErrProjectAccessDenied), errors.Is(err, sql.ErrNoRows):
s.writeError(c, http.StatusForbidden, "无权重试此任务", nil)
case errors.Is(err, repository.ErrTaskNotRetryable):
s.writeError(c, http.StatusConflict, "任务状态已变化,当前无法重试", nil)
default:
s.writeError(c, http.StatusInternalServerError, "创建任务重试失败", err)
}
return
}
s.executeCertificateIssueTask(c, retryTask, attempt, "certificate_issue_retry")
}
func validTaskIdempotencyKey(value string) bool {
if len(value) < 8 || len(value) > 128 {
return false
+40
View File
@@ -453,3 +453,43 @@ func TestAuditLogResponseUsesDashboardFieldNames(t *testing.T) {
}
}
}
func TestTaskAPIRetriesFailedCertificateIssue(t *testing.T) {
calls := 0
server, taskRepo, auditRepo, closeDB := newTaskAPITestServer(t, func(_ context.Context, id string) (certificate.IssueResult, deployment.Report, error) {
calls++
if calls == 1 {
return certificate.IssueResult{DomainID: id}, deployment.Report{}, errors.New("temporary certificate failure")
}
return certificate.IssueResult{DomainID: id}, deployment.Report{Status: "success"}, nil
})
defer closeDB()
first := httptest.NewRecorder()
serveAdminHTTP(server, first, httptest.NewRequest(http.MethodPost, "/api/v1/domains/domain-1/issue", nil))
if first.Code != http.StatusBadGateway {
t.Fatalf("initial failure response: %d %s", first.Code, first.Body.String())
}
tasks, err := taskRepo.ListTasks(context.Background(), "domain-1", 10)
if err != nil || len(tasks) != 1 || tasks[0].Status != "failed" {
t.Fatalf("failed task was not persisted: %+v %v", tasks, err)
}
retry := httptest.NewRecorder()
serveAdminHTTP(server, retry, httptest.NewRequest(http.MethodPost, "/api/v1/tasks/"+tasks[0].ID+"/retry", nil))
if retry.Code != http.StatusOK {
t.Fatalf("retry response: %d %s", retry.Code, retry.Body.String())
}
updated, err := taskRepo.GetTask(context.Background(), tasks[0].ID)
if err != nil || updated.Status != "success" || updated.OperatorID != "test-admin" {
t.Fatalf("retried task did not converge: %+v %v", updated, err)
}
attempts, err := taskRepo.ListAttempts(context.Background(), tasks[0].ID)
if err != nil || len(attempts) != 2 || attempts[0].AttemptNumber != 1 || attempts[0].Status != "failed" || attempts[1].AttemptNumber != 2 || attempts[1].Status != "success" {
t.Fatalf("retry attempts were not recorded correctly: %+v %v", attempts, err)
}
logs, err := auditRepo.ListAuditLogs(context.Background(), 10)
if err != nil || len(logs) != 2 || logs[0].Action != "certificate_issue_retry" || logs[0].OperatorID != "test-admin" {
t.Fatalf("retry audit was not recorded correctly: %+v %v", logs, err)
}
}