Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-24 16:59:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

caddytls: Run replacer on ask URL, for env vars (#4154)

Browse source 
Fixes #3922
This commit is contained in:
Francis Lavoie 2021-05-09 00:37:27 -04:00 committed by GitHub
parent 3cf443f0fe
commit 61642b766b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/caddytls/tls.go
View file

@ -87,6 +87,7 @@ func (TLS) CaddyModule() caddy.ModuleInfo {
func (t *TLS) Provision(ctx caddy.Context) error { func (t *TLS) Provision(ctx caddy.Context) error {
t.ctx = ctx t.ctx = ctx
t.logger = ctx.Logger(t) t.logger = ctx.Logger(t)
repl := caddy.NewReplacer()
// set up a new certificate cache; this (re)loads all certificates // set up a new certificate cache; this (re)loads all certificates
cacheOpts := certmagic.CacheOptions{ cacheOpts := certmagic.CacheOptions{
@ -176,6 +177,11 @@ func (t *TLS) Provision(ctx caddy.Context) error {
onDemandRateLimiter.SetWindow(0) 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 // load manual/static (unmanaged) certificates - we do this in
// provision so that other apps (such as http) can know which // provision so that other apps (such as http) can know which
// certificates have been manually loaded, and also so that // certificates have been manually loaded, and also so that