fix: support standard HTTP headers in S3 multipart upload (#7884)

Co-authored-by: Chris Lu <chris.lu@gmail.com>
This commit is contained in:
steve.wei
2025-12-27 05:15:17 +08:00
committed by GitHub
parent 95716a2f87
commit f07ba2c5aa
2 changed files with 37 additions and 0 deletions

View File

@@ -12,10 +12,12 @@ import (
"net/url"
"strconv"
"strings"
"time"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/google/uuid"
"github.com/pquerna/cachecontrol/cacheobject"
"github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
@@ -64,6 +66,22 @@ func (s3a *S3ApiServer) NewMultipartUploadHandler(w http.ResponseWriter, r *http
return
}
// Validate Cache-Control header format if present
if r.Header.Get("Cache-Control") != "" {
if _, err := cacheobject.ParseRequestCacheControl(r.Header.Get("Cache-Control")); err != nil {
s3err.WriteErrorResponse(w, r, s3err.ErrInvalidDigest)
return
}
}
// Validate Expires header format if present
if r.Header.Get("Expires") != "" {
if _, err := time.Parse(http.TimeFormat, r.Header.Get("Expires")); err != nil {
s3err.WriteErrorResponse(w, r, s3err.ErrMalformedDate)
return
}
}
createMultipartUploadInput := &s3.CreateMultipartUploadInput{
Bucket: aws.String(bucket),
Key: objectKey(aws.String(object)),