Browse Source
fix listing objects (#7008)
fix listing objects (#7008)
* fix listing objects * add more list testing * address comments * fix next marker * fix isTruncated in listing * fix tests * address tests * Update s3api_object_handlers_multipart.go * fixes * store json into bucket content, for tagging and cors * switch bucket metadata from json to proto * fix * Update s3api_bucket_config.go * fix test issue * fix test_bucket_listv2_delimiter_prefix * Update cors.go * skip special characters * passing listing * fix test_bucket_list_delimiter_prefix * ok. fix the xsd generated go code now * fix cors tests * fix test * fix test_bucket_list_unordered and test_bucket_listv2_unordered do not accept the allow-unordered and delimiter parameter combination * fix test_bucket_list_objects_anonymous and test_bucket_listv2_objects_anonymous The tests test_bucket_list_objects_anonymous and test_bucket_listv2_objects_anonymous were failing because they try to set bucket ACL to public-read, but SeaweedFS only supported private ACL. Updated PutBucketAclHandler to use the existing ExtractAcl function which already supports all standard S3 canned ACLs Replaced the hardcoded check for only private ACL with proper ACL parsing that handles public-read, public-read-write, authenticated-read, bucket-owner-read, bucket-owner-full-control, etc. Added unit tests to verify all standard canned ACLs are accepted * fix list unordered The test is expecting the error code to be InvalidArgument instead of InvalidRequest * allow anonymous listing( and head, get) * fix test_bucket_list_maxkeys_invalid Invalid values: max-keys=blah → Returns ErrInvalidMaxKeys (HTTP 400) * updating IsPublicRead when parsing acl * more logs * CORS Test Fix * fix test_bucket_list_return_data * default to private * fix test_bucket_list_delimiter_not_skip_special * default no acl * add debug logging * more logs * use basic http client remove logs also * fixes * debug * Update stats.go * debugging * fix anonymous test expectation anonymous user can read, as configured in s3 json.pull/7032/head
Chris Lu
2 months ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 2131 additions and 689 deletions
-
137.github/workflows/s3tests.yml
-
169test/s3/basic/delimiter_test.go
-
102test/s3/cors/s3_cors_http_test.go
-
134test/s3/cors/s3_cors_test.go
-
BINtest/s3/versioning/versioning.test
-
21weed/pb/s3.proto
-
233weed/pb/s3_pb/s3.pb.go
-
1weed/s3api/auth_credentials.go
-
23weed/s3api/auth_credentials_subscribe.go
-
470weed/s3api/cors/cors.go
-
155weed/s3api/cors/middleware.go
-
25weed/s3api/s3api_auth.go
-
341weed/s3api/s3api_bucket_config.go
-
13weed/s3api/s3api_bucket_cors_handlers.go
-
104weed/s3api/s3api_bucket_handlers.go
-
217weed/s3api/s3api_bucket_handlers_test.go
-
22weed/s3api/s3api_bucket_skip_handlers.go
-
102weed/s3api/s3api_bucket_tagging_handlers.go
-
19weed/s3api/s3api_object_handlers.go
-
174weed/s3api/s3api_object_handlers_list.go
-
212weed/s3api/s3api_object_handlers_list_test.go
-
2weed/s3api/s3api_object_handlers_multipart.go
-
67weed/s3api/s3api_object_handlers_test.go
-
25weed/s3api/s3api_server.go
-
12weed/s3api/s3api_xsd_generated.go
-
31weed/s3api/s3err/error_handler.go
-
6weed/s3api/s3err/s3api_errors.go
-
3weed/s3api/stats.go
@ -0,0 +1,169 @@ |
|||||
|
package basic |
||||
|
|
||||
|
import ( |
||||
|
"fmt" |
||||
|
"math/rand" |
||||
|
"strings" |
||||
|
"testing" |
||||
|
"time" |
||||
|
|
||||
|
"github.com/aws/aws-sdk-go/aws" |
||||
|
"github.com/aws/aws-sdk-go/service/s3" |
||||
|
"github.com/stretchr/testify/assert" |
||||
|
"github.com/stretchr/testify/require" |
||||
|
) |
||||
|
|
||||
|
// TestS3ListDelimiterWithDirectoryKeyObjects tests the specific scenario from
|
||||
|
// test_bucket_list_delimiter_not_skip_special where directory key objects
|
||||
|
// should be properly grouped into common prefixes when using delimiters
|
||||
|
func TestS3ListDelimiterWithDirectoryKeyObjects(t *testing.T) { |
||||
|
bucketName := fmt.Sprintf("test-delimiter-dir-key-%d", rand.Int31()) |
||||
|
|
||||
|
// Create bucket
|
||||
|
_, err := svc.CreateBucket(&s3.CreateBucketInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
}) |
||||
|
require.NoError(t, err) |
||||
|
defer cleanupBucket(t, bucketName) |
||||
|
|
||||
|
// Create objects matching the failing test scenario:
|
||||
|
// ['0/'] + ['0/1000', '0/1001', '0/1002'] + ['1999', '1999#', '1999+', '2000']
|
||||
|
objects := []string{ |
||||
|
"0/", // Directory key object
|
||||
|
"0/1000", // Objects under 0/ prefix
|
||||
|
"0/1001", |
||||
|
"0/1002", |
||||
|
"1999", // Objects without delimiter
|
||||
|
"1999#", |
||||
|
"1999+", |
||||
|
"2000", |
||||
|
} |
||||
|
|
||||
|
// Create all objects
|
||||
|
for _, key := range objects { |
||||
|
_, err := svc.PutObject(&s3.PutObjectInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
Key: aws.String(key), |
||||
|
Body: strings.NewReader(fmt.Sprintf("content for %s", key)), |
||||
|
}) |
||||
|
require.NoError(t, err, "Failed to create object %s", key) |
||||
|
} |
||||
|
|
||||
|
// Test with delimiter='/'
|
||||
|
resp, err := svc.ListObjects(&s3.ListObjectsInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
Delimiter: aws.String("/"), |
||||
|
}) |
||||
|
require.NoError(t, err) |
||||
|
|
||||
|
// Extract keys and prefixes
|
||||
|
var keys []string |
||||
|
for _, content := range resp.Contents { |
||||
|
keys = append(keys, *content.Key) |
||||
|
} |
||||
|
|
||||
|
var prefixes []string |
||||
|
for _, prefix := range resp.CommonPrefixes { |
||||
|
prefixes = append(prefixes, *prefix.Prefix) |
||||
|
} |
||||
|
|
||||
|
// Expected results:
|
||||
|
// Keys should be: ['1999', '1999#', '1999+', '2000'] (objects without delimiters)
|
||||
|
// Prefixes should be: ['0/'] (grouping '0/' and all '0/xxxx' objects)
|
||||
|
|
||||
|
expectedKeys := []string{"1999", "1999#", "1999+", "2000"} |
||||
|
expectedPrefixes := []string{"0/"} |
||||
|
|
||||
|
t.Logf("Actual keys: %v", keys) |
||||
|
t.Logf("Actual prefixes: %v", prefixes) |
||||
|
|
||||
|
assert.ElementsMatch(t, expectedKeys, keys, "Keys should only include objects without delimiters") |
||||
|
assert.ElementsMatch(t, expectedPrefixes, prefixes, "CommonPrefixes should group directory key object with other objects sharing prefix") |
||||
|
|
||||
|
// Additional validation
|
||||
|
assert.Equal(t, "/", *resp.Delimiter, "Delimiter should be set correctly") |
||||
|
assert.Contains(t, prefixes, "0/", "Directory key object '0/' should be grouped into common prefix '0/'") |
||||
|
assert.NotContains(t, keys, "0/", "Directory key object '0/' should NOT appear as individual key when delimiter is used") |
||||
|
|
||||
|
// Verify none of the '0/xxxx' objects appear as individual keys
|
||||
|
for _, key := range keys { |
||||
|
assert.False(t, strings.HasPrefix(key, "0/"), "No object with '0/' prefix should appear as individual key, found: %s", key) |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
// TestS3ListWithoutDelimiter tests that directory key objects appear as individual keys when no delimiter is used
|
||||
|
func TestS3ListWithoutDelimiter(t *testing.T) { |
||||
|
bucketName := fmt.Sprintf("test-no-delimiter-%d", rand.Int31()) |
||||
|
|
||||
|
// Create bucket
|
||||
|
_, err := svc.CreateBucket(&s3.CreateBucketInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
}) |
||||
|
require.NoError(t, err) |
||||
|
defer cleanupBucket(t, bucketName) |
||||
|
|
||||
|
// Create objects
|
||||
|
objects := []string{"0/", "0/1000", "1999"} |
||||
|
|
||||
|
for _, key := range objects { |
||||
|
_, err := svc.PutObject(&s3.PutObjectInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
Key: aws.String(key), |
||||
|
Body: strings.NewReader(fmt.Sprintf("content for %s", key)), |
||||
|
}) |
||||
|
require.NoError(t, err) |
||||
|
} |
||||
|
|
||||
|
// Test without delimiter
|
||||
|
resp, err := svc.ListObjects(&s3.ListObjectsInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
// No delimiter specified
|
||||
|
}) |
||||
|
require.NoError(t, err) |
||||
|
|
||||
|
// Extract keys
|
||||
|
var keys []string |
||||
|
for _, content := range resp.Contents { |
||||
|
keys = append(keys, *content.Key) |
||||
|
} |
||||
|
|
||||
|
// When no delimiter is used, all objects should be returned as individual keys
|
||||
|
expectedKeys := []string{"0/", "0/1000", "1999"} |
||||
|
assert.ElementsMatch(t, expectedKeys, keys, "All objects should be individual keys when no delimiter is used") |
||||
|
|
||||
|
// No common prefixes should be present
|
||||
|
assert.Empty(t, resp.CommonPrefixes, "No common prefixes should be present when no delimiter is used") |
||||
|
assert.Contains(t, keys, "0/", "Directory key object '0/' should appear as individual key when no delimiter is used") |
||||
|
} |
||||
|
|
||||
|
func cleanupBucket(t *testing.T, bucketName string) { |
||||
|
// Delete all objects
|
||||
|
resp, err := svc.ListObjects(&s3.ListObjectsInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
}) |
||||
|
if err != nil { |
||||
|
t.Logf("Failed to list objects for cleanup: %v", err) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
for _, obj := range resp.Contents { |
||||
|
_, err := svc.DeleteObject(&s3.DeleteObjectInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
Key: obj.Key, |
||||
|
}) |
||||
|
if err != nil { |
||||
|
t.Logf("Failed to delete object %s: %v", *obj.Key, err) |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
// Give some time for eventual consistency
|
||||
|
time.Sleep(100 * time.Millisecond) |
||||
|
|
||||
|
// Delete bucket
|
||||
|
_, err = svc.DeleteBucket(&s3.DeleteBucketInput{ |
||||
|
Bucket: aws.String(bucketName), |
||||
|
}) |
||||
|
if err != nil { |
||||
|
t.Logf("Failed to delete bucket %s: %v", bucketName, err) |
||||
|
} |
||||
|
} |
||||
@ -1,37 +1,206 @@ |
|||||
package s3api |
package s3api |
||||
|
|
||||
import ( |
import ( |
||||
"github.com/seaweedfs/seaweedfs/weed/s3api/s3err" |
|
||||
|
"encoding/json" |
||||
|
"net/http/httptest" |
||||
"testing" |
"testing" |
||||
"time" |
|
||||
|
|
||||
|
"github.com/aws/aws-sdk-go/service/s3" |
||||
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" |
||||
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" |
||||
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3err" |
||||
|
"github.com/stretchr/testify/assert" |
||||
|
"github.com/stretchr/testify/require" |
||||
) |
) |
||||
|
|
||||
func TestListBucketsHandler(t *testing.T) { |
|
||||
|
func TestPutBucketAclCannedAclSupport(t *testing.T) { |
||||
|
// Test that the ExtractAcl function can handle various canned ACLs
|
||||
|
// This tests the core functionality without requiring a fully initialized S3ApiServer
|
||||
|
|
||||
|
testCases := []struct { |
||||
|
name string |
||||
|
cannedAcl string |
||||
|
shouldWork bool |
||||
|
description string |
||||
|
}{ |
||||
|
{ |
||||
|
name: "private", |
||||
|
cannedAcl: s3_constants.CannedAclPrivate, |
||||
|
shouldWork: true, |
||||
|
description: "private ACL should be accepted", |
||||
|
}, |
||||
|
{ |
||||
|
name: "public-read", |
||||
|
cannedAcl: s3_constants.CannedAclPublicRead, |
||||
|
shouldWork: true, |
||||
|
description: "public-read ACL should be accepted", |
||||
|
}, |
||||
|
{ |
||||
|
name: "public-read-write", |
||||
|
cannedAcl: s3_constants.CannedAclPublicReadWrite, |
||||
|
shouldWork: true, |
||||
|
description: "public-read-write ACL should be accepted", |
||||
|
}, |
||||
|
{ |
||||
|
name: "authenticated-read", |
||||
|
cannedAcl: s3_constants.CannedAclAuthenticatedRead, |
||||
|
shouldWork: true, |
||||
|
description: "authenticated-read ACL should be accepted", |
||||
|
}, |
||||
|
{ |
||||
|
name: "bucket-owner-read", |
||||
|
cannedAcl: s3_constants.CannedAclBucketOwnerRead, |
||||
|
shouldWork: true, |
||||
|
description: "bucket-owner-read ACL should be accepted", |
||||
|
}, |
||||
|
{ |
||||
|
name: "bucket-owner-full-control", |
||||
|
cannedAcl: s3_constants.CannedAclBucketOwnerFullControl, |
||||
|
shouldWork: true, |
||||
|
description: "bucket-owner-full-control ACL should be accepted", |
||||
|
}, |
||||
|
{ |
||||
|
name: "invalid-acl", |
||||
|
cannedAcl: "invalid-acl-value", |
||||
|
shouldWork: false, |
||||
|
description: "invalid ACL should be rejected", |
||||
|
}, |
||||
|
} |
||||
|
|
||||
|
for _, tc := range testCases { |
||||
|
t.Run(tc.name, func(t *testing.T) { |
||||
|
// Create a request with the specified canned ACL
|
||||
|
req := httptest.NewRequest("PUT", "/bucket?acl", nil) |
||||
|
req.Header.Set(s3_constants.AmzCannedAcl, tc.cannedAcl) |
||||
|
req.Header.Set(s3_constants.AmzAccountId, "test-account-123") |
||||
|
|
||||
expected := `<?xml version="1.0" encoding="UTF-8"?> |
|
||||
<ListAllMyBucketsResult><Owner><ID></ID></Owner><Buckets><Bucket><Name>test1</Name><CreationDate>2011-04-09T12:34:49Z</CreationDate></Bucket><Bucket><Name>test2</Name><CreationDate>2011-02-09T12:34:49Z</CreationDate></Bucket></Buckets></ListAllMyBucketsResult>` |
|
||||
var response ListAllMyBucketsResult |
|
||||
|
// Create a mock IAM for testing
|
||||
|
mockIam := &mockIamInterface{} |
||||
|
|
||||
var bucketsList ListAllMyBucketsList |
|
||||
bucketsList.Bucket = append(bucketsList.Bucket, ListAllMyBucketsEntry{ |
|
||||
Name: "test1", |
|
||||
CreationDate: time.Date(2011, 4, 9, 12, 34, 49, 0, time.UTC), |
|
||||
}) |
|
||||
bucketsList.Bucket = append(bucketsList.Bucket, ListAllMyBucketsEntry{ |
|
||||
Name: "test2", |
|
||||
CreationDate: time.Date(2011, 2, 9, 12, 34, 49, 0, time.UTC), |
|
||||
}) |
|
||||
|
// Test the ACL extraction directly
|
||||
|
grants, errCode := ExtractAcl(req, mockIam, "", "test-account-123", "test-account-123", "test-account-123") |
||||
|
|
||||
response = ListAllMyBucketsResult{ |
|
||||
Owner: CanonicalUser{ |
|
||||
ID: "", |
|
||||
DisplayName: "", |
|
||||
}, |
|
||||
Buckets: bucketsList, |
|
||||
|
if tc.shouldWork { |
||||
|
assert.Equal(t, s3err.ErrNone, errCode, "Expected ACL parsing to succeed for %s", tc.cannedAcl) |
||||
|
assert.NotEmpty(t, grants, "Expected grants to be generated for valid ACL %s", tc.cannedAcl) |
||||
|
t.Logf("✓ PASS: %s - %s", tc.name, tc.description) |
||||
|
} else { |
||||
|
assert.NotEqual(t, s3err.ErrNone, errCode, "Expected ACL parsing to fail for invalid ACL %s", tc.cannedAcl) |
||||
|
t.Logf("✓ PASS: %s - %s", tc.name, tc.description) |
||||
|
} |
||||
|
}) |
||||
} |
} |
||||
|
} |
||||
|
|
||||
encoded := string(s3err.EncodeXMLResponse(response)) |
|
||||
if encoded != expected { |
|
||||
t.Errorf("unexpected output:%s\nexpecting:%s", encoded, expected) |
|
||||
|
// TestBucketWithoutACLIsNotPublicRead tests that buckets without ACLs are not public-read
|
||||
|
func TestBucketWithoutACLIsNotPublicRead(t *testing.T) { |
||||
|
// Create a bucket config without ACL (like a freshly created bucket)
|
||||
|
config := &BucketConfig{ |
||||
|
Name: "test-bucket", |
||||
|
IsPublicRead: false, // Should be explicitly false
|
||||
} |
} |
||||
|
|
||||
|
// Verify that buckets without ACL are not public-read
|
||||
|
assert.False(t, config.IsPublicRead, "Bucket without ACL should not be public-read") |
||||
|
} |
||||
|
|
||||
|
func TestBucketConfigInitialization(t *testing.T) { |
||||
|
// Test that BucketConfig properly initializes IsPublicRead field
|
||||
|
config := &BucketConfig{ |
||||
|
Name: "test-bucket", |
||||
|
IsPublicRead: false, // Explicitly set to false for private buckets
|
||||
|
} |
||||
|
|
||||
|
// Verify proper initialization
|
||||
|
assert.False(t, config.IsPublicRead, "Newly created bucket should not be public-read by default") |
||||
|
} |
||||
|
|
||||
|
// TestUpdateBucketConfigCacheConsistency tests that updateBucketConfigCacheFromEntry
|
||||
|
// properly handles the IsPublicRead flag consistently with getBucketConfig
|
||||
|
func TestUpdateBucketConfigCacheConsistency(t *testing.T) { |
||||
|
t.Run("bucket without ACL should have IsPublicRead=false", func(t *testing.T) { |
||||
|
// Simulate an entry without ACL (like a freshly created bucket)
|
||||
|
entry := &filer_pb.Entry{ |
||||
|
Name: "test-bucket", |
||||
|
Attributes: &filer_pb.FuseAttributes{ |
||||
|
FileMode: 0755, |
||||
|
}, |
||||
|
// Extended is nil or doesn't contain ACL
|
||||
|
} |
||||
|
|
||||
|
// Test what updateBucketConfigCacheFromEntry would create
|
||||
|
config := &BucketConfig{ |
||||
|
Name: entry.Name, |
||||
|
Entry: entry, |
||||
|
IsPublicRead: false, // Should be explicitly false
|
||||
|
} |
||||
|
|
||||
|
// When Extended is nil, IsPublicRead should be false
|
||||
|
assert.False(t, config.IsPublicRead, "Bucket without Extended metadata should not be public-read") |
||||
|
|
||||
|
// When Extended exists but has no ACL key, IsPublicRead should also be false
|
||||
|
entry.Extended = make(map[string][]byte) |
||||
|
entry.Extended["some-other-key"] = []byte("some-value") |
||||
|
|
||||
|
config = &BucketConfig{ |
||||
|
Name: entry.Name, |
||||
|
Entry: entry, |
||||
|
IsPublicRead: false, // Should be explicitly false
|
||||
|
} |
||||
|
|
||||
|
// Simulate the else branch: no ACL means private bucket
|
||||
|
if _, exists := entry.Extended[s3_constants.ExtAmzAclKey]; !exists { |
||||
|
config.IsPublicRead = false |
||||
|
} |
||||
|
|
||||
|
assert.False(t, config.IsPublicRead, "Bucket with Extended but no ACL should not be public-read") |
||||
|
}) |
||||
|
|
||||
|
t.Run("bucket with public-read ACL should have IsPublicRead=true", func(t *testing.T) { |
||||
|
// Create a mock public-read ACL using AWS S3 SDK types
|
||||
|
publicReadGrants := []*s3.Grant{ |
||||
|
{ |
||||
|
Grantee: &s3.Grantee{ |
||||
|
Type: &s3_constants.GrantTypeGroup, |
||||
|
URI: &s3_constants.GranteeGroupAllUsers, |
||||
|
}, |
||||
|
Permission: &s3_constants.PermissionRead, |
||||
|
}, |
||||
|
} |
||||
|
|
||||
|
aclBytes, err := json.Marshal(publicReadGrants) |
||||
|
require.NoError(t, err) |
||||
|
|
||||
|
entry := &filer_pb.Entry{ |
||||
|
Name: "public-bucket", |
||||
|
Extended: map[string][]byte{ |
||||
|
s3_constants.ExtAmzAclKey: aclBytes, |
||||
|
}, |
||||
|
} |
||||
|
|
||||
|
config := &BucketConfig{ |
||||
|
Name: entry.Name, |
||||
|
Entry: entry, |
||||
|
IsPublicRead: false, // Start with false
|
||||
|
} |
||||
|
|
||||
|
// Simulate what updateBucketConfigCacheFromEntry would do
|
||||
|
if acl, exists := entry.Extended[s3_constants.ExtAmzAclKey]; exists { |
||||
|
config.ACL = acl |
||||
|
config.IsPublicRead = parseAndCachePublicReadStatus(acl) |
||||
|
} |
||||
|
|
||||
|
assert.True(t, config.IsPublicRead, "Bucket with public-read ACL should be public-read") |
||||
|
}) |
||||
|
} |
||||
|
|
||||
|
// mockIamInterface is a simple mock for testing
|
||||
|
type mockIamInterface struct{} |
||||
|
|
||||
|
func (m *mockIamInterface) GetAccountNameById(canonicalId string) string { |
||||
|
return "test-user-" + canonicalId |
||||
|
} |
||||
|
|
||||
|
func (m *mockIamInterface) GetAccountIdByEmail(email string) string { |
||||
|
return "account-for-" + email |
||||
} |
} |
||||
@ -0,0 +1,102 @@ |
|||||
|
package s3api |
||||
|
|
||||
|
import ( |
||||
|
"encoding/xml" |
||||
|
"io" |
||||
|
"net/http" |
||||
|
|
||||
|
"github.com/seaweedfs/seaweedfs/weed/glog" |
||||
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" |
||||
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3err" |
||||
|
) |
||||
|
|
||||
|
// GetBucketTaggingHandler Returns the tag set associated with the bucket
|
||||
|
// https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketTagging.html
|
||||
|
func (s3a *S3ApiServer) GetBucketTaggingHandler(w http.ResponseWriter, r *http.Request) { |
||||
|
bucket, _ := s3_constants.GetBucketAndObject(r) |
||||
|
glog.V(3).Infof("GetBucketTagging %s", bucket) |
||||
|
|
||||
|
if err := s3a.checkBucket(r, bucket); err != s3err.ErrNone { |
||||
|
s3err.WriteErrorResponse(w, r, err) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
// Load bucket tags from metadata
|
||||
|
tags, err := s3a.getBucketTags(bucket) |
||||
|
if err != nil { |
||||
|
glog.V(3).Infof("GetBucketTagging: no tags found for bucket %s: %v", bucket, err) |
||||
|
s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchTagSet) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
// Convert tags to XML response format
|
||||
|
tagging := FromTags(tags) |
||||
|
writeSuccessResponseXML(w, r, tagging) |
||||
|
} |
||||
|
|
||||
|
// PutBucketTaggingHandler Put bucket tagging
|
||||
|
// https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketTagging.html
|
||||
|
func (s3a *S3ApiServer) PutBucketTaggingHandler(w http.ResponseWriter, r *http.Request) { |
||||
|
bucket, _ := s3_constants.GetBucketAndObject(r) |
||||
|
glog.V(3).Infof("PutBucketTagging %s", bucket) |
||||
|
|
||||
|
if err := s3a.checkBucket(r, bucket); err != s3err.ErrNone { |
||||
|
s3err.WriteErrorResponse(w, r, err) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
// Parse tagging configuration from request body
|
||||
|
tagging := &Tagging{} |
||||
|
input, err := io.ReadAll(io.LimitReader(r.Body, r.ContentLength)) |
||||
|
if err != nil { |
||||
|
glog.Errorf("PutBucketTagging read input %s: %v", r.URL, err) |
||||
|
s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) |
||||
|
return |
||||
|
} |
||||
|
if err = xml.Unmarshal(input, tagging); err != nil { |
||||
|
glog.Errorf("PutBucketTagging Unmarshal %s: %v", r.URL, err) |
||||
|
s3err.WriteErrorResponse(w, r, s3err.ErrMalformedXML) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
tags := tagging.ToTags() |
||||
|
|
||||
|
// Validate tags using existing validation
|
||||
|
err = ValidateTags(tags) |
||||
|
if err != nil { |
||||
|
glog.Errorf("PutBucketTagging ValidateTags error %s: %v", r.URL, err) |
||||
|
s3err.WriteErrorResponse(w, r, s3err.ErrInvalidTag) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
// Store bucket tags in metadata
|
||||
|
if err = s3a.setBucketTags(bucket, tags); err != nil { |
||||
|
glog.Errorf("PutBucketTagging setBucketTags %s: %v", r.URL, err) |
||||
|
s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
writeSuccessResponseEmpty(w, r) |
||||
|
} |
||||
|
|
||||
|
// DeleteBucketTaggingHandler Delete bucket tagging
|
||||
|
// https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketTagging.html
|
||||
|
func (s3a *S3ApiServer) DeleteBucketTaggingHandler(w http.ResponseWriter, r *http.Request) { |
||||
|
bucket, _ := s3_constants.GetBucketAndObject(r) |
||||
|
glog.V(3).Infof("DeleteBucketTagging %s", bucket) |
||||
|
|
||||
|
if err := s3a.checkBucket(r, bucket); err != s3err.ErrNone { |
||||
|
s3err.WriteErrorResponse(w, r, err) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
// Remove bucket tags from metadata
|
||||
|
if err := s3a.deleteBucketTags(bucket); err != nil { |
||||
|
glog.Errorf("DeleteBucketTagging deleteBucketTags %s: %v", r.URL, err) |
||||
|
s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) |
||||
|
return |
||||
|
} |
||||
|
|
||||
|
w.WriteHeader(http.StatusNoContent) |
||||
|
s3err.PostLog(r, http.StatusNoContent, s3err.ErrNone) |
||||
|
} |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue