拆分 DNS 权限验证与证书传播等待

This commit is contained in:
xuans committed 2026-09-16 00:33:14 +08:00
1 parent d872d7eaaf
commit f64f0d778f
12 files changed
+45 -87

No files matched your search

+15 -9
View File
@@ -32,16 +32,22 @@ type Tester struct {
propagationInterval time.Duration
}
const dnsCleanupTimeout = 30 * time.Second
const defaultDNSPropagationTimeout = 30 * time.Second
const defaultDNSPropagationInterval = 2 * time.Second
const (
// PermissionVerificationTimeout 是 DNS API 权限验证的整体请求上限。
// 它与 ACME DNS-01 的公网传播等待相互独立。
PermissionVerificationTimeout = 60 * time.Second
dnsCleanupTimeout = 30 * time.Second
defaultDNSPermissionTXTLookupTimeout = 30 * time.Second
defaultDNSPermissionTXTLookupInterval = 2 * time.Second
)
func NewTester(factory Factory) *Tester {
return NewTesterWithResolverAndSettings(factory, legoTXTResolver{}, defaultDNSPropagationTimeout, defaultDNSPropagationInterval)
return NewTesterWithResolverAndSettings(factory, legoTXTResolver{}, defaultDNSPermissionTXTLookupTimeout, defaultDNSPermissionTXTLookupInterval)
}
func NewTesterWithResolver(factory Factory, resolver TXTResolver) *Tester {
return NewTesterWithResolverAndSettings(factory, resolver, defaultDNSPropagationTimeout, defaultDNSPropagationInterval)
return NewTesterWithResolverAndSettings(factory, resolver, defaultDNSPermissionTXTLookupTimeout, defaultDNSPermissionTXTLookupInterval)
}
func NewTesterWithSettings(factory Factory, timeout, interval time.Duration) *Tester {
@@ -50,10 +56,10 @@ func NewTesterWithSettings(factory Factory, timeout, interval time.Duration) *Te
func NewTesterWithResolverAndSettings(factory Factory, resolver TXTResolver, timeout, interval time.Duration) *Tester {
if timeout <= 0 {
timeout = defaultDNSPropagationTimeout
timeout = defaultDNSPermissionTXTLookupTimeout
}
if interval <= 0 || interval > timeout {
interval = defaultDNSPropagationInterval
interval = defaultDNSPermissionTXTLookupInterval
if interval > timeout {
interval = timeout
}
@@ -192,10 +198,10 @@ func waitForTXT(ctx context.Context, resolver TXTResolver, fqdn, expected string
return errors.New("TXT 查询服务未初始化")
}
if timeout <= 0 {
timeout = defaultDNSPropagationTimeout
timeout = defaultDNSPermissionTXTLookupTimeout
}
if interval <= 0 || interval > timeout {
interval = defaultDNSPropagationInterval
interval = defaultDNSPermissionTXTLookupInterval
if interval > timeout {
interval = timeout
}