mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-07-31 04:23:34 +00:00
* s3: validate indirect filer path inputs * s3: avoid query parsing on common request path * filer: scope copy/move source against JWT AllowedPrefixes maybeCheckJwtAuthorization only checked r.URL.Path, but copy and move read their source from the cp.from / mv.from query params. A prefix-restricted token could copy or move data out of a subtree it cannot otherwise reach. Check every path the request touches, reusing pathHasComponentPrefix so `..` in the source is collapsed before the prefix match. * s3: confine iceberg CreateTable location to the catalog bucket CreateTable derived the metadata bucket and path from the client-supplied req.Location / req.Name and wrote there directly, so a caller scoped to one table bucket could place metadata in another bucket (and path.Join collapsed any `..`). Require the parsed bucket to equal the request's catalog bucket and reject traversal segments in the table path. * webdav: clean client path before subFolder confinement wrappedFs concatenated subFolder + name before the underlying FileSystem ran path.Clean, so `..` in the request path or COPY/MOVE Destination resolved across the FilerRootPath confinement boundary. Clean the name as a rooted path first so traversal segments collapse below subFolder. Only the non-default -filer.path (non-empty subFolder) setup was affected. * filer: enforce read-only rule on real write path with destination header The x-seaweedfs-destination header overrides the path used for storage-rule matching while the entry is written at r.URL.Path, letting a caller select a writable rule for a read-only target. When the header is present, also check the read-only/quota rule against the actual write path.
138 lines
4.6 KiB
Go
138 lines
4.6 KiB
Go
package iceberg
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/gorilla/mux"
|
|
)
|
|
|
|
func TestIsValidTablePath(t *testing.T) {
|
|
tests := []struct {
|
|
tablePath string
|
|
want bool
|
|
}{
|
|
{"sales.orders", true},
|
|
{"ns/table", true},
|
|
{"ns//table", true},
|
|
{"", true},
|
|
{"../other", false},
|
|
{"ns/../../etc", false},
|
|
{"ns/./x", false},
|
|
{`ns\..\x`, false},
|
|
}
|
|
for _, tt := range tests {
|
|
if got := isValidTablePath(tt.tablePath); got != tt.want {
|
|
t.Errorf("isValidTablePath(%q) = %v, want %v", tt.tablePath, got, tt.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateRequestPath_RejectsTraversal(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
rawPath string
|
|
wantCode int
|
|
}{
|
|
{"clean namespace+table passes", "/v1/namespaces/sales/tables/orders", http.StatusOK},
|
|
{"clean prefixed passes", "/v1/wh/namespaces/sales/tables/orders", http.StatusOK},
|
|
{"clean namespace only passes", "/v1/namespaces/sales", http.StatusOK},
|
|
|
|
// SkipClean(true) means raw `..` survives routing — these are the
|
|
// realistic traversal shapes the middleware must catch.
|
|
{"dotdot as prefix var rejected", "/v1/../namespaces/sales", http.StatusBadRequest},
|
|
{"dotdot as namespace var rejected", "/v1/namespaces/..", http.StatusBadRequest},
|
|
{"dotdot as namespace var prefixed rejected", "/v1/wh/namespaces/..", http.StatusBadRequest},
|
|
{"dotdot as table var rejected", "/v1/namespaces/sales/tables/..", http.StatusBadRequest},
|
|
{"dot as table var rejected", "/v1/namespaces/sales/tables/.", http.StatusBadRequest},
|
|
// Iceberg clients send the 0x1F unit separator percent-encoded; mux
|
|
// decodes it before the middleware sees the namespace var.
|
|
{"unit-sep namespace with dotdot part rejected", "/v1/namespaces/sales%1F..%1Fevil", http.StatusBadRequest},
|
|
{"leading unit-sep namespace rejected", "/v1/namespaces/%1Fsales", http.StatusBadRequest},
|
|
{"trailing unit-sep namespace rejected", "/v1/namespaces/sales%1F", http.StatusBadRequest},
|
|
{"consecutive unit-sep namespace rejected", "/v1/namespaces/sales%1F%1Fevil", http.StatusBadRequest},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
router := mux.NewRouter().SkipClean(true)
|
|
router.Use(validateRequestPath)
|
|
handlerCalled := false
|
|
pass := func(w http.ResponseWriter, r *http.Request) {
|
|
handlerCalled = true
|
|
w.WriteHeader(http.StatusOK)
|
|
}
|
|
router.HandleFunc("/v1/namespaces/{namespace}", pass)
|
|
router.HandleFunc("/v1/namespaces/{namespace}/tables/{table}", pass)
|
|
router.HandleFunc("/v1/{prefix}/namespaces/{namespace}", pass)
|
|
router.HandleFunc("/v1/{prefix}/namespaces/{namespace}/tables/{table}", pass)
|
|
|
|
req := httptest.NewRequest(http.MethodGet, tt.rawPath, nil)
|
|
rr := httptest.NewRecorder()
|
|
router.ServeHTTP(rr, req)
|
|
|
|
if rr.Code != tt.wantCode {
|
|
t.Fatalf("path %q: got status %d, want %d (body=%q)", tt.rawPath, rr.Code, tt.wantCode, rr.Body.String())
|
|
}
|
|
if tt.wantCode == http.StatusBadRequest && handlerCalled {
|
|
t.Fatalf("path %q: inner handler reached despite rejection", tt.rawPath)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// Defense-in-depth: if a future route or middleware ever leaves one of the
|
|
// captured vars empty, the middleware must still reject the request. The
|
|
// default mux regex won't normally allow this.
|
|
func TestValidateRequestPath_RejectsEmptyCapturedVars(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
vars map[string]string
|
|
}{
|
|
{"empty prefix", map[string]string{"prefix": "", "namespace": "ns"}},
|
|
{"empty table", map[string]string{"namespace": "ns", "table": ""}},
|
|
{"empty namespace", map[string]string{"namespace": ""}},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
handlerCalled := false
|
|
h := validateRequestPath(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
handlerCalled = true
|
|
}))
|
|
req := mux.SetURLVars(httptest.NewRequest(http.MethodGet, "/", nil), tt.vars)
|
|
rr := httptest.NewRecorder()
|
|
h.ServeHTTP(rr, req)
|
|
if handlerCalled {
|
|
t.Fatalf("vars %v: inner handler reached despite empty capture", tt.vars)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIsValidNameSegment(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
input string
|
|
want bool
|
|
}{
|
|
{"empty ok", "", true},
|
|
{"plain", "orders", true},
|
|
{"with dot inside", "my.table", true},
|
|
{"hidden", ".hidden", true},
|
|
|
|
{"bare dot", ".", false},
|
|
{"bare dotdot", "..", false},
|
|
{"contains slash", "foo/bar", false},
|
|
{"contains backslash", "foo\\bar", false},
|
|
{"contains nul", "foo\x00bar", false},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := isValidNameSegment(tt.input); got != tt.want {
|
|
t.Errorf("isValidNameSegment(%q) = %v, want %v", tt.input, got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|