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

caddyhttp: Fix header matcher when using nil

Browse Source 
Uncovered in #3807
This commit is contained in:
Matthew Holt 2020-11-17 11:29:43 -07:00
parent 99b8f44486
commit 4fc570711e
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/caddyhttp/matchers.go
View File

@ -445,6 +445,10 @@ func matchHeaders(input, against http.Header, host string) bool {
// match if the header field exists at all // match if the header field exists at all
continue continue
} }
if allowedFieldVals == nil && actualFieldVals == nil {
// a nil list means match if the header does not exist at all
continue
}
var match bool var match bool
fieldVals: fieldVals:
for _, actualFieldVal := range actualFieldVals { for _, actualFieldVal := range actualFieldVals {

10
modules/caddyhttp/matchers_test.go
View File

@ -480,6 +480,16 @@ func TestHeaderMatcher(t *testing.T) {
host: "caddyserver.com", host: "caddyserver.com",
expect: false, expect: false,
}, },
{
match: MatchHeader{"Must-Not-Exist": nil},
input: http.Header{},
expect: true,
},
{
match: MatchHeader{"Must-Not-Exist": nil},
input: http.Header{"Must-Not-Exist": []string{"do not match"}},
expect: false,
},
} { } {
req := &http.Request{Header: tc.input, Host: tc.host} req := &http.Request{Header: tc.input, Host: tc.host}
actual := tc.match.Match(req) actual := tc.match.Match(req)