serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 14:13:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

http: Fix vars matcher

Browse source
This commit is contained in:
Matthew Holt 2020-01-22 09:43:42 -07:00
parent 0742530d3d
commit c6bddbfbe2
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/caddyhttp/vars.go
View file

@ -16,6 +16,7 @@ package caddyhttp
import (
"context"
"fmt"
"net/http"
"github.com/caddyserver/caddy/v2"
@ -64,12 +65,23 @@ func (VarsMatcher) CaddyModule() caddy.ModuleInfo {
// Match matches a request based on variables in the context.
func (m VarsMatcher) Match(r *http.Request) bool {
vars := r.Context().Value(VarsCtxKey).(map[string]string)
vars := r.Context().Value(VarsCtxKey).(map[string]interface{})
repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
for k, v := range m {
keyExpanded := repl.ReplaceAll(k, "")
valExpanded := repl.ReplaceAll(v, "")
if vars[keyExpanded] != valExpanded {
var varStr string
switch vv := vars[keyExpanded].(type) {
case string:
varStr = vv
case fmt.Stringer:
varStr = vv.String()
case error:
varStr = vv.Error()
default:
varStr = fmt.Sprintf("%v", vv)
}
if varStr != valExpanded {
return false
}
}