mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-26 23:10:44 +01:00
s3: close list-type / ownership-controls routing mismatch (#11280)
* s3: reject list-type paired with another operation subresource ?list-type=2&ownershipControls= routes to ListObjectsV2 (the list-type route is registered first) while the IAM action resolver resolves the ownershipControls selector to s3:GetBucketOwnershipControls. A principal denied s3:ListBucket but allowed s3:GetBucketOwnershipControls would therefore list the bucket. list-type selects an operation just like the other keys in operationSubresources, so add it there and reject the combination before routing, matching the fix for policy&tagging (#10987). * s3: resolve list-type to s3:ListBucket ahead of bucket subresources The router registers the ListObjectsV2 route ahead of the bucket subresource routes, so the action resolver should resolve list-type the same way. Without this, a request carrying list-type and another operation selector resolves to the subresource action (e.g. s3:GetBucketOwnershipControls) while being served by ListObjectsV2. The ambiguity guard rejects such combinations before routing, but resolving list-type to s3:ListBucket keeps the resolver aligned with the router, mirroring how versions is handled. * s3: match list-type=2 exactly in action resolver The router selects ListObjectsV2 only for list-type=2; other values fall through to the subresource routes. Resolve the same way so the action matches the handler for every list-type value, not just 2.
This commit is contained in:
1 parent
9f6feef299
commit
210afacd12
4 files changed
+64
-3
No files matched your search
@@ -45,6 +45,10 @@ func TestAmbiguousSubresource(t *testing.T) {
|
||||
"delete=&policy=",
|
||||
"uploads=&uploadId=xyz",
|
||||
"policy=&tagging=&cors=",
|
||||
"list-type=2&ownershipControls=",
|
||||
"list-type=2&tagging=",
|
||||
"ownershipControls=&list-type=2",
|
||||
"list-type=2&versions=",
|
||||
} {
|
||||
req, _ := http.NewRequest("PUT", "http://localhost/bucket?"+query, nil)
|
||||
assert.True(t, hasAmbiguousSubresource(req.URL.Query()), "%q names two operations", query)
|
||||
@@ -73,3 +77,27 @@ func TestAmbiguousSubresourceRejectedBeforeHandler(t *testing.T) {
|
||||
handler.ServeHTTP(rec, req)
|
||||
assert.True(t, served, "an unambiguous request must still be served")
|
||||
}
|
||||
|
||||
// The listing disclosure: GET /bucket?list-type=2&ownershipControls= routes to
|
||||
// ListObjectsV2 while resolving as s3:GetBucketOwnershipControls, so a principal
|
||||
// denied s3:ListBucket but allowed the ownership-controls read would list the
|
||||
// bucket. The guard has to reject the combined request before the listing handler.
|
||||
func TestListTypeOwnershipControlsRejectedBeforeHandler(t *testing.T) {
|
||||
served := false
|
||||
handler := validateRequestPath(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
served = true
|
||||
}))
|
||||
|
||||
req, _ := http.NewRequest("GET", "http://localhost/bucket?list-type=2&ownershipControls=", nil)
|
||||
rec := httptest.NewRecorder()
|
||||
handler.ServeHTTP(rec, req)
|
||||
|
||||
require.False(t, served, "a list-type+ownershipControls request must not reach a handler")
|
||||
assert.Equal(t, http.StatusBadRequest, rec.Code)
|
||||
|
||||
served = false
|
||||
req, _ = http.NewRequest("GET", "http://localhost/bucket?list-type=2&prefix=a", nil)
|
||||
rec = httptest.NewRecorder()
|
||||
handler.ServeHTTP(rec, req)
|
||||
assert.True(t, served, "a plain list-type request must still be served")
|
||||
}
|
||||
Reference in new issue
Block a user