diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2024-04-14 22:41:32 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 10:41:32 -0700 |
| commit | 33537ae29f09af88f55d2f28a28406d3b8bfacd3 (patch) | |
| tree | 5c0ba5fb6ab26c3b4f8e6a1d153c6c7704186a54 /weed/s3api/s3api_object_handlers.go | |
| parent | 8833745fbcb140bfb61710d600c713e1ce50bd6c (diff) | |
| download | seaweedfs-33537ae29f09af88f55d2f28a28406d3b8bfacd3.tar.xz seaweedfs-33537ae29f09af88f55d2f28a28406d3b8bfacd3.zip | |
[s3] fix s3 test_multipart_get_part (#5476)
* try fix s3 test_multipart_get_part
* add passed s3 tests
* fix SeaweedFSUploadId
* rm spaces
* convert part request to range
* add passed s3 tests of multipart
Diffstat (limited to 'weed/s3api/s3api_object_handlers.go')
| -rw-r--r-- | weed/s3api/s3api_object_handlers.go | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go index f32dcefeb..dd3a16bf8 100644 --- a/weed/s3api/s3api_object_handlers.go +++ b/weed/s3api/s3api_object_handlers.go @@ -370,6 +370,9 @@ func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, des if _, ok := s3_constants.PassThroughHeaders[strings.ToLower(k)]; ok { proxyReq.Header[k] = v } + if k == "partNumber" { + proxyReq.Header[s3_constants.SeaweedFSPartNumber] = v + } } for header, values := range r.Header { proxyReq.Header[header] = values @@ -411,7 +414,7 @@ func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, des } TimeToFirstByte(r.Method, start, r) - if resp.Header.Get(s3_constants.X_SeaweedFS_Header_Directory_Key) == "true" { + if resp.Header.Get(s3_constants.SeaweedFSIsDirectoryKey) == "true" { responseStatusCode := responseFn(resp, w) s3err.PostLog(r, responseStatusCode, s3err.ErrNone) return @@ -429,6 +432,18 @@ func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, des return } + if resp.StatusCode == http.StatusBadRequest { + resp_body, _ := io.ReadAll(resp.Body) + switch string(resp_body) { + case "InvalidPart": + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidPart) + default: + s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRequest) + } + resp.Body.Close() + return + } + setUserMetadataKeyToLowercase(resp) responseStatusCode := responseFn(resp, w) |