mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-20 04:54:24 +02:00
Chris Lu
7e1c2c812f
Fixes #8712: S3 API directory markers created via PutObject with an explicit Content-Type header (e.g. application/octet-stream) were not appearing in ListObjects results. Root cause: The filer strips "application/octet-stream" from the Mime field during InsertEntry/UpdateEntry (filerstore_wrapper.go). This causes IsDirectoryKeyObject() to return false, so the directory markers are excluded from listings. Additionally, when AWS CLI includes a Content-Type header, it may use AWS chunked encoding. r.ContentLength then includes chunked overhead, which can exceed 1024 bytes even for zero-byte payloads, preventing the directory marker fast-path from triggering. Changes: - Use x-amz-decoded-content-length header for accurate payload size - Require actualContentLength >= 0 to reject unknown/negative lengths - Wrap body reader with io.LimitReader(1024+1) to prevent OOM - Reject payloads > 1024 bytes with HTTP 413 - Store MIME in ExtMimeType extended attribute for zero-byte markers (persists even when the filer strips the Mime field) - Update IsDirectoryKeyObject() to check ExtMimeType as fallback
56 lines
2.1 KiB
Go
56 lines
2.1 KiB
Go
package s3_constants
|
|
|
|
const (
|
|
ExtAmzOwnerKey = "Seaweed-X-Amz-Owner"
|
|
ExtAmzAclKey = "Seaweed-X-Amz-Acl"
|
|
ExtOwnershipKey = "Seaweed-X-Amz-Ownership"
|
|
ExtVersioningKey = "Seaweed-X-Amz-Versioning"
|
|
ExtVersionIdKey = "Seaweed-X-Amz-Version-Id"
|
|
ExtDeleteMarkerKey = "Seaweed-X-Amz-Delete-Marker"
|
|
ExtIsLatestKey = "Seaweed-X-Amz-Is-Latest"
|
|
ExtETagKey = "Seaweed-X-Amz-ETag"
|
|
ExtLatestVersionIdKey = "Seaweed-X-Amz-Latest-Version-Id"
|
|
ExtLatestVersionFileNameKey = "Seaweed-X-Amz-Latest-Version-File-Name"
|
|
ExtAllowEmptyFolders = "Seaweed-X-Amz-Allow-Empty-Folders"
|
|
// Cached list metadata in .versions directory for single-scan efficiency
|
|
ExtLatestVersionSizeKey = "Seaweed-X-Amz-Latest-Version-Size"
|
|
ExtLatestVersionETagKey = "Seaweed-X-Amz-Latest-Version-ETag"
|
|
ExtLatestVersionMtimeKey = "Seaweed-X-Amz-Latest-Version-Mtime"
|
|
ExtLatestVersionOwnerKey = "Seaweed-X-Amz-Latest-Version-Owner"
|
|
ExtLatestVersionIsDeleteMarker = "Seaweed-X-Amz-Latest-Version-Is-Delete-Marker"
|
|
ExtMultipartObjectKey = "key"
|
|
ExtMimeType = "Seaweed-X-Amz-Mime-Type"
|
|
|
|
// Bucket Policy
|
|
ExtBucketPolicyKey = "Seaweed-X-Amz-Bucket-Policy"
|
|
|
|
// Object Retention and Legal Hold
|
|
ExtObjectLockModeKey = "Seaweed-X-Amz-Object-Lock-Mode"
|
|
ExtRetentionUntilDateKey = "Seaweed-X-Amz-Retention-Until-Date"
|
|
ExtLegalHoldKey = "Seaweed-X-Amz-Legal-Hold"
|
|
ExtObjectLockEnabledKey = "Seaweed-X-Amz-Object-Lock-Enabled"
|
|
|
|
// Object Lock Bucket Configuration (individual components, not XML)
|
|
ExtObjectLockDefaultModeKey = "Lock-Default-Mode"
|
|
ExtObjectLockDefaultDaysKey = "Lock-Default-Days"
|
|
ExtObjectLockDefaultYearsKey = "Lock-Default-Years"
|
|
)
|
|
|
|
// Object Lock and Retention Constants
|
|
const (
|
|
// Retention modes
|
|
RetentionModeGovernance = "GOVERNANCE"
|
|
RetentionModeCompliance = "COMPLIANCE"
|
|
|
|
// Legal hold status
|
|
LegalHoldOn = "ON"
|
|
LegalHoldOff = "OFF"
|
|
|
|
// Object lock enabled status
|
|
ObjectLockEnabled = "Enabled"
|
|
|
|
// Bucket versioning status
|
|
VersioningEnabled = "Enabled"
|
|
VersioningSuspended = "Suspended"
|
|
)
|