Skip to content

Commit b7280e6

Browse files
committed
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
1 parent a63767d commit b7280e6

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/Masterminds/sprig/v3 v3.2.3
1010
github.com/alecthomas/chroma/v2 v2.13.0
1111
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
1313
github.com/caddyserver/zerossl v0.1.3
1414
github.com/dustin/go-humanize v1.0.1
1515
github.com/go-chi/chi/v5 v5.0.12

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
7373
github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
7474
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
7575
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=
7878
github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA=
7979
github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
8080
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=

modules/caddytls/acmeissuer.go

+13-6
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,12 @@ func (iss *ACMEIssuer) Revoke(ctx context.Context, cert certmagic.CertificateRes
264264
// to be accessed and manipulated.
265265
func (iss *ACMEIssuer) GetACMEIssuer() *ACMEIssuer { return iss }
266266

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+
267273
// generateZeroSSLEABCredentials generates ZeroSSL EAB credentials for the primary contact email
268274
// on the issuer. It should only be usedif the CA endpoint is ZeroSSL. An email address is required.
269275
func (iss *ACMEIssuer) generateZeroSSLEABCredentials(ctx context.Context, acct acme.Account) (*acme.EAB, acme.Account, error) {
@@ -649,10 +655,11 @@ type ChainPreference struct {
649655

650656
// Interface guards
651657
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)
658665
)

0 commit comments

Comments
 (0)