Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

s3: fix empty delimiter parameter rejected by Archiware P5 server

Nick Craig-Woode12c250705f7
diff --git a/backend/s3/s3.go b/backend/s3/s3.go
index 5bfc118a9..2543c01f9 100644
--- a/backend/s3/s3.go
+++ b/backend/s3/s3.go
@@ -2343,9 +2343,11 @@ func (f *Fs) list(ctx context.Context, opt listOpt, fn listFn) error {
opt.directory += "/"
}
}
- delimiter := ""
+ // Use nil delimiter for recursive listings to omit the parameter
+ // entirely. Some S3-compatible servers reject an empty delimiter.
+ var delimiter *string
if !opt.recurse {
- delimiter = "/"
+ delimiter = aws.String("/")
}
// URL encode the listings so we can use control characters in object names
// See: https://github.com/aws/aws-sdk-go/issues/1914
@@ -2365,7 +2367,7 @@ func (f *Fs) list(ctx context.Context, opt listOpt, fn listFn) error {
urlEncodeListings := f.opt.ListURLEncode.Value
req := s3.ListObjectsV2Input{
Bucket: &opt.bucket,
- Delimiter: &delimiter,
+ Delimiter: delimiter,
Prefix: &opt.directory,
MaxKeys: &f.opt.ListChunk,
}