接入证书任务取消上下文
为证书导入、恢复、校验和当前部署工作流绑定任务取消回调,补充取消接口与回归测试,并同步四份整改清单进度。
This commit is contained in:
1 parent
b8997512f9
commit
4cf9fb6076
11 files changed
+162
-14
No files matched your search
@@ -96,13 +96,22 @@ func (s *Server) validateCertificate(c *gin.Context) {
|
||||
if !s.authorizeVisibleDomainPermission(c, domain.PermissionPrivateKeyRead) {
|
||||
return
|
||||
}
|
||||
if s.currentCertificate == nil {
|
||||
if s.currentCertificate == nil && s.validateCertificateWorkflow == nil {
|
||||
s.writeError(c, http.StatusNotImplemented, "证书校验接口尚未配置", errors.New("证书服务未配置"))
|
||||
return
|
||||
}
|
||||
if s.validateCertificateWorkflow != nil {
|
||||
result, validation, err := s.validateCertificateWorkflow(s.taskWorkflowContext(c), strings.TrimSpace(c.Param("id")))
|
||||
if err != nil {
|
||||
s.writeError(c, http.StatusUnprocessableEntity, "\u8bc1\u4e66\u6821\u9a8c\u5931\u8d25", err)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{"certificate": result, "validation": validation})
|
||||
return
|
||||
}
|
||||
result, err := s.currentCertificate.Current(c.Request.Context(), strings.TrimSpace(c.Param("id")))
|
||||
if err != nil {
|
||||
s.writeError(c, certificateErrorStatus(err), "读取当前证书失败", err)
|
||||
s.writeError(c, certificateErrorStatus(err), "\u8bfb\u53d6\u5f53\u524d\u8bc1\u4e66\u5931\u8d25", err)
|
||||
return
|
||||
}
|
||||
validation, err := (certificate.LocalValidator{VerifyChain: true}).ValidateFiles(
|
||||
@@ -127,7 +136,7 @@ func (s *Server) deployCertificateCurrent(c *gin.Context) {
|
||||
s.writeError(c, http.StatusNotImplemented, "证书部署接口尚未配置", errors.New("证书部署流程未配置"))
|
||||
return
|
||||
}
|
||||
result, report, err := s.deployCertificate(c.Request.Context(), strings.TrimSpace(c.Param("id")))
|
||||
result, report, err := s.deployCertificate(s.taskWorkflowContext(c), strings.TrimSpace(c.Param("id")))
|
||||
report = sanitizeDeploymentReport(report)
|
||||
response := gin.H{"certificate": result, "deployment": report}
|
||||
if err != nil {
|
||||
@@ -156,7 +165,7 @@ func (s *Server) importCertificateFiles(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
defer cleanup()
|
||||
result, report, err := s.importCertificate(c.Request.Context(), request)
|
||||
result, report, err := s.importCertificate(s.taskWorkflowContext(c), request)
|
||||
report = sanitizeDeploymentReport(report)
|
||||
// 导入保存与远端部署是不同阶段;部署失败不能让用户误以为证书尚未保存。
|
||||
imported := err == nil || (result.DomainID == request.DomainID &&
|
||||
|
||||
@@ -20,7 +20,7 @@ func (s *Server) restoreCertificateVersion(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
version := strings.TrimSpace(c.Param("version"))
|
||||
result, err := s.restoreVersion(c.Request.Context(), strings.TrimSpace(c.Param("id")), version)
|
||||
result, err := s.restoreVersion(s.taskWorkflowContext(c), strings.TrimSpace(c.Param("id")), version)
|
||||
if err != nil {
|
||||
if s.logger != nil {
|
||||
s.logger.Error("恢复证书历史版本失败", "domain_id", c.Param("id"), "version", version, "error", err)
|
||||
|
||||
@@ -241,6 +241,13 @@ func (s *Server) unregisterTaskCancel(taskID string) {
|
||||
delete(s.taskCancels, taskID)
|
||||
}
|
||||
|
||||
func (s *Server) taskWorkflowContext(c *gin.Context) context.Context {
|
||||
return repository.WithTaskCancellationHooks(c.Request.Context(), repository.TaskCancellationHooks{
|
||||
Register: s.registerTaskCancel,
|
||||
Unregister: s.unregisterTaskCancel,
|
||||
})
|
||||
}
|
||||
|
||||
func taskRepositoryUnavailable(tasks repository.TaskRepository) bool {
|
||||
if tasks == nil {
|
||||
return true
|
||||
@@ -285,7 +292,7 @@ func (s *Server) cancelTask(c *gin.Context) {
|
||||
c.JSON(http.StatusConflict, gin.H{"error": "任务当前无法取消", "task": item})
|
||||
return
|
||||
}
|
||||
if item.TaskType == "renewal_run" || item.TaskType == "certificate_deploy" {
|
||||
if item.TaskType == "renewal_run" {
|
||||
c.JSON(http.StatusConflict, gin.H{"error": "该任务由证书工作流控制,不能单独修改取消状态", "task": item})
|
||||
return
|
||||
}
|
||||
|
||||
@@ -4,12 +4,40 @@ import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/repository"
|
||||
)
|
||||
|
||||
func TestTaskAPICancelsTrackedCertificateWorkflowTask(t *testing.T) {
|
||||
server, tasks, _, closeDB := newTaskAPITestServer(t, nil)
|
||||
defer closeDB()
|
||||
item := repository.Task{
|
||||
ID: "tracked-workflow-task", DomainID: "domain-1",
|
||||
HistoryScope: repository.HistoryScope{ScopeType: repository.ScopeProject, ProjectID: domain.DefaultProjectID},
|
||||
TaskType: "certificate_deploy", Status: "running", Stage: "certificate_deploy",
|
||||
}
|
||||
if err := tasks.CreateTask(t.Context(), item); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cancelled := make(chan struct{}, 1)
|
||||
server.registerTaskCancel(item.ID, func() { cancelled <- struct{}{} })
|
||||
response := httptest.NewRecorder()
|
||||
serveAdminHTTP(server, response, httptest.NewRequest(http.MethodDelete, "/api/v1/tasks/"+item.ID, nil))
|
||||
stored, err := tasks.GetTask(t.Context(), item.ID)
|
||||
if response.Code != http.StatusOK || err != nil || stored.Status != "cancelled" {
|
||||
t.Fatalf("tracked workflow task was not cancelled: %d %+v %v", response.Code, stored, err)
|
||||
}
|
||||
select {
|
||||
case <-cancelled:
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("tracked workflow cancellation callback was not called")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskAPICannotFalselyCancelWorkflowTasks(t *testing.T) {
|
||||
for _, kind := range []string{"renewal_run", "certificate_deploy"} {
|
||||
for _, kind := range []string{"renewal_run"} {
|
||||
t.Run(kind, func(t *testing.T) {
|
||||
server, tasks, _, closeDB := newTaskAPITestServer(t, nil)
|
||||
defer closeDB()
|
||||
|
||||
Reference in new issue
Block a user