github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: when S3 PutObject with objectName contains /, aliyundriveopen failed due to KeyNotFound, make dir to fix this.

pull/6660/head
David Hao 2024-06-27 19:45:26 +08:00
parent 29fe49fb87
commit eb24f45771
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/s3/backend.go
View File

@ -6,6 +6,7 @@ import (
"context" "context"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"github.com/pkg/errors"
"io" "io"
"path" "path"
"strings" "strings"
@ -21,6 +22,7 @@ import (
"github.com/alist-org/alist/v3/pkg/utils" "github.com/alist-org/alist/v3/pkg/utils"
"github.com/alist-org/gofakes3" "github.com/alist-org/gofakes3"
"github.com/ncw/swift/v2" "github.com/ncw/swift/v2"
log "github.com/sirupsen/logrus"
) )
var ( var (
@ -268,9 +270,19 @@ func (b *s3Backend) PutObject(
fp := path.Join(bucketPath, objectName) fp := path.Join(bucketPath, objectName)
reqPath := path.Dir(fp) reqPath := path.Dir(fp)
fmeta, _ := op.GetNearestMeta(fp) fmeta, _ := op.GetNearestMeta(fp)
_, err = fs.Get(context.WithValue(ctx, "meta", fmeta), reqPath, &fs.GetArgs{}) ctx = context.WithValue(ctx, "meta", fmeta)
_, err = fs.Get(ctx, reqPath, &fs.GetArgs{})
if err != nil { if err != nil {
return result, gofakes3.KeyNotFound(objectName) if errs.IsObjectNotFound(err) && strings.Contains(objectName, "/") {
log.Debugf("reqPath: %s not found and objectName contains /, need to makeDir", reqPath)
err = fs.MakeDir(ctx, reqPath, true)
if err != nil {
return result, errors.WithMessagef(err, "failed to makeDir, reqPath: %s", reqPath)
}
} else {
return result, gofakes3.KeyNotFound(objectName)
}
} }
var ti time.Time var ti time.Time