caddyhttp: Refactor header matching

This allows response matchers to benefit from the same matching logic
as the request header matchers (mainly prefix/suffix wildcards).

1 files changed, 33 insertions, 0 deletions

diff --git a/modules/caddyhttp/matchers_test.go b/modules/caddyhttp/matchers_test.go
index 021bb9838..9b3a9a857 100644
--- a/modules/caddyhttp/matchers_test.go
+++ b/modules/caddyhttp/matchers_test.go
@@ -449,6 +449,21 @@ func TestHeaderMatcher(t *testing.T) {
 			expect: false,
 		},
 		{
+			match:  MatchHeader{"Field1": []string{"foo*"}},
+			input:  http.Header{"Field1": []string{"foo"}},
+			expect: true,
+		},
+		{
+			match:  MatchHeader{"Field1": []string{"foo*"}},
+			input:  http.Header{"Field1": []string{"asdf", "foobar"}},
+			expect: true,
+		},
+		{
+			match:  MatchHeader{"Field1": []string{"*bar"}},
+			input:  http.Header{"Field1": []string{"asdf", "foobar"}},
+			expect: true,
+		},
+		{
 			match:  MatchHeader{"host": []string{"localhost"}},
 			input:  http.Header{},
 			host:   "localhost",
@@ -814,6 +829,24 @@ func TestResponseMatcher(t *testing.T) {
 			hdr:    http.Header{"Foo": []string{"bar"}, "Foo2": []string{"baz"}},
 			expect: true,
 		},
+		{
+			require: ResponseMatcher{
+				Headers: http.Header{
+					"Foo": []string{"foo*"},
+				},
+			},
+			hdr:    http.Header{"Foo": []string{"foobar"}},
+			expect: true,
+		},
+		{
+			require: ResponseMatcher{
+				Headers: http.Header{
+					"Foo": []string{"foo*"},
+				},
+			},
+			hdr:    http.Header{"Foo": []string{"foobar"}},
+			expect: true,
+		},
 	} {
 		actual := tc.require.Match(tc.status, tc.hdr)
 		if actual != tc.expect {