完善DNS临时凭据清理重试

在单个和批量DNS临时凭据删除失败时保留可重试会话,保持正式配置凭据保护语义,补充回归测试并更新整改清单。
This commit is contained in:
xuans committed 2026-09-30 12:05:18 +08:00
1 parent debcc67fb7
commit 4ec81eecab
6 files changed
+137 -5

No files matched your search

@@ -61,6 +61,11 @@ type cancellingSecretWriter struct {
cancel context.CancelFunc
}
type retryableSecretWriter struct {
memorySecretWriter
failDelete bool
}
func (s *cancellingSecretWriter) Put(ctx context.Context, reference string, value map[string]string) error {
if err := s.memorySecretWriter.Put(ctx, reference, value); err != nil {
return err
@@ -69,6 +74,13 @@ func (s *cancellingSecretWriter) Put(ctx context.Context, reference string, valu
return nil
}
func (s *retryableSecretWriter) Delete(ctx context.Context, reference string) error {
if s.failDelete {
return errors.New("delete failed")
}
return s.memorySecretWriter.Delete(ctx, reference)
}
func (m *memorySecretWriter) Put(_ context.Context, reference string, value map[string]string) error {
m.mu.Lock()
defer m.mu.Unlock()
@@ -320,6 +332,58 @@ func TestDNSVerificationManagerCleansCredentialWhenContextCancelsAfterStore(t *t
}
}
func TestDNSVerificationManagerRetainsTokenWhenDiscardCleanupFails(t *testing.T) {
store := &retryableSecretWriter{failDelete: true}
manager := NewDNSVerificationManager(fakeDNSTester{}, store)
result, err := manager.Verify(t.Context(), DNSVerificationInput{
ProviderID: "cloudflare", TestDomain: "example.com",
Credentials: map[string]string{"api_token": "secret"},
})
if err != nil {
t.Fatal(err)
}
if err := manager.Discard(result.VerificationToken); err == nil {
t.Fatal("临时凭据回收失败时应返回错误")
}
if _, err := manager.Resolve(result.VerificationToken); err != nil {
t.Fatalf("回收失败后应保留验证令牌以便重试:%v", err)
}
if len(store.values) != 1 {
t.Fatalf("回收失败后不应丢失临时凭据:%v", store.values)
}
store.failDelete = false
if err := manager.Discard(result.VerificationToken); err != nil {
t.Fatalf("临时凭据回收重试失败:%v", err)
}
if len(store.values) != 0 {
t.Fatalf("回收重试后仍有临时凭据:%v", store.values)
}
}
func TestDNSVerificationManagerRetriesDiscardAllCleanupFailures(t *testing.T) {
store := &retryableSecretWriter{failDelete: true}
manager := NewDNSVerificationManager(fakeDNSTester{}, store)
for range 2 {
if _, err := manager.Verify(t.Context(), DNSVerificationInput{
ProviderID: "cloudflare", TestDomain: "example.com",
Credentials: map[string]string{"api_token": "secret"},
}); err != nil {
t.Fatal(err)
}
}
manager.DiscardAll()
if len(manager.sessions) != 2 || len(store.values) != 2 {
t.Fatalf("批量回收失败后应保留可重试会话:sessions=%d values=%d", len(manager.sessions), len(store.values))
}
store.failDelete = false
manager.DiscardAll()
if len(manager.sessions) != 0 || len(store.values) != 0 {
t.Fatalf("批量回收重试后仍有临时状态:sessions=%d values=%d", len(manager.sessions), len(store.values))
}
}
type countingDNSTester struct {
mu sync.Mutex
calls int