mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-31 17:30:42 +01:00
s3: validate per-part checksums in CompleteMultipartUpload
Parse the Checksum* elements of each completed part and enforce what AWS does for uploads created with x-amz-checksum-algorithm: every part must carry a checksum in the complete request (InvalidRequest when missing, BadDigest when it differs from the stored part checksum), and an x-amz-checksum-type header must match the upload resolved checksum type (BadDigest). Add the issue-11401 reproduction as a regression test.
This commit is contained in:
1 parent
4eb30f3b5b
commit
e9d2bdd02b
4 files changed
+168
-2
No files matched your search
@@ -383,7 +383,7 @@ func applyMultipartSSES3HeadersFromUploadEntry(dst *filer_pb.Entry, sses3Info *m
|
||||
}
|
||||
}
|
||||
|
||||
func (s3a *S3ApiServer) prepareMultipartCompletionState(r *http.Request, input *s3.CompleteMultipartUploadInput, uploadDirectory, entryName, dirName string, completedPartNumbers []int, completedPartMap map[int][]string, maxPartNo int) (*multipartCompletionState, *CompleteMultipartUploadResult, s3err.ErrorCode) {
|
||||
func (s3a *S3ApiServer) prepareMultipartCompletionState(r *http.Request, input *s3.CompleteMultipartUploadInput, parts *CompleteMultipartUpload, uploadDirectory, entryName, dirName string, completedPartNumbers []int, completedPartMap map[int][]string, maxPartNo int) (*multipartCompletionState, *CompleteMultipartUploadResult, s3err.ErrorCode) {
|
||||
if entry, err := s3a.resolveObjectEntry(*input.Bucket, *input.Key, ""); err == nil && entry != nil && entry.Extended != nil {
|
||||
if uploadId, ok := entry.Extended[s3_constants.SeaweedFSUploadId]; ok && *input.UploadId == string(uploadId) {
|
||||
cleanupEntries, _, cleanupErr := s3a.list(uploadDirectory, "", "", false, s3_constants.MaxS3MultipartParts+1)
|
||||
@@ -581,8 +581,29 @@ func (s3a *S3ApiServer) prepareMultipartCompletionState(r *http.Request, input *
|
||||
glog.Errorf("completeMultipartUpload: %v", typeErr)
|
||||
return nil, nil, s3err.ErrInvalidRequest
|
||||
}
|
||||
if completeType := r.Header.Get(s3_constants.AmzChecksumType); completeType != "" && !strings.EqualFold(completeType, resolvedType) {
|
||||
return nil, nil, s3err.ErrBadDigest
|
||||
}
|
||||
checksumType = resolvedType
|
||||
|
||||
provided := make(map[int]string, len(parts.Parts))
|
||||
for _, part := range parts.Parts {
|
||||
provided[part.PartNumber] = part.GetChecksum(checksumHeaderName)
|
||||
}
|
||||
for _, partNumber := range completedPartNumbers {
|
||||
if provided[partNumber] == "" {
|
||||
return nil, nil, s3err.ErrInvalidRequest
|
||||
}
|
||||
raw, _, decodeErr := decodePartChecksum(partNumber, partEntries[partNumber], checksumHeaderName)
|
||||
if decodeErr != nil {
|
||||
glog.Errorf("completeMultipartUpload: %v", decodeErr)
|
||||
return nil, nil, s3err.ErrInvalidPart
|
||||
}
|
||||
if provided[partNumber] != base64.StdEncoding.EncodeToString(raw) {
|
||||
return nil, nil, s3err.ErrBadDigest
|
||||
}
|
||||
}
|
||||
|
||||
var checksumErr error
|
||||
if checksumType == s3_constants.ChecksumTypeFullObject {
|
||||
checksumValue, checksumErr = computeFullObjectChecksum(checksumHeaderName, partEntries, completedPartNumbers)
|
||||
@@ -656,7 +677,7 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl
|
||||
routeKey := s3a.objectRouteKey(*input.Bucket, *input.Key)
|
||||
completionBody := func() s3err.ErrorCode {
|
||||
var prepCode s3err.ErrorCode
|
||||
completionState, output, prepCode = s3a.prepareMultipartCompletionState(r, input, uploadDirectory, entryName, dirName, completedPartNumbers, completedPartMap, maxPartNo)
|
||||
completionState, output, prepCode = s3a.prepareMultipartCompletionState(r, input, parts, uploadDirectory, entryName, dirName, completedPartNumbers, completedPartMap, maxPartNo)
|
||||
if prepCode != s3err.ErrNone || output != nil {
|
||||
return prepCode
|
||||
}
|
||||
|
||||
@@ -645,6 +645,7 @@ type CompleteMultipartUpload struct {
|
||||
type CompletedPart struct {
|
||||
ETag string
|
||||
PartNumber int
|
||||
ChecksumResult
|
||||
}
|
||||
|
||||
// handleSSES3MultipartHeaders handles SSE-S3 multipart upload header setup to reduce nesting complexity
|
||||
|
||||
@@ -1225,6 +1225,22 @@ func (c *ChecksumResult) SetChecksum(headerName, value string) {
|
||||
}
|
||||
}
|
||||
|
||||
func (c *ChecksumResult) GetChecksum(headerName string) string {
|
||||
switch headerName {
|
||||
case s3_constants.AmzChecksumCRC32:
|
||||
return c.ChecksumCRC32
|
||||
case s3_constants.AmzChecksumCRC32C:
|
||||
return c.ChecksumCRC32C
|
||||
case s3_constants.AmzChecksumCRC64NVME:
|
||||
return c.ChecksumCRC64NVME
|
||||
case s3_constants.AmzChecksumSHA1:
|
||||
return c.ChecksumSHA1
|
||||
case s3_constants.AmzChecksumSHA256:
|
||||
return c.ChecksumSHA256
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// lookupHeaderOrQuery returns the value of an x-amz-* parameter, checking the
|
||||
// request headers first and falling back to the pre-parsed query values. AWS
|
||||
// SDK presigners hoist headers such as x-amz-sdk-checksum-algorithm into the
|
||||
|
||||
Reference in new issue
Block a user