baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix empty body error in mirror

Browse source
This commit is contained in:
Anton Gubarev 2021-09-02 11:46:13 +03:00 committed by GitHub
parent 2b73860ea5
commit 0ac6f80b50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/server/service/loadbalancer/mirror/mirror.go
View file

@ -204,7 +204,7 @@ func newReusableRequest(req *http.Request, maxBodySize int64) (*reusableRequest,
if req == nil { if req == nil {
return nil, nil, errors.New("nil input request") return nil, nil, errors.New("nil input request")
} }
if req.Body == nil { if req.Body == nil || req.ContentLength == 0 {
return &reusableRequest{req: req}, nil, nil return &reusableRequest{req: req}, nil, nil
} }

15
pkg/server/service/loadbalancer/mirror/mirror_test.go
View file

@ -243,9 +243,22 @@ func TestCloneRequest(t *testing.T) {
req, err := http.NewRequest(http.MethodPost, "/", buf) req, err := http.NewRequest(http.MethodPost, "/", buf)
assert.NoError(t, err) assert.NoError(t, err)
_, expectedBytes, err := newReusableRequest(req, 20) rr, expectedBytes, err := newReusableRequest(req, 20)
assert.NoError(t, err) assert.NoError(t, err)
assert.Nil(t, expectedBytes) assert.Nil(t, expectedBytes)
assert.Len(t, rr.body, 10)
})
t.Run("valid GET case with maxBodySize", func(t *testing.T) {
buf := bytes.NewBuffer([]byte{})
req, err := http.NewRequest(http.MethodGet, "/", buf)
assert.NoError(t, err)
rr, expectedBytes, err := newReusableRequest(req, 20)
assert.NoError(t, err)
assert.Nil(t, expectedBytes)
assert.Len(t, rr.body, 0)
}) })
t.Run("no request given", func(t *testing.T) { t.Run("no request given", func(t *testing.T) {