From 22e34cb12e0e9f95335cc2bd2898a66b4fe4a5ce Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Fri, 26 Mar 2021 07:37:04 +0000 Subject: [PATCH 1/4] Close file on invalid range. --- modules/lfs/content_store.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index 788ef5b9a6950..aa79c34621e66 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -53,6 +53,10 @@ func (s *ContentStore) Get(meta *models.LFSMetaObject, fromByte int64) (io.ReadC } if fromByte > 0 { if fromByte >= meta.Size { + err = f.Close() + if err != nil { + log.Error("Whilst trying to read LFS OID[%s]: Unable to close Error: %v", meta.Oid, err) + } return nil, ErrRangeNotSatisfiable{ FromByte: fromByte, } From c7fc2355574aa747f27511b82ff9328816579650 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 26 Mar 2021 10:33:15 +0000 Subject: [PATCH 2/4] Close on seek error Signed-off-by: Andrew Thornton --- modules/lfs/content_store.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index aa79c34621e66..9473cc35c2bff 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -64,6 +64,10 @@ func (s *ContentStore) Get(meta *models.LFSMetaObject, fromByte int64) (io.ReadC _, 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) + errClose := f.Close() + if errClose != nil { + log.Error("Whilst trying to read LFS OID[%s]: Unable to close Error: %v", meta.Oid, errClose) + } } } return f, err From 144ccb482d873107067ba0b0728397a51f6d527c Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Wed, 31 Mar 2021 21:22:00 +0200 Subject: [PATCH 3/4] Moved 'Seek' into server. --- modules/lfs/content_store.go | 23 ++--------------------- modules/lfs/pointers.go | 2 +- modules/lfs/server.go | 25 ++++++++++++++++++------- 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index 9473cc35c2bff..9a11a4253dbc7 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -44,32 +44,13 @@ type ContentStore struct { } // 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 -func (s *ContentStore) Get(meta *models.LFSMetaObject, fromByte int64) (io.ReadCloser, error) { +// it as an io.ReadSeekCloser. +func (s *ContentStore) Get(meta *models.LFSMetaObject) (io.ReadSeekCloser, error) { f, err := s.Open(meta.RelativePath()) if err != nil { log.Error("Whilst trying to read LFS OID[%s]: Unable to open Error: %v", meta.Oid, err) return nil, err } - if fromByte > 0 { - if fromByte >= meta.Size { - err = f.Close() - if err != nil { - log.Error("Whilst trying to read LFS OID[%s]: Unable to close Error: %v", meta.Oid, err) - } - 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) - errClose := f.Close() - if errClose != nil { - log.Error("Whilst trying to read LFS OID[%s]: Unable to close Error: %v", meta.Oid, errClose) - } - } - } return f, err } diff --git a/modules/lfs/pointers.go b/modules/lfs/pointers.go index c6fbf090e5164..692c81f5832cf 100644 --- a/modules/lfs/pointers.go +++ b/modules/lfs/pointers.go @@ -67,5 +67,5 @@ func IsPointerFile(buf *[]byte) *models.LFSMetaObject { // ReadMetaObject will read a models.LFSMetaObject and return a reader func ReadMetaObject(meta *models.LFSMetaObject) (io.ReadCloser, error) { contentStore := &ContentStore{ObjectStorage: storage.LFS} - return contentStore.Get(meta, 0) + return contentStore.Get(meta) } diff --git a/modules/lfs/server.go b/modules/lfs/server.go index 45cba9d9b7512..f45423b85108e 100644 --- a/modules/lfs/server.go +++ b/modules/lfs/server.go @@ -175,6 +175,11 @@ func getContentHandler(ctx *context.Context) { statusCode = 206 fromByte, _ = strconv.ParseInt(match[1], 10, 32) + if fromByte >= meta.Size { + writeStatus(ctx, http.StatusRequestedRangeNotSatisfiable) + return + } + if match[2] != "" { _toByte, _ := strconv.ParseInt(match[2], 10, 32) if _toByte >= fromByte && _toByte < toByte { @@ -188,18 +193,24 @@ func getContentHandler(ctx *context.Context) { } contentStore := &ContentStore{ObjectStorage: storage.LFS} - content, err := contentStore.Get(meta, fromByte) + content, err := contentStore.Get(meta) if err != nil { - if IsErrRangeNotSatisfiable(err) { - writeStatus(ctx, http.StatusRequestedRangeNotSatisfiable) - } else { - // Errors are logged in contentStore.Get - writeStatus(ctx, 404) - } + // Errors are logged in contentStore.Get + writeStatus(ctx, http.StatusNotFound) return } 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 ctx.Resp.Header().Set("Content-Length", strconv.FormatInt(contentLength, 10)) ctx.Resp.Header().Set("Content-Type", "application/octet-stream") From 6ec47406356ab8cf125414ea870451a2b99222cb Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Sat, 3 Apr 2021 19:18:16 +0000 Subject: [PATCH 4/4] io.ReadSeekCloser is only available in Go 1.16 --- modules/lfs/content_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index 8d4ab74a2d635..520caa4c99033 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -45,7 +45,7 @@ type ContentStore struct { // Get takes a Meta object and retrieves the content from the store, returning // it as an io.ReadSeekCloser. -func (s *ContentStore) Get(meta *models.LFSMetaObject) (io.ReadSeekCloser, error) { +func (s *ContentStore) Get(meta *models.LFSMetaObject) (storage.Object, error) { f, err := s.Open(meta.RelativePath()) if err != nil { log.Error("Whilst trying to read LFS OID[%s]: Unable to open Error: %v", meta.Oid, err)