补充DNS过期凭据清理重试
修复DNS验证会话过期后临时凭据清理失败的可恢复性,保留原会话以便重试且不恢复过期授权,补充回归测试并更新四份整改清单。
This commit is contained in:
1 parent
4ec81eecab
commit
f9dcb37763
6 files changed
+119
-9
No files matched your search
@@ -79,6 +79,11 @@ type dnsVerificationSession struct {
|
||||
ExpiresAt time.Time
|
||||
}
|
||||
|
||||
type expiredDNSVerificationSession struct {
|
||||
Token string
|
||||
Session dnsVerificationSession
|
||||
}
|
||||
|
||||
// DNSVerificationSession 仅供服务端完整初始化事务读取验证结果。
|
||||
// 所有字段均禁止 JSON 序列化,避免凭据引用被误写入 HTTP 响应。
|
||||
type DNSVerificationSession struct {
|
||||
@@ -89,20 +94,21 @@ type DNSVerificationSession struct {
|
||||
}
|
||||
|
||||
type DNSVerificationManager struct {
|
||||
mu sync.Mutex
|
||||
tester DNSCredentialTester
|
||||
store SecretWriter
|
||||
deleter SecretDeleter
|
||||
now func() time.Time
|
||||
sessions map[string]dnsVerificationSession
|
||||
inFlight int
|
||||
mu sync.Mutex
|
||||
tester DNSCredentialTester
|
||||
store SecretWriter
|
||||
deleter SecretDeleter
|
||||
now func() time.Time
|
||||
sessions map[string]dnsVerificationSession
|
||||
expiredSession map[string]expiredDNSVerificationSession
|
||||
inFlight int
|
||||
}
|
||||
|
||||
func NewDNSVerificationManager(tester DNSCredentialTester, store SecretWriter) *DNSVerificationManager {
|
||||
deleter, _ := store.(SecretDeleter)
|
||||
return &DNSVerificationManager{
|
||||
tester: tester, store: store, deleter: deleter, now: time.Now,
|
||||
sessions: make(map[string]dnsVerificationSession),
|
||||
sessions: make(map[string]dnsVerificationSession), expiredSession: make(map[string]expiredDNSVerificationSession),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -396,7 +402,10 @@ func (m *DNSVerificationManager) clearExpiredExceptLocked(now time.Time, exclude
|
||||
}
|
||||
if !session.ExpiresAt.After(now) {
|
||||
delete(m.sessions, token)
|
||||
references = append(references, session.CredentialRef)
|
||||
if reference := strings.TrimSpace(session.CredentialRef); reference != "" {
|
||||
m.expiredSession[reference] = expiredDNSVerificationSession{Token: token, Session: session}
|
||||
references = append(references, reference)
|
||||
}
|
||||
}
|
||||
}
|
||||
return references
|
||||
@@ -416,11 +425,39 @@ func (m *DNSVerificationManager) restoreSession(token string, session dnsVerific
|
||||
func (m *DNSVerificationManager) deleteCredentials(references []string) {
|
||||
for _, reference := range references {
|
||||
if err := m.deleteCredential(reference); err != nil {
|
||||
m.restoreExpiredSession(reference)
|
||||
m.logCleanupFailure()
|
||||
continue
|
||||
}
|
||||
m.forgetExpiredSession(reference)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *DNSVerificationManager) restoreExpiredSession(reference string) {
|
||||
if m == nil || strings.TrimSpace(reference) == "" {
|
||||
return
|
||||
}
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
expired, ok := m.expiredSession[reference]
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
if _, exists := m.sessions[expired.Token]; !exists {
|
||||
m.sessions[expired.Token] = expired.Session
|
||||
}
|
||||
delete(m.expiredSession, reference)
|
||||
}
|
||||
|
||||
func (m *DNSVerificationManager) forgetExpiredSession(reference string) {
|
||||
if m == nil || strings.TrimSpace(reference) == "" {
|
||||
return
|
||||
}
|
||||
m.mu.Lock()
|
||||
delete(m.expiredSession, reference)
|
||||
m.mu.Unlock()
|
||||
}
|
||||
|
||||
func (m *DNSVerificationManager) logCleanupFailure() {
|
||||
log.Print("DNS 临时凭据回收失败")
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user