Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

caddyhttp: Empty, not nil, query matcher matches empty query string

Browse source
This commit is contained in:
Matthew Holt 2020-06-16 12:02:23 -06:00
parent 6db3615547
commit 3af15c0725
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/caddyhttp/matchers.go
View file

@ -349,6 +349,9 @@ 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) {
@ -361,9 +364,6 @@ func (m *MatchQuery) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
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,11 +372,8 @@ func (m *MatchQuery) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
return nil
}
// Match returns true if r matches m.
// Match returns true if r matches m. An empty m matches an empty query string.
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 {
@ -387,7 +384,7 @@ func (m MatchQuery) Match(r *http.Request) bool {
}
}
}
return false
return len(m) == 0 && len(r.URL.Query()) == 0
}
// CaddyModule returns the Caddy module information.

8
modules/caddyhttp/matchers_test.go
View file

@ -529,20 +529,20 @@ func TestQueryMatcher(t *testing.T) {
expect: false,
},
{
scenario: "nil matcher value should match empty query",
match: MatchQuery(nil),
scenario: "empty matcher value should match empty query",
match: MatchQuery{},
input: "/?",
expect: true,
},
{
scenario: "nil matcher value should NOT match a non-empty query",
match: MatchQuery(nil),
match: MatchQuery{},
input: "/?foo=bar",
expect: false,
},
{
scenario: "non-nil matcher should NOT match an empty query",
match: MatchQuery{"": []string{}},
match: MatchQuery{"": nil},
input: "/?",
expect: false,
},