|
|
@ -513,7 +513,8 @@ func (m *MatchHeader) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { |
|
|
|
|
|
|
|
// Match returns true if r matches m.
|
|
|
|
func (m MatchHeader) Match(r *http.Request) bool { |
|
|
|
return matchHeaders(r.Header, http.Header(m), r.Host) |
|
|
|
repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer) |
|
|
|
return matchHeaders(r.Header, http.Header(m), r.Host, repl) |
|
|
|
} |
|
|
|
|
|
|
|
// getHeaderFieldVals returns the field values for the given fieldName from input.
|
|
|
@ -530,7 +531,7 @@ func getHeaderFieldVals(input http.Header, fieldName, host string) []string { |
|
|
|
// matchHeaders returns true if input matches the criteria in against without regex.
|
|
|
|
// The host parameter should be obtained from the http.Request.Host field since
|
|
|
|
// net/http removes it from the header map.
|
|
|
|
func matchHeaders(input, against http.Header, host string) bool { |
|
|
|
func matchHeaders(input, against http.Header, host string, repl *caddy.Replacer) bool { |
|
|
|
for field, allowedFieldVals := range against { |
|
|
|
actualFieldVals := getHeaderFieldVals(input, field, host) |
|
|
|
if allowedFieldVals != nil && len(allowedFieldVals) == 0 && actualFieldVals != nil { |
|
|
@ -546,6 +547,9 @@ func matchHeaders(input, against http.Header, host string) bool { |
|
|
|
fieldVals: |
|
|
|
for _, actualFieldVal := range actualFieldVals { |
|
|
|
for _, allowedFieldVal := range allowedFieldVals { |
|
|
|
if repl != nil { |
|
|
|
allowedFieldVal = repl.ReplaceAll(allowedFieldVal, "") |
|
|
|
} |
|
|
|
switch { |
|
|
|
case allowedFieldVal == "*": |
|
|
|
match = true |
|
|
@ -985,7 +989,7 @@ func (rm ResponseMatcher) Match(statusCode int, hdr http.Header) bool { |
|
|
|
if !rm.matchStatusCode(statusCode) { |
|
|
|
return false |
|
|
|
} |
|
|
|
return matchHeaders(hdr, rm.Headers, "") |
|
|
|
return matchHeaders(hdr, rm.Headers, "", nil) |
|
|
|
} |
|
|
|
|
|
|
|
func (rm ResponseMatcher) matchStatusCode(statusCode int) bool { |
|
|
|