生产部署整改阶段检查点

This commit is contained in:
xuans committed 2026-08-31 23:33:56 +08:00
1 parent f3348cf95d
commit 92d4b3d398
56 files changed
+4178 -240

No files matched your search

+50 -2
View File
@@ -39,8 +39,15 @@ type App struct {
Workflow *CertificateWorkflow
Renewal *certificate.RenewalScheduler
HTTP *httpapi.Server
maintenanceStop context.CancelFunc
maintenanceDone chan struct{}
}
const (
auditLogRetentionDays = 30
auditCleanupInterval = 24 * time.Hour
)
func New(ctx context.Context, cfg config.Config) (*App, error) {
return NewWithConfigPath(ctx, cfg, filepath.Join(cfg.Paths.Config, "scert.json"))
}
@@ -99,6 +106,11 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
logger.Warn("\u670d\u52a1\u91cd\u542f\u524d\u672a\u5b8c\u6210\u4efb\u52a1\u5df2\u6807\u8bb0\u4e3a\u5931\u8d25", "count", recovered)
}
auditRepo := repository.NewSQLAuditRepository(db.DB)
if deleted, err := auditRepo.PruneExpiredAuditLogs(ctx, time.Now().UTC().AddDate(0, 0, -auditLogRetentionDays)); err != nil {
logger.Warn("启动时清理过期审计日志失败", "error", err)
} else if deleted > 0 {
logger.Info("启动时已清理过期审计日志", "count", deleted)
}
sshKeys := sshkey.NewService(secretStore)
accounts := certificate.NewAccountRepository(secretStore)
certificates := certificate.NewService(cfg, repo, secretStore, dnsprovider.NewLegoFactory(), accounts)
@@ -154,8 +166,9 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
ResetStatePath: admin.StatePath(cfg.Paths.Data),
Audit: auditRepo,
Tasks: taskRepo,
ReadinessCheck: db.DB.PingContext,
})
return &App{
application := &App{
Config: cfg, Logger: logger, Database: db, Repository: repo,
Servers: serverRepo,
Users: userRepo,
@@ -165,7 +178,36 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
Certificates: certificates,
Workflow: workflow,
Renewal: renewal,
}, nil
}
application.startAuditCleanup(auditRepo)
return application, nil
}
func (a *App) startAuditCleanup(repo *repository.SQLAuditRepository) {
ctx, cancel := context.WithCancel(context.Background())
done := make(chan struct{})
a.maintenanceStop = cancel
a.maintenanceDone = done
go func() {
defer close(done)
ticker := time.NewTicker(auditCleanupInterval)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
return
case <-ticker.C:
deleted, err := repo.PruneExpiredAuditLogs(ctx, time.Now().UTC().AddDate(0, 0, -auditLogRetentionDays))
if err != nil {
a.Logger.Warn("定时清理过期审计日志失败", "error", err)
continue
}
if deleted > 0 {
a.Logger.Info("已定时清理过期审计日志", "count", deleted)
}
}
}
}()
}
func (a *App) Close() error {
@@ -176,6 +218,12 @@ func (a *App) Close() error {
if a.Renewal != nil {
a.Renewal.Stop()
}
if a.maintenanceStop != nil {
a.maintenanceStop()
}
if a.maintenanceDone != nil {
<-a.maintenanceDone
}
if a.HTTP != nil {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
if err := a.HTTP.Shutdown(ctx); err != nil && first == nil {
@@ -71,6 +71,7 @@ func (w *CertificateWorkflow) IssueWithReport(ctx context.Context, domainID stri
return CertificateWorkflowResult{}, err
}
report, err := w.deploy(ctx, certificateResult)
err = appendDeploymentResultError(err, report)
if err != nil {
w.markDeploymentError(certificateResult)
}
@@ -101,6 +102,7 @@ func (w *CertificateWorkflow) DeployCurrent(ctx context.Context, domainID string
return CertificateWorkflowResult{}, err
}
report, err := w.deploy(ctx, result)
err = appendDeploymentResultError(err, report)
if err != nil {
w.markDeploymentError(result)
} else if updateErr := w.Domains.UpdateCertificateState(ctx, result.DomainID, "valid", &result.Saved.NotAfter); updateErr != nil {
@@ -127,6 +129,7 @@ func (w *CertificateWorkflow) Import(ctx context.Context, request certificate.Im
return CertificateWorkflowResult{}, err
}
report, err := w.deploy(ctx, certificateResult)
err = appendDeploymentResultError(err, report)
if err != nil {
w.markDeploymentError(certificateResult)
}
@@ -158,6 +161,31 @@ func errorText(err error) string {
return err.Error()
}
func appendDeploymentResultError(err error, report deployment.Report) error {
if err == nil {
return nil
}
messages := make([]string, 0, len(report.Results))
for _, result := range report.Results {
message := strings.TrimSpace(result.Message)
if result.Status == "success" || message == "" {
continue
}
server := strings.TrimSpace(result.Server)
if server == "" {
server = strings.TrimSpace(result.ServerID)
}
if server != "" {
message = server + ": " + message
}
messages = append(messages, message)
}
if len(messages) == 0 {
return err
}
return fmt.Errorf("%w; %s", err, strings.Join(messages, "; "))
}
func (w *CertificateWorkflow) deploy(ctx context.Context, result certificate.IssueResult) (deployment.Report, error) {
domainItem, err := w.Domains.GetByID(ctx, result.DomainID)
if err != nil {
@@ -112,7 +112,13 @@ func TestCertificateWorkflowDeploysIssuedCertificateToAssociatedServers(t *testi
}
func TestCertificateWorkflowReturnsPartialDeploymentError(t *testing.T) {
deployer := &workflowDeployer{report: deployment.Report{Total: 2, Success: 1, Failed: 1, Status: "partial"}}
deployer := &workflowDeployer{report: deployment.Report{
Total: 2, Success: 1, Failed: 1, Status: "partial",
Results: []deployment.Result{
{ServerID: "server-1", Server: "primary", Status: "success", Message: "deployed"},
{ServerID: "server-2", Server: "secondary", Status: "failed", Message: "validation failed"},
},
}}
state := &workflowDomainState{item: domain.Domain{ID: "domain-1", Name: "*.example.com", CertificateType: domain.CertificateWildcard}}
workflow := &CertificateWorkflow{
Certificates: &workflowCertificateService{result: certificate.IssueResult{DomainID: "domain-1"}},
@@ -124,6 +130,9 @@ func TestCertificateWorkflowReturnsPartialDeploymentError(t *testing.T) {
if err == nil || result.Deployment.Status != "partial" {
t.Fatalf("部分部署应返回错误和报告:%+v %v", result, err)
}
if !strings.Contains(err.Error(), "secondary: validation failed") || strings.Contains(err.Error(), "primary: deployed") {
t.Fatalf("deployment error details are incomplete: %v", err)
}
if result.Certificate.DomainID != "domain-1" {
t.Fatalf("证书结果未保留:%+v", result.Certificate)
}