mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-08 18:16:59 +00:00
Remove the Content-Length requirement on upload request (#1831)
* Remove the Content-Length requirement * Make sure that the file size does not exceed max content size * Address review comment - universally check if temp file size exceeds max file size
This commit is contained in:
parent
080ae6a829
commit
653e30619c
@ -158,6 +158,12 @@ func (r *uploadRequest) doUpload(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if temp file size exceeds max file size configuration
|
||||||
|
if bytesWritten > types.FileSizeBytes(*cfg.MaxFileSizeBytes) {
|
||||||
|
fileutils.RemoveDir(tmpDir, r.Logger) // delete temp file
|
||||||
|
return requestEntityTooLargeJSONResponse(*cfg.MaxFileSizeBytes)
|
||||||
|
}
|
||||||
|
|
||||||
// Look up the media by the file hash. If we already have the file but under a
|
// Look up the media by the file hash. If we already have the file but under a
|
||||||
// different media ID then we won't upload the file again - instead we'll just
|
// different media ID then we won't upload the file again - instead we'll just
|
||||||
// add a new metadata entry that refers to the same file.
|
// add a new metadata entry that refers to the same file.
|
||||||
@ -219,19 +225,17 @@ func (r *uploadRequest) doUpload(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func requestEntityTooLargeJSONResponse(maxFileSizeBytes config.FileSizeBytes) *util.JSONResponse {
|
||||||
|
return &util.JSONResponse{
|
||||||
|
Code: http.StatusRequestEntityTooLarge,
|
||||||
|
JSON: jsonerror.Unknown(fmt.Sprintf("HTTP Content-Length is greater than the maximum allowed upload size (%v).", maxFileSizeBytes)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Validate validates the uploadRequest fields
|
// Validate validates the uploadRequest fields
|
||||||
func (r *uploadRequest) Validate(maxFileSizeBytes config.FileSizeBytes) *util.JSONResponse {
|
func (r *uploadRequest) Validate(maxFileSizeBytes config.FileSizeBytes) *util.JSONResponse {
|
||||||
if r.MediaMetadata.FileSizeBytes < 1 {
|
|
||||||
return &util.JSONResponse{
|
|
||||||
Code: http.StatusLengthRequired,
|
|
||||||
JSON: jsonerror.Unknown("HTTP Content-Length request header must be greater than zero."),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if maxFileSizeBytes > 0 && r.MediaMetadata.FileSizeBytes > types.FileSizeBytes(maxFileSizeBytes) {
|
if maxFileSizeBytes > 0 && r.MediaMetadata.FileSizeBytes > types.FileSizeBytes(maxFileSizeBytes) {
|
||||||
return &util.JSONResponse{
|
return requestEntityTooLargeJSONResponse(maxFileSizeBytes)
|
||||||
Code: http.StatusRequestEntityTooLarge,
|
|
||||||
JSON: jsonerror.Unknown(fmt.Sprintf("HTTP Content-Length is greater than the maximum allowed upload size (%v).", maxFileSizeBytes)),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// TODO: Check if the Content-Type is a valid type?
|
// TODO: Check if the Content-Type is a valid type?
|
||||||
if r.MediaMetadata.ContentType == "" {
|
if r.MediaMetadata.ContentType == "" {
|
||||||
|
Loading…
Reference in New Issue
Block a user