"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
serve s3: allow copying directory markers
Nick Craig-Wood79c19dc1d338
diff --git a/cmd/serve/s3/backend.go b/cmd/serve/s3/backend.goindex 0f1bf608e..55c4fa4b1 100644--- a/cmd/serve/s3/backend.go+++ b/cmd/serve/s3/backend.go@@ -824,15 +824,22 @@ func (b *s3Backend) CopyObject(ctx context.Context, srcBucket, srcKey, dstBucketif err != nil {return result, err}- fp, err := bucketObjectPath(srcBucket, srcKey)+ fp, isMarker, err := bucketDirMarkerPath(srcBucket, srcKey)+ if !isMarker {+ fp, err = bucketObjectPath(srcBucket, srcKey)+ }if err != nil {return result, err}cStat, err := _vfs.Stat(fp)- if err != nil || !cStat.IsFile() {+ if err != nil || cStat.IsDir() != isMarker {return result, gofakes3.KeyNotFound(srcKey)}if srcBucket == dstBucket && srcKey == dstKey {+ if isMarker {+ // Directory markers have no metadata to replace+ return result, nil+ }return result, b.tenant(ctx).storeMeta(_vfs, fp, meta)}diff --git a/cmd/serve/s3/backend_test.go b/cmd/serve/s3/backend_test.goindex 5dd12fb3e..1642a7275 100644--- a/cmd/serve/s3/backend_test.go+++ b/cmd/serve/s3/backend_test.go@@ -408,6 +408,25 @@ func TestDirMarkers(t *testing.T) {assert.True(t, gofakes3.HasErrorCode(err, gofakes3.ErrNoSuchKey), "%s: %v", key, err)}+ // Copying a marker makes the directory of another marker, or an+ // empty object+ _, err = b.CopyObject(ctx, "bucket", "dir/sub/", "bucket", "copy/", map[string]string{})+ require.NoError(t, err)+ assert.True(t, isDir("copy"))+ _, err = b.CopyObject(ctx, "bucket", "dir/sub/", "bucket", "empty.txt", map[string]string{})+ require.NoError(t, err)+ obj, err = b.HeadObject(ctx, "bucket", "empty.txt")+ require.NoError(t, err)+ assert.Equal(t, int64(0), obj.Size)+ _, err = b.CopyObject(ctx, "bucket", "dir/", "bucket", "dir/", map[string]string{})+ require.NoError(t, err)++ // A copy needs the "/" for a directory and none for an object+ for _, key := range []string{"dir", "empty.txt/", "missing/"} {+ _, err = b.CopyObject(ctx, "bucket", key, "bucket", "other.txt", map[string]string{})+ assert.True(t, gofakes3.HasErrorCode(err, gofakes3.ErrNoSuchKey), "%s: %v", key, err)+ }+// Deleting a marker removes its directory only if emptyrequire.NoError(t, put("dir/sub/file.txt", "data"))require.NoError(t, b.deleteObject(ctx, "bucket", "dir/sub/"))diff --git a/cmd/serve/s3/serve_s3.md b/cmd/serve/s3/serve_s3.mdindex 3a6fdc0e8..201615351 100644--- a/cmd/serve/s3/serve_s3.md+++ b/cmd/serve/s3/serve_s3.md@@ -493,9 +493,10 @@ A key ending in `/`, such as `dir/`, is a directory marker, standingfor the directory `dir`. Putting an empty directory marker creates thedirectory (one with data is rejected with `400 Bad Request`), anddeleting it removes the directory if it is empty. Directory markers-are found by `HeadObject` and `GetObject` for any directory, but only-the markers of empty directories are listed as objects, as other-directories may not have been made by putting a marker.+are found by `HeadObject`, `GetObject` and `CopyObject` for any+directory, but only the markers of empty directories are listed as+objects, as other directories may not have been made by putting a+marker.As keys are file paths, a key can't be both an object and a directoryholding other objects, for example `a/b` and `a/b/c`. Writing an