修复DNS验证取消后的临时凭据回收
补充DNS在线验证上下文取消检查,避免取消请求继续测试或发布验证令牌;凭据保存后取消时执行临时凭据回收,并同步更新四份任务清单进度。
This commit is contained in:
1 parent
55fba4861a
commit
debcc67fb7
6 files changed
+121
No files matched your search
@@ -123,6 +123,9 @@ func (m *DNSVerificationManager) Verify(ctx context.Context, input DNSVerificati
|
||||
if err != nil {
|
||||
return DNSVerificationResult{}, err
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return DNSVerificationResult{}, err
|
||||
}
|
||||
if err := m.reserveVerificationSlot(); err != nil {
|
||||
return DNSVerificationResult{}, err
|
||||
}
|
||||
@@ -139,6 +142,12 @@ func (m *DNSVerificationManager) Verify(ctx context.Context, input DNSVerificati
|
||||
Err: err,
|
||||
}
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return DNSVerificationResult{TestReport: testReport}, &DNSVerificationError{
|
||||
Report: testReport,
|
||||
Err: err,
|
||||
}
|
||||
}
|
||||
verificationToken, err := secureToken(32)
|
||||
if err != nil {
|
||||
return DNSVerificationResult{}, fmt.Errorf("生成 DNS 验证令牌失败:%w", err)
|
||||
@@ -156,6 +165,20 @@ func (m *DNSVerificationManager) Verify(ctx context.Context, input DNSVerificati
|
||||
}
|
||||
return DNSVerificationResult{}, fmt.Errorf("加密保存 DNS 凭据失败:%w", err)
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
cleanupErr := m.deleteCredential(credentialRef)
|
||||
if cleanupErr != nil {
|
||||
m.logCleanupFailure()
|
||||
return DNSVerificationResult{TestReport: testReport}, errors.Join(
|
||||
err,
|
||||
fmt.Errorf("DNS 在线验证取消后临时凭据回收失败:%w", cleanupErr),
|
||||
)
|
||||
}
|
||||
return DNSVerificationResult{TestReport: testReport}, &DNSVerificationError{
|
||||
Report: testReport,
|
||||
Err: err,
|
||||
}
|
||||
}
|
||||
expiresAt := m.now().UTC().Add(dnsVerificationLifetime)
|
||||
m.mu.Lock()
|
||||
expiredRefs := m.clearExpiredLocked(m.now().UTC())
|
||||
|
||||
Reference in new issue
Block a user