补齐执行租约配置快照与底层域名保护并更新进度

This commit is contained in:
xuans committed 2026-10-04 07:41:18 +08:00
1 parent 7a3b78daa3
commit f17ea6c99e
11 files changed
+198 -8

No files matched your search

@@ -0,0 +1,54 @@
package httpapi
import (
"fmt"
"net/http"
"strings"
"testing"
"git.pcux.cn/xuans/Scert/backend/internal/domain"
"git.pcux.cn/xuans/Scert/backend/internal/repository"
)
func TestDomainDNSExecutionLeaseMutationConflict(t *testing.T) {
f, account := newDomainDNSAPIFixture(t)
f.server.projectDomains = f.members
if _, err := f.members.SetDomainDNSAccountBinding(t.Context(), "manager", "domain-a", account.ID, "", account.Revision); err != nil {
t.Fatal(err)
}
item, err := repository.NewSQLDomainRepository(f.db).GetByID(t.Context(), "domain-a")
if err != nil {
t.Fatal(err)
}
tasks := repository.NewSQLTaskRepository(f.db)
identity := domain.DNSExecutionIdentity{TaskID: domain.NewID(), AttemptID: domain.NewID(), AttemptNumber: 1}
if err := tasks.CreateTask(t.Context(), repository.Task{ID: identity.TaskID, DomainID: item.ID, TaskType: "certificate_issue", Status: "running", Stage: "certificate_issue", OperatorID: "manager"}); err != nil {
t.Fatal(err)
}
if err := tasks.CreateAttempt(t.Context(), repository.TaskAttempt{ID: identity.AttemptID, TaskID: identity.TaskID, AttemptNumber: 1, Status: "running", Stage: "certificate_issue"}); err != nil {
t.Fatal(err)
}
lease, err := f.members.AcquireDNSExecutionLease(t.Context(), item, identity)
if err != nil {
t.Fatal(err)
}
// 任务已终态也不能越过尚未清理的租约。
if _, err := f.db.ExecContext(t.Context(), `UPDATE tasks SET status = 'failed' WHERE id = ?`, identity.TaskID); err != nil {
t.Fatal(err)
}
body := fmt.Sprintf(`{"name":%q,"certificate_type":%q,"dns_provider":%q,"challenge_type":"dns-01"}`, item.Name, item.CertificateType, item.DNSProvider)
for _, method := range []string{http.MethodPut, http.MethodDelete} {
response := serveUserRequest(f.server, f.cookies["manager"], method, "/api/v1/domains/"+item.ID, body)
if response.Code != http.StatusConflict {
t.Fatal("活动租约应返回冲突而非内部错误", method, response.Code, response.Body.String())
}
for _, secret := range []string{lease.ID, account.CredentialRef, "credential_ref"} {
if secret != "" && strings.Contains(response.Body.String(), secret) {
t.Fatal("冲突响应泄露租约或凭据引用")
}
}
}
if _, err := repository.NewSQLDomainRepository(f.db).GetByID(t.Context(), item.ID); err != nil {
t.Fatal("冲突请求不能删除域名", err)
}
}
+8
View File
@@ -721,6 +721,10 @@ func (s *Server) updateDomain(c *gin.Context) {
item.Status = "pending"
item.ExpiresAt = nil
if err := s.projectDomains.UpdateProjectDomain(c.Request.Context(), c.GetString(authenticatedActorKey), item); err != nil {
if errors.Is(err, repository.ErrDNSAccountBusy) {
s.writeError(c, http.StatusConflict, repository.ErrDNSAccountBusy.Error(), nil)
return
}
if errors.Is(err, repository.ErrProjectAccessDenied) {
s.writeError(c, http.StatusForbidden, "无权管理此项目的域名", nil)
return
@@ -773,6 +777,10 @@ func (s *Server) deleteDomain(c *gin.Context) {
}
domainID := strings.TrimSpace(c.Param("id"))
if err := s.projectDomains.DeleteProjectDomain(c.Request.Context(), c.GetString(authenticatedActorKey), domainID); err != nil {
if errors.Is(err, repository.ErrDNSAccountBusy) {
s.writeError(c, http.StatusConflict, repository.ErrDNSAccountBusy.Error(), nil)
return
}
if errors.Is(err, repository.ErrProjectAccessDenied) {
s.writeError(c, http.StatusForbidden, "无权管理此项目的域名", nil)
return