接入管理证书续期调度并记录任务审计通知
This commit is contained in:
1 parent
5597dd7cc2
commit
c8c712131d
13 files changed
+943
-27
No files matched your search
@@ -0,0 +1,101 @@
|
||||
package certificate
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
)
|
||||
|
||||
type managementRenewalFunc func(context.Context, RenewalPolicy, time.Time) (RenewalReport, error)
|
||||
|
||||
func (f managementRenewalFunc) RunRenewal(ctx context.Context, policy RenewalPolicy, now time.Time) (RenewalReport, error) {
|
||||
return f(ctx, policy, now)
|
||||
}
|
||||
|
||||
func TestRenewalSchedulerChecksManagementWithoutBusinessDomains(t *testing.T) {
|
||||
calls := 0
|
||||
management := managementRenewalFunc(func(_ context.Context, policy RenewalPolicy, now time.Time) (RenewalReport, error) {
|
||||
calls++
|
||||
if policy.MaxRetries != 3 || now.IsZero() {
|
||||
t.Fatal("管理续期未收到当前策略和时间")
|
||||
}
|
||||
return RenewalReport{Checked: 1, Selected: 1, Succeeded: 1}, nil
|
||||
})
|
||||
s := NewRenewalSchedulerWithManagement(renewalLister{}, &renewalService{}, RenewalPolicy{}, management)
|
||||
report, err := s.RunOnce(t.Context())
|
||||
if err != nil || calls != 1 || report.Checked != 1 || report.Succeeded != 1 {
|
||||
t.Fatalf("空业务列表漏掉管理证书:%+v %v", report, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenewalSchedulerKeepsBusinessRenewalAfterManagementFailure(t *testing.T) {
|
||||
managementErr := errors.New("模拟管理证书读取失败")
|
||||
management := managementRenewalFunc(func(context.Context, RenewalPolicy, time.Time) (RenewalReport, error) {
|
||||
return RenewalReport{Checked: 1, Selected: 1, Failed: 1}, managementErr
|
||||
})
|
||||
issuer := &renewalService{}
|
||||
s := NewRenewalSchedulerWithManagement(renewalLister{items: []domain.Domain{{ID: "business", AutoRenew: true}}}, issuer, RenewalPolicy{}, management)
|
||||
report, err := s.RunOnce(t.Context())
|
||||
if !errors.Is(err, managementErr) || report.Checked != 2 || report.Succeeded != 1 || report.Failed != 1 || len(issuer.ids) != 1 {
|
||||
t.Fatalf("管理错误阻断业务续期:%+v %v", report, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenewalSchedulerChecksManagementBeforeFailedBusinessQuery(t *testing.T) {
|
||||
management := managementRenewalFunc(func(context.Context, RenewalPolicy, time.Time) (RenewalReport, error) {
|
||||
return RenewalReport{Checked: 1, Selected: 1, Succeeded: 1}, nil
|
||||
})
|
||||
s := NewRenewalSchedulerWithManagement(renewalLister{err: errors.New("模拟业务查询失败")}, &renewalService{}, RenewalPolicy{}, management)
|
||||
report, err := s.RunOnce(t.Context())
|
||||
if err == nil || report.Succeeded != 1 {
|
||||
t.Fatalf("业务查询失败导致遗漏管理续期:%+v %v", report, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenewalSchedulerStopsManagementBeforeClosing(t *testing.T) {
|
||||
started := make(chan struct{})
|
||||
stopped := make(chan struct{})
|
||||
management := managementRenewalFunc(func(ctx context.Context, _ RenewalPolicy, _ time.Time) (RenewalReport, error) {
|
||||
close(started)
|
||||
<-ctx.Done()
|
||||
close(stopped)
|
||||
return RenewalReport{}, ctx.Err()
|
||||
})
|
||||
s := NewRenewalSchedulerWithManagement(renewalLister{}, &renewalService{}, RenewalPolicy{}, management)
|
||||
s.Start(t.Context())
|
||||
select {
|
||||
case <-started:
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("管理调度未启动")
|
||||
}
|
||||
s.Stop()
|
||||
select {
|
||||
case <-stopped:
|
||||
default:
|
||||
t.Fatal("停止调度未等待管理任务退出")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenewalSchedulerDoesNotLengthenShortCheckInterval(t *testing.T) {
|
||||
calls := make(chan struct{}, 2)
|
||||
management := managementRenewalFunc(func(context.Context, RenewalPolicy, time.Time) (RenewalReport, error) {
|
||||
select {
|
||||
case calls <- struct{}{}:
|
||||
default:
|
||||
}
|
||||
return RenewalReport{Checked: 1, NearExpiry: 1}, nil
|
||||
})
|
||||
s := NewRenewalSchedulerWithManagement(renewalLister{}, &renewalService{}, RenewalPolicy{CheckInterval: 10 * time.Millisecond}, management)
|
||||
s.Start(t.Context())
|
||||
t.Cleanup(s.Stop)
|
||||
for i := 0; i < 2; i++ {
|
||||
select {
|
||||
case <-calls:
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("临期规则不应将较短检查间隔延长为一天")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,11 @@ type CertificateIssuer interface {
|
||||
Issue(ctx context.Context, domainID string) (IssueResult, error)
|
||||
}
|
||||
|
||||
// ManagementRenewalCheck 独立检查管理入口,不将其伪装为业务域名。
|
||||
type ManagementRenewalCheck interface {
|
||||
RunRenewal(context.Context, RenewalPolicy, time.Time) (RenewalReport, error)
|
||||
}
|
||||
|
||||
type RenewalPolicy struct {
|
||||
CheckInterval time.Duration
|
||||
NearExpiryThreshold time.Duration
|
||||
@@ -28,17 +33,18 @@ type RenewalPolicy struct {
|
||||
}
|
||||
|
||||
type RenewalScheduler struct {
|
||||
lister DomainLister
|
||||
issuer CertificateIssuer
|
||||
policy RenewalPolicy
|
||||
now func() time.Time
|
||||
mu sync.Mutex
|
||||
policyMu sync.RWMutex
|
||||
runMu sync.Mutex
|
||||
running bool
|
||||
cancel context.CancelFunc
|
||||
done chan struct{}
|
||||
wake chan struct{}
|
||||
lister DomainLister
|
||||
issuer CertificateIssuer
|
||||
management ManagementRenewalCheck
|
||||
policy RenewalPolicy
|
||||
now func() time.Time
|
||||
mu sync.Mutex
|
||||
policyMu sync.RWMutex
|
||||
runMu sync.Mutex
|
||||
running bool
|
||||
cancel context.CancelFunc
|
||||
done chan struct{}
|
||||
wake chan struct{}
|
||||
}
|
||||
|
||||
type RenewalReport struct {
|
||||
@@ -70,6 +76,12 @@ func NewRenewalSchedulerWithPolicy(lister DomainLister, issuer CertificateIssuer
|
||||
return &RenewalScheduler{lister: lister, issuer: issuer, policy: policy, now: time.Now, wake: make(chan struct{}, 1)}
|
||||
}
|
||||
|
||||
func NewRenewalSchedulerWithManagement(lister DomainLister, issuer CertificateIssuer, policy RenewalPolicy, management ManagementRenewalCheck) *RenewalScheduler {
|
||||
s := NewRenewalSchedulerWithPolicy(lister, issuer, policy)
|
||||
s.management = management
|
||||
return s
|
||||
}
|
||||
|
||||
func (s *RenewalScheduler) UpdatePolicy(policy RenewalPolicy) {
|
||||
if s == nil {
|
||||
return
|
||||
@@ -103,14 +115,28 @@ func (s *RenewalScheduler) RunOnce(ctx context.Context) (RenewalReport, error) {
|
||||
return RenewalReport{}, errors.New("自动续期任务正在执行")
|
||||
}
|
||||
defer s.runMu.Unlock()
|
||||
items, err := s.lister.List(ctx)
|
||||
if err != nil {
|
||||
return RenewalReport{}, fmt.Errorf("查询续期域名失败:%w", err)
|
||||
}
|
||||
report := RenewalReport{Checked: len(items)}
|
||||
policy := s.Policy()
|
||||
now := s.now().UTC()
|
||||
var report RenewalReport
|
||||
var managementErr error
|
||||
if s.management != nil {
|
||||
report, managementErr = s.management.RunRenewal(ctx, policy, now)
|
||||
if managementErr != nil {
|
||||
report.Errors = append(report.Errors, "管理证书续期检查失败")
|
||||
}
|
||||
}
|
||||
if err := ctx.Err(); err != nil {
|
||||
return report, errors.Join(managementErr, err)
|
||||
}
|
||||
items, err := s.lister.List(ctx)
|
||||
if err != nil {
|
||||
return report, errors.Join(managementErr, fmt.Errorf("查询续期域名失败:%w", err))
|
||||
}
|
||||
report.Checked += len(items)
|
||||
for _, item := range items {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return report, errors.Join(managementErr, err)
|
||||
}
|
||||
if !item.AutoRenew || item.Status == "issuing" {
|
||||
continue
|
||||
}
|
||||
@@ -133,7 +159,7 @@ func (s *RenewalScheduler) RunOnce(ctx context.Context) (RenewalReport, error) {
|
||||
}
|
||||
report.Succeeded++
|
||||
}
|
||||
return report, nil
|
||||
return report, managementErr
|
||||
}
|
||||
|
||||
func (s *RenewalScheduler) Start(ctx context.Context) {
|
||||
@@ -167,7 +193,7 @@ func (s *RenewalScheduler) Start(ctx context.Context) {
|
||||
report, err := s.RunOnce(runCtx)
|
||||
for {
|
||||
interval := s.Policy().CheckInterval
|
||||
if err == nil && report.NearExpiry > 0 {
|
||||
if (report.NearExpiry > 0 || err != nil) && interval > 24*time.Hour {
|
||||
interval = 24 * time.Hour
|
||||
}
|
||||
timer := time.NewTimer(interval)
|
||||
@@ -180,6 +206,7 @@ func (s *RenewalScheduler) Start(ctx context.Context) {
|
||||
case <-timer.C:
|
||||
case <-s.wake:
|
||||
}
|
||||
timer.Stop()
|
||||
if runCtx.Err() != nil {
|
||||
return
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user