extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-06-24 05:51:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

s3: fix handling of objects with // in #5858

Browse Source
This commit is contained in:
Nick Craig-Wood 2025-01-04 10:24:06 +00:00
parent 39b8f17ebb
commit 77429b154e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/s3/s3.go
View File

@ -3677,6 +3677,9 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
if opt.Provider == "IDrive" { if opt.Provider == "IDrive" {
f.features.SetTier = false f.features.SetTier = false
} }
if opt.Provider == "AWS" {
f.features.DoubleSlash = true
}
if opt.DirectoryMarkers { if opt.DirectoryMarkers {
f.features.CanHaveEmptyDirectories = true f.features.CanHaveEmptyDirectories = true
} }
@ -4148,7 +4151,7 @@ func (f *Fs) list(ctx context.Context, opt listOpt, fn listFn) error {
opt.prefix += "/" opt.prefix += "/"
} }
if !opt.findFile { if !opt.findFile {
if opt.directory != "" { if opt.directory != "" && (opt.prefix == "" && !bucket.IsAllSlashes(opt.directory) || opt.prefix != "" && !strings.HasSuffix(opt.directory, "/")) {
opt.directory += "/" opt.directory += "/"
} }
} }
@ -4245,14 +4248,18 @@ func (f *Fs) list(ctx context.Context, opt listOpt, fn listFn) error {
} }
remote = f.opt.Enc.ToStandardPath(remote) remote = f.opt.Enc.ToStandardPath(remote)
if !strings.HasPrefix(remote, opt.prefix) { if !strings.HasPrefix(remote, opt.prefix) {
fs.Logf(f, "Odd name received %q", remote) fs.Logf(f, "Odd directory name received %q", remote)
continue continue
} }
remote = remote[len(opt.prefix):] remote = remote[len(opt.prefix):]
// Trim one slash off the remote name
remote, _ = strings.CutSuffix(remote, "/")
if remote == "" || bucket.IsAllSlashes(remote) {
remote += "/"
}
if opt.addBucket { if opt.addBucket {
remote = bucket.Join(opt.bucket, remote) remote = bucket.Join(opt.bucket, remote)
} }
remote = strings.TrimSuffix(remote, "/")
err = fn(remote, &types.Object{Key: &remote}, nil, true) err = fn(remote, &types.Object{Key: &remote}, nil, true)
if err != nil { if err != nil {
if err == errEndList { if err == errEndList {