From 49481caf6db89b0853626ac52ab5f786a6887179 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 4 May 2017 15:45:19 -0400 Subject: PLT-6262 Add config setting to disable file attachments (#6301) * Add config setting to disable file attachments * Add unit tests * Updating UI for no attachments (#6312) * Update UI text on file upload System Console setting (#6313) * Update storage_settings.jsx * Update en.json --- api/file.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'api/file.go') diff --git a/api/file.go b/api/file.go index 0f2fd9319..9a5de5669 100644 --- a/api/file.go +++ b/api/file.go @@ -31,6 +31,11 @@ func InitFile() { } func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) { + if !*utils.Cfg.FileSettings.EnableFileAttachments { + c.Err = model.NewAppError("uploadFile", "api.file.attachments.disabled.app_error", nil, "", http.StatusNotImplemented) + return + } + if r.ContentLength > *utils.Cfg.FileSettings.MaxFileSize { c.Err = model.NewLocAppError("uploadFile", "api.file.upload_file.too_large.app_error", nil, "") c.Err.StatusCode = http.StatusRequestEntityTooLarge @@ -181,9 +186,7 @@ func getPublicFile(c *Context, w http.ResponseWriter, r *http.Request) { func getFileInfoForRequest(c *Context, r *http.Request, requireFileVisible bool) (*model.FileInfo, *model.AppError) { if len(utils.Cfg.FileSettings.DriverName) == 0 { - err := model.NewLocAppError("getFileInfoForRequest", "api.file.get_file_info_for_request.storage.app_error", nil, "") - err.StatusCode = http.StatusNotImplemented - return nil, err + return nil, model.NewAppError("getFileInfoForRequest", "api.file.get_info_for_request.storage.app_error", nil, "", http.StatusNotImplemented) } params := mux.Vars(r) -- cgit v1.2.3-1-g7c22