alexvanin/frostfs-http-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-http-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

uploader: drain body buffer before ending request processing

Browse source 
Fixes

2021-04-28T00:03:36.514+0300    debug   uploader/upload.go:64   close temporary multipart/form file     {"cid": "Dxhf4PNprrJHWWTG5RGLdfLkJiSQ3AQqit1MSnEPRkDZ", "address": "Dxhf4PNprrJHWWTG5RGLdfLkJiSQ3AQqit1MSnEPRkDZ/2m8PtaoricLouCn5zE8hAFr3gZEBDCZFe9BEgVJTSocX", "filename": "vid.mp4"}
2021/04/28 00:03:36 error when serving connection "127.0.0.1:8082"<->"127.0.0.1:41390": error when reading request headers: cannot find http request method in "0\r\n\r\n". Buffer size=5, contents: "0\r\n\r\n"
This commit is contained in:
Roman Khimov 2021-04-28 11:39:12 +03:00 committed by Roman Khimov
parent b94bfb3b76
commit ed3c576b70
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
uploader/upload.go
View file

@ -18,7 +18,10 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
) )
const jsonHeader = "application/json; charset=UTF-8" const (
jsonHeader = "application/json; charset=UTF-8"
drainBufSize = 4096
)
var putOptionsPool = sync.Pool{ var putOptionsPool = sync.Pool{
New: func() interface{} { New: func() interface{} {
@ -44,6 +47,8 @@ func (u *Uploader) Upload(c *fasthttp.RequestCtx) {
cid = container.NewID() cid = container.NewID()
scid, _ = c.UserValue("cid").(string) scid, _ = c.UserValue("cid").(string)
log = u.log.With(zap.String("cid", scid)) log = u.log.With(zap.String("cid", scid))
bodyStream = c.RequestBodyStream()
drainBuf = make([]byte, drainBufSize)
) )
if err = tokens.StoreBearerToken(c); err != nil { if err = tokens.StoreBearerToken(c); err != nil {
log.Error("could not fetch bearer token", zap.Error(err)) log.Error("could not fetch bearer token", zap.Error(err))
@ -69,7 +74,7 @@ func (u *Uploader) Upload(c *fasthttp.RequestCtx) {
) )
}() }()
boundary := string(c.Request.Header.MultipartFormBoundary()) boundary := string(c.Request.Header.MultipartFormBoundary())
if file, err = fetchMultipartFile(u.log, c.RequestBodyStream(), boundary); err != nil { if file, err = fetchMultipartFile(u.log, bodyStream, boundary); err != nil {
log.Error("could not receive multipart/form", zap.Error(err)) log.Error("could not receive multipart/form", zap.Error(err))
c.Error("could not receive multipart/form: "+err.Error(), fasthttp.StatusBadRequest) c.Error("could not receive multipart/form: "+err.Error(), fasthttp.StatusBadRequest)
return return
@ -124,6 +129,18 @@ func (u *Uploader) Upload(c *fasthttp.RequestCtx) {
return return
} }
// Multipart is multipart and thus can contain more than one part which
// we ignore at the moment. Also, when dealing with chunked encoding
// the last zero-length chunk might be left unread (because multipart
// reader only cares about its boundary and doesn't look further) and
// it will be (erroneously) interpreted as the start of the next
// pipelined header. Thus we need to drain the body buffer.
for {
_, err = bodyStream.Read(drainBuf)
if err == io.EOF || err == io.ErrUnexpectedEOF {
break
}
}
// Report status code and content type. // Report status code and content type.
c.Response.SetStatusCode(fasthttp.StatusOK) c.Response.SetStatusCode(fasthttp.StatusOK)
c.Response.Header.SetContentType(jsonHeader) c.Response.Header.SetContentType(jsonHeader)