* 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:
@@ -2,12 +2,13 @@ package s3api
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
|
||||
"net/http"
|
||||
"reflect"
|
||||
"sort"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
|
||||
)
|
||||
|
||||
type H map[string]string
|
||||
@@ -442,10 +443,10 @@ func transferHeaderToH(data map[string][]string) H {
|
||||
// This addresses issue #7505 where copies were incorrectly creating versions for non-versioned buckets.
|
||||
func TestShouldCreateVersionForCopy(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
versioningState string
|
||||
expectedResult bool
|
||||
description string
|
||||
name string
|
||||
versioningState string
|
||||
expectedResult bool
|
||||
description string
|
||||
}{
|
||||
{
|
||||
name: "VersioningEnabled",
|
||||
@@ -503,7 +504,7 @@ func TestCleanupVersioningMetadata(t *testing.T) {
|
||||
removedKeys: []string{s3_constants.ExtVersionIdKey, s3_constants.ExtDeleteMarkerKey, s3_constants.ExtIsLatestKey, s3_constants.ExtETagKey},
|
||||
},
|
||||
{
|
||||
name: "HandlesEmptyMetadata",
|
||||
name: "HandlesEmptyMetadata",
|
||||
sourceMetadata: map[string][]byte{},
|
||||
expectedKeys: []string{},
|
||||
removedKeys: []string{s3_constants.ExtVersionIdKey, s3_constants.ExtDeleteMarkerKey, s3_constants.ExtIsLatestKey, s3_constants.ExtETagKey},
|
||||
@@ -511,11 +512,11 @@ func TestCleanupVersioningMetadata(t *testing.T) {
|
||||
{
|
||||
name: "PreservesNonVersioningMetadata",
|
||||
sourceMetadata: map[string][]byte{
|
||||
s3_constants.ExtVersionIdKey: []byte("version-456"),
|
||||
s3_constants.ExtETagKey: []byte("\"def456\""),
|
||||
"X-Amz-Meta-Custom": []byte("value1"),
|
||||
"X-Amz-Meta-Another": []byte("value2"),
|
||||
s3_constants.ExtIsLatestKey: []byte("true"),
|
||||
s3_constants.ExtVersionIdKey: []byte("version-456"),
|
||||
s3_constants.ExtETagKey: []byte("\"def456\""),
|
||||
"X-Amz-Meta-Custom": []byte("value1"),
|
||||
"X-Amz-Meta-Another": []byte("value2"),
|
||||
s3_constants.ExtIsLatestKey: []byte("true"),
|
||||
},
|
||||
expectedKeys: []string{"X-Amz-Meta-Custom", "X-Amz-Meta-Another"},
|
||||
removedKeys: []string{s3_constants.ExtVersionIdKey, s3_constants.ExtETagKey, s3_constants.ExtIsLatestKey},
|
||||
@@ -639,3 +640,68 @@ func TestCopyVersioningIntegration(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestIsOrphanedSSES3Header tests detection of orphaned SSE-S3 headers.
|
||||
// This is a regression test for GitHub issue #7562 where copying from an
|
||||
// encrypted bucket to an unencrypted bucket left behind the encryption header
|
||||
// without the actual key, causing subsequent copy operations to fail.
|
||||
func TestIsOrphanedSSES3Header(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
headerKey string
|
||||
metadata map[string][]byte
|
||||
expected bool
|
||||
}{
|
||||
{
|
||||
name: "Not an encryption header",
|
||||
headerKey: "X-Amz-Meta-Custom",
|
||||
metadata: map[string][]byte{
|
||||
"X-Amz-Meta-Custom": []byte("value"),
|
||||
},
|
||||
expected: false,
|
||||
},
|
||||
{
|
||||
name: "SSE-S3 header with key present (valid)",
|
||||
headerKey: s3_constants.AmzServerSideEncryption,
|
||||
metadata: map[string][]byte{
|
||||
s3_constants.AmzServerSideEncryption: []byte("AES256"),
|
||||
s3_constants.SeaweedFSSSES3Key: []byte("key-data"),
|
||||
},
|
||||
expected: false,
|
||||
},
|
||||
{
|
||||
name: "SSE-S3 header without key (orphaned - GitHub #7562)",
|
||||
headerKey: s3_constants.AmzServerSideEncryption,
|
||||
metadata: map[string][]byte{
|
||||
s3_constants.AmzServerSideEncryption: []byte("AES256"),
|
||||
},
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
name: "SSE-KMS header (not SSE-S3)",
|
||||
headerKey: s3_constants.AmzServerSideEncryption,
|
||||
metadata: map[string][]byte{
|
||||
s3_constants.AmzServerSideEncryption: []byte("aws:kms"),
|
||||
},
|
||||
expected: false,
|
||||
},
|
||||
{
|
||||
name: "Different header key entirely",
|
||||
headerKey: s3_constants.SeaweedFSSSES3Key,
|
||||
metadata: map[string][]byte{
|
||||
s3_constants.AmzServerSideEncryption: []byte("AES256"),
|
||||
},
|
||||
expected: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
result := isOrphanedSSES3Header(tc.headerKey, tc.metadata)
|
||||
if result != tc.expected {
|
||||
t.Errorf("isOrphanedSSES3Header(%q, metadata) = %v, expected %v",
|
||||
tc.headerKey, result, tc.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user