github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-01 00:43:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddyhttp: Enable matching empty query string

Browse Source 
Caddyfile syntax: query ""

Or a nil matcher in the JSON should also match an empty query string.

See https://caddy.community/t/v2-match-empty-query/8708?u=matt
This commit is contained in:
Matthew Holt
2020-06-16 10:41:37 -06:00
parent 32cafbb630
commit 6db3615547
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/caddyhttp/matchers.go
View File

@ -349,19 +349,21 @@ func (MatchQuery) CaddyModule() caddy.ModuleInfo {
// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
func (m *MatchQuery) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
if *m == nil {
*m = make(map[string][]string)
}
for d.Next() {
var query string
if !d.Args(&query) {
return d.ArgErr()
}
if query == "" {
continue
}
parts := strings.SplitN(query, "=", 2)
if len(parts) != 2 {
return d.Errf("malformed query matcher token: %s; must be in param=val format", d.Val())
}
if *m == nil {
*m = make(map[string][]string)
}
url.Values(*m).Set(parts[0], parts[1])
if d.NextBlock(0) {
return d.Err("malformed query matcher: blocks are not supported")
@ -372,6 +374,9 @@ func (m *MatchQuery) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
// Match returns true if r matches m.
func (m MatchQuery) Match(r *http.Request) bool {
if m == nil {
return len(r.URL.Query()) == 0
}
for param, vals := range m {
paramVal, found := r.URL.Query()[param]
if found {