Skip to content

SeaweedFS is a distributed storage system for object storage (S3), file systems, Iceberg table buckets, and Lance vector buckets, designed to handle billions of files with O(1) disk access and effortless horizontal scaling.

s3: allow copying an object onto itself in a versioned bucket (#10497)

Chris Lu63d514048540
diff --git a/test/s3/versioning/s3_copy_versioning_regression_test.go b/test/s3/versioning/s3_copy_versioning_regression_test.go
index fc419b0ad3..c92d1eeb93 100644
--- a/test/s3/versioning/s3_copy_versioning_regression_test.go
+++ b/test/s3/versioning/s3_copy_versioning_regression_test.go
@@ -3,6 +3,7 @@ package s3api
import (
"bytes"
"context"
+ "errors"
"fmt"
"io"
"net/url"
@@ -11,6 +12,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/aws/aws-sdk-go-v2/service/s3/types"
+ "github.com/aws/smithy-go"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -145,3 +147,106 @@ func TestVersioningSelfCopyMetadataReplaceSuspendedKeepsNullVersion(t *testing.T
assert.Equal(t, "null", *versionsResp.Versions[0].VersionId, "Suspended self-copy should preserve null-version semantics")
assert.True(t, *versionsResp.Versions[0].IsLatest, "Null version should remain latest")
}
+
+func TestVersioningSelfCopyCreatesNewVersion(t *testing.T) {
+ client := getS3Client(t)
+ bucketName := getNewBucketName()
+
+ createBucket(t, client, bucketName)
+ defer deleteBucket(t, client, bucketName)
+
+ enableVersioning(t, client, bucketName)
+
+ objectKey := "self-copy-no-directive.txt"
+ firstContent := []byte("first")
+ secondContent := []byte("second")
+
+ firstPut, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
+ Bucket: aws.String(bucketName),
+ Key: aws.String(objectKey),
+ Body: bytes.NewReader(firstContent),
+ })
+ require.NoError(t, err)
+ require.NotNil(t, firstPut.VersionId)
+
+ _, err = client.PutObject(context.TODO(), &s3.PutObjectInput{
+ Bucket: aws.String(bucketName),
+ Key: aws.String(objectKey),
+ Body: bytes.NewReader(secondContent),
+ })
+ require.NoError(t, err)
+
+ // Copying an earlier version onto its own key is how AWS restores that version.
+ copyResp, err := client.CopyObject(context.TODO(), &s3.CopyObjectInput{
+ Bucket: aws.String(bucketName),
+ Key: aws.String(objectKey),
+ CopySource: aws.String(fmt.Sprintf("%s?versionId=%s", versioningCopySource(bucketName, objectKey), *firstPut.VersionId)),
+ })
+ require.NoError(t, err, "Self-copy of an earlier version should succeed on a versioned bucket")
+ require.NotNil(t, copyResp.VersionId)
+ assert.NotEqual(t, *firstPut.VersionId, *copyResp.VersionId, "Restore should write a new version")
+
+ getResp, err := client.GetObject(context.TODO(), &s3.GetObjectInput{
+ Bucket: aws.String(bucketName),
+ Key: aws.String(objectKey),
+ })
+ require.NoError(t, err)
+ defer getResp.Body.Close()
+ body, err := io.ReadAll(getResp.Body)
+ require.NoError(t, err)
+ assert.Equal(t, firstContent, body, "Restored version should serve the earlier body")
+
+ versionsResp, err := client.ListObjectVersions(context.TODO(), &s3.ListObjectVersionsInput{
+ Bucket: aws.String(bucketName),
+ Prefix: aws.String(objectKey),
+ })
+ require.NoError(t, err)
+ assert.Len(t, versionsResp.Versions, 3, "Restore should append to the version history")
+}
+
+func TestSelfCopyWithoutVersioningIsRejected(t *testing.T) {
+ client := getS3Client(t)
+ bucketName := getNewBucketName()
+
+ createBucket(t, client, bucketName)
+ defer deleteBucket(t, client, bucketName)
+
+ objectKey := "self-copy-unversioned.txt"
+ putObject(t, client, bucketName, objectKey, "content")
+
+ _, err := client.CopyObject(context.TODO(), &s3.CopyObjectInput{
+ Bucket: aws.String(bucketName),
+ Key: aws.String(objectKey),
+ CopySource: aws.String(versioningCopySource(bucketName, objectKey)),
+ })
+ require.Error(t, err, "Self-copy without a metadata change is a no-op on an unversioned bucket")
+ var apiErr smithy.APIError
+ if assert.True(t, errors.As(err, &apiErr), "Expected a smithy.APIError, but got %T", err) {
+ assert.Equal(t, "InvalidRequest", apiErr.ErrorCode())
+ }
+}
+
+func TestSelfCopyWithSuspendedVersioningIsRejected(t *testing.T) {
+ client := getS3Client(t)
+ bucketName := getNewBucketName()
+
+ createBucket(t, client, bucketName)
+ defer deleteBucket(t, client, bucketName)
+
+ enableVersioning(t, client, bucketName)
+ suspendVersioning(t, client, bucketName)
+
+ objectKey := "self-copy-suspended-no-directive.txt"
+ putObject(t, client, bucketName, objectKey, "content")
+
+ _, err := client.CopyObject(context.TODO(), &s3.CopyObjectInput{
+ Bucket: aws.String(bucketName),
+ Key: aws.String(objectKey),
+ CopySource: aws.String(versioningCopySource(bucketName, objectKey)),
+ })
+ require.Error(t, err, "Suspended versioning overwrites the null version in place, so the copy changes nothing")
+ var apiErr smithy.APIError
+ if assert.True(t, errors.As(err, &apiErr), "Expected a smithy.APIError, but got %T", err) {
+ assert.Equal(t, "InvalidRequest", apiErr.ErrorCode())
+ }
+}
diff --git a/weed/s3api/s3api_object_handlers_copy.go b/weed/s3api/s3api_object_handlers_copy.go
index 0881359c26..a35eca72b2 100644
--- a/weed/s3api/s3api_object_handlers_copy.go
+++ b/weed/s3api/s3api_object_handlers_copy.go
@@ -200,7 +200,9 @@ func (s3a *S3ApiServer) CopyObjectHandler(w http.ResponseWriter, r *http.Request
}
sameDestination := srcBucket == dstBucket && srcObject == dstObject
- if sameDestination && !(replaceMeta || replaceTagging) {
+ // A self-copy into a versioned bucket writes a new version instead of overwriting in
+ // place, so it is not the no-op AWS rejects. It is how an earlier version is restored.
+ if sameDestination && !(replaceMeta || replaceTagging) && srcVersioningState != s3_constants.VersioningEnabled {
s3err.WriteErrorResponse(w, r, s3err.ErrInvalidCopyDest)
return
}