领取初始化验证凭据并防止过期清理误删

This commit is contained in:
xuans committed 2026-09-16 19:13:25 +08:00
1 parent 8615296565
commit efb405ea11
6 files changed
+316 -36

No files matched your search

+104
View File
@@ -0,0 +1,104 @@
package setup
import (
"sync"
"testing"
"time"
)
func TestDNSClaimProtectsCredentialUntilTransactionCleanup(t *testing.T) {
store := &memorySecretWriter{}
manager := NewDNSVerificationManager(fakeDNSTester{}, store)
result, err := manager.Verify(t.Context(), DNSVerificationInput{
ProviderID: "aliyun", TestDomain: "admin.example.test",
Credentials: map[string]string{"access_key_id": "test-id", "access_key_secret": "test-secret"},
})
if err != nil {
t.Fatal(err)
}
session, cleanup, err := manager.Claim(result.VerificationToken)
if err != nil || cleanup == nil || session.CredentialRef != result.CredentialRef || session.TestDomain != "admin.example.test" {
t.Fatalf("领取 DNS 凭据失败:%v", err)
}
manager.now = func() time.Time { return result.ExpiresAt.Add(time.Second) }
if _, err := manager.Resolve(result.VerificationToken); err == nil {
t.Fatal("已领取 DNS 令牌仍可读取")
}
if _, _, err := manager.Claim(result.VerificationToken); err == nil {
t.Fatal("已领取 DNS 令牌仍可重复领取")
}
manager.DiscardAll()
store.mu.Lock()
_, exists := store.values[result.CredentialRef]
store.mu.Unlock()
if !exists {
t.Fatal("过期或批量清理误删了事务持有的 DNS 凭据")
}
var workers sync.WaitGroup
for range 32 {
workers.Go(func() {
if err := cleanup(); err != nil {
t.Errorf("事务回收失败:%v", err)
}
})
}
workers.Wait()
store.mu.Lock()
defer store.mu.Unlock()
if len(store.values) != 0 || len(store.deleted) != 1 {
t.Fatalf("DNS 事务回收必须且只能删除一次:剩余=%d,删除=%d", len(store.values), len(store.deleted))
}
}
func TestDNSClaimHasOnlyOneConcurrentOwner(t *testing.T) {
manager := NewDNSVerificationManager(fakeDNSTester{}, &memorySecretWriter{})
result, err := manager.Verify(t.Context(), DNSVerificationInput{
ProviderID: "aliyun", TestDomain: "admin.example.test",
Credentials: map[string]string{"access_key_id": "test-id", "access_key_secret": "test-secret"},
})
if err != nil {
t.Fatal(err)
}
owners := make(chan func() error, 32)
var workers sync.WaitGroup
for range 32 {
workers.Go(func() {
if _, cleanup, err := manager.Claim(result.VerificationToken); err == nil {
owners <- cleanup
}
})
}
workers.Wait()
close(owners)
count := 0
for cleanup := range owners {
count++
if err := cleanup(); err != nil {
t.Fatal(err)
}
}
if count != 1 {
t.Fatalf("DNS 验证结果存在多个事务拥有者:%d", count)
}
}
func TestDNSClaimRejectsExpiredToken(t *testing.T) {
store := &memorySecretWriter{}
manager := NewDNSVerificationManager(fakeDNSTester{}, store)
result, err := manager.Verify(t.Context(), DNSVerificationInput{
ProviderID: "aliyun", TestDomain: "admin.example.test",
Credentials: map[string]string{"access_key_id": "test-id", "access_key_secret": "test-secret"},
})
if err != nil {
t.Fatal(err)
}
manager.now = func() time.Time { return result.ExpiresAt }
if _, cleanup, err := manager.Claim(result.VerificationToken); err == nil || cleanup != nil {
t.Fatal("已过期的 DNS 令牌不得被领取")
}
store.mu.Lock()
defer store.mu.Unlock()
if len(store.values) != 0 {
t.Fatal("过期且未领取的 DNS 凭据未回收")
}
}
+19 -2
View File
@@ -183,7 +183,7 @@ func (m *DNSVerificationManager) Consume(token, providerID, credentialRef, testD
// Resolve 按验证令牌读取完整初始化所需的服务端状态,但不消费令牌。
func (m *DNSVerificationManager) Resolve(token string) (DNSVerificationSession, error) {
session, err := m.resolveSession(token)
session, err := m.resolveSession(token, false)
if err != nil {
return DNSVerificationSession{}, err
}
@@ -195,6 +195,20 @@ func (m *DNSVerificationManager) Resolve(token string) (DNSVerificationSession,
}, nil
}
// Claim 原子领取验证结果,并把凭据回收责任移交给初始化事务。
// 领取后令牌立即失效,不再受过期或批量清理影响;提交失败时必须调用返回的回收函数。
func (m *DNSVerificationManager) Claim(token string) (DNSVerificationSession, func() error, error) {
session, err := m.resolveSession(token, true)
if err != nil {
return DNSVerificationSession{}, nil, err
}
cleanup := sync.OnceValue(func() error { return m.deleteCredential(session.CredentialRef) })
return DNSVerificationSession{
ProviderID: session.ProviderID, TestDomain: session.TestDomain,
CredentialRef: session.CredentialRef, ExpiresAt: session.ExpiresAt,
}, cleanup, nil
}
// Discard 按验证令牌精确回收尚未消费的 DNS 临时凭据,不影响其他初始化会话。
func (m *DNSVerificationManager) Discard(token string) error {
if m == nil {
@@ -283,7 +297,7 @@ func (m *DNSVerificationManager) validateSession(token, providerID, credentialRe
return nil
}
func (m *DNSVerificationManager) resolveSession(token string) (dnsVerificationSession, error) {
func (m *DNSVerificationManager) resolveSession(token string, claim bool) (dnsVerificationSession, error) {
if m == nil {
return dnsVerificationSession{}, errors.New("DNS 在线验证服务未初始化")
}
@@ -295,6 +309,9 @@ func (m *DNSVerificationManager) resolveSession(token string) (dnsVerificationSe
m.mu.Lock()
expiredRefs := m.clearExpiredLocked(now)
session, ok := m.sessions[token]
if ok && claim {
delete(m.sessions, token)
}
m.mu.Unlock()
m.deleteCredentials(expiredRefs)
if !ok {