mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-24 07:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Get downloaded file size regardless of the Content-Size header

Browse source 
Signed-off-by: Florian Le Minoux <darkgallium+git@deuxfleurs.fr>
This commit is contained in:
darkgallium 2020-10-18 00:03:47 +02:00
parent 640e8c50ec
commit a1cba59444
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
mediaapi/routing/download.go
View file

@ -19,6 +19,8 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"bytes"
"mime"
"net/http"
"net/url"
@ -692,16 +694,36 @@ func (r *downloadRequest) fetchRemoteFile(
}
defer resp.Body.Close() // nolint: errcheck
// get metadata from request and set metadata on response
contentLength, err := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
if err != nil {
r.Logger.WithError(err).Warn("Failed to parse content length")
return "", false, errors.Wrap(err, "invalid response from remote server")
var reader io.Reader
var contentLength int64
if resp.Header.Get("Content-Length") != "" {
parsedLength, err := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
if err != nil {
r.Logger.WithError(err).Warn("Failed to parse content length")
return "", false, errors.Wrap(err, "invalid response from remote server")
}
reader = resp.Body
contentLength = parsedLength
} else {
// Content-Length header is missing, we need to read the whole body to get its length
bodyBytes, err := ioutil.ReadAll(resp.Body)
if err != nil {
r.Logger.WithError(err).Warn("Could not read response body from remote server")
return "", false, fmt.Errorf("file could not be downloaded from remote server")
}
contentLength = int64(len(bodyBytes))
reader = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
}
if contentLength > int64(maxFileSizeBytes) {
// TODO: Bubble up this as a 413
return "", false, fmt.Errorf("remote file is too large (%v > %v bytes)", contentLength, maxFileSizeBytes)
}
r.MediaMetadata.FileSizeBytes = types.FileSizeBytes(contentLength)
r.MediaMetadata.ContentType = types.ContentType(resp.Header.Get("Content-Type"))
@ -728,7 +750,7 @@ func (r *downloadRequest) fetchRemoteFile(
// method of deduplicating files to save storage, as well as a way to conduct
// integrity checks on the file data in the repository.
// Data is truncated to maxFileSizeBytes. Content-Length was reported as 0 < Content-Length <= maxFileSizeBytes so this is OK.
hash, bytesWritten, tmpDir, err := fileutils.WriteTempFile(ctx, resp.Body, maxFileSizeBytes, absBasePath)
hash, bytesWritten, tmpDir, err := fileutils.WriteTempFile(ctx, reader, maxFileSizeBytes, absBasePath)
if err != nil {
r.Logger.WithError(err).WithFields(log.Fields{
"MaxFileSizeBytes": maxFileSizeBytes,