* filer use context without cancellation * pass along context * fix: copy to bucket with default SSE-S3 encryption fails (#7562) When copying an object from an encrypted bucket to a temporary unencrypted bucket, then to another bucket with default SSE-S3 encryption, the operation fails with 'invalid SSE-S3 source key type' error. Root cause: When objects are copied from an SSE-S3 encrypted bucket to an unencrypted bucket, the 'X-Amz-Server-Side-Encryption: AES256' header is preserved but the actual encryption key (SeaweedFSSSES3Key) is stripped. This creates an 'orphaned' SSE-S3 header that causes IsSSES3EncryptedInternal() to return true, triggering decryption logic with a nil key. Fix: 1. Modified IsSSES3EncryptedInternal() to require BOTH the AES256 header AND the SeaweedFSSSES3Key to be present before returning true 2. Added isOrphanedSSES3Header() to detect orphaned SSE-S3 headers 3. Updated copy handler to strip orphaned headers during copy operations Fixes #7562 * fmt * refactor: simplify isOrphanedSSES3Header function logic Remove redundant existence check since the caller iterates through metadata map, making the check unnecessary. Improves readability while maintaining the same functionality.
This commit is contained in:
@@ -51,11 +51,21 @@ func IsSSES3RequestInternal(r *http.Request) bool {
|
||||
}
|
||||
|
||||
// IsSSES3EncryptedInternal checks if the object metadata indicates SSE-S3 encryption
|
||||
// An object is considered SSE-S3 encrypted only if it has BOTH the encryption header
|
||||
// AND the actual encryption key metadata. This prevents false positives when an object
|
||||
// has leftover headers from a previous encryption state (e.g., after being decrypted
|
||||
// during a copy operation). Fixes GitHub issue #7562.
|
||||
func IsSSES3EncryptedInternal(metadata map[string][]byte) bool {
|
||||
if sseAlgorithm, exists := metadata[s3_constants.AmzServerSideEncryption]; exists {
|
||||
return string(sseAlgorithm) == SSES3Algorithm
|
||||
// Check for SSE-S3 algorithm header
|
||||
sseAlgorithm, hasHeader := metadata[s3_constants.AmzServerSideEncryption]
|
||||
if !hasHeader || string(sseAlgorithm) != SSES3Algorithm {
|
||||
return false
|
||||
}
|
||||
return false
|
||||
|
||||
// Must also have the actual encryption key to be considered encrypted
|
||||
// Without the key, the object cannot be decrypted and should be treated as unencrypted
|
||||
_, hasKey := metadata[s3_constants.SeaweedFSSSES3Key]
|
||||
return hasKey
|
||||
}
|
||||
|
||||
// GenerateSSES3Key generates a new SSE-S3 encryption key
|
||||
|
||||
Reference in New Issue
Block a user