Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 12, 10:45 UTC
caddytls: Implement certmagic.RenewalInfoGetter
Fixes ARI errors reported here: https://caddy.community/t/error-in-logs-with-updating-ari-after-upgrading-to-caddy-v2-8-1/24320
Matthew Holt committed
Jun 1, 2024 at 18:02 UTC
b7280e6949287bc39ab5939ace4f772528316172
3 files changed
+16
-9
go.mod
+1
-1
@@ -9,7 +9,7 @@ require (
9
github.com/Masterminds/sprig/v3 v3.2.3
10
github.com/alecthomas/chroma/v2 v2.13.0
11
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b
12
- github.com/caddyserver/certmagic v0.21.2
12
+ github.com/caddyserver/certmagic v0.21.3
13
github.com/caddyserver/zerossl v0.1.3
14
github.com/dustin/go-humanize v1.0.1
15
github.com/go-chi/chi/v5 v5.0.12
go.sum
+2
-2
@@ -73,8 +73,8 @@ github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
73
github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
74
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
75
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
76
-github.com/caddyserver/certmagic v0.21.2 h1:O18LtaYBGDooyy257cYePnhp4lPfz6TaJELil6Q1fDg=
77
-github.com/caddyserver/certmagic v0.21.2/go.mod h1:Zq6pklO9nVRl3DIFUw9gVUfXKdpc/0qwTUAQMBlfgtI=
76
+github.com/caddyserver/certmagic v0.21.3 h1:pqRRry3yuB4CWBVq9+cUqu+Y6E2z8TswbhNx1AZeYm0=
77
+github.com/caddyserver/certmagic v0.21.3/go.mod h1:Zq6pklO9nVRl3DIFUw9gVUfXKdpc/0qwTUAQMBlfgtI=
78
github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA=
79
github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
80
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
modules/caddytls/acmeissuer.go
+13
-6
@@ -264,6 +264,12 @@ func (iss *ACMEIssuer) Revoke(ctx context.Context, cert certmagic.CertificateRes
264
// to be accessed and manipulated.
265
func (iss *ACMEIssuer) GetACMEIssuer() *ACMEIssuer { return iss }
266
267
+// GetRenewalInfo wraps the underlying GetRenewalInfo method and satisifes
268
+// the CertMagic interface for ARI support.
269
+func (iss *ACMEIssuer) GetRenewalInfo(ctx context.Context, cert certmagic.Certificate) (acme.RenewalInfo, error) {
270
+ return iss.issuer.GetRenewalInfo(ctx, cert)
271
+}
272
+
273
// generateZeroSSLEABCredentials generates ZeroSSL EAB credentials for the primary contact email
274
// on the issuer. It should only be usedif the CA endpoint is ZeroSSL. An email address is required.
275
func (iss *ACMEIssuer) generateZeroSSLEABCredentials(ctx context.Context, acct acme.Account) (*acme.EAB, acme.Account, error) {
@@ -649,10 +655,11 @@ type ChainPreference struct {
655
656
// Interface guards
657
var (
652
- _ certmagic.PreChecker = (*ACMEIssuer)(nil)
653
- _ certmagic.Issuer = (*ACMEIssuer)(nil)
654
- _ certmagic.Revoker = (*ACMEIssuer)(nil)
655
- _ caddy.Provisioner = (*ACMEIssuer)(nil)
656
- _ ConfigSetter = (*ACMEIssuer)(nil)
657
- _ caddyfile.Unmarshaler = (*ACMEIssuer)(nil)
658
+ _ certmagic.PreChecker = (*ACMEIssuer)(nil)
659
+ _ certmagic.Issuer = (*ACMEIssuer)(nil)
660
+ _ certmagic.Revoker = (*ACMEIssuer)(nil)
661
+ _ certmagic.RenewalInfoGetter = (*ACMEIssuer)(nil)
662
+ _ caddy.Provisioner = (*ACMEIssuer)(nil)
663
+ _ ConfigSetter = (*ACMEIssuer)(nil)
664
+ _ caddyfile.Unmarshaler = (*ACMEIssuer)(nil)
665
)