lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-12-22 02:10:49 +00:00
Code Issues Releases Activity

Merge pull request #4272 from jianzhiyao/fix-4224

Browse Source 
fix 4224：form entity too large casue run out of memory
This commit is contained in:
Ming Deng 2020-10-20 20:53:19 +08:00 committed by GitHub
commit f9075e8274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adapter/context/input.go
View File

@ -266,7 +266,7 @@ func (input *BeegoInput) SetData(key, val interface{}) {
// ParseFormOrMulitForm parseForm or parseMultiForm based on Content-type
func (input *BeegoInput) ParseFormOrMulitForm(maxMemory int64) error {
return (*context.BeegoInput)(input).ParseFormOrMulitForm(maxMemory)
return (*context.BeegoInput)(input).ParseFormOrMultiForm(maxMemory)
}
// Bind data from request.Form[key] to dest

5
server/web/context/input.go
View File

@ -420,9 +420,10 @@ func (input *BeegoInput) SetData(key, val interface{}) {
input.data[key] = val
}
// ParseFormOrMulitForm parseForm or parseMultiForm based on Content-type
func (input *BeegoInput) ParseFormOrMulitForm(maxMemory int64) error {
// ParseFormOrMultiForm parseForm or parseMultiForm based on Content-type
func (input *BeegoInput) ParseFormOrMultiForm(maxMemory int64) error {
// Parse the body depending on the content type.
input.Context.Request.Body = http.MaxBytesReader(input.Context.ResponseWriter, input.Context.Request.Body, maxMemory)
if strings.Contains(input.Header("Content-Type"), "multipart/form-data") {
if err := input.Context.Request.ParseMultipartForm(maxMemory); err != nil {
return errors.New("Error parsing request body:" + err.Error())

14
server/web/router.go
View File

@ -666,6 +666,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
}
func (p *ControllerRegister) serveHttp(ctx *beecontext.Context) {
var err error
startTime := time.Now()
r := ctx.Request
rw := ctx.ResponseWriter.ResponseWriter
@ -718,12 +719,21 @@ func (p *ControllerRegister) serveHttp(ctx *beecontext.Context) {
}
ctx.Input.CopyBody(p.cfg.MaxMemory)
}
ctx.Input.ParseFormOrMulitForm(p.cfg.MaxMemory)
err = ctx.Input.ParseFormOrMultiForm(p.cfg.MaxMemory)
if err != nil {
logs.Error(err)
if strings.Contains(err.Error(), `http: request body too large`) {
exception("413", ctx)
} else {
exception("500", ctx)
}
goto Admin
}
}
// session init
if p.cfg.WebConfig.Session.SessionOn {
var err error
ctx.Input.CruSession, err = GlobalSessions.SessionStart(rw, r)
if err != nil {
logs.Error(err)