接入DNS在线测试传播参数

This commit is contained in:
xuans committed 2026-08-31 03:01:32 +08:00
1 parent e982f54607
commit 8c1471e8fe
7 files changed
+175 -20

No files matched your search

+43 -8
View File
@@ -26,18 +26,44 @@ type TXTResolver interface {
}
type Tester struct {
factory Factory
resolver TXTResolver
factory Factory
resolver TXTResolver
propagationTimeout time.Duration
propagationInterval time.Duration
}
const dnsCleanupTimeout = 30 * time.Second
const defaultDNSPropagationTimeout = 30 * time.Second
const defaultDNSPropagationInterval = 2 * time.Second
func NewTester(factory Factory) *Tester {
return NewTesterWithResolver(factory, legoTXTResolver{})
return NewTesterWithResolverAndSettings(factory, legoTXTResolver{}, defaultDNSPropagationTimeout, defaultDNSPropagationInterval)
}
func NewTesterWithResolver(factory Factory, resolver TXTResolver) *Tester {
return &Tester{factory: factory, resolver: resolver}
return NewTesterWithResolverAndSettings(factory, resolver, defaultDNSPropagationTimeout, defaultDNSPropagationInterval)
}
func NewTesterWithSettings(factory Factory, timeout, interval time.Duration) *Tester {
return NewTesterWithResolverAndSettings(factory, legoTXTResolver{}, timeout, interval)
}
func NewTesterWithResolverAndSettings(factory Factory, resolver TXTResolver, timeout, interval time.Duration) *Tester {
if timeout <= 0 {
timeout = defaultDNSPropagationTimeout
}
if interval <= 0 || interval > timeout {
interval = defaultDNSPropagationInterval
if interval > timeout {
interval = timeout
}
}
return &Tester{
factory: factory,
resolver: resolver,
propagationTimeout: timeout,
propagationInterval: interval,
}
}
type VerificationError struct {
@@ -100,7 +126,7 @@ func (t *Tester) VerifyWithReport(ctx context.Context, providerID, testDomain st
Name: "创建记录", Status: "completed", Message: "已调用 DNS API 创建临时 TXT 记录。",
})
if err := waitForTXT(ctx, t.resolver, report.RecordName, challengeInfo.Value); err != nil {
if err := waitForTXT(ctx, t.resolver, report.RecordName, challengeInfo.Value, t.propagationTimeout, t.propagationInterval); err != nil {
report.Stages = append(report.Stages, setup.DNSVerificationStage{
Name: "查询记录", Status: "failed", Message: "公网 DNS 查询未确认 TXT 记录已生效。",
})
@@ -158,13 +184,22 @@ func (legoTXTResolver) LookupTXT(ctx context.Context, fqdn string) ([]string, er
return values, nil
}
func waitForTXT(ctx context.Context, resolver TXTResolver, fqdn, expected string) error {
func waitForTXT(ctx context.Context, resolver TXTResolver, fqdn, expected string, timeout, interval time.Duration) error {
if resolver == nil {
return errors.New("TXT 查询服务未初始化")
}
deadline := time.NewTimer(30 * time.Second)
if timeout <= 0 {
timeout = defaultDNSPropagationTimeout
}
if interval <= 0 || interval > timeout {
interval = defaultDNSPropagationInterval
if interval > timeout {
interval = timeout
}
}
deadline := time.NewTimer(timeout)
defer deadline.Stop()
ticker := time.NewTicker(2 * time.Second)
ticker := time.NewTicker(interval)
defer ticker.Stop()
for {
values, err := resolver.LookupTXT(ctx, fqdn)
@@ -5,6 +5,7 @@ import (
"errors"
"strings"
"testing"
"time"
"github.com/go-acme/lego/v5/challenge"
"github.com/go-acme/lego/v5/challenge/dns01"
@@ -79,6 +80,22 @@ func TestTesterCreatesAndCleansChallengeRecord(t *testing.T) {
}
}
func TestTesterUsesConfiguredPropagationSettings(t *testing.T) {
provider := &fakeProvider{}
tester := NewTesterWithResolverAndSettings(fakeFactory{provider: provider}, missingTXTResolver{}, 20*time.Millisecond, 5*time.Millisecond)
started := time.Now()
_, err := tester.Verify(context.Background(), Cloudflare, "example.com", map[string]string{"api_token": "secret-token"})
if err == nil {
t.Fatal("missing TXT record should fail")
}
if elapsed := time.Since(started); elapsed > time.Second {
t.Fatalf("configured propagation timeout was ignored: %s", elapsed)
}
if !provider.cleaned {
t.Fatal("failed propagation check should clean up the record")
}
}
func TestTesterDoesNotCleanupWhenPresentFails(t *testing.T) {
provider := &fakeProvider{presentErr: errors.New("拒绝访问")}
tester := NewTester(fakeFactory{provider: provider})