diff options
| author | Andreas Kohn <[email protected]> | 2023-12-07 18:40:13 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-07 10:40:13 -0700 |
| commit | b24ae63ea612b1e5538602632d70b835ab339e59 (patch) | |
| tree | fa2ffc86e6837d03de763655df632281526f1651 | |
| parent | 4173e2c77ab883a509ef3be1cbdc868442c5a9b8 (diff) | |
| download | caddy-b24ae63ea612b1e5538602632d70b835ab339e59.tar.gz caddy-b24ae63ea612b1e5538602632d70b835ab339e59.zip | |
caddytls: Context to DecisionFunc (#5923)
See https://github.com/caddyserver/certmagic/pull/255
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | modules/caddytls/automation.go | 3 |
3 files changed, 5 insertions, 2 deletions
@@ -7,7 +7,7 @@ require ( github.com/Masterminds/sprig/v3 v3.2.3 github.com/alecthomas/chroma/v2 v2.9.1 github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b - github.com/caddyserver/certmagic v0.19.2 + github.com/caddyserver/certmagic v0.19.3-0.20231030175448-e8e6167a2a51 github.com/dustin/go-humanize v1.0.1 github.com/go-chi/chi/v5 v5.0.10 github.com/google/cel-go v0.15.1 @@ -63,6 +63,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/caddyserver/certmagic v0.19.2 h1:HZd1AKLx4592MalEGQS39DKs2ZOAJCEM/xYPMQ2/ui0= github.com/caddyserver/certmagic v0.19.2/go.mod h1:fsL01NomQ6N+kE2j37ZCnig2MFosG+MIO4ztnmG/zz8= +github.com/caddyserver/certmagic v0.19.3-0.20231030175448-e8e6167a2a51 h1:9gmY8uzVBgUqJPjGBHMikvrxoyA+Ctu1u5WeVk5ktQ0= +github.com/caddyserver/certmagic v0.19.3-0.20231030175448-e8e6167a2a51/go.mod h1:N4sXgpICQUskEWpj7zVzvWD41p3NYacrNoZYiRM2jTg= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= diff --git a/modules/caddytls/automation.go b/modules/caddytls/automation.go index ee25400a6..e331cc701 100644 --- a/modules/caddytls/automation.go +++ b/modules/caddytls/automation.go @@ -15,6 +15,7 @@ package caddytls import ( + "context" "encoding/json" "errors" "fmt" @@ -251,7 +252,7 @@ func (ap *AutomationPolicy) Provision(tlsApp *TLS) error { return fmt.Errorf("on-demand TLS cannot be enabled without an 'ask' endpoint to prevent abuse; please refer to documentation for details") } ond = &certmagic.OnDemandConfig{ - DecisionFunc: func(name string) error { + DecisionFunc: func(ctx context.Context, name string) error { if tlsApp.Automation == nil || tlsApp.Automation.OnDemand == nil { return nil } |