实现初始化验证令牌服务端解析

This commit is contained in:
xuans committed 2026-09-16 18:12:50 +08:00
1 parent ab0039998a
commit 814291773f
4 files changed
+187

No files matched your search

@@ -79,6 +79,15 @@ type dnsVerificationSession struct {
ExpiresAt time.Time
}
// DNSVerificationSession 仅供服务端完整初始化事务读取验证结果。
// 所有字段均禁止 JSON 序列化,避免凭据引用被误写入 HTTP 响应。
type DNSVerificationSession struct {
ProviderID string `json:"-"`
TestDomain string `json:"-"`
CredentialRef string `json:"-"`
ExpiresAt time.Time `json:"-"`
}
type DNSVerificationManager struct {
mu sync.Mutex
tester DNSCredentialTester
@@ -172,6 +181,20 @@ func (m *DNSVerificationManager) Consume(token, providerID, credentialRef, testD
return m.validateSession(token, providerID, credentialRef, testDomain, true)
}
// Resolve 按验证令牌读取完整初始化所需的服务端状态,但不消费令牌。
func (m *DNSVerificationManager) Resolve(token string) (DNSVerificationSession, error) {
session, err := m.resolveSession(token)
if err != nil {
return DNSVerificationSession{}, err
}
return DNSVerificationSession{
ProviderID: session.ProviderID,
TestDomain: session.TestDomain,
CredentialRef: session.CredentialRef,
ExpiresAt: session.ExpiresAt,
}, nil
}
// Discard 按验证令牌精确回收尚未消费的 DNS 临时凭据,不影响其他初始化会话。
func (m *DNSVerificationManager) Discard(token string) error {
if m == nil {
@@ -249,6 +272,26 @@ func (m *DNSVerificationManager) validateSession(token, providerID, credentialRe
return nil
}
func (m *DNSVerificationManager) resolveSession(token string) (dnsVerificationSession, error) {
if m == nil {
return dnsVerificationSession{}, errors.New("DNS 在线验证服务未初始化")
}
token = strings.TrimSpace(token)
if token == "" {
return dnsVerificationSession{}, errors.New("必须先完成 DNS API 在线验证")
}
now := m.now().UTC()
m.mu.Lock()
expiredRefs := m.clearExpiredLocked(now)
session, ok := m.sessions[token]
m.mu.Unlock()
m.deleteCredentials(expiredRefs)
if !ok {
return dnsVerificationSession{}, errors.New("DNS 验证令牌无效或已经过期,请重新测试")
}
return session, nil
}
func (m *DNSVerificationManager) reserveVerificationSlot() error {
if m == nil {
return errors.New("DNS 在线验证服务未初始化")
@@ -2,7 +2,9 @@ package setup
import (
"context"
"encoding/json"
"errors"
"strings"
"sync"
"testing"
"time"
@@ -357,3 +359,36 @@ func TestDNSVerificationManagerNormalizesCredentialCopyBeforeTestingAndStoring(t
t.Fatal("规范化过程不应修改调用方的原始凭据 Map")
}
}
func TestDNSVerificationResolveIsServerOnlyAndDoesNotConsumeToken(t *testing.T) {
store := &memorySecretWriter{}
manager := NewDNSVerificationManager(fakeDNSTester{}, store)
result, err := manager.Verify(t.Context(), DNSVerificationInput{
ProviderID: "aliyun", TestDomain: "www.example.com",
Credentials: map[string]string{"access_key_id": "test-id", "access_key_secret": "test-secret"},
})
if err != nil {
t.Fatal(err)
}
resolved, err := manager.Resolve(result.VerificationToken)
if err != nil {
t.Fatalf("按令牌解析 DNS 验证结果失败:%v", err)
}
if resolved.ProviderID != "aliyun" || resolved.TestDomain != "www.example.com" ||
resolved.CredentialRef != result.CredentialRef || resolved.ExpiresAt != result.ExpiresAt {
t.Fatalf("解析的 DNS 验证状态不完整:%+v", resolved)
}
encoded, err := json.Marshal(resolved)
if err != nil {
t.Fatal(err)
}
if strings.Contains(string(encoded), result.CredentialRef) || strings.Contains(string(encoded), resolved.TestDomain) {
t.Fatalf("服务端 DNS 验证状态可被意外序列化:%s", encoded)
}
if err := manager.Consume(result.VerificationToken, resolved.ProviderID, resolved.CredentialRef, resolved.TestDomain); err != nil {
t.Fatalf("Resolve 不应消费 DNS 验证令牌:%v", err)
}
if _, err := manager.Resolve(result.VerificationToken); err == nil {
t.Fatal("已消费的 DNS 验证令牌仍可被解析")
}
}