self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2024-12-21 13:38:56 +02:00
Code Issues Releases Activity

Merge pull request #4695 from mattermost/CherryPick_MM-51885_panic_file_handler

Browse Source 
Cherry-pick MM-51885: Avoid panic in file request handler on error
This commit is contained in:
Scott Bishel 2023-04-03 19:16:55 -06:00 committed by GitHub
commit a184ef25c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/api/files.go
View File

@ -19,6 +19,7 @@ import (
"github.com/mattermost/focalboard/server/model"
"github.com/mattermost/focalboard/server/services/audit"
mmModel "github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/shared/mlog"
@ -167,7 +168,14 @@ func (a *API) handleServeFile(w http.ResponseWriter, r *http.Request) {
_ = a.app.MoveFile(board.ChannelID, board.TeamID, boardID, filename)
}
if err != nil {
// if err is still not nil then it is an error other than `not found` so we must
// return the error to the requestor. fileReader and Fileinfo are nil in this case.
a.errorResponse(w, r, err)
}
defer fileReader.Close()
mimeType := ""
var fileSize int64
if fileInfo != nil {