保存完整任务报告及完成审计原子化基线,最新回归待确认
This commit is contained in:
1 parent
8a8b1a5e0e
commit
4e8d50919a
21 files changed
+505
-52
No files matched your search
@@ -180,15 +180,6 @@ func (s *Server) runCertificateTask(ctx context.Context, task repository.Task, a
|
||||
}
|
||||
attempt.Stage = stage
|
||||
s.finishTaskBeforeExecution(task, attempt, "failed", failureMessage)
|
||||
if s.audit != nil {
|
||||
auditCtx, auditCancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer auditCancel()
|
||||
_ = s.audit.CreateAuditLog(auditCtx, repository.AuditLog{
|
||||
TaskID: task.ID, OperatorID: task.OperatorID,
|
||||
Action: auditAction, ResourceType: "domain", ResourceID: task.DomainID,
|
||||
Status: "error", Message: failureMessage,
|
||||
})
|
||||
}
|
||||
return
|
||||
}
|
||||
if s.audit != nil {
|
||||
@@ -216,10 +207,6 @@ func (s *Server) runCertificateTask(ctx context.Context, task repository.Task, a
|
||||
finishCtx, finishCancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer finishCancel()
|
||||
deploymentReport = sanitizeDeploymentReport(deploymentReport)
|
||||
recordErr := s.tasks.RecordTaskDeploymentResults(finishCtx, task.ID, attempt.ID, attempt.AttemptNumber, taskDeploymentResults(deploymentReport))
|
||||
if recordErr != nil {
|
||||
issueErr = errors.Join(issueErr, recordErr)
|
||||
}
|
||||
finished := time.Now().UTC()
|
||||
status := "success"
|
||||
message := successMessage
|
||||
@@ -240,9 +227,6 @@ func (s *Server) runCertificateTask(ctx context.Context, task repository.Task, a
|
||||
} else if partial {
|
||||
status = "partial_success"
|
||||
}
|
||||
if recordErr != nil {
|
||||
status, message = "failed", "部署结果保存失败,请核查实际部署状态后再重试"
|
||||
}
|
||||
s.taskMu.Lock()
|
||||
defer s.taskMu.Unlock()
|
||||
if persisted, err := s.tasks.GetTask(finishCtx, task.ID); err != nil {
|
||||
@@ -257,21 +241,10 @@ func (s *Server) runCertificateTask(ctx context.Context, task repository.Task, a
|
||||
message = "任务已停止;已执行操作是否回滚请查看部署结果"
|
||||
}
|
||||
}
|
||||
if s.audit != nil {
|
||||
auditStatus := status
|
||||
if issueErr != nil && status != "cancelled" && status != "partial_success" {
|
||||
auditStatus = "error"
|
||||
}
|
||||
if err := s.audit.CreateAuditLog(finishCtx, repository.AuditLog{
|
||||
TaskID: task.ID, OperatorID: task.OperatorID,
|
||||
Action: auditAction, ResourceType: "domain", ResourceID: task.DomainID, Status: auditStatus, Message: message,
|
||||
}); err != nil {
|
||||
status, message = "failed", "任务完成审计保存失败,请检查任务恢复状态"
|
||||
}
|
||||
}
|
||||
if err := s.tasks.FinishTaskAttempt(finishCtx, repository.TaskCompletion{
|
||||
TaskID: task.ID, AttemptID: attempt.ID, Status: status, Stage: stage,
|
||||
Message: message, StartedAt: &now, FinishedAt: finished,
|
||||
Report: &deploymentReport, AuditAction: auditAction,
|
||||
}); err != nil && s.logger != nil {
|
||||
s.logger.Error("保存任务及尝试终态失败,保留中断恢复状态", "task_id", task.ID, "error", err)
|
||||
}
|
||||
@@ -620,7 +593,12 @@ func (s *Server) listTaskDeploymentResults(c *gin.Context) {
|
||||
items[index].Message = deployment.PublicStoredFailureMessage(items[index].Message)
|
||||
}
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{"items": items})
|
||||
reports, err := reader.ListVisibleTaskDeploymentReports(c.Request.Context(), actorID, c.Param("id"))
|
||||
if err != nil {
|
||||
s.writeError(c, http.StatusInternalServerError, "查询完整部署报告失败", err)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{"items": items, "reports": reports})
|
||||
}
|
||||
|
||||
func taskDeploymentResults(report deployment.Report) []repository.TaskDeploymentResult {
|
||||
|
||||
@@ -246,8 +246,8 @@ func TestTaskAPIClosesTaskWhenStartAuditFails(t *testing.T) {
|
||||
t.Fatalf("任务启动审计失败后尝试未收敛:%+v %v", attempts, err)
|
||||
}
|
||||
logs, err := auditRepo.ListAuditLogs(context.Background(), 10)
|
||||
if err != nil || len(logs) != 0 {
|
||||
t.Fatalf("启动审计写入失败时不应生成伪造终态审计:%+v %v", logs, err)
|
||||
if err != nil || len(logs) != 1 || logs[0].Status != "error" || logs[0].Message != items[0].Message || logs[0].TaskID != items[0].ID {
|
||||
t.Fatalf("启动失败必须由终态事务记录真实失败,不能伪造运行或成功审计:%+v %v", logs, err)
|
||||
}
|
||||
}
|
||||
func TestTaskAPIClosesTaskWhenStartStateUpdateFails(t *testing.T) {
|
||||
|
||||
@@ -72,6 +72,7 @@ func (s *Server) finishTaskBeforeExecution(task repository.Task, attempt reposit
|
||||
if err := s.tasks.FinishTaskAttempt(ctx, repository.TaskCompletion{
|
||||
TaskID: task.ID, AttemptID: attempt.ID, Status: status, Stage: attempt.Stage,
|
||||
Message: message, FinishedAt: finished,
|
||||
AuditAction: task.TaskType,
|
||||
}); err != nil && s.logger != nil {
|
||||
s.logger.Error("保存任务及尝试终态失败,保留中断恢复状态", "task_id", task.ID, "error", err)
|
||||
}
|
||||
|
||||
@@ -110,31 +110,31 @@ func TestAsyncDeadlineBeforeExecutionIsFailureNotUserCancellation(t *testing.T)
|
||||
}
|
||||
}
|
||||
|
||||
type failingTaskFinishAuditRepository struct{ repository.AuditRepository }
|
||||
type failingTaskFinishAuditRepository struct{ repository.TaskRepository }
|
||||
|
||||
func (r failingTaskFinishAuditRepository) CreateAuditLog(ctx context.Context, item repository.AuditLog) error {
|
||||
if item.Status == "success" {
|
||||
func (r failingTaskFinishAuditRepository) FinishTaskAttempt(ctx context.Context, item repository.TaskCompletion) error {
|
||||
if item.AuditAction != "" {
|
||||
return errors.New("模拟完成审计写入失败")
|
||||
}
|
||||
return r.AuditRepository.CreateAuditLog(ctx, item)
|
||||
return r.TaskRepository.FinishTaskAttempt(ctx, item)
|
||||
}
|
||||
|
||||
func TestAsyncFinishAuditFailureDoesNotLeaveSuccessfulAttempt(t *testing.T) {
|
||||
server, tasks, audit, cleanup := newTaskAPITestServer(t, func(context.Context, string) (certificate.IssueResult, deployment.Report, error) {
|
||||
server, tasks, _, cleanup := newTaskAPITestServer(t, func(context.Context, string) (certificate.IssueResult, deployment.Report, error) {
|
||||
return certificate.IssueResult{}, deployment.Report{Status: "success"}, nil
|
||||
})
|
||||
defer cleanup()
|
||||
server.audit = failingTaskFinishAuditRepository{audit}
|
||||
server.tasks = failingTaskFinishAuditRepository{tasks}
|
||||
response := httptest.NewRecorder()
|
||||
serveAdminHTTP(server, response, httptest.NewRequest(http.MethodPost, "/api/v1/domains/domain-1/issue", nil))
|
||||
task := submittedTask(t, response)
|
||||
waitTaskWorkersForTest(t, server)
|
||||
stored, err := tasks.GetTask(t.Context(), task.ID)
|
||||
if err != nil || stored.Status != "failed" {
|
||||
if err != nil || !isActiveTaskStatus(stored.Status) || stored.FinishedAt != nil {
|
||||
t.Fatalf("完成审计失败却标记成功:%+v %v", stored, err)
|
||||
}
|
||||
attempts, err := tasks.ListAttempts(t.Context(), task.ID)
|
||||
if err != nil || len(attempts) != 1 || attempts[0].Status != "failed" || attempts[0].Message != stored.Message {
|
||||
if err != nil || len(attempts) != 1 || !isActiveTaskStatus(attempts[0].Status) || attempts[0].FinishedAt != nil {
|
||||
t.Fatalf("任务与尝试终态不一致:%+v %v", attempts, err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/certificate"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/deployment"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/repository"
|
||||
)
|
||||
|
||||
func TestAsyncTaskReportRestoresVerificationAndRecovery(t *testing.T) {
|
||||
server, tasks, _, cleanup := newTaskAPITestServer(t, func(context.Context, string) (certificate.IssueResult, deployment.Report, error) {
|
||||
return certificate.IssueResult{}, deployment.Report{
|
||||
Total: 1, Failed: 1, Status: "failed", VerificationStatus: "failed", RecoveryStatus: "success",
|
||||
Results: []deployment.Result{{ServerID: "private-report-target", Status: "failed", FailureCode: deployment.FailureRecoveryRestored, Message: "secret-remote-output"}},
|
||||
}, errors.New("站点校验失败,已恢复")
|
||||
})
|
||||
defer cleanup()
|
||||
response := httptest.NewRecorder()
|
||||
serveAdminHTTP(server, response, httptest.NewRequest(http.MethodPost, "/api/v1/domains/domain-1/issue", nil))
|
||||
task := submittedTask(t, response)
|
||||
waitTaskWorkersForTest(t, server)
|
||||
path := "/api/v1/tasks/" + task.ID + "/deployment-results"
|
||||
response = httptest.NewRecorder()
|
||||
serveAdminHTTP(server, response, httptest.NewRequest(http.MethodGet, path, nil))
|
||||
var body struct {
|
||||
Items []repository.TaskDeploymentResult `json:"items"`
|
||||
Reports []repository.TaskDeploymentReport `json:"reports"`
|
||||
}
|
||||
if response.Code != http.StatusOK || json.Unmarshal(response.Body.Bytes(), &body) != nil || len(body.Items) != 1 || len(body.Reports) != 1 {
|
||||
t.Fatalf("任务完整报告接口响应错误:%d %s", response.Code, response.Body.String())
|
||||
}
|
||||
report := body.Reports[0]
|
||||
if report.TaskID != task.ID || report.AttemptNumber != 1 || report.Report.VerificationStatus != "failed" || report.Report.RecoveryStatus != "success" || report.Report.Results[0].FailureCode != deployment.FailureRecoveryRestored {
|
||||
t.Fatalf("接口遗漏验证和恢复报告:%+v", report)
|
||||
}
|
||||
if strings.Contains(response.Body.String(), "secret-remote-output") {
|
||||
t.Fatal("接口泄露原始远端输出")
|
||||
}
|
||||
outsider := httpUserSessionCookie(server, "outsider", repository.UserRoleUser)
|
||||
response = serveUserRequest(server, outsider, http.MethodGet, path, "")
|
||||
if response.Code != http.StatusForbidden || strings.Contains(response.Body.String(), "private-report-target") {
|
||||
t.Fatal("完整报告未遵守项目权限")
|
||||
}
|
||||
member := httpUserSessionCookie(server, "report-reader", repository.UserRoleUser)
|
||||
if err := server.projectMembers.GrantProjectRole(t.Context(), "test-admin", domain.DefaultProjectID, "report-reader", domain.ProjectRoleReadOnly); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
response = serveUserRequest(server, member, http.MethodGet, path, "")
|
||||
if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), "private-report-target") {
|
||||
t.Fatal("只读成员无法读取完整报告")
|
||||
}
|
||||
if err := server.projectMembers.RevokeProjectRole(t.Context(), "test-admin", domain.DefaultProjectID, "report-reader", domain.ProjectRoleReadOnly); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
response = serveUserRequest(server, member, http.MethodGet, path, "")
|
||||
if response.Code != http.StatusForbidden || strings.Contains(response.Body.String(), "private-report-target") {
|
||||
t.Fatal("撤权后仍泄露完整报告")
|
||||
}
|
||||
visible, err := tasks.ListVisibleTaskDeploymentReports(t.Context(), "report-reader", task.ID)
|
||||
if err != nil || len(visible) != 0 {
|
||||
t.Fatalf("报告仓储未实时检查权限:%+v %v", visible, err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user