mirror of
https://github.com/versity/versitygw.git
synced 2026-02-13 05:31:09 +00:00
2365f9f1ae
Fixes #1809 Fixes #1806 Fixes #1804 Fixes #1794 This PR focuses on correcting so-called "list-limiter" parsing and validation. The affected limiters include: `max-keys`, `max-uploads`, `max-parts`, `max-buckets`, `max-uploads` and `part-number-marker`. When a limiter value is outside the integer range, a specific `InvalidArgument` error is now returned. If the value is a valid integer but negative, a different `InvalidArgument` error is produced. `max-buckets` has its own validation rules: completely invalid values and values outside the allowed range (`1 <= input <= 10000`) return distinct errors. For `ListObjectVersions`, negative `max-keys` values follow S3’s special-case behavior and return a different `InvalidArgument` error message. Additionally, `GetObjectAttributes` now follows S3 semantics for `x-amz-max-parts`: S3 ignores invalid values, so the gateway now matches that behavior.
61 lines
1.7 KiB
Go
61 lines
1.7 KiB
Go
// Copyright 2023 Versity Software
|
|
// This file is licensed under the Apache License, Version 2.0
|
|
// (the "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing,
|
|
// software distributed under the License is distributed on an
|
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
// KIND, either express or implied. See the License for the
|
|
// specific language governing permissions and limitations
|
|
// under the License.
|
|
|
|
package controllers
|
|
|
|
import (
|
|
"github.com/gofiber/fiber/v2"
|
|
"github.com/versity/versitygw/auth"
|
|
"github.com/versity/versitygw/s3api/utils"
|
|
"github.com/versity/versitygw/s3response"
|
|
)
|
|
|
|
func (c S3ApiController) ListBuckets(ctx *fiber.Ctx) (*Response, error) {
|
|
cToken := ctx.Query("continuation-token")
|
|
prefix := ctx.Query("prefix")
|
|
maxBucketsStr := ctx.Query("max-buckets")
|
|
acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
|
|
region, ok := utils.ContextKeyRegion.Get(ctx).(string)
|
|
if !ok {
|
|
region = defaultRegion
|
|
}
|
|
|
|
maxBuckets, err := utils.ParseMaxLimiter(maxBucketsStr, utils.LimiterTypeMaxBuckets)
|
|
if err != nil {
|
|
return &Response{
|
|
MetaOpts: &MetaOptions{},
|
|
}, err
|
|
}
|
|
|
|
res, err := c.be.ListBuckets(ctx.Context(),
|
|
s3response.ListBucketsInput{
|
|
Owner: acct.Access,
|
|
IsAdmin: acct.Role == auth.RoleAdmin,
|
|
MaxBuckets: maxBuckets,
|
|
ContinuationToken: cToken,
|
|
Prefix: prefix,
|
|
})
|
|
if err != nil {
|
|
return &Response{}, err
|
|
}
|
|
|
|
for i := range res.Buckets.Bucket {
|
|
res.Buckets.Bucket[i].BucketRegion = region
|
|
}
|
|
|
|
return &Response{
|
|
Data: res,
|
|
}, nil
|
|
}
|