* fix multipart etag * address comments * clean up * clean up * optimization * address comments * unquoted etag * dedup * upgrade * clean * etag * return quoted tag * quoted etag * debug * s3api: unify ETag retrieval and quoting across handlers Refactor newListEntry to take *S3ApiServer and use getObjectETag, and update setResponseHeaders to use the same logic. This ensures consistent ETags are returned for both listing and direct access. * s3api: implement ListObjects deduplication for versioned buckets Handle duplicate entries between the main path and the .versions directory by prioritizing the latest version when bucket versioning is enabled. * s3api: cleanup stale main file entries during versioned uploads Add explicit deletion of pre-existing "main" files when creating new versions in versioned buckets. This prevents stale entries from appearing in bucket listings and ensures consistency. * s3api: fix cleanup code placement in versioned uploads Correct the placement of rm calls in completeMultipartUpload and putVersionedObject to ensure stale main files are properly deleted during versioned uploads. * s3api: improve getObjectETag fallback for empty ExtETagKey Ensure that when ExtETagKey exists but contains an empty value, the function falls through to MD5/chunk-based calculation instead of returning an empty string. * s3api: fix test files for new newListEntry signature Update test files to use the new newListEntry signature where the first parameter is *S3ApiServer. Created mockS3ApiServer to properly test owner display name lookup functionality. * s3api: use filer.ETag for consistent Md5 handling in getEtagFromEntry Change getEtagFromEntry fallback to use filer.ETag(entry) instead of filer.ETagChunks to ensure legacy entries with Attributes.Md5 are handled consistently with the rest of the codebase. * s3api: optimize list logic and fix conditional header logging - Hoist bucket versioning check out of per-entry callback to avoid repeated getVersioningState calls - Extract appendOrDedup helper function to eliminate duplicate dedup/append logic across multiple code paths - Change If-Match mismatch logging from glog.Errorf to glog.V(3).Infof and remove DEBUG prefix for consistency * s3api: fix test mock to properly initialize IAM accounts Fixed nil pointer dereference in TestNewListEntryOwnerDisplayName by directly initializing the IdentityAccessManagement.accounts map in the test setup. This ensures newListEntry can properly look up account display names without panicking. * cleanup * s3api: remove premature main file cleanup in versioned uploads Removed incorrect cleanup logic that was deleting main files during versioned uploads. This was causing test failures because it deleted objects that should have been preserved as null versions when versioning was first enabled. The deduplication logic in listing is sufficient to handle duplicate entries without deleting files during upload. * s3api: add empty-value guard to getEtagFromEntry Added the same empty-value guard used in getObjectETag to prevent returning quoted empty strings. When ExtETagKey exists but is empty, the function now falls through to filer.ETag calculation instead of returning "". * s3api: fix listing of directory key objects with matching prefix Revert prefix handling logic to use strings.TrimPrefix instead of checking HasPrefix with empty string result. This ensures that when a directory key object exactly matches the prefix (e.g. prefix="dir/", object="dir/"), it is correctly handled as a regular entry instead of being skipped or incorrectly processed as a common prefix. Also fixed missing variable definition. * s3api: refactor list inline dedup to use appendOrDedup helper Refactored the inline deduplication logic in listFilerEntries to use the shared appendOrDedup helper function. This ensures consistent behavior and reduces code duplication. * test: fix port allocation race in s3tables integration test Updated startMiniCluster to find all required ports simultaneously using findAvailablePorts instead of sequentially. This prevents race conditions where the OS reallocates a port that was just released, causing multiple services (e.g. Filer and Volume) to be assigned the same port and fail to start.
261 lines
7.6 KiB
Go
261 lines
7.6 KiB
Go
package s3api
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
// mockAccountManager implements AccountManager for testing
|
|
type mockAccountManager struct {
|
|
accounts map[string]string
|
|
}
|
|
|
|
func (m *mockAccountManager) GetAccountNameById(id string) string {
|
|
if name, exists := m.accounts[id]; exists {
|
|
return name
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func (m *mockAccountManager) GetAccountIdByEmail(email string) string {
|
|
return ""
|
|
}
|
|
|
|
func TestNewListEntryOwnerDisplayName(t *testing.T) {
|
|
// Create S3ApiServer with a properly initialized IAM
|
|
s3a := &S3ApiServer{
|
|
iam: &IdentityAccessManagement{
|
|
accounts: map[string]*Account{
|
|
"testid": {Id: "testid", DisplayName: "M. Tester"},
|
|
"userid123": {Id: "userid123", DisplayName: "John Doe"},
|
|
},
|
|
},
|
|
}
|
|
|
|
// Create test entry with owner metadata
|
|
entry := &filer_pb.Entry{
|
|
Name: "test-object",
|
|
Attributes: &filer_pb.FuseAttributes{
|
|
Mtime: time.Now().Unix(),
|
|
FileSize: 1024,
|
|
},
|
|
Extended: map[string][]byte{
|
|
s3_constants.ExtAmzOwnerKey: []byte("testid"),
|
|
},
|
|
}
|
|
|
|
// Test that display name is correctly looked up from IAM
|
|
listEntry := newListEntry(s3a, entry, "", "dir", "test-object", "/buckets/test/", true, false, false)
|
|
|
|
assert.NotNil(t, listEntry.Owner, "Owner should be set when fetchOwner is true")
|
|
assert.Equal(t, "testid", listEntry.Owner.ID, "Owner ID should match stored owner")
|
|
assert.Equal(t, "M. Tester", listEntry.Owner.DisplayName, "Display name should be looked up from IAM")
|
|
|
|
// Test with owner that doesn't exist in IAM (should fallback to ID)
|
|
entry.Extended[s3_constants.ExtAmzOwnerKey] = []byte("unknown-user")
|
|
listEntry = newListEntry(s3a, entry, "", "dir", "test-object", "/buckets/test/", true, false, false)
|
|
|
|
assert.Equal(t, "unknown-user", listEntry.Owner.ID, "Owner ID should match stored owner")
|
|
assert.Equal(t, "unknown-user", listEntry.Owner.DisplayName, "Display name should fallback to ID when not found in IAM")
|
|
|
|
// Test with no owner metadata (should use anonymous)
|
|
entry.Extended = make(map[string][]byte)
|
|
listEntry = newListEntry(s3a, entry, "", "dir", "test-object", "/buckets/test/", true, false, false)
|
|
|
|
assert.Equal(t, s3_constants.AccountAnonymousId, listEntry.Owner.ID, "Should use anonymous ID when no owner metadata")
|
|
assert.Equal(t, "anonymous", listEntry.Owner.DisplayName, "Should use anonymous display name when no owner metadata")
|
|
|
|
// Test with fetchOwner false (should not set owner)
|
|
listEntry = newListEntry(s3a, entry, "", "dir", "test-object", "/buckets/test/", false, false, false)
|
|
|
|
assert.Nil(t, listEntry.Owner, "Owner should not be set when fetchOwner is false")
|
|
}
|
|
|
|
func TestRemoveDuplicateSlashes(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
path string
|
|
expectedResult string
|
|
}{
|
|
{
|
|
name: "empty",
|
|
path: "",
|
|
expectedResult: "",
|
|
},
|
|
{
|
|
name: "slash",
|
|
path: "/",
|
|
expectedResult: "/",
|
|
},
|
|
{
|
|
name: "object",
|
|
path: "object",
|
|
expectedResult: "object",
|
|
},
|
|
{
|
|
name: "correct path",
|
|
path: "/path/to/object",
|
|
expectedResult: "/path/to/object",
|
|
},
|
|
{
|
|
name: "path with duplicates",
|
|
path: "///path//to/object//",
|
|
expectedResult: "/path/to/object/",
|
|
},
|
|
}
|
|
|
|
for _, tst := range tests {
|
|
t.Run(tst.name, func(t *testing.T) {
|
|
obj := removeDuplicateSlashes(tst.path)
|
|
assert.Equal(t, tst.expectedResult, obj)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestS3ApiServer_toFilerPath(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
args string
|
|
want string
|
|
}{
|
|
{
|
|
"simple",
|
|
"/uploads/eaf10b3b-3b3a-4dcd-92a7-edf2a512276e/67b8b9bf-7cca-4cb6-9b34-22fcb4d6e27d/Bildschirmfoto 2022-09-19 um 21.38.37.png",
|
|
"/uploads/eaf10b3b-3b3a-4dcd-92a7-edf2a512276e/67b8b9bf-7cca-4cb6-9b34-22fcb4d6e27d/Bildschirmfoto%202022-09-19%20um%2021.38.37.png",
|
|
},
|
|
{
|
|
"double prefix",
|
|
"//uploads/t.png",
|
|
"/uploads/t.png",
|
|
},
|
|
{
|
|
"triple prefix",
|
|
"///uploads/t.png",
|
|
"/uploads/t.png",
|
|
},
|
|
{
|
|
"empty prefix",
|
|
"uploads/t.png",
|
|
"/uploads/t.png",
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assert.Equalf(t, tt.want, urlEscapeObject(tt.args), "clean %v", tt.args)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestPartNumberWithRangeHeader(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
partStartOffset int64 // Part's start offset in the object
|
|
partEndOffset int64 // Part's end offset in the object
|
|
clientRangeHeader string
|
|
expectedStart int64 // Expected absolute start offset
|
|
expectedEnd int64 // Expected absolute end offset
|
|
expectError bool
|
|
}{
|
|
{
|
|
name: "No client range - full part",
|
|
partStartOffset: 1000,
|
|
partEndOffset: 1999,
|
|
clientRangeHeader: "",
|
|
expectedStart: 1000,
|
|
expectedEnd: 1999,
|
|
expectError: false,
|
|
},
|
|
{
|
|
name: "Range within part - start and end",
|
|
partStartOffset: 1000,
|
|
partEndOffset: 1999, // Part size: 1000 bytes
|
|
clientRangeHeader: "bytes=0-99",
|
|
expectedStart: 1000, // 1000 + 0
|
|
expectedEnd: 1099, // 1000 + 99
|
|
expectError: false,
|
|
},
|
|
{
|
|
name: "Range within part - start to end",
|
|
partStartOffset: 1000,
|
|
partEndOffset: 1999,
|
|
clientRangeHeader: "bytes=100-",
|
|
expectedStart: 1100, // 1000 + 100
|
|
expectedEnd: 1999, // 1000 + 999 (end of part)
|
|
expectError: false,
|
|
},
|
|
{
|
|
name: "Range suffix - last 100 bytes",
|
|
partStartOffset: 1000,
|
|
partEndOffset: 1999, // Part size: 1000 bytes
|
|
clientRangeHeader: "bytes=-100",
|
|
expectedStart: 1900, // 1000 + (1000 - 100)
|
|
expectedEnd: 1999, // 1000 + 999
|
|
expectError: false,
|
|
},
|
|
{
|
|
name: "Range suffix larger than part",
|
|
partStartOffset: 1000,
|
|
partEndOffset: 1999, // Part size: 1000 bytes
|
|
clientRangeHeader: "bytes=-2000",
|
|
expectedStart: 1000, // Start of part (clamped)
|
|
expectedEnd: 1999, // End of part
|
|
expectError: false,
|
|
},
|
|
{
|
|
name: "Range start beyond part size",
|
|
partStartOffset: 1000,
|
|
partEndOffset: 1999,
|
|
clientRangeHeader: "bytes=1000-1100",
|
|
expectedStart: 0,
|
|
expectedEnd: 0,
|
|
expectError: true,
|
|
},
|
|
{
|
|
name: "Range end clamped to part size",
|
|
partStartOffset: 1000,
|
|
partEndOffset: 1999,
|
|
clientRangeHeader: "bytes=0-2000",
|
|
expectedStart: 1000, // 1000 + 0
|
|
expectedEnd: 1999, // Clamped to end of part
|
|
expectError: false,
|
|
},
|
|
{
|
|
name: "Single byte range at start",
|
|
partStartOffset: 5000,
|
|
partEndOffset: 9999, // Part size: 5000 bytes
|
|
clientRangeHeader: "bytes=0-0",
|
|
expectedStart: 5000,
|
|
expectedEnd: 5000,
|
|
expectError: false,
|
|
},
|
|
{
|
|
name: "Single byte range in middle",
|
|
partStartOffset: 5000,
|
|
partEndOffset: 9999,
|
|
clientRangeHeader: "bytes=100-100",
|
|
expectedStart: 5100,
|
|
expectedEnd: 5100,
|
|
expectError: false,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Test the actual range adjustment logic from GetObjectHandler
|
|
startOffset, endOffset, err := adjustRangeForPart(tt.partStartOffset, tt.partEndOffset, tt.clientRangeHeader)
|
|
|
|
if tt.expectError {
|
|
assert.Error(t, err, "Expected error for range %s", tt.clientRangeHeader)
|
|
} else {
|
|
assert.NoError(t, err, "Unexpected error for range %s: %v", tt.clientRangeHeader, err)
|
|
assert.Equal(t, tt.expectedStart, startOffset, "Start offset mismatch")
|
|
assert.Equal(t, tt.expectedEnd, endOffset, "End offset mismatch")
|
|
}
|
|
})
|
|
}
|
|
}
|