diff options
Diffstat (limited to 'weed/s3api')
| -rw-r--r-- | weed/s3api/filer_multipart.go | 16 | ||||
| -rw-r--r-- | weed/s3api/s3_constants/extend_key.go | 1 | ||||
| -rw-r--r-- | weed/s3api/s3api_object_handlers_put.go | 5 | ||||
| -rw-r--r-- | weed/s3api/s3api_server.go | 1 |
4 files changed, 12 insertions, 11 deletions
diff --git a/weed/s3api/filer_multipart.go b/weed/s3api/filer_multipart.go index c9247f2c5..5850766cc 100644 --- a/weed/s3api/filer_multipart.go +++ b/weed/s3api/filer_multipart.go @@ -55,8 +55,9 @@ func (s3a *S3ApiServer) createMultipartUpload(r *http.Request, input *s3.CreateM if entry.Extended == nil { entry.Extended = make(map[string][]byte) } - entry.Extended["key"] = []byte(*input.Key) - + entry.Extended[s3_constants.ExtMultipartObjectKey] = []byte(*input.Key) + // Set TTL-based S3 expiry (modification time) + entry.Extended[s3_constants.SeaweedFSExpiresS3] = []byte("true") // Set object owner for multipart upload amzAccountId := r.Header.Get(s3_constants.AmzAccountId) if amzAccountId != "" { @@ -334,7 +335,7 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl } for k, v := range pentry.Extended { - if k != "key" { + if k != s3_constants.ExtMultipartObjectKey { versionEntry.Extended[k] = v } } @@ -396,7 +397,7 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl } for k, v := range pentry.Extended { - if k != "key" { + if k != s3_constants.ExtMultipartObjectKey { entry.Extended[k] = v } } @@ -449,7 +450,7 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl } for k, v := range pentry.Extended { - if k != "key" { + if k != s3_constants.ExtMultipartObjectKey { entry.Extended[k] = v } } @@ -472,7 +473,8 @@ func (s3a *S3ApiServer) completeMultipartUpload(r *http.Request, input *s3.Compl entry.Attributes.Mime = mime } entry.Attributes.FileSize = uint64(offset) - if s3a.option.AllowDeleteObjectsByTTL && entityWithTtl { + // Set TTL-based S3 expiry (modification time) + if entityWithTtl { entry.Extended[s3_constants.SeaweedFSExpiresS3] = []byte("true") } }) @@ -594,7 +596,7 @@ func (s3a *S3ApiServer) listMultipartUploads(input *s3.ListMultipartUploadsInput uploadsCount := int64(0) for _, entry := range entries { if entry.Extended != nil { - key := string(entry.Extended["key"]) + key := string(entry.Extended[s3_constants.ExtMultipartObjectKey]) if *input.KeyMarker != "" && *input.KeyMarker != key { continue } diff --git a/weed/s3api/s3_constants/extend_key.go b/weed/s3api/s3_constants/extend_key.go index f0f223a45..d57798341 100644 --- a/weed/s3api/s3_constants/extend_key.go +++ b/weed/s3api/s3_constants/extend_key.go @@ -11,6 +11,7 @@ const ( ExtETagKey = "Seaweed-X-Amz-ETag" ExtLatestVersionIdKey = "Seaweed-X-Amz-Latest-Version-Id" ExtLatestVersionFileNameKey = "Seaweed-X-Amz-Latest-Version-File-Name" + ExtMultipartObjectKey = "key" // Bucket Policy ExtBucketPolicyKey = "Seaweed-X-Amz-Bucket-Policy" diff --git a/weed/s3api/s3api_object_handlers_put.go b/weed/s3api/s3api_object_handlers_put.go index 1609ca510..0d07c548e 100644 --- a/weed/s3api/s3api_object_handlers_put.go +++ b/weed/s3api/s3api_object_handlers_put.go @@ -333,9 +333,8 @@ func (s3a *S3ApiServer) putToFiler(r *http.Request, uploadUrl string, dataReader proxyReq.Header.Set(s3_constants.SeaweedFSSSES3Key, base64.StdEncoding.EncodeToString(sseS3Metadata)) glog.V(3).Infof("putToFiler: storing SSE-S3 metadata for object %s with keyID %s", uploadUrl, sseS3Key.KeyID) } - if s3a.option.AllowDeleteObjectsByTTL { - proxyReq.Header.Set(s3_constants.SeaweedFSExpiresS3, "true") - } + // Set TTL-based S3 expiry (modification time) + proxyReq.Header.Set(s3_constants.SeaweedFSExpiresS3, "true") // ensure that the Authorization header is overriding any previous // Authorization header which might be already present in proxyReq s3a.maybeAddFilerJwtAuthorization(proxyReq, true) diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index baf28b237..e21886c57 100644 --- a/weed/s3api/s3api_server.go +++ b/weed/s3api/s3api_server.go @@ -41,7 +41,6 @@ type S3ApiServerOption struct { GrpcDialOption grpc.DialOption AllowEmptyFolder bool AllowDeleteBucketNotEmpty bool - AllowDeleteObjectsByTTL bool LocalFilerSocket string DataCenter string FilerGroup string |