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:
Chris LuandClaude Opus 5.5 authored and GitHub committed 2026-11-17 17:05:34 -08:00
1 parent 1d30b0de21
commit c4e1802e3e
7 files changed
+132 -12

No files matched your search

@@ -7,6 +7,7 @@ import (
"testing"
"github.com/gorilla/mux"
util_http "github.com/seaweedfs/seaweedfs/weed/util/http"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -140,3 +141,32 @@ func TestRouteQueryKeysAreClassified(t *testing.T) {
})
require.NoError(t, err)
}
// mux matches Queries() on the raw query, splitting pairs on ';', before any
// router middleware runs, while handlers and the IAM resolver read the escaped
// query. The server escapes ahead of the router so both see one operation.
func TestSemicolonQueryRoutesAsAuthorized(t *testing.T) {
router := mux.NewRouter().SkipClean(true)
setupRoutingTestServer(t).registerRouter(router)
match := func(r *http.Request) *mux.Route {
var m mux.RouteMatch
require.True(t, router.Match(r, &m))
return m.Route
}
raw := func(query string) *mux.Route {
return match(httptest.NewRequest(http.MethodGet, "/bucket?"+query, nil))
}
escaped := func(query string) (route *mux.Route) {
util_http.EscapeSemicolonsInQuery(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.False(t, r.URL.Query().Has("uploads"))
route = match(r)
})).ServeHTTP(httptest.NewRecorder(), httptest.NewRequest(http.MethodGet, "/bucket?"+query, nil))
return route
}
uploads, listing := raw("uploads"), raw("x=1")
require.NotSame(t, uploads, listing)
assert.Same(t, uploads, raw("uploads;x=1"), "unescaped, mux reads the ';' pair as uploads")
assert.Same(t, listing, escaped("uploads;x=1"))
assert.Same(t, listing, escaped("x=1;uploads"))
}