Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-09-29 15:31:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddypki: check intermediate lifetime to actual root cert lifetime (#7272)
Some checks failed
Tests / test (./cmd/caddy/caddy, ~1.25.0, ubuntu-latest, 0, 1.25, linux) (push) Failing after 15s
Details
Tests / test (s390x on IBM Z) (push) Has been skipped
Details
Tests / goreleaser-check (push) Has been skipped
Details
Cross-Build / build (~1.25.0, 1.25, aix) (push) Failing after 22s
Details
Cross-Build / build (~1.25.0, 1.25, darwin) (push) Failing after 14s
Details
Cross-Build / build (~1.25.0, 1.25, dragonfly) (push) Failing after 14s
Details
Cross-Build / build (~1.25.0, 1.25, freebsd) (push) Failing after 14s
Details
Cross-Build / build (~1.25.0, 1.25, illumos) (push) Failing after 14s
Details
Cross-Build / build (~1.25.0, 1.25, linux) (push) Failing after 15s
Details
Cross-Build / build (~1.25.0, 1.25, netbsd) (push) Failing after 14s
Details
Cross-Build / build (~1.25.0, 1.25, openbsd) (push) Failing after 17s
Details
Cross-Build / build (~1.25.0, 1.25, solaris) (push) Failing after 23s
Details
Cross-Build / build (~1.25.0, 1.25, windows) (push) Failing after 14s
Details
Lint / lint (ubuntu-latest, linux) (push) Failing after 14s
Details
Lint / govulncheck (push) Successful in 1m14s
Details
Lint / dependency-review (push) Failing after 14s
Details
OpenSSF Scorecard supply-chain security / Scorecard analysis (push) Failing after 14s
Details
Tests / test (./cmd/caddy/caddy, ~1.25.0, macos-14, 0, 1.25, mac) (push) Has been cancelled
Details
Tests / test (./cmd/caddy/caddy.exe, ~1.25.0, windows-latest, True, 1.25, windows) (push) Has been cancelled
Details
Lint / lint (macos-14, mac) (push) Has been cancelled
Details
Lint / lint (windows-latest, windows) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Y.Horie 2025-09-27 01:24:52 +09:00 committed by GitHub
parent 25be2f26fc
commit 1e82f9652e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/caddypki/ca.go
View File

@ -124,8 +124,6 @@ func (ca *CA) Provision(ctx caddy.Context, id string, log *zap.Logger) error {
}
if ca.IntermediateLifetime == 0 {
ca.IntermediateLifetime = caddy.Duration(defaultIntermediateLifetime)
} else if time.Duration(ca.IntermediateLifetime) >= defaultRootLifetime {
return fmt.Errorf("intermediate certificate lifetime must be less than root certificate lifetime (%s)", defaultRootLifetime)
}
// load the certs and key that will be used for signing
@ -144,6 +142,10 @@ func (ca *CA) Provision(ctx caddy.Context, id string, log *zap.Logger) error {
if err != nil {
return err
}
actualRootLifetime := time.Until(rootCert.NotAfter)
if time.Duration(ca.IntermediateLifetime) >= actualRootLifetime {
return fmt.Errorf("intermediate certificate lifetime must be less than actual root certificate lifetime (%s)", actualRootLifetime)
}
if ca.Intermediate != nil {
interCert, interKey, err = ca.Intermediate.Load()
} else {