From 885c7e277d190ee606a7d4cf57a4991ec232fa6b Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 4 Aug 2017 09:05:16 -0400 Subject: PLT-7261 Fixed incorrect content type for preview and thumbnail images (#7119) --- api/file.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'api') diff --git a/api/file.go b/api/file.go index 3b49be5e0..342430ed1 100644 --- a/api/file.go +++ b/api/file.go @@ -16,6 +16,11 @@ import ( "github.com/mattermost/platform/utils" ) +const ( + PREVIEW_IMAGE_TYPE = "image/jpeg" + THUMBNAIL_IMAGE_TYPE = "image/jpeg" +) + var UNSAFE_CONTENT_TYPES = [...]string{ "application/javascript", "application/ecmascript", @@ -116,7 +121,7 @@ func getFileThumbnail(c *Context, w http.ResponseWriter, r *http.Request) { if data, err := app.ReadFile(info.ThumbnailPath); err != nil { c.Err = err c.Err.StatusCode = http.StatusNotFound - } else if err := writeFileResponse(info.Name, "", data, w, r); err != nil { + } else if err := writeFileResponse(info.Name, THUMBNAIL_IMAGE_TYPE, data, w, r); err != nil { c.Err = err return } @@ -138,7 +143,7 @@ func getFilePreview(c *Context, w http.ResponseWriter, r *http.Request) { if data, err := app.ReadFile(info.PreviewPath); err != nil { c.Err = err c.Err.StatusCode = http.StatusNotFound - } else if err := writeFileResponse(info.Name, "", data, w, r); err != nil { + } else if err := writeFileResponse(info.Name, PREVIEW_IMAGE_TYPE, data, w, r); err != nil { c.Err = err return } -- cgit v1.2.3-1-g7c22