Merge pull request #10 from rhnvrm/develop

fix: missing optional fields in policy
2021-01-29 14:34:31 +05:30
parent fbf23c1eaf 01c1568859
commit cacb5dc7e1
1 changed files with 11 additions and 0 deletions
@@ -117,6 +117,7 @@ func (s3 *S3) CreateUploadPolicies(uploadConfig UploadConfig) (UploadPolicies, e
 }

 func buildUploadSign(nowTime time.Time, credential string, uploadConfig UploadConfig) ([]byte, error) {
+	// essential conditions
 	conditions := []interface{}{
 		map[string]string{"bucket": uploadConfig.BucketName},
 		map[string]string{"key": uploadConfig.ObjectKey},
@@ -126,6 +127,16 @@ func buildUploadSign(nowTime time.Time, credential string, uploadConfig UploadCo
 		map[string]string{"x-amz-algorithm": algorithm},
 		map[string]string{"x-amz-date": nowTime.Format(amzDateISO8601TimeFormat)},
 	}
+
+	// optional conditions
+	if uploadConfig.ContentDisposition != "" {
+		conditions = append(conditions, map[string]string{"Content-Disposition": uploadConfig.ContentDisposition})
+	}
+
+	if uploadConfig.ACL != "" {
+		conditions = append(conditions, map[string]string{"x-amz-acl": uploadConfig.ACL})
+	}
+
 	for k, v := range uploadConfig.MetaData {
 		conditions = append(conditions, map[string]string{k: v})
 	}