blackbeard420/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-03-09 07:29:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

caddypki: Remove lifetime check at Caddyfile parse (fix #6878)

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 package acmeserver
import ( import (
"time"
"github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/caddyserver/caddy/v2/modules/caddypki" "github.com/caddyserver/caddy/v2/modules/caddypki"
@ -74,14 +72,10 @@ func parseACMEServer(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error
if !h.NextArg() { if !h.NextArg() {
return nil, h.ArgErr() return nil, h.ArgErr()
} }
dur, err := caddy.ParseDuration(h.Val()) dur, err := caddy.ParseDuration(h.Val())
if err != nil { if err != nil {
return nil, err 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) acmeServer.Lifetime = caddy.Duration(dur)
case "resolvers": case "resolvers":
acmeServer.Resolvers = h.RemainingArgs() acmeServer.Resolvers = h.RemainingArgs()