Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-24 02:02:26 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddypki: Remove lifetime check at Caddyfile parse (fix #6878)
Some checks failed
Lint / lint (macos-14, mac) (push) Waiting to run
Details
Lint / lint (windows-latest, windows) (push) Waiting to run
Details
Tests / test (./cmd/caddy/caddy, ~1.24.1, ubuntu-latest, 0, 1.24, linux) (push) Failing after 1m30s
Details
Tests / test (s390x on IBM Z) (push) Has been skipped
Details
Tests / goreleaser-check (push) Has been skipped
Details
Cross-Build / build (~1.24.1, 1.24, aix) (push) Successful in 1m19s
Details
Cross-Build / build (~1.24.1, 1.24, darwin) (push) Successful in 1m17s
Details
Cross-Build / build (~1.24.1, 1.24, dragonfly) (push) Successful in 1m15s
Details
Cross-Build / build (~1.24.1, 1.24, freebsd) (push) Successful in 1m15s
Details
Cross-Build / build (~1.24.1, 1.24, illumos) (push) Successful in 1m16s
Details
Cross-Build / build (~1.24.1, 1.24, linux) (push) Successful in 1m17s
Details
Cross-Build / build (~1.24.1, 1.24, netbsd) (push) Successful in 1m18s
Details
Cross-Build / build (~1.24.1, 1.24, openbsd) (push) Successful in 1m16s
Details
Cross-Build / build (~1.24.1, 1.24, solaris) (push) Successful in 1m14s
Details
Cross-Build / build (~1.24.1, 1.24, windows) (push) Successful in 1m19s
Details
Lint / lint (ubuntu-latest, linux) (push) Successful in 1m56s
Details
Lint / govulncheck (push) Successful in 1m9s
Details
Tests / test (./cmd/caddy/caddy, ~1.24.1, macos-14, 0, 1.24, mac) (push) Has been cancelled
Details
Tests / test (./cmd/caddy/caddy.exe, ~1.24.1, windows-latest, True, 1.24, windows) (push) Has been cancelled
Details

Browse Source 
The same check is done at provision time of the ACME server, and that is the correct place to do it.
This commit is contained in:
Matthew Holt 2025-03-06 11:40:03 -07:00
parent 1641e76fd7
commit 84364ffcd0
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/caddypki/acmeserver/caddyfile.go
View File

@ -15,8 +15,6 @@
package acmeserver
import (
"time"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddypki"
@ -74,14 +72,10 @@ func parseACMEServer(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error
if !h.NextArg() {
return nil, h.ArgErr()
}
dur, err := caddy.ParseDuration(h.Val())
if err != nil {
return nil, err
}
if d := time.Duration(ca.IntermediateLifetime); d > 0 && dur > d {
return nil, h.Errf("certificate lifetime (%s) exceeds intermediate certificate lifetime (%s)", dur, d)
}
acmeServer.Lifetime = caddy.Duration(dur)
case "resolvers":
acmeServer.Resolvers = h.RemainingArgs()