lavender-legacy/gitea
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

When handling errors in storageHandler check underlying error (#13178)

Browse source 
Unfortunately there was a mistake in #13164 which fails to handle
os.PathError wrapping an os.ErrNotExist

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
zeripath 2020-10-18 02:29:06 +01:00 committed by GitHub
parent 4cc8697a65
commit 25b7766673
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/storage/minio.go
View file

@ -32,7 +32,7 @@ type minioObject struct {
func (m *minioObject) Stat() (os.FileInfo, error) { func (m *minioObject) Stat() (os.FileInfo, error) {
oi, err := m.Object.Stat() oi, err := m.Object.Stat()
if err != nil { if err != nil {
return nil, err return nil, convertMinioErr(err)
} }
return &minioFileInfo{oi}, nil return &minioFileInfo{oi}, nil

5
routers/routes/routes.go
View file

@ -7,6 +7,7 @@ package routes
import ( import (
"bytes" "bytes"
"encoding/gob" "encoding/gob"
"errors"
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
@ -127,7 +128,7 @@ func storageHandler(storageSetting setting.Storage, prefix string, objStore stor
rPath := strings.TrimPrefix(req.RequestURI, "/"+prefix) rPath := strings.TrimPrefix(req.RequestURI, "/"+prefix)
u, err := objStore.URL(rPath, path.Base(rPath)) u, err := objStore.URL(rPath, path.Base(rPath))
if err != nil { if err != nil {
if err == os.ErrNotExist { if os.IsNotExist(err) || errors.Is(err, os.ErrNotExist) {
log.Warn("Unable to find %s %s", prefix, rPath) log.Warn("Unable to find %s %s", prefix, rPath)
ctx.Error(404, "file not found") ctx.Error(404, "file not found")
return return
@ -160,7 +161,7 @@ func storageHandler(storageSetting setting.Storage, prefix string, objStore stor
//If we have matched and access to release or issue //If we have matched and access to release or issue
fr, err := objStore.Open(rPath) fr, err := objStore.Open(rPath)
if err != nil { if err != nil {
if err == os.ErrNotExist { if os.IsNotExist(err) || errors.Is(err, os.ErrNotExist) {
log.Warn("Unable to find %s %s", prefix, rPath) log.Warn("Unable to find %s %s", prefix, rPath)
ctx.Error(404, "file not found") ctx.Error(404, "file not found")
return return