补齐执行租约配置快照与底层域名保护并更新进度
This commit is contained in:
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)
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -3,7 +3,9 @@ package repository
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
@@ -37,11 +39,21 @@ func (r *SQLProjectMemberRepository) AcquireDNSExecutionLease(ctx context.Contex
|
||||
return domain.DNSExecutionLease{}, err
|
||||
}
|
||||
// 域名行锁与资料更新共用,拒绝授权前后被换掉的签发快照。
|
||||
var updated time.Time
|
||||
if err := tx.QueryRowContext(ctx, Rebind(r.driver, `SELECT updated_at FROM domains WHERE id = ?`), item.ID).Scan(&updated); err != nil {
|
||||
var stored domain.Domain
|
||||
var sansJSON string
|
||||
if err := tx.QueryRowContext(ctx, Rebind(r.driver, `SELECT name, certificate_type, sans_json, auto_renew,
|
||||
acme_environment, dns_provider, challenge_type, updated_at FROM domains WHERE id = ?`), item.ID).
|
||||
Scan(&stored.Name, &stored.CertificateType, &sansJSON, &stored.AutoRenew, &stored.ACMEEnvironment,
|
||||
&stored.DNSProvider, &stored.ChallengeType, &stored.UpdatedAt); err != nil {
|
||||
return domain.DNSExecutionLease{}, err
|
||||
}
|
||||
if !updated.Equal(item.UpdatedAt) {
|
||||
// 时间戳可能只有秒精度,必须核对实际配置;SAN 按解码后的数组比较。
|
||||
if json.Unmarshal([]byte(sansJSON), &stored.SANs) != nil ||
|
||||
!stored.UpdatedAt.Equal(item.UpdatedAt) || stored.Name != item.Name ||
|
||||
stored.CertificateType != item.CertificateType || !slices.Equal(stored.SANs, item.SANs) ||
|
||||
stored.AutoRenew != item.AutoRenew || stored.ACMEEnvironment != item.ACMEEnvironment ||
|
||||
stored.DNSProvider != item.DNSProvider || stored.ChallengeType != item.ChallengeType ||
|
||||
stored.DNSProvider != account.Provider {
|
||||
return domain.DNSExecutionLease{}, ErrDNSExecutionInvalid
|
||||
}
|
||||
lease.Revision, lease.Provider, lease.CredentialRef = account.Revision, account.Provider, account.CredentialRef
|
||||
|
||||
@@ -3,6 +3,7 @@ package repository
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
@@ -128,12 +129,20 @@ func TestDNSExecutionLeaseRepository(t *testing.T) {
|
||||
return err
|
||||
},
|
||||
func() error { return f.repo.UpdateProjectDomain(t.Context(), "lease-root", f.item) },
|
||||
func() error { return NewSQLDomainRepository(db.DB, driver).Update(t.Context(), f.item) },
|
||||
func() error { return NewSQLDomainRepository(db.DB, driver).Delete(t.Context(), f.item.ID) },
|
||||
} {
|
||||
if err := mutate(); !errors.Is(err, ErrDNSAccountBusy) {
|
||||
t.Fatal("活动租约未阻止变更", err)
|
||||
}
|
||||
}
|
||||
f.exec(t, `UPDATE tasks SET status = 'failed' WHERE id = ?`, f.identity.TaskID)
|
||||
if err := NewSQLDomainRepository(db.DB, driver).UpdateCertificateState(t.Context(), f.item.ID, "failed", nil); err != nil {
|
||||
t.Fatal("活动租约不能阻止证书状态更新", err)
|
||||
}
|
||||
if err := NewSQLDomainRepository(db.DB, driver).Delete(t.Context(), f.item.ID); !errors.Is(err, ErrDNSAccountBusy) {
|
||||
t.Fatal("底层删除不能绕过终态任务的遗留租约", err)
|
||||
}
|
||||
if err := f.repo.DeleteProjectDomain(t.Context(), "lease-root", f.item.ID); !errors.Is(err, ErrDNSAccountBusy) {
|
||||
t.Fatal("终态任务仍有租约,不能删除域名", err)
|
||||
}
|
||||
@@ -157,6 +166,51 @@ func TestDNSExecutionLeaseRepository(t *testing.T) {
|
||||
if _, err := f.repo.SetDNSAccountEnabled(t.Context(), "lease-root", f.account.ID, f.account.Revision, false); err != nil {
|
||||
t.Fatal("正常释放后应允许禁用", err)
|
||||
}
|
||||
if err := NewSQLDomainRepository(db.DB, driver).Update(t.Context(), f.item); err != nil {
|
||||
t.Fatal("正常释放后应允许资料更新", err)
|
||||
}
|
||||
if err := NewSQLDomainRepository(db.DB, driver).Delete(t.Context(), f.item.ID); err != nil {
|
||||
t.Fatal("正常释放后应允许底层删除", err)
|
||||
}
|
||||
})
|
||||
for _, scenario := range []struct {
|
||||
name, column string
|
||||
value any
|
||||
}{
|
||||
{"name", "name", "changed.example.test"},
|
||||
{"type", "certificate_type", "san"},
|
||||
{"sans", "sans_json", `["other.example.test"]`},
|
||||
{"renewal", "auto_renew", false},
|
||||
{"environment", "acme_environment", "production"},
|
||||
{"provider", "dns_provider", "aliyun"},
|
||||
{"challenge", "challenge_type", "http-01"},
|
||||
} {
|
||||
t.Run("same-timestamp-"+scenario.name, func(t *testing.T) {
|
||||
f := newDNSLeaseFixture(t, db.DB, driver)
|
||||
f.exec(t, `UPDATE domains SET `+scenario.column+` = ? WHERE id = ?`, scenario.value, f.item.ID)
|
||||
if _, err := f.repo.AcquireDNSExecutionLease(t.Context(), f.item, f.identity); !errors.Is(err, ErrDNSExecutionInvalid) {
|
||||
t.Fatal("同时间戳的旧配置快照未拒绝", err)
|
||||
}
|
||||
var count int
|
||||
if err := db.DB.QueryRowContext(t.Context(), Rebind(driver, `SELECT COUNT(*) FROM dns_execution_leases WHERE domain_id = ?`), f.item.ID).Scan(&count); err != nil || count != 0 {
|
||||
t.Fatal("无效快照遗留执行租约", count, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
t.Run("equivalent-sans-encoding", func(t *testing.T) {
|
||||
f := newDNSLeaseFixture(t, db.DB, driver)
|
||||
encoded, err := json.MarshalIndent(f.item.SANs, "", " ")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
f.exec(t, `UPDATE domains SET sans_json = ? WHERE id = ?`, string(encoded), f.item.ID)
|
||||
lease, err := f.repo.AcquireDNSExecutionLease(t.Context(), f.item, f.identity)
|
||||
if err != nil {
|
||||
t.Fatal("相同 SAN 不应因 JSON 格式而被拒绝", err)
|
||||
}
|
||||
if err := f.repo.ReleaseDNSExecutionLease(t.Context(), lease.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
})
|
||||
t.Run("atomic-initial-binding", func(t *testing.T) {
|
||||
f := newDNSLeaseFixture(t, db.DB, driver)
|
||||
|
||||
@@ -72,6 +72,9 @@ func (r *SQLDomainRepository) Update(ctx context.Context, item domain.Domain) er
|
||||
if err := validateBoundDomainDNS(ctx, tx, r.driver, item, challengeType); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := NewSQLProjectMemberRepository(r.db, r.driver).rejectActiveDNSLease(ctx, tx, "domain_id", item.ID); err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.ExecContext(ctx, r.query(`UPDATE domains SET
|
||||
name = ?, certificate_type = ?, sans_json = ?, auto_renew = ?, acme_environment = ?, dns_provider = ?, updated_at = ?, updated_by = ?, challenge_type = ?
|
||||
WHERE id = ? AND project_id = ?`), item.Name, item.CertificateType, string(payload), item.AutoRenew, item.ACMEEnvironment,
|
||||
@@ -125,6 +128,13 @@ func (r *SQLDomainRepository) Delete(ctx context.Context, id string) error {
|
||||
_ = tx.Rollback()
|
||||
return cause
|
||||
}
|
||||
var storedID string
|
||||
if err := tx.QueryRowContext(ctx, r.query(`SELECT id FROM domains WHERE id = ?`+taskResourceWriteLock(r.driver)), id).Scan(&storedID); err != nil {
|
||||
return rollback(err)
|
||||
}
|
||||
if err := NewSQLProjectMemberRepository(r.db, r.driver).rejectActiveDNSLease(ctx, tx, "domain_id", id); err != nil {
|
||||
return rollback(err)
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, r.query("DELETE FROM domain_servers WHERE domain_id = ?"), id); err != nil {
|
||||
return rollback(fmt.Errorf("删除域名服务器关联失败:%w", err))
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user