补齐证书任务工作流入口
接入证书导入、恢复和校验任务流程,保持现有应用与 HTTP 依赖兼容。
This commit is contained in:
1 parent
7e14bbf42f
commit
b8997512f9
4 files changed
+124
-58
No files matched your search
@@ -170,7 +170,7 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
|
||||
return certificate.RollbackSavedResource(ctx, saved)
|
||||
},
|
||||
ImportCertificate: func(ctx context.Context, request certificate.ImportRequest) (certificate.IssueResult, deployment.Report, error) {
|
||||
result, err := workflow.Import(ctx, request)
|
||||
result, err := trackedWorkflow.Import(ctx, request)
|
||||
return result.Certificate, result.Deployment, err
|
||||
},
|
||||
DeployCertificate: func(ctx context.Context, domainID string) (certificate.IssueResult, deployment.Report, error) {
|
||||
@@ -178,7 +178,11 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
|
||||
return result.Certificate, result.Deployment, err
|
||||
},
|
||||
RestoreCertificateVersion: func(ctx context.Context, domainID, version string) (certificate.IssueResult, error) {
|
||||
return certificates.RestoreVersion(ctx, domainID, version)
|
||||
result, err := trackedWorkflow.Restore(ctx, domainID, version)
|
||||
return result.Certificate, err
|
||||
},
|
||||
ValidateCertificate: func(ctx context.Context, domainID string) (certificate.IssueResult, certificate.ValidationResult, error) {
|
||||
return trackedWorkflow.Validate(ctx, domainID)
|
||||
},
|
||||
RunRenewal: func(ctx context.Context) (certificate.RenewalReport, error) {
|
||||
return renewal.RunOnce(ctx)
|
||||
|
||||
@@ -34,6 +34,29 @@ func (w *certificateTaskWorkflow) DeployCurrent(ctx context.Context, id string)
|
||||
return w.run(ctx, id, "certificate_deploy", "certificate_deploy", 1, 0, w.workflow.DeployCurrent)
|
||||
}
|
||||
|
||||
func (w *certificateTaskWorkflow) Import(ctx context.Context, request certificate.ImportRequest) (CertificateWorkflowResult, error) {
|
||||
return w.run(ctx, request.DomainID, "certificate_import", "certificate_import", 1, 0, func(ctx context.Context, _ string) (CertificateWorkflowResult, error) {
|
||||
return w.workflow.Import(ctx, request)
|
||||
})
|
||||
}
|
||||
|
||||
func (w *certificateTaskWorkflow) Restore(ctx context.Context, domainID, version string) (CertificateWorkflowResult, error) {
|
||||
return w.run(ctx, domainID, "certificate_restore", "certificate_restore", 1, 0, func(ctx context.Context, id string) (CertificateWorkflowResult, error) {
|
||||
result, err := w.workflow.RestoreVersion(ctx, id, version)
|
||||
return CertificateWorkflowResult{Certificate: result}, err
|
||||
})
|
||||
}
|
||||
|
||||
func (w *certificateTaskWorkflow) Validate(ctx context.Context, domainID string) (certificate.IssueResult, certificate.ValidationResult, error) {
|
||||
var validation certificate.ValidationResult
|
||||
result, err := w.run(ctx, domainID, "certificate_validate", "certificate_validate", 1, 0, func(ctx context.Context, id string) (CertificateWorkflowResult, error) {
|
||||
certificateResult, validationResult, err := w.workflow.ValidateCurrent(ctx, id)
|
||||
validation = validationResult
|
||||
return CertificateWorkflowResult{Certificate: certificateResult}, err
|
||||
})
|
||||
return result.Certificate, validation, err
|
||||
}
|
||||
|
||||
func (w *certificateTaskWorkflow) run(ctx context.Context, id, taskType, stage string, attempts int, interval time.Duration, execute func(context.Context, string) (CertificateWorkflowResult, error)) (result CertificateWorkflowResult, resultErr error) {
|
||||
if w.tasks == nil || w.audit == nil {
|
||||
return result, errors.New("证书任务记录服务未初始化")
|
||||
|
||||
@@ -145,6 +145,42 @@ func (w *CertificateWorkflow) Import(ctx context.Context, request certificate.Im
|
||||
return CertificateWorkflowResult{Certificate: certificateResult, Deployment: report}, err
|
||||
}
|
||||
|
||||
// RestoreVersion restores a certificate version through the certificate service.
|
||||
func (w *CertificateWorkflow) RestoreVersion(ctx context.Context, domainID, version string) (certificate.IssueResult, error) {
|
||||
if w == nil || w.Certificates == nil {
|
||||
return certificate.IssueResult{}, errors.New("证书恢复流程未初始化")
|
||||
}
|
||||
restorer, ok := w.Certificates.(interface {
|
||||
RestoreVersion(context.Context, string, string) (certificate.IssueResult, error)
|
||||
})
|
||||
if !ok {
|
||||
return certificate.IssueResult{}, errors.New("证书恢复服务未配置")
|
||||
}
|
||||
return restorer.RestoreVersion(ctx, domainID, version)
|
||||
}
|
||||
|
||||
// ValidateCurrent validates the active certificate through the workflow boundary.
|
||||
func (w *CertificateWorkflow) ValidateCurrent(ctx context.Context, domainID string) (certificate.IssueResult, certificate.ValidationResult, error) {
|
||||
if w == nil || w.CurrentCertificate == nil {
|
||||
return certificate.IssueResult{}, certificate.ValidationResult{}, errors.New("证书校验流程未初始化")
|
||||
}
|
||||
result, err := w.CurrentCertificate(ctx, domainID)
|
||||
if err != nil {
|
||||
return certificate.IssueResult{}, certificate.ValidationResult{}, err
|
||||
}
|
||||
validation, err := (certificate.LocalValidator{VerifyChain: true}).ValidateFiles(
|
||||
ctx,
|
||||
result.Saved.CertificatePath,
|
||||
result.Saved.FullChainPath,
|
||||
result.Saved.PrivateKeyPath,
|
||||
result.Domains,
|
||||
)
|
||||
if err != nil {
|
||||
return certificate.IssueResult{}, certificate.ValidationResult{}, fmt.Errorf("当前证书校验失败:%w", err)
|
||||
}
|
||||
return result, validation, nil
|
||||
}
|
||||
|
||||
func (w *CertificateWorkflow) notify(ctx context.Context, event notification.Event) {
|
||||
if w == nil || w.Notifier == nil {
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user