fix: validate and apply the ListBuckets bucket-region query

ListBuckets ignored bucket-region: a value that is not a region was
accepted, and a region other than the gateway one still listed every
bucket. S3 rejects an invalid value with 400 InvalidArgument, "Argument
value abc is not a valid AWS Region", and lists only the buckets of the
requested region.

Check bucket-region against the AWS region code format, always
accepting the gateway region whatever its name, and return an empty
list for any other region, since every bucket lives in the gateway
region. Enable the REST tests that cover both cases.

Fixes #1923
Fixes #1930
This commit is contained in:
dualfroz committed 2026-10-05 20:42:18 +02:00
1 parent 2bb327ec69
commit b7ff97181d
8 files changed
+175 -6

No files matched your search

+55
View File
@@ -17,6 +17,7 @@ package integration
import (
"context"
"fmt"
"slices"
"sort"
"github.com/aws/aws-sdk-go-v2/service/s3"
@@ -271,6 +272,60 @@ func ListBuckets_invalid_max_buckets(s *S3Conf) error {
})
}
func ListBuckets_invalid_bucket_region(s *S3Conf) error {
testName := "ListBuckets_invalid_bucket_region"
return actionHandler(s, testName, func(s3client *s3.Client, bucket string) error {
ctx, cancel := context.WithTimeout(context.Background(), shortTimeout)
_, err := s3client.ListBuckets(ctx, &s3.ListBucketsInput{
BucketRegion: getPtr("abc"),
})
cancel()
return checkApiErr(err, s3err.GetInvalidArgBucketRegion("abc"))
})
}
func ListBuckets_bucket_region(s *S3Conf) error {
testName := "ListBuckets_bucket_region"
return actionHandler(s, testName, func(s3client *s3.Client, bucket string) error {
listBuckets := func(region string) ([]types.Bucket, error) {
ctx, cancel := context.WithTimeout(context.Background(), shortTimeout)
out, err := s3client.ListBuckets(ctx, &s3.ListBucketsInput{
BucketRegion: &region,
})
cancel()
if err != nil {
return nil, err
}
return out.Buckets, nil
}
buckets, err := listBuckets(s.awsRegion)
if err != nil {
return err
}
if !slices.ContainsFunc(buckets, func(b types.Bucket) bool { return getString(b.Name) == bucket }) {
return fmt.Errorf("expected bucket %v in the %v listing, instead got %v",
bucket, s.awsRegion, buckets)
}
// every bucket of the gateway lives in its own region
otherRegion := "us-west-2"
if s.awsRegion == otherRegion {
otherRegion = "us-east-1"
}
buckets, err = listBuckets(otherRegion)
if err != nil {
return err
}
if len(buckets) != 0 {
return fmt.Errorf("expected an empty %v listing, instead got %v",
otherRegion, buckets)
}
return nil
})
}
func ListBuckets_truncated(s *S3Conf) error {
testName := "ListBuckets_truncated"
return actionHandler(s, testName, func(s3client *s3.Client, bucket string) error {
+4
View File
@@ -110,6 +110,8 @@ func TestListBuckets(ts *TestState) {
ts.Sync(ListBuckets_as_admin)
ts.Sync(ListBuckets_with_prefix)
ts.Sync(ListBuckets_invalid_max_buckets)
ts.Sync(ListBuckets_invalid_bucket_region)
ts.Sync(ListBuckets_bucket_region)
ts.Sync(ListBuckets_truncated)
ts.Sync(ListBuckets_success)
ts.Sync(ListBuckets_empty_success)
@@ -2985,6 +2987,8 @@ func GetIntTests() IntTests {
"ListBuckets_as_admin": ListBuckets_as_admin,
"ListBuckets_with_prefix": ListBuckets_with_prefix,
"ListBuckets_invalid_max_buckets": ListBuckets_invalid_max_buckets,
"ListBuckets_invalid_bucket_region": ListBuckets_invalid_bucket_region,
"ListBuckets_bucket_region": ListBuckets_bucket_region,
"ListBuckets_truncated": ListBuckets_truncated,
"ListBuckets_success": ListBuckets_success,
"ListBuckets_empty_success": ListBuckets_empty_success,
-6
View File
@@ -258,9 +258,6 @@ export RUN_USERS=true
# tags: curl,ListBuckets,bucket-region,invalid-query
@test "REST - ListBuckets - invalid bucket-region query" {
if [ "$DIRECT" != "true" ]; then
skip "https://github.com/versity/versitygw/issues/1923"
fi
local invalid_region="abc"
run get_bucket_name "$BUCKET_ONE_NAME"
@@ -277,9 +274,6 @@ export RUN_USERS=true
# tags: curl,ListBuckets,bucket-region
@test "REST - ListBuckets - incorrect bucket region" {
if [ "$DIRECT" != "true" ]; then
skip "https://github.com/versity/versitygw/issues/1930"
fi
local test_region="us-east-1"
if [ "$AWS_REGION" == "us-east-1" ]; then
test_region="us-west-1"