diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-04 09:05:16 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-08-04 09:05:16 -0400 |
| commit | 885c7e277d190ee606a7d4cf57a4991ec232fa6b (patch) | |
| tree | 4affbee1592f35f7984b827f6236544b62d7b570 | |
| parent | e06686dbf4173e5f1af672209037642166ac0ba5 (diff) | |
| download | chat-885c7e277d190ee606a7d4cf57a4991ec232fa6b.tar.gz chat-885c7e277d190ee606a7d4cf57a4991ec232fa6b.tar.bz2 chat-885c7e277d190ee606a7d4cf57a4991ec232fa6b.zip | |
PLT-7261 Fixed incorrect content type for preview and thumbnail images (#7119)
| -rw-r--r-- | api/file.go | 9 | ||||
| -rw-r--r-- | api4/file.go | 7 |
2 files changed, 12 insertions, 4 deletions
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 } diff --git a/api4/file.go b/api4/file.go index 4b39a1812..0607c1942 100644 --- a/api4/file.go +++ b/api4/file.go @@ -17,6 +17,9 @@ import ( const ( FILE_TEAM_ID = "noteam" + + PREVIEW_IMAGE_TYPE = "image/jpeg" + THUMBNAIL_IMAGE_TYPE = "image/jpeg" ) var UNSAFE_CONTENT_TYPES = [...]string{ @@ -165,7 +168,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, info.MimeType, data, forceDownload, w, r); err != nil { + } else if err := writeFileResponse(info.Name, THUMBNAIL_IMAGE_TYPE, data, forceDownload, w, r); err != nil { c.Err = err return } @@ -237,7 +240,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, info.MimeType, data, forceDownload, w, r); err != nil { + } else if err := writeFileResponse(info.Name, PREVIEW_IMAGE_TYPE, data, forceDownload, w, r); err != nil { c.Err = err return } |