mirror of
https://github.com/go-gitea/gitea
synced 2024-12-25 10:04:27 +00:00
* Close file on invalid range. * Close on seek error Signed-off-by: Andrew Thornton <art27@cantab.net> * Moved 'Seek' into server. * io.ReadSeekCloser is only available in Go 1.16 Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
parent
a8c6a4a70e
commit
cf9b6c281f
@ -44,24 +44,13 @@ type ContentStore struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get takes a Meta object and retrieves the content from the store, returning
|
// Get takes a Meta object and retrieves the content from the store, returning
|
||||||
// it as an io.Reader. If fromByte > 0, the reader starts from that byte
|
// it as an io.ReadSeekCloser.
|
||||||
func (s *ContentStore) Get(meta *models.LFSMetaObject, fromByte int64) (io.ReadCloser, error) {
|
func (s *ContentStore) Get(meta *models.LFSMetaObject) (storage.Object, error) {
|
||||||
f, err := s.Open(meta.RelativePath())
|
f, err := s.Open(meta.RelativePath())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Whilst trying to read LFS OID[%s]: Unable to open Error: %v", meta.Oid, err)
|
log.Error("Whilst trying to read LFS OID[%s]: Unable to open Error: %v", meta.Oid, err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if fromByte > 0 {
|
|
||||||
if fromByte >= meta.Size {
|
|
||||||
return nil, ErrRangeNotSatisfiable{
|
|
||||||
FromByte: fromByte,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_, err = f.Seek(fromByte, io.SeekStart)
|
|
||||||
if err != nil {
|
|
||||||
log.Error("Whilst trying to read LFS OID[%s]: Unable to seek to %d Error: %v", meta.Oid, fromByte, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return f, err
|
return f, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,5 +67,5 @@ func IsPointerFile(buf *[]byte) *models.LFSMetaObject {
|
|||||||
// ReadMetaObject will read a models.LFSMetaObject and return a reader
|
// ReadMetaObject will read a models.LFSMetaObject and return a reader
|
||||||
func ReadMetaObject(meta *models.LFSMetaObject) (io.ReadCloser, error) {
|
func ReadMetaObject(meta *models.LFSMetaObject) (io.ReadCloser, error) {
|
||||||
contentStore := &ContentStore{ObjectStorage: storage.LFS}
|
contentStore := &ContentStore{ObjectStorage: storage.LFS}
|
||||||
return contentStore.Get(meta, 0)
|
return contentStore.Get(meta)
|
||||||
}
|
}
|
||||||
|
@ -175,6 +175,11 @@ func getContentHandler(ctx *context.Context) {
|
|||||||
statusCode = 206
|
statusCode = 206
|
||||||
fromByte, _ = strconv.ParseInt(match[1], 10, 32)
|
fromByte, _ = strconv.ParseInt(match[1], 10, 32)
|
||||||
|
|
||||||
|
if fromByte >= meta.Size {
|
||||||
|
writeStatus(ctx, http.StatusRequestedRangeNotSatisfiable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if match[2] != "" {
|
if match[2] != "" {
|
||||||
_toByte, _ := strconv.ParseInt(match[2], 10, 32)
|
_toByte, _ := strconv.ParseInt(match[2], 10, 32)
|
||||||
if _toByte >= fromByte && _toByte < toByte {
|
if _toByte >= fromByte && _toByte < toByte {
|
||||||
@ -188,18 +193,24 @@ func getContentHandler(ctx *context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
contentStore := &ContentStore{ObjectStorage: storage.LFS}
|
contentStore := &ContentStore{ObjectStorage: storage.LFS}
|
||||||
content, err := contentStore.Get(meta, fromByte)
|
content, err := contentStore.Get(meta)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if IsErrRangeNotSatisfiable(err) {
|
// Errors are logged in contentStore.Get
|
||||||
writeStatus(ctx, http.StatusRequestedRangeNotSatisfiable)
|
writeStatus(ctx, http.StatusNotFound)
|
||||||
} else {
|
|
||||||
// Errors are logged in contentStore.Get
|
|
||||||
writeStatus(ctx, 404)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer content.Close()
|
defer content.Close()
|
||||||
|
|
||||||
|
if fromByte > 0 {
|
||||||
|
_, err = content.Seek(fromByte, io.SeekStart)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("Whilst trying to read LFS OID[%s]: Unable to seek to %d Error: %v", meta.Oid, fromByte, err)
|
||||||
|
|
||||||
|
writeStatus(ctx, http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
contentLength := toByte + 1 - fromByte
|
contentLength := toByte + 1 - fromByte
|
||||||
ctx.Resp.Header().Set("Content-Length", strconv.FormatInt(contentLength, 10))
|
ctx.Resp.Header().Set("Content-Length", strconv.FormatInt(contentLength, 10))
|
||||||
ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
|
ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
|
||||||
|
Loading…
Reference in New Issue
Block a user