From d89e55481c4612426580df21ffbea212e5f5257b Mon Sep 17 00:00:00 2001 From: xfy Date: Fri, 10 Apr 2026 09:40:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ssl):=20=E9=80=82=E9=85=8D=20resolver.?= =?UTF-8?q?DNSCacheEntry=20=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 适配 resolver 模块类型重命名 Co-Authored-By: Claude Opus 4.6 --- internal/ssl/ocsp.go | 10 +++++----- internal/ssl/ocsp_test.go | 2 +- internal/ssl/session_tickets.go | 5 +---- internal/ssl/ssl.go | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/internal/ssl/ocsp.go b/internal/ssl/ocsp.go index cb2b206..11c0c54 100644 --- a/internal/ssl/ocsp.go +++ b/internal/ssl/ocsp.go @@ -60,16 +60,16 @@ type ocspResponse struct { response []byte // 原始 OCSP 响应数据 thisUpdate time.Time // 响应生成时间 nextUpdate time.Time // 响应过期时间 - status ocspStatus // 响应状态 + status OCSPStatus // 响应状态 fetchedAt time.Time // 获取响应的时间 errors int // 连续获取失败的次数 } -// ocspStatus OCSP 响应状态类型。 -type ocspStatus int +// OCSPStatus OCSP 响应状态类型。 +type OCSPStatus int const ( - statusValid ocspStatus = iota // 响应有效且新鲜 + statusValid OCSPStatus = iota // 响应有效且新鲜 statusStale // 响应过期但可用(优雅降级) statusFailed // 无有效响应可用 ) @@ -433,7 +433,7 @@ func (m *OCSPManager) RefreshResponse(cert, issuer *x509.Certificate) error { // 返回值: // - status: OCSP 响应状态 // - hasResponse: 是否有可用响应 -func (m *OCSPManager) GetStatus(serial string) (status ocspStatus, hasResponse bool) { +func (m *OCSPManager) GetStatus(serial string) (status OCSPStatus, hasResponse bool) { m.mu.RLock() resp, ok := m.responses[serial] m.mu.RUnlock() diff --git a/internal/ssl/ocsp_test.go b/internal/ssl/ocsp_test.go index 473c4b3..dc000de 100644 --- a/internal/ssl/ocsp_test.go +++ b/internal/ssl/ocsp_test.go @@ -345,7 +345,7 @@ func TestOCSPManagerRegisterCertificate(t *testing.T) { } // Create mock OCSP server - ocspServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ocspServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { // Return a simple OCSP response w.WriteHeader(http.StatusOK) _, _ = w.Write([]byte("mock-ocsp-response")) diff --git a/internal/ssl/session_tickets.go b/internal/ssl/session_tickets.go index d3da52b..187492e 100644 --- a/internal/ssl/session_tickets.go +++ b/internal/ssl/session_tickets.go @@ -374,12 +374,9 @@ func generateTicketKey() ([]byte, error) { return key, nil } -// GetKeyStatus 返回当前密钥状态信息。 +// SessionTicketStatus Session Ticket 密钥状态信息。 // // 用于监控和调试,显示当前密钥数量和轮换状态。 -// -// 返回值: -// - SessionTicketStatus: 密钥状态信息 type SessionTicketStatus struct { // KeyCount 当前密钥数量 KeyCount int diff --git a/internal/ssl/ssl.go b/internal/ssl/ssl.go index bdde2f8..45b30e3 100644 --- a/internal/ssl/ssl.go +++ b/internal/ssl/ssl.go @@ -436,7 +436,7 @@ func (m *TLSManager) GetOCSPStatus() map[string]OCSPStatusInfo { type OCSPStatusInfo struct { Serial string // 证书序列号 Subject string // 证书主题 CN - Status ocspStatus // OCSP 响应状态 + Status OCSPStatus // OCSP 响应状态 HasResponse bool // 是否有可用响应 }