完成证书历史版本恢复核心实现

补充历史证书版本读取、稳定标识、完整证书链恢复、恢复回滚保护及接口安全输出,并同步更新整改任务进度。
This commit is contained in:
xuans committed 2026-10-03 01:14:12 +08:00
1 parent 3c59ac5e80
commit 3f6a05d2b9
11 files changed
+864 -102

No files matched your search

+34 -1
View File
@@ -9,6 +9,7 @@ import (
"net/http"
"os"
"strings"
"time"
"github.com/gin-gonic/gin"
@@ -31,6 +32,34 @@ type certificatePathRequest struct {
IssuerBundlePath string `json:"issuer_bundle_path"`
}
// certificateVersionResponse 只公开证书历史元数据,不公开服务器本地路径。
type certificateVersionResponse struct {
Domain string `json:"domain"`
CertificateType string `json:"certificate_type,omitempty"`
CertificateIdentifier string `json:"certificate_identifier,omitempty"`
Version string `json:"version,omitempty"`
HistoryID string `json:"history_id,omitempty"`
Current bool `json:"current"`
SavedAt time.Time `json:"saved_at"`
SANs []string `json:"sans,omitempty"`
SerialNumber string `json:"serial_number,omitempty"`
FingerprintSHA256 string `json:"fingerprint_sha256,omitempty"`
ChainLength int `json:"chain_length,omitempty"`
NotBefore time.Time `json:"not_before"`
NotAfter time.Time `json:"not_after"`
}
func publicCertificateVersion(item certificate.SavedResource) certificateVersionResponse {
return certificateVersionResponse{
Domain: item.Domain, CertificateType: item.CertificateType,
CertificateIdentifier: item.CertificateIdentifier, Version: item.Version,
HistoryID: item.HistoryID, Current: item.Current, SavedAt: item.SavedAt,
SANs: append([]string(nil), item.SANs...), SerialNumber: item.SerialNumber,
FingerprintSHA256: item.FingerprintSHA256, ChainLength: item.ChainLength,
NotBefore: item.NotBefore, NotAfter: item.NotAfter,
}
}
func (s *Server) listCertificates(c *gin.Context) {
if !s.requireProjectResourceReader(c) {
return
@@ -90,7 +119,11 @@ func (s *Server) listCertificateVersions(c *gin.Context) {
s.writeError(c, certificateErrorStatus(err), "查询证书历史版本失败", err)
return
}
c.JSON(http.StatusOK, gin.H{"items": items})
publicItems := make([]certificateVersionResponse, 0, len(items))
for _, item := range items {
publicItems = append(publicItems, publicCertificateVersion(item))
}
c.JSON(http.StatusOK, gin.H{"items": publicItems})
}
func (s *Server) validateCertificate(c *gin.Context) {
@@ -47,7 +47,7 @@ func TestCertificateReadAPIs(t *testing.T) {
NotAfter: expiresAt,
},
},
versions: []certificate.SavedResource{{Version: "20260827-120000.000000000"}},
versions: []certificate.SavedResource{{Version: "20260827-120000.000000000", HistoryID: "history-test", Directory: "/private/cert", PrivateKeyPath: "/private/key.pem"}},
}
repo := &stubDomainRepository{items: []domain.Domain{{ID: "domain-1", Name: "example.com", CertificateType: domain.CertificateSAN}}}
repo.loaded = repo.items[0]
@@ -73,6 +73,9 @@ func TestCertificateReadAPIs(t *testing.T) {
if versions.Code != http.StatusOK || !strings.Contains(versions.Body.String(), "20260827-120000.000000000") {
t.Fatalf("证书历史版本响应错误:%d %s", versions.Code, versions.Body.String())
}
if strings.Contains(versions.Body.String(), "private_key_path") || strings.Contains(versions.Body.String(), "/private/key.pem") || strings.Contains(versions.Body.String(), "directory") {
t.Fatalf("证书历史接口不应公开本地路径:%s", versions.Body.String())
}
}
func TestCertificateListHidesReaderErrors(t *testing.T) {