diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-12-14 16:04:10 -0500 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-12-15 09:16:58 -0500 |
commit | 76e1f1f6138de9cfea03847af0eff61a10261043 (patch) | |
tree | 4ad4831fc97232ad9c2eb83c496a3018cfdfb877 | |
parent | 6e08669d22cce01a4b1e54c64bc236899c959163 (diff) | |
download | chat-76e1f1f6138de9cfea03847af0eff61a10261043.tar.gz chat-76e1f1f6138de9cfea03847af0eff61a10261043.tar.bz2 chat-76e1f1f6138de9cfea03847af0eff61a10261043.zip |
Added serverside file size check for post attachments
-rw-r--r-- | api/file.go | 6 | ||||
-rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/api/file.go b/api/file.go index 8afc70692..4339e610b 100644 --- a/api/file.go +++ b/api/file.go @@ -76,6 +76,12 @@ func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) { return } + if r.ContentLength > model.MAX_FILE_SIZE { + c.Err = model.NewAppError("uploadFile", "Unable to upload file. File is too large.", "") + c.Err.StatusCode = http.StatusRequestEntityTooLarge + return + } + err := r.ParseMultipartForm(model.MAX_FILE_SIZE) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index c47f7d33d..014038dd4 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -162,7 +162,6 @@ export default class UserSettingsGeneralTab extends React.Component { return; } - var formData = new FormData(); formData.append('image', picture, picture.name); this.setState({loadingPicture: true}); |