mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-18 17:55:26 +01:00
s3: route ';' queries as authorized, and report an empty s3:prefix to policies (#12702)
* s3: escape raw semicolons before the router matches a route registerRouter applied EscapeSemicolonsInQuery with router.Use, but mux runs router middleware only after it has picked the route. Queries() matchers split pairs on ';', so GET /bucket?uploads;x=1 reached the multipart listing handler while the handler and the IAM resolver read uploads%3Bx=1 and saw no uploads subresource. Wrap the S3 router with the escape so routing and authorization read the same query. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3api: report a listing without prefix as s3:prefix "" in policy conditions The advanced IAM path already sets s3:prefix to "" when a bucket listing names no prefix, as AWS does, but bucket policies and attached policies read conditions from ExtractConditionValuesFromRequest, which leaves the key out. The AWS home-directory policy that grants s3:prefix ["", "home/"] then denied the root listing, and a Deny keyed on the empty prefix never applied. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3: test the served handler composition for the semicolon escape Move the escape and the Vectors split into s3Handler so a command test can send ';' queries through the handler the server actually serves. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3: keep the isVectorsRequest doc comment on its function Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
1d30b0de21
commit
c4e1802e3e
7 files changed
+132
-12
No files matched your search
@@ -1948,6 +1948,14 @@ func isBucketListingRequest(r *http.Request, action Action) bool {
|
||||
return object == "" || object == "/"
|
||||
}
|
||||
|
||||
// addEmptyListPrefix reports a listing that names no prefix as s3:prefix "",
|
||||
// as AWS and the advanced IAM path do.
|
||||
func addEmptyListPrefix(conditions map[string][]string, r *http.Request, action Action) {
|
||||
if _, ok := conditions["s3:prefix"]; !ok && isBucketListingRequest(r, action) {
|
||||
conditions["s3:prefix"] = []string{""}
|
||||
}
|
||||
}
|
||||
|
||||
// multipartListingAction returns the scoped action for a request the router
|
||||
// sends to ListObjectPartsHandler or ListMultipartUploadsHandler, or "" for
|
||||
// any other request. It follows the route order in s3api_server.go and reads
|
||||
@@ -2752,6 +2760,7 @@ func (iam *IdentityAccessManagement) evaluateAttachedIAMPolicies(r *http.Request
|
||||
principal := buildPrincipalARN(identity, r)
|
||||
explicitAllow := false
|
||||
conditions := engine.ExtractConditionValuesFromRequest(r)
|
||||
addEmptyListPrefix(conditions, r, action)
|
||||
for key, values := range vectorIAMConditions(r) {
|
||||
conditions[key] = values
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user