gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

S3 bucket list, response with uploaded storageclass.

Browse Source
This commit is contained in:
ruitao.liu
2020-10-29 14:57:19 +08:00
parent 2dcc178d0a
commit b917be7955
4 changed files with 157 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed/server/filer_server_handlers_read.go
View File

@@ -97,12 +97,12 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request,
if r.Method == "GET" {
tagCount := 0
for k, _ := range entry.Extended {
if strings.HasPrefix(k, "X-Amz-Tagging-") {
if strings.HasPrefix(k, util.AmzObjectTagging+"-") {
tagCount++
}
}
if tagCount > 0 {
w.Header().Set("x-amz-tag-count", strconv.Itoa(tagCount))
w.Header().Set(util.AmzTagCount, strconv.Itoa(tagCount))
}
}

15
weed/server/filer_server_handlers_write_autochunk.go
View File

@@ -312,31 +312,26 @@ func (fs *FilerServer) mkdir(ctx context.Context, w http.ResponseWriter, r *http
}
func (fs *FilerServer) saveAmzMetaData(r *http.Request, entry *filer.Entry) {
var (
storageClass = "X-Amz-Storage-Class"
objectTagging = "X-Amz-Tagging"
userMetaPrefix = "X-Amz-Meta-"
)
if entry.Extended == nil {
entry.Extended = make(map[string][]byte)
}
if sc := r.Header.Get(storageClass); sc != "" {
entry.Extended[storageClass] = []byte(sc)
if sc := r.Header.Get(util.AmzStorageClass); sc != "" {
entry.Extended[util.AmzStorageClass] = []byte(sc)
}
if tags := r.Header.Get(objectTagging); tags != "" {
if tags := r.Header.Get(util.AmzObjectTagging); tags != "" {
for _, v := range strings.Split(tags, "&") {
tag := strings.Split(v, "=")
if len(tag) == 2 {
entry.Extended[objectTagging+"-"+tag[0]] = []byte(tag[1])
entry.Extended[util.AmzObjectTagging+"-"+tag[0]] = []byte(tag[1])
}
}
}
for header, values := range r.Header {
if strings.HasPrefix(header, userMetaPrefix) {
if strings.HasPrefix(header, util.AmzUserMetaPrefix) {
for _, value := range values {
entry.Extended[header] = []byte(value)
}