Skip to content

Commit

Permalink
caddytls: Run replacer on ask URL, for env vars (#4154)
Browse files Browse the repository at this point in the history
Fixes #3922
  • Loading branch information
francislavoie committed May 9, 2021
1 parent 3cf443f commit 61642b7
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions modules/caddytls/tls.go
Expand Up @@ -87,6 +87,7 @@ func (TLS) CaddyModule() caddy.ModuleInfo {
func (t *TLS) Provision(ctx caddy.Context) error {
t.ctx = ctx
t.logger = ctx.Logger(t)
repl := caddy.NewReplacer()

// set up a new certificate cache; this (re)loads all certificates
cacheOpts := certmagic.CacheOptions{
Expand Down Expand Up @@ -176,6 +177,11 @@ func (t *TLS) Provision(ctx caddy.Context) error {
onDemandRateLimiter.SetWindow(0)
}

// run replacer on ask URL (for environment variables)
if t.Automation != nil && t.Automation.OnDemand != nil && t.Automation.OnDemand.Ask != "" {
t.Automation.OnDemand.Ask = repl.ReplaceAll(t.Automation.OnDemand.Ask, "")
}

// load manual/static (unmanaged) certificates - we do this in
// provision so that other apps (such as http) can know which
// certificates have been manually loaded, and also so that
Expand Down

0 comments on commit 61642b7

Please sign in to comment.