diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-08-24 12:15:44 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 00:15:44 -0700 |
| commit | f7aeb06544ef12d49f39010dcedcd34845deddff (patch) | |
| tree | 6ef638e1ffff65d9fe834c336cea6fbaf98374bf | |
| parent | c57c79a0ab2cb2b83c2f7ebf90a0d86c621f4d9f (diff) | |
| download | seaweedfs-f7aeb06544ef12d49f39010dcedcd34845deddff.tar.xz seaweedfs-f7aeb06544ef12d49f39010dcedcd34845deddff.zip | |
s3: report metadata if the directory is explicitly created (#3498)
* replace mkdir to mkFile
* ContentLength must be zero
* revert mkDir
* Seaweedfs-Is-Directory-Key return metadata
| -rw-r--r-- | weed/s3api/s3api_object_handlers.go | 18 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_read.go | 19 |
2 files changed, 20 insertions, 17 deletions
diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go index 1525889fd..7a423d524 100644 --- a/weed/s3api/s3api_object_handlers.go +++ b/weed/s3api/s3api_object_handlers.go @@ -93,13 +93,15 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request) defer dataReader.Close() objectContentType := r.Header.Get("Content-Type") - if strings.HasSuffix(object, "/") { - if err := s3a.mkdir(s3a.option.BucketsPath, bucket+strings.TrimSuffix(object, "/"), func(entry *filer_pb.Entry) { - if objectContentType == "" { - objectContentType = "httpd/unix-directory" - } - entry.Attributes.Mime = objectContentType - }); err != nil { + if strings.HasSuffix(object, "/") && r.ContentLength == 0 { + if err := s3a.mkdir( + s3a.option.BucketsPath, bucket+strings.TrimSuffix(object, "/"), + func(entry *filer_pb.Entry) { + if objectContentType == "" { + objectContentType = "httpd/unix-directory" + } + entry.Attributes.Mime = objectContentType + }); err != nil { s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) return } @@ -314,7 +316,7 @@ func (s3a *S3ApiServer) DeleteMultipleObjectsHandler(w http.ResponseWriter, r *h func (s3a *S3ApiServer) doDeleteEmptyDirectories(client filer_pb.SeaweedFilerClient, directoriesWithDeletion map[string]int) (newDirectoriesWithDeletion map[string]int) { var allDirs []string - for dir, _ := range directoriesWithDeletion { + for dir := range directoriesWithDeletion { allDirs = append(allDirs, dir) } slices.SortFunc(allDirs, func(a, b string) bool { diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index 58df2f524..327eaa54d 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -25,10 +25,11 @@ import ( // Validates the preconditions. Returns true if GET/HEAD operation should not proceed. // Preconditions supported are: -// If-Modified-Since -// If-Unmodified-Since -// If-Match -// If-None-Match +// +// If-Modified-Since +// If-Unmodified-Since +// If-Match +// If-None-Match func checkPreconditions(w http.ResponseWriter, r *http.Request, entry *filer.Entry) bool { etag := filer.ETagEntry(entry) @@ -111,12 +112,12 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) w.WriteHeader(http.StatusMethodNotAllowed) return } - if entry.Attr.Mime != "" { - // inform S3 API this is a user created directory key object - w.Header().Set(s3_constants.X_SeaweedFS_Header_Directory_Key, "true") + if entry.Attr.Mime == "" { + fs.listDirectoryHandler(w, r) + return } - fs.listDirectoryHandler(w, r) - return + // inform S3 API this is a user created directory key object + w.Header().Set(s3_constants.X_SeaweedFS_Header_Directory_Key, "true") } if isForDirectory { |