mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-06-13 23:36:45 +03:00
0345658ea8
* 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.
109 lines
4.5 KiB
Go
109 lines
4.5 KiB
Go
package s3api
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3err"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestValidateDeleteObjectIdentifier(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
identifier ObjectIdentifier
|
|
want s3err.ErrorCode
|
|
}{
|
|
{"clean key", ObjectIdentifier{Key: "dir/key"}, s3err.ErrNone},
|
|
{"clean version", ObjectIdentifier{Key: "dir/key", VersionId: "opaque-version"}, s3err.ErrNone},
|
|
{"key traversal", ObjectIdentifier{Key: "../victim/key"}, s3err.ErrInvalidRequest},
|
|
{"encoded traversal already decoded", ObjectIdentifier{Key: "dir/../../victim/key"}, s3err.ErrInvalidRequest},
|
|
{"backslash traversal", ObjectIdentifier{Key: `..\victim\key`}, s3err.ErrInvalidRequest},
|
|
{"version traversal", ObjectIdentifier{Key: "key", VersionId: "v1/../../../victim"}, s3err.ErrInvalidRequest},
|
|
{"version backslash", ObjectIdentifier{Key: "key", VersionId: `v1\..\victim`}, s3err.ErrInvalidRequest},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assert.Equal(t, tt.want, validateDeleteObjectIdentifier(tt.identifier))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetSpecificObjectVersionRejectsUnsafeVersionID(t *testing.T) {
|
|
s3a := &S3ApiServer{option: &S3ApiServerOption{BucketsPath: "/buckets"}}
|
|
|
|
_, err := s3a.getSpecificObjectVersion("bucket", "key", "v1/../../../victim")
|
|
|
|
require.Error(t, err)
|
|
assert.True(t, errors.Is(err, errInvalidVersionID))
|
|
}
|
|
|
|
func TestDeleteUnversionedObjectWithClient_MetadataOnlySkipsChunkDelete(t *testing.T) {
|
|
// metadataOnly=true must reach the filer as IsDeleteData=false so the
|
|
// volume server reclaims chunks via TTL instead of the filer enqueueing
|
|
// per-chunk DeleteFile RPCs.
|
|
s3a := &S3ApiServer{option: &S3ApiServerOption{BucketsPath: "/buckets"}}
|
|
client := &deleteObjectEntryTestClient{}
|
|
|
|
err := s3a.deleteUnversionedObjectWithClient(client, "b", "k", true)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, client.deleteReq)
|
|
assert.Equal(t, "/buckets/b", client.deleteReq.Directory)
|
|
assert.Equal(t, "k", client.deleteReq.Name)
|
|
assert.False(t, client.deleteReq.IsDeleteData, "metadataOnly must clear IsDeleteData")
|
|
}
|
|
|
|
func TestDeleteUnversionedObjectWithClient_FullDeletePreservesIsDeleteData(t *testing.T) {
|
|
// Default behavior (metadataOnly=false): filer should still enqueue
|
|
// chunk deletions as before.
|
|
s3a := &S3ApiServer{option: &S3ApiServerOption{BucketsPath: "/buckets"}}
|
|
client := &deleteObjectEntryTestClient{}
|
|
|
|
err := s3a.deleteUnversionedObjectWithClient(client, "b", "k", false)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, client.deleteReq)
|
|
assert.True(t, client.deleteReq.IsDeleteData, "default delete must keep IsDeleteData true")
|
|
}
|
|
|
|
func TestDeleteUnversionedObjectWithClient_FullPathFromBucketsRoot(t *testing.T) {
|
|
// Sanity: BucketsPath joins to <bucketsPath>/<bucket>/<object> in the
|
|
// DeleteEntryRequest so the filer can locate the entry. Object keys
|
|
// with multiple path segments should split into Directory + Name
|
|
// correctly.
|
|
s3a := &S3ApiServer{option: &S3ApiServerOption{BucketsPath: "/buckets"}}
|
|
client := &deleteObjectEntryTestClient{}
|
|
|
|
err := s3a.deleteUnversionedObjectWithClient(client, "mybucket", "a/b/c.txt", false)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, client.deleteReq)
|
|
assert.Equal(t, "/buckets/mybucket/a/b", client.deleteReq.Directory)
|
|
assert.Equal(t, "c.txt", client.deleteReq.Name)
|
|
}
|
|
|
|
func TestDeleteUnversionedObjectWithClientRejectsTraversal(t *testing.T) {
|
|
s3a := &S3ApiServer{option: &S3ApiServerOption{BucketsPath: "/buckets"}}
|
|
client := &deleteObjectEntryTestClient{}
|
|
|
|
err := s3a.deleteUnversionedObjectWithClient(client, "source-bucket", "../victim-bucket/secret", false)
|
|
|
|
require.Error(t, err)
|
|
assert.Nil(t, client.deleteReq, "invalid path must be rejected before a filer delete RPC")
|
|
}
|
|
|
|
func TestDeleteUnversionedObjectWithClient_PropagatesEntryAttributesIrrelevant(t *testing.T) {
|
|
// The metadataOnly decision is the caller's responsibility (the
|
|
// lifecycle handler). This function is dumb plumbing — it must not
|
|
// inspect the entry itself, only translate the bool to IsDeleteData.
|
|
s3a := &S3ApiServer{option: &S3ApiServerOption{BucketsPath: "/buckets"}}
|
|
client := &deleteObjectEntryTestClient{
|
|
// A response with no error is fine; attributes on a delete are unused.
|
|
deleteResp: &filer_pb.DeleteEntryResponse{},
|
|
}
|
|
|
|
require.NoError(t, s3a.deleteUnversionedObjectWithClient(client, "b", "k", true))
|
|
require.NotNil(t, client.deleteReq)
|
|
assert.False(t, client.deleteReq.IsDeleteData)
|
|
}
|