PLT-7261 Fixed incorrect content type for preview and thumbnail images (#7119)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
e06686dbf4
Коммит
885c7e277d
@@ -16,6 +16,11 @@ import (
|
|||||||
"github.com/mattermost/platform/utils"
|
"github.com/mattermost/platform/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
PREVIEW_IMAGE_TYPE = "image/jpeg"
|
||||||
|
THUMBNAIL_IMAGE_TYPE = "image/jpeg"
|
||||||
|
)
|
||||||
|
|
||||||
var UNSAFE_CONTENT_TYPES = [...]string{
|
var UNSAFE_CONTENT_TYPES = [...]string{
|
||||||
"application/javascript",
|
"application/javascript",
|
||||||
"application/ecmascript",
|
"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 {
|
if data, err := app.ReadFile(info.ThumbnailPath); err != nil {
|
||||||
c.Err = err
|
c.Err = err
|
||||||
c.Err.StatusCode = http.StatusNotFound
|
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
|
c.Err = err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -138,7 +143,7 @@ func getFilePreview(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
if data, err := app.ReadFile(info.PreviewPath); err != nil {
|
if data, err := app.ReadFile(info.PreviewPath); err != nil {
|
||||||
c.Err = err
|
c.Err = err
|
||||||
c.Err.StatusCode = http.StatusNotFound
|
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
|
c.Err = err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,9 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
FILE_TEAM_ID = "noteam"
|
FILE_TEAM_ID = "noteam"
|
||||||
|
|
||||||
|
PREVIEW_IMAGE_TYPE = "image/jpeg"
|
||||||
|
THUMBNAIL_IMAGE_TYPE = "image/jpeg"
|
||||||
)
|
)
|
||||||
|
|
||||||
var UNSAFE_CONTENT_TYPES = [...]string{
|
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 {
|
if data, err := app.ReadFile(info.ThumbnailPath); err != nil {
|
||||||
c.Err = err
|
c.Err = err
|
||||||
c.Err.StatusCode = http.StatusNotFound
|
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
|
c.Err = err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -237,7 +240,7 @@ func getFilePreview(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
if data, err := app.ReadFile(info.PreviewPath); err != nil {
|
if data, err := app.ReadFile(info.PreviewPath); err != nil {
|
||||||
c.Err = err
|
c.Err = err
|
||||||
c.Err.StatusCode = http.StatusNotFound
|
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
|
c.Err = err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user