@marcel91200 / caddy Mirror · read-only / commits / b24ae63e
Fork 0

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, 20:45 UTC

caddytls: Context to DecisionFunc (#5923)

See https://github.com/caddyserver/certmagic/pull/255

Andreas Kohn committed Dec 7, 2023 at 18:40 UTC b24ae63ea612b1e5538602632d70b835ab339e59
3 files changed +5 -2
go.mod
+1 -1
@@ -7,7 +7,7 @@ require (
7 github.com/Masterminds/sprig/v3 v3.2.3
8 github.com/alecthomas/chroma/v2 v2.9.1
9 github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b
10 - github.com/caddyserver/certmagic v0.19.2
10 + github.com/caddyserver/certmagic v0.19.3-0.20231030175448-e8e6167a2a51
11 github.com/dustin/go-humanize v1.0.1
12 github.com/go-chi/chi/v5 v5.0.10
13 github.com/google/cel-go v0.15.1
go.sum
+2
@@ -63,6 +63,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
63 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
64 github.com/caddyserver/certmagic v0.19.2 h1:HZd1AKLx4592MalEGQS39DKs2ZOAJCEM/xYPMQ2/ui0=
65 github.com/caddyserver/certmagic v0.19.2/go.mod h1:fsL01NomQ6N+kE2j37ZCnig2MFosG+MIO4ztnmG/zz8=
66 +github.com/caddyserver/certmagic v0.19.3-0.20231030175448-e8e6167a2a51 h1:9gmY8uzVBgUqJPjGBHMikvrxoyA+Ctu1u5WeVk5ktQ0=
67 +github.com/caddyserver/certmagic v0.19.3-0.20231030175448-e8e6167a2a51/go.mod h1:N4sXgpICQUskEWpj7zVzvWD41p3NYacrNoZYiRM2jTg=
68 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
69 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
70 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
modules/caddytls/automation.go
+2 -1
@@ -15,6 +15,7 @@
15 package caddytls
16
17 import (
18 + "context"
19 "encoding/json"
20 "errors"
21 "fmt"
@@ -251,7 +252,7 @@ func (ap *AutomationPolicy) Provision(tlsApp *TLS) error {
252 return fmt.Errorf("on-demand TLS cannot be enabled without an 'ask' endpoint to prevent abuse; please refer to documentation for details")
253 }
254 ond = &certmagic.OnDemandConfig{
254 - DecisionFunc: func(name string) error {
255 + DecisionFunc: func(ctx context.Context, name string) error {
256 if tlsApp.Automation == nil || tlsApp.Automation.OnDemand == nil {
257 return nil
258 }