diff --git a/test/s3/tagging/s3_tagging_versioning_test.go b/test/s3/tagging/s3_tagging_versioning_test.go index 5aa49f9567..2288efdcf4 100644 --- a/test/s3/tagging/s3_tagging_versioning_test.go +++ b/test/s3/tagging/s3_tagging_versioning_test.go @@ -432,3 +432,100 @@ func createVersionedTestBucket(t *testing.T, client *s3.Client) string { return bucketName } + +// TestTaggingReportsVersionId checks that tagging requests on a versioned +// bucket answer with the version they acted on. +func TestTaggingReportsVersionId(t *testing.T) { + client := getS3Client(t) + bucketName := createVersionedTestBucket(t, client) + defer cleanupTestBucket(t, client, bucketName) + + objectKey := "tagging-version-id" + put := func(body string) string { + resp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + Body: strings.NewReader(body), + }) + require.NoError(t, err) + return aws.ToString(resp.VersionId) + } + versionId1 := put("v1") + versionId2 := put("v2") + require.NotEmpty(t, versionId1) + require.NotEmpty(t, versionId2) + require.NotEqual(t, versionId1, versionId2) + tagging := &types.Tagging{TagSet: []types.Tag{{Key: aws.String("k"), Value: aws.String("v")}}} + + putResp, err := client.PutObjectTagging(context.TODO(), &s3.PutObjectTaggingInput{ + Bucket: aws.String(bucketName), Key: aws.String(objectKey), VersionId: aws.String(versionId1), Tagging: tagging, + }) + require.NoError(t, err) + assert.Equal(t, versionId1, aws.ToString(putResp.VersionId)) + + putResp, err = client.PutObjectTagging(context.TODO(), &s3.PutObjectTaggingInput{ + Bucket: aws.String(bucketName), Key: aws.String(objectKey), Tagging: tagging, + }) + require.NoError(t, err) + assert.Equal(t, versionId2, aws.ToString(putResp.VersionId)) + + getResp, err := client.GetObjectTagging(context.TODO(), &s3.GetObjectTaggingInput{ + Bucket: aws.String(bucketName), Key: aws.String(objectKey), VersionId: aws.String(versionId1), + }) + require.NoError(t, err) + assert.Equal(t, versionId1, aws.ToString(getResp.VersionId)) + + getResp, err = client.GetObjectTagging(context.TODO(), &s3.GetObjectTaggingInput{ + Bucket: aws.String(bucketName), Key: aws.String(objectKey), + }) + require.NoError(t, err) + assert.Equal(t, versionId2, aws.ToString(getResp.VersionId)) + + delResp, err := client.DeleteObjectTagging(context.TODO(), &s3.DeleteObjectTaggingInput{ + Bucket: aws.String(bucketName), Key: aws.String(objectKey), VersionId: aws.String(versionId1), + }) + require.NoError(t, err) + assert.Equal(t, versionId1, aws.ToString(delResp.VersionId)) +} + +// TestTaggingReportsNullVersionId checks that tagging an object written before +// versioning was enabled reports the "null" version. +func TestTaggingReportsNullVersionId(t *testing.T) { + client := getS3Client(t) + bucketName := createTestBucket(t, client) + defer cleanupTestBucket(t, client, bucketName) + + objectKey := "tagging-null-version-id" + _, err := client.PutObject(context.TODO(), &s3.PutObjectInput{ + Bucket: aws.String(bucketName), + Key: aws.String(objectKey), + Body: strings.NewReader("before versioning"), + }) + require.NoError(t, err) + _, err = client.PutBucketVersioning(context.TODO(), &s3.PutBucketVersioningInput{ + Bucket: aws.String(bucketName), + VersioningConfiguration: &types.VersioningConfiguration{Status: types.BucketVersioningStatusEnabled}, + }) + require.NoError(t, err) + tagging := &types.Tagging{TagSet: []types.Tag{{Key: aws.String("k"), Value: aws.String("v")}}} + + for _, versionId := range []*string{nil, aws.String("null")} { + putResp, err := client.PutObjectTagging(context.TODO(), &s3.PutObjectTaggingInput{ + Bucket: aws.String(bucketName), Key: aws.String(objectKey), VersionId: versionId, Tagging: tagging, + }) + require.NoError(t, err) + assert.Equal(t, "null", aws.ToString(putResp.VersionId)) + + getResp, err := client.GetObjectTagging(context.TODO(), &s3.GetObjectTaggingInput{ + Bucket: aws.String(bucketName), Key: aws.String(objectKey), VersionId: versionId, + }) + require.NoError(t, err) + assert.Equal(t, "null", aws.ToString(getResp.VersionId)) + + delResp, err := client.DeleteObjectTagging(context.TODO(), &s3.DeleteObjectTaggingInput{ + Bucket: aws.String(bucketName), Key: aws.String(objectKey), VersionId: versionId, + }) + require.NoError(t, err) + assert.Equal(t, "null", aws.ToString(delResp.VersionId)) + } +} diff --git a/weed/s3api/s3api_object_handlers_tagging.go b/weed/s3api/s3api_object_handlers_tagging.go index 850de45629..96f2e8ae6a 100644 --- a/weed/s3api/s3api_object_handlers_tagging.go +++ b/weed/s3api/s3api_object_handlers_tagging.go @@ -107,6 +107,9 @@ func (s3a *S3ApiServer) GetObjectTaggingHandler(w http.ResponseWriter, r *http.R } } + if versioningConfigured { + setTaggingVersionIdHeader(w, versionId, entry) + } writeSuccessResponseXML(w, r, FromTags(tags)) } @@ -273,6 +276,7 @@ func (s3a *S3ApiServer) PutObjectTaggingHandler(w http.ResponseWriter, r *http.R } glog.V(3).Infof("PutObjectTaggingHandler: Successfully updated tags for %s/%s", bucket, object) + setTaggingVersionIdHeader(w, versionId, entry) w.WriteHeader(http.StatusOK) s3err.PostLog(r, http.StatusOK, s3err.ErrNone) } @@ -391,6 +395,7 @@ func (s3a *S3ApiServer) DeleteObjectTaggingHandler(w http.ResponseWriter, r *htt if !hasDeletion { // No tags to delete - success + setTaggingVersionIdHeader(w, versionId, entry) w.WriteHeader(http.StatusNoContent) s3err.PostLog(r, http.StatusNoContent, s3err.ErrNone) return @@ -416,6 +421,17 @@ func (s3a *S3ApiServer) DeleteObjectTaggingHandler(w http.ResponseWriter, r *htt } glog.V(3).Infof("DeleteObjectTaggingHandler: Successfully deleted tags for %s/%s", bucket, object) + setTaggingVersionIdHeader(w, versionId, entry) w.WriteHeader(http.StatusNoContent) s3err.PostLog(r, http.StatusNoContent, s3err.ErrNone) } + +// setTaggingVersionIdHeader reports the version the tagging request acted on, +// "null" for an object written before versioning was enabled. +func setTaggingVersionIdHeader(w http.ResponseWriter, versionId string, entry *filer_pb.Entry) { + versionId = resolvedSourceVersionId(versionId, entry) + if versionId == "" { + versionId = "null" + } + w.Header().Set("x-amz-version-id", versionId) +}