补齐管理证书TLS热更新并保留原版本用于回退

This commit is contained in:
xuans committed 2026-09-18 00:32:11 +08:00
1 parent 230cbaa017
commit 9074d83dc8
6 files changed
+551 -10

No files matched your search

+3 -1
View File
@@ -62,6 +62,8 @@ type FileStore struct {
Root string
BackupRoot string
Now func() time.Time
// 管理入口仍可能引用旧版本,完成双层 TLS 切换前不得清理该目录。
RetainPrevious bool
}
func NormalizeDomains(domains []string) ([]string, error) {
@@ -268,7 +270,7 @@ func (s FileStore) save(ctx context.Context, domain, certificateType string, res
}
return SavedResource{}, fmt.Errorf("写入证书元数据失败:%w", err)
}
if certificateType != "" && activeDirectory != "" && activeDirectory != currentDirectory {
if !s.RetainPrevious && certificateType != "" && activeDirectory != "" && activeDirectory != currentDirectory {
if err := removeCertificateDirectory(activeDirectory, typeDirectory); err != nil {
return SavedResource{}, fmt.Errorf("清理旧当前证书目录失败:%w", err)
}
@@ -0,0 +1,72 @@
package certificate
import (
"bytes"
"context"
"os"
"path/filepath"
"testing"
"github.com/go-acme/lego/v5/challenge"
)
func TestManagementCertificatePreservesReferencedVersions(t *testing.T) {
cfg := certificateTestConfig(t.TempDir())
issuer := &serviceIssuer{resource: testResource(t, "management.example.com")}
service := NewService(cfg, nil, serviceCredentials{}, serviceProviderFactory{}, serviceAccounts{})
service.acmeRoots = testResourceRoots(t, issuer.resource)
service.newIssuer = func(*AccountUser, challenge.Provider, string) Issuer { return issuer }
request := SetupCertificateRequest{
Domains: []string{"management.example.com"}, CertificateType: "single",
ProviderID: "cloudflare", CredentialRef: "secret://dns/cloudflare/test",
AccountEmail: "admin@example.com", Environment: "staging",
CertificateRoot: cfg.Paths.Certificate, BackupRoot: cfg.Paths.Backup,
}
first, err := service.IssueForSetup(t.Context(), request)
if err != nil {
t.Fatal(err)
}
original := make(map[string][]byte)
for _, name := range []string{"cert.pem", "fullchain.pem", "key.pem", "metadata.json"} {
data, err := os.ReadFile(filepath.Join(first.Directory, name))
if err != nil {
t.Fatal(err)
}
original[name] = data
}
// 使用不同证书证明后续申请及失败回退不会覆盖旧版本内容。
issuer.resource = testResource(t, "management.example.com")
service.acmeRoots = testResourceRoots(t, issuer.resource)
second, err := service.IssueForSetup(t.Context(), request)
if err != nil {
t.Fatal(err)
}
if second.Directory == first.Directory || second.BackupDirectory == "" {
t.Fatal("管理证书候选必须保存到新版本并备份旧版本")
}
assertUnchanged := func() {
t.Helper()
for name, expected := range original {
actual, err := os.ReadFile(filepath.Join(first.Directory, name))
if err != nil || !bytes.Equal(actual, expected) {
t.Fatalf("仍被引用的管理证书文件被修改:%s %v", name, err)
}
}
}
assertUnchanged()
if err := RollbackSavedResource(context.Background(), second); err != nil {
t.Fatal(err)
}
assertUnchanged()
third, err := service.IssueForSetup(t.Context(), request)
if err != nil {
t.Fatal(err)
}
if third.Directory == second.Directory || third.Directory == first.Directory {
t.Fatal("后续申请不得复用既有管理证书版本")
}
assertUnchanged()
if _, err := os.Stat(second.FullChainPath); err != nil {
t.Fatalf("失败候选应保留用于审查:%v", err)
}
}
+1 -1
View File
@@ -271,7 +271,7 @@ func (s *Service) IssueForSetup(ctx context.Context, request SetupCertificateReq
if err := s.validateACMEResource(ctx, resource, domains, environment); err != nil {
return SavedResource{}, err
}
store := FileStore{Root: request.CertificateRoot, BackupRoot: request.BackupRoot}
store := FileStore{Root: request.CertificateRoot, BackupRoot: request.BackupRoot, RetainPrevious: true}
saved, err := store.SaveForType(ctx, domains[0], certificateType, resource)
if err != nil {
return SavedResource{}, fmt.Errorf("保存初始化证书失败:%w", err)