fix post policy bug

Author: cuixiaotian

api/handler-utils.go

@@ -75,14 +75,20 @@ func extractMetadataFromHeader(header http.Header) map[string]string {
 	metadata := make(map[string]string)
 	// Save standard supported headers.
 	for _, supportedHeader := range supportedHeaders {
-		if h := header.Get(http.CanonicalHeaderKey(supportedHeader)); h != "" {
-			metadata[http.CanonicalHeaderKey(supportedHeader)] = h
+		if value, ok := header[http.CanonicalHeaderKey(supportedHeader)]; ok {
+			metadata[http.CanonicalHeaderKey(supportedHeader)] = value[0]
+		} else if value, ok := header[supportedHeader]; ok {
+			metadata[supportedHeader] = value[0]
 		}
 	}
 	// Go through all other headers for any additional headers that needs to be saved.
 	for key := range header {
 		if strings.HasPrefix(strings.ToLower(key), "x-amz-meta-") {
-			metadata[key] = header.Get(key)
+			value, ok := header[key]
+			if ok {
+				metadata[key] = strings.Join(value, ",")
+				break
+			}
 		}
 	}
 	// Return.

api/log-replacer.go

@@ -271,7 +271,7 @@ func (r *replacer) getSubstitution(key string) string {
 		return objectInfo.StorageClass.ToString()
 	case "{target_storage_class}":
 		if r.request.Header.Get("X-Amz-Copy-Source") != "" && r.request.Header.Get("X-Amz-Metadata-Directive") != "" {
-			storageClassFromHeader, err := getStorageClassFromHeader(r.request)
+			storageClassFromHeader, err := getStorageClassFromHeader(r.request.Header)
 			if err != nil {
 				return "-"
 			}

api/object-handlers.go

@@ -58,8 +58,8 @@ func setGetRespHeaders(w http.ResponseWriter, reqParams url.Values) {
 	}
 }
 
-func getStorageClassFromHeader(r *http.Request) (meta.StorageClass, error) {
-	storageClassStr := r.Header.Get("X-Amz-Storage-Class")
+func getStorageClassFromHeader(header http.Header) (meta.StorageClass, error) {
+	storageClassStr := header.Get("X-Amz-Storage-Class")
 
 	if storageClassStr != "" {
 		helper.Logger.Info("Get storage class header:", storageClassStr)
@@ -743,7 +743,7 @@ func (api ObjectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req
 		return
 	}
 
-	storageClass, err := getStorageClassFromHeader(r)
+	storageClass, err := getStorageClassFromHeader(r.Header)
 	if err != nil {
 		WriteErrorResponse(w, r, err)
 		return
@@ -905,7 +905,7 @@ func (api ObjectAPIHandlers) AppendObjectHandler(w http.ResponseWriter, r *http.
 		return
 	}
 
-	storageClass, err := getStorageClassFromHeader(r)
+	storageClass, err := getStorageClassFromHeader(r.Header)
 	if err != nil {
 		WriteErrorResponse(w, r, err)
 		return
@@ -1253,7 +1253,7 @@ func (api ObjectAPIHandlers) NewMultipartUploadHandler(w http.ResponseWriter, r
 		}
 	}
 
-	storageClass, err := getStorageClassFromHeader(r)
+	storageClass, err := getStorageClassFromHeader(r.Header)
 	if err != nil {
 		WriteErrorResponse(w, r, err)
 		return
@@ -1867,7 +1867,7 @@ func (api ObjectAPIHandlers) PostObjectHandler(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	if err = signature.CheckPostPolicy(formValues, postPolicyType); err != nil {
+	if err = signature.CheckPostPolicy(formValues); err != nil {
 		WriteErrorResponse(w, r, err)
 		return
 	}
@@ -1882,7 +1882,7 @@ func (api ObjectAPIHandlers) PostObjectHandler(w http.ResponseWriter, r *http.Re
 	metadata := extractMetadataFromHeader(headerfiedFormValues)
 
 	var acl Acl
-	acl.CannedAcl = headerfiedFormValues.Get("acl")
+	acl.CannedAcl = headerfiedFormValues.Get("Acl")
 	if acl.CannedAcl == "" {
 		acl.CannedAcl = "private"
 	}
@@ -1898,7 +1898,7 @@ func (api ObjectAPIHandlers) PostObjectHandler(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	storageClass, err := getStorageClassFromHeader(r)
+	storageClass, err := getStorageClassFromHeader(headerfiedFormValues)
 	if err != nil {
 		WriteErrorResponse(w, r, err)
 		return