* Replace removeDuplicateSlashes with NormalizeObjectKey Use s3_constants.NormalizeObjectKey instead of removeDuplicateSlashes in most places for consistency. NormalizeObjectKey handles both duplicate slash removal and ensures the path starts with '/', providing more complete normalization. * Fix double slash issues after NormalizeObjectKey After using NormalizeObjectKey, object keys have a leading '/'. This commit ensures: - getVersionedObjectDir strips leading slash before concatenation - getEntry calls receive names without leading slash - String concatenation with '/' doesn't create '//' paths This prevents path construction errors like: /buckets/bucket//object (wrong) /buckets/bucket/object (correct) * ensure object key leading "/" * fix compilation * fix: Strip leading slash from object keys in S3 API responses After introducing NormalizeObjectKey, all internal object keys have a leading slash. However, S3 API responses must return keys without leading slashes to match AWS S3 behavior. Fixed in three functions: - addVersion: Strip slash for version list entries - processRegularFile: Strip slash for regular file entries - processExplicitDirectory: Strip slash for directory entries This ensures ListObjectVersions and similar APIs return keys like 'bar' instead of '/bar', matching S3 API specifications. * fix: Normalize keyMarker for consistent pagination comparison The S3 API provides keyMarker without a leading slash (e.g., 'object-001'), but after introducing NormalizeObjectKey, all internal object keys have leading slashes (e.g., '/object-001'). When comparing keyMarker < normalizedObjectKey in shouldSkipObjectForMarker, the ASCII value of '/' (47) is less than 'o' (111), causing all objects to be incorrectly skipped during pagination. This resulted in page 2 and beyond returning 0 results. Fix: Normalize the keyMarker when creating versionCollector so comparisons work correctly with normalized object keys. Fixes pagination tests: - TestVersioningPaginationOver1000Versions - TestVersioningPaginationMultipleObjectsManyVersions * refactor: Change NormalizeObjectKey to return keys without leading slash BREAKING STRATEGY CHANGE: Previously, NormalizeObjectKey added a leading slash to all object keys, which required stripping it when returning keys to S3 API clients and caused complexity in marker normalization for pagination. NEW STRATEGY: - NormalizeObjectKey now returns keys WITHOUT leading slash (e.g., 'foo/bar' not '/foo/bar') - This matches the S3 API format directly - All path concatenations now explicitly add '/' between bucket and object - No need to strip slashes in responses or normalize markers Changes: 1. Modified NormalizeObjectKey to strip leading slash instead of adding it 2. Fixed all path concatenations to use: - BucketsPath + '/' + bucket + '/' + object instead of: - BucketsPath + '/' + bucket + object 3. Reverted response key stripping in: - addVersion() - processRegularFile() - processExplicitDirectory() 4. Reverted keyMarker normalization in findVersionsRecursively() 5. Updated matchesPrefixFilter() to work with keys without leading slash 6. Fixed paths in handlers: - s3api_object_handlers.go (GetObject, HeadObject, cacheRemoteObjectForStreaming) - s3api_object_handlers_postpolicy.go - s3api_object_handlers_tagging.go - s3api_object_handlers_acl.go - s3api_version_id.go (getVersionedObjectDir, getVersionIdFormat) - s3api_object_versioning.go (getObjectVersionList, updateLatestVersionAfterDeletion) All versioning tests pass including pagination stress tests. * adjust format * Update post policy tests to match new NormalizeObjectKey behavior - Update TestPostPolicyKeyNormalization to expect keys without leading slashes - Update TestNormalizeObjectKey to expect keys without leading slashes - Update TestPostPolicyFilenameSubstitution to expect keys without leading slashes - Update path construction in tests to use new pattern: BucketsPath + '/' + bucket + '/' + object * Fix ListObjectVersions prefix filtering Remove leading slash addition to prefix parameter to allow correct filtering of .versions directories when listing object versions with a specific prefix. The prefix parameter should match entry paths relative to bucket root. Adding a leading slash was breaking the prefix filter for paginated requests. Fixes pagination issue where second page returned 0 versions instead of continuing with remaining versions. * no leading slash * Fix urlEscapeObject to add leading slash for filer paths NormalizeObjectKey now returns keys without leading slashes to match S3 API format. However, urlEscapeObject is used for filer paths which require leading slashes. Add leading slash back after normalization to ensure filer paths are correct. Fixes TestS3ApiServer_toFilerPath test failures. * adjust tests * normalize * Fix: Normalize prefixes and markers in LIST operations using NormalizeObjectKey Ensure consistent key normalization across all S3 operations (GET, PUT, LIST). Previously, LIST operations were not applying the same normalization rules (handling backslashes, duplicate slashes, leading slashes) as GET/PUT operations. Changes: - Updated normalizePrefixMarker() to call NormalizeObjectKey for both prefix and marker - This ensures prefixes with leading slashes, backslashes, or duplicate slashes are handled consistently with how object keys are normalized - Fixes Parquet test failures where pads.write_dataset creates implicit directory structures that couldn't be discovered by subsequent LIST operations - Added TestPrefixNormalizationInList and TestListPrefixConsistency tests All existing LIST tests continue to pass with the normalization improvements. * Add debugging logging to LIST operations to track prefix normalization * Fix: Remove leading slash addition from GetPrefix to work with NormalizeObjectKey The NormalizeObjectKey function removes leading slashes to match S3 API format (e.g., 'foo/bar' not '/foo/bar'). However, GetPrefix was adding a leading slash back, which caused LIST operations to fail with incorrect path handling. Now GetPrefix only normalizes duplicate slashes without adding a leading slash, which allows NormalizeObjectKey changes to work correctly for S3 LIST operations. All Parquet integration tests now pass (20/20). * Fix: Handle object paths without leading slash in checkDirectoryObject NormalizeObjectKey() removes the leading slash to match S3 API format. However, checkDirectoryObject() was assuming the object path has a leading slash when processing directory markers (paths ending with '/'). Now we ensure the object has a leading slash before processing it for filer operations. Fixes implicit directory marker test (explicit_dir/) while keeping Parquet integration tests passing (20/20). All tests pass: - Implicit directory tests: 6/6 - Parquet integration tests: 20/20 * Fix: Handle explicit directory markers with trailing slashes Explicit directory markers created with put_object(Key='dir/', ...) are stored in the filer with the trailing slash as part of the name. The checkDirectoryObject() function now checks for both: 1. Explicit directories: lookup with trailing slash preserved (e.g., 'explicit_dir/') 2. Implicit directories: lookup without trailing slash (e.g., 'implicit_dir') This ensures both types of directory markers are properly recognized. All tests pass: - Implicit directory tests: 6/6 (including explicit directory marker test) - Parquet integration tests: 20/20 * Fix: Preserve trailing slash in NormalizeObjectKey NormalizeObjectKey now preserves trailing slashes when normalizing object keys. This is important for explicit directory markers like 'explicit_dir/' which rely on the trailing slash to be recognized as directory objects. The normalization process: 1. Notes if trailing slash was present 2. Removes duplicate slashes and converts backslashes 3. Removes leading slash for S3 API format 4. Restores trailing slash if it was in the original This ensures explicit directory markers created with put_object(Key='dir/', ...) are properly normalized and can be looked up by their exact name. All tests pass: - Implicit directory tests: 6/6 - Parquet integration tests: 20/20 * clean object * Fix: Don't restore trailing slash if result is empty When normalizing paths that are only slashes (e.g., '///', '/'), the function should return an empty string, not a single slash. The fix ensures we only restore the trailing slash if the result is non-empty. This fixes the 'just_slashes' test case: - Input: '///' - Expected: '' - Previous: '/' - Fixed: '' All tests now pass: - Unit tests: TestNormalizeObjectKey (13/13) - Implicit directory tests: 6/6 - Parquet integration tests: 20/20 * prefixEndsOnDelimiter * Update s3api_object_handlers_list.go * Update s3api_object_handlers_list.go * handle create directory
185 lines
6.0 KiB
Go
185 lines
6.0 KiB
Go
package s3api
|
||
|
||
import (
|
||
"crypto/rand"
|
||
"encoding/hex"
|
||
"fmt"
|
||
"math"
|
||
"strconv"
|
||
"time"
|
||
|
||
"github.com/seaweedfs/seaweedfs/weed/glog"
|
||
s3_constants "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
|
||
)
|
||
|
||
// Version ID format constants
|
||
// New format uses inverted timestamps so newer versions sort first lexicographically
|
||
// Old format used raw timestamps where older versions sorted first
|
||
const (
|
||
// Threshold to distinguish old vs new format version IDs
|
||
// Around year 2024-2025:
|
||
// - Old format (raw ns): ~1.7×10¹⁸ ≈ 0x17... (BELOW threshold)
|
||
// - New format (MaxInt64 - ns): ~7.5×10¹⁸ ≈ 0x68... (ABOVE threshold)
|
||
// We use 0x4000000000000000 (~4.6×10¹⁸) as threshold
|
||
versionIdFormatThreshold = 0x4000000000000000
|
||
)
|
||
|
||
// generateVersionId creates a unique version ID
|
||
// If useInvertedFormat is true, uses inverted timestamps so newer versions sort first
|
||
// If false, uses raw timestamps (old format) for backward compatibility
|
||
func generateVersionId(useInvertedFormat bool) string {
|
||
now := time.Now().UnixNano()
|
||
var timestampHex string
|
||
|
||
if useInvertedFormat {
|
||
// INVERTED timestamp: newer versions have SMALLER values
|
||
// This makes lexicographic sorting return newest versions first
|
||
invertedTimestamp := math.MaxInt64 - now
|
||
timestampHex = fmt.Sprintf("%016x", invertedTimestamp)
|
||
} else {
|
||
// Raw timestamp: older versions have SMALLER values (old format)
|
||
timestampHex = fmt.Sprintf("%016x", now)
|
||
}
|
||
|
||
// Generate random 8 bytes for uniqueness (last 16 chars of version ID)
|
||
randBytes := make([]byte, 8)
|
||
if _, err := rand.Read(randBytes); err != nil {
|
||
glog.Errorf("Failed to generate random bytes for version ID: %v", err)
|
||
// Fallback to timestamp-only if random generation fails
|
||
return timestampHex + "0000000000000000"
|
||
}
|
||
|
||
// Combine timestamp (16 chars) + random (16 chars) = 32 chars total
|
||
randomHex := hex.EncodeToString(randBytes)
|
||
return timestampHex + randomHex
|
||
}
|
||
|
||
// isNewFormatVersionId returns true if the version ID uses the new inverted timestamp format
|
||
func isNewFormatVersionId(versionId string) bool {
|
||
if len(versionId) < 16 || versionId == "null" {
|
||
return false
|
||
}
|
||
// Parse the first 16 hex chars as the timestamp portion
|
||
timestampPart, err := strconv.ParseUint(versionId[:16], 16, 64)
|
||
if err != nil {
|
||
return false
|
||
}
|
||
// New format has inverted timestamps (MaxInt64 - ns), which are ABOVE the threshold (~0x68...)
|
||
// Old format has raw timestamps, which are BELOW the threshold (~0x17...)
|
||
return timestampPart > versionIdFormatThreshold
|
||
}
|
||
|
||
// getVersionTimestamp extracts the actual timestamp from a version ID,
|
||
// handling both old (raw) and new (inverted) formats
|
||
func getVersionTimestamp(versionId string) int64 {
|
||
if len(versionId) < 16 || versionId == "null" {
|
||
return 0
|
||
}
|
||
timestampPart, err := strconv.ParseUint(versionId[:16], 16, 64)
|
||
if err != nil {
|
||
return 0
|
||
}
|
||
if timestampPart > versionIdFormatThreshold {
|
||
// New format: inverted timestamp (above threshold), convert back
|
||
return int64(math.MaxInt64 - timestampPart)
|
||
}
|
||
// Validate old format timestamp is within int64 range
|
||
if timestampPart > math.MaxInt64 {
|
||
return 0
|
||
}
|
||
// Old format: raw timestamp (below threshold)
|
||
return int64(timestampPart)
|
||
}
|
||
|
||
// compareVersionIds compares two version IDs for sorting (newest first)
|
||
// Returns: negative if a is newer, positive if b is newer, 0 if equal
|
||
// Handles both old and new format version IDs
|
||
func compareVersionIds(a, b string) int {
|
||
if a == b {
|
||
return 0
|
||
}
|
||
if a == "null" {
|
||
return 1 // null versions sort last
|
||
}
|
||
if b == "null" {
|
||
return -1
|
||
}
|
||
|
||
aIsNew := isNewFormatVersionId(a)
|
||
bIsNew := isNewFormatVersionId(b)
|
||
|
||
if aIsNew == bIsNew {
|
||
// Same format - compare lexicographically
|
||
// For new format: smaller value = newer (correct)
|
||
// For old format: smaller value = older (need to invert)
|
||
if aIsNew {
|
||
// New format: lexicographic order is correct (smaller = newer)
|
||
if a < b {
|
||
return -1
|
||
}
|
||
return 1
|
||
} else {
|
||
// Old format: lexicographic order is inverted (smaller = older)
|
||
if a < b {
|
||
return 1
|
||
}
|
||
return -1
|
||
}
|
||
}
|
||
|
||
// Mixed formats - compare by actual timestamp
|
||
aTime := getVersionTimestamp(a)
|
||
bTime := getVersionTimestamp(b)
|
||
if aTime > bTime {
|
||
return -1 // a is newer
|
||
}
|
||
if aTime < bTime {
|
||
return 1 // b is newer
|
||
}
|
||
return 0
|
||
}
|
||
|
||
// getVersionedObjectDir returns the directory path for storing object versions
|
||
func (s3a *S3ApiServer) getVersionedObjectDir(bucket, object string) string {
|
||
return s3a.option.BucketsPath + "/" + bucket + "/" + object + s3_constants.VersionsFolder
|
||
}
|
||
|
||
// getVersionFileName returns the filename for a specific version
|
||
func (s3a *S3ApiServer) getVersionFileName(versionId string) string {
|
||
return fmt.Sprintf("v_%s", versionId)
|
||
}
|
||
|
||
// getVersionIdFormat checks the .versions directory to determine which version ID format to use.
|
||
// Returns true if inverted format (new format) should be used.
|
||
// For new .versions directories, returns true (use new format).
|
||
// For existing directories, infers format from the latest version ID.
|
||
func (s3a *S3ApiServer) getVersionIdFormat(bucket, object string) bool {
|
||
bucketDir := s3a.option.BucketsPath + "/" + bucket
|
||
versionsPath := object + s3_constants.VersionsFolder
|
||
|
||
// Try to get the .versions directory entry
|
||
versionsEntry, err := s3a.getEntry(bucketDir, versionsPath)
|
||
if err != nil {
|
||
// .versions directory doesn't exist yet - use new format
|
||
return true
|
||
}
|
||
|
||
// Infer format from the latest version ID stored in metadata
|
||
if versionsEntry.Extended != nil {
|
||
if latestVersionId, exists := versionsEntry.Extended[s3_constants.ExtLatestVersionIdKey]; exists {
|
||
return isNewFormatVersionId(string(latestVersionId))
|
||
}
|
||
}
|
||
|
||
// No latest version metadata - this is likely a new or empty directory
|
||
// Use new format
|
||
return true
|
||
}
|
||
|
||
// generateVersionIdForObject generates a version ID using the appropriate format for the object.
|
||
// For new objects, uses inverted format. For existing versioned objects, uses their existing format.
|
||
func (s3a *S3ApiServer) generateVersionIdForObject(bucket, object string) string {
|
||
useInvertedFormat := s3a.getVersionIdFormat(bucket, object)
|
||
return generateVersionId(useInvertedFormat)
|
||
}
|