修复DNS验证取消后的临时凭据回收
补充DNS在线验证上下文取消检查,避免取消请求继续测试或发布验证令牌;凭据保存后取消时执行临时凭据回收,并同步更新四份任务清单进度。
This commit is contained in:
1 parent
55fba4861a
commit
debcc67fb7
6 files changed
+121
No files matched your search
@@ -56,6 +56,19 @@ type memorySecretWriter struct {
|
||||
deleteErr error
|
||||
}
|
||||
|
||||
type cancellingSecretWriter struct {
|
||||
memorySecretWriter
|
||||
cancel context.CancelFunc
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
s.cancel()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *memorySecretWriter) Put(_ context.Context, reference string, value map[string]string) error {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
@@ -265,6 +278,48 @@ func TestDNSVerificationManagerDeletesCredentialWhenPutReportsFailure(t *testing
|
||||
}
|
||||
}
|
||||
|
||||
func TestDNSVerificationManagerRejectsAlreadyCancelledContextBeforeTesting(t *testing.T) {
|
||||
tester := &countingDNSTester{}
|
||||
store := &memorySecretWriter{}
|
||||
manager := NewDNSVerificationManager(tester, store)
|
||||
ctx, cancel := context.WithCancel(t.Context())
|
||||
cancel()
|
||||
|
||||
_, err := manager.Verify(ctx, DNSVerificationInput{
|
||||
ProviderID: "cloudflare", TestDomain: "example.com",
|
||||
Credentials: map[string]string{"api_token": "secret"},
|
||||
})
|
||||
if !errors.Is(err, context.Canceled) {
|
||||
t.Fatalf("已取消上下文应返回 context.Canceled:%v", err)
|
||||
}
|
||||
if tester.CallCount() != 0 || len(store.values) != 0 {
|
||||
t.Fatalf("已取消上下文不应执行测试或保存凭据:calls=%d values=%v", tester.CallCount(), store.values)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDNSVerificationManagerCleansCredentialWhenContextCancelsAfterStore(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(t.Context())
|
||||
store := &cancellingSecretWriter{cancel: cancel}
|
||||
manager := NewDNSVerificationManager(fakeDNSTester{}, store)
|
||||
|
||||
result, err := manager.Verify(ctx, DNSVerificationInput{
|
||||
ProviderID: "cloudflare", TestDomain: "example.com",
|
||||
Credentials: map[string]string{"api_token": "secret"},
|
||||
})
|
||||
if !errors.Is(err, context.Canceled) {
|
||||
t.Fatalf("保存凭据后取消应返回 context.Canceled:%v", err)
|
||||
}
|
||||
if result.CredentialRef != "" || result.VerificationToken != "" {
|
||||
t.Fatalf("取消的 DNS 验证不应发布令牌:%+v", result)
|
||||
}
|
||||
if len(store.values) != 0 {
|
||||
t.Fatalf("保存后取消未回收临时凭据:%v", store.values)
|
||||
}
|
||||
if len(store.deleted) != 1 {
|
||||
t.Fatalf("保存后取消未执行临时凭据回收:%v", store.deleted)
|
||||
}
|
||||
}
|
||||
|
||||
type countingDNSTester struct {
|
||||
mu sync.Mutex
|
||||
calls int
|
||||
|
||||
Reference in new issue
Block a user