homelab/traefik
1
0
Fork 0
Code Activity

Don't panic with undefined middleware

Browse source
This commit is contained in:
Ludovic Fernandez 2019-09-03 15:22:05 +02:00 • committed by Traefiker Bot
parent a917115a85
commit 10acbb8d92
4 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/responsemodifiers/response_modifier.go
View file

@ -23,6 +23,11 @@ func (f *Builder) Build(ctx context.Context, names []string) func(*http.Response
for _, middleName := range names {
if conf, ok := f.configs[middleName]; ok {
if conf == nil || conf.Middleware == nil {
getLogger(ctx, middleName, "undefined").Error("Invalid Middleware configuration (ResponseModifier)")
continue
}
if conf.Headers != nil {
getLogger(ctx, middleName, "Headers").Debug("Creating Middleware (ResponseModifier)")

21
pkg/responsemodifiers/response_modifier_test.go
View file

@ -47,7 +47,7 @@ func TestBuilderBuild(t *testing.T) {
assertResponse: func(t *testing.T, resp *http.Response) {
t.Helper()
assert.Equal(t, resp.Header.Get("X-Foo"), "foo")
assert.Equal(t, "foo", resp.Header.Get("X-Foo"))
},
},
{
@ -85,7 +85,7 @@ func TestBuilderBuild(t *testing.T) {
assertResponse: func(t *testing.T, resp *http.Response) {
t.Helper()
assert.Equal(t, resp.Header.Get("Referrer-Policy"), "no-referrer")
assert.Equal(t, "no-referrer", resp.Header.Get("Referrer-Policy"))
},
},
{
@ -107,8 +107,8 @@ func TestBuilderBuild(t *testing.T) {
assertResponse: func(t *testing.T, resp *http.Response) {
t.Helper()
assert.Equal(t, resp.Header.Get("X-Foo"), "foo")
assert.Equal(t, resp.Header.Get("X-Bar"), "bar")
assert.Equal(t, "foo", resp.Header.Get("X-Foo"))
assert.Equal(t, "bar", resp.Header.Get("X-Bar"))
},
},
{
@ -130,7 +130,7 @@ func TestBuilderBuild(t *testing.T) {
assertResponse: func(t *testing.T, resp *http.Response) {
t.Helper()
assert.Equal(t, resp.Header.Get("X-Foo"), "foo")
assert.Equal(t, "foo", resp.Header.Get("X-Foo"))
},
},
{
@ -157,9 +157,18 @@ func TestBuilderBuild(t *testing.T) {
assertResponse: func(t *testing.T, resp *http.Response) {
t.Helper()
assert.Equal(t, resp.Header.Get("X-Foo"), "foo")
assert.Equal(t, "foo", resp.Header.Get("X-Foo"))
},
},
{
desc: "nil middleware",
middlewares: []string{"foo"},
buildResponse: stubResponse,
conf: map[string]*dynamic.Middleware{
"foo": nil,
},
assertResponse: func(t *testing.T, resp *http.Response) {},
},
}
for _, test := range testCases {