Merge pull request #234 from tencentyun/feature_jojoliang_9a5a6c47

更新ACL常量，兼容key非法时分块上传返回xml解析失败

Author: agin719

cos.go

@@ -569,6 +569,26 @@ type ACLXml struct {
 	AccessControlList []ACLGrant `xml:"AccessControlList>Grant,omitempty"`
 }
 
+type aclEnum struct {
+	Private                string
+	PublicRead             string
+	PublicReadWrite        string
+	AuthenticatedRead      string
+	Default                string
+	BucketOwnerRead        string
+	BucketOwnerFullControl string
+}
+
+var ACL = &aclEnum{
+	Private:                "private",
+	PublicRead:             "public-read",
+	PublicReadWrite:        "public-read-write",
+	AuthenticatedRead:      "authenticated-read",
+	Default:                "default",
+	BucketOwnerRead:        "bucket-owner-read",
+	BucketOwnerFullControl: "bucket-owner-full-control",
+}
+
 func decodeACL(resp *Response, res *ACLXml) {
 	ItemMap := map[string]string{
 		"ACL":          "x-cos-acl",

helper.go

@@ -12,6 +12,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -394,3 +395,62 @@ func deliverInitOptions(opt *InitiateMultipartUploadOptions) (*http.Header, erro
 	}
 	return header, nil
 }
+
+var (
+	bucketReg   = regexp.MustCompile(`<Bucket>([a-z0-9-]+-[0-9]+)</Bucket>`)
+	keyReg      = regexp.MustCompile(`<Key>(.*?)</Key>`)
+	uploadIdReg = regexp.MustCompile(`<UploadId>([a-z0-9]+)</UploadId>`)
+	locationReg = regexp.MustCompile(`<Location>(.*?)</Location>`)
+	etagReg     = regexp.MustCompile(`<ETag>&quot;(.*?)&quot;</ETag>`)
+)
+
+func UnmarshalInitMultiUploadResult(data []byte, res *InitiateMultipartUploadResult) error {
+	match := bucketReg.FindStringSubmatch(string(data))
+	if len(match) > 1 {
+		res.Bucket = match[1]
+	} else {
+		return fmt.Errorf("Unmarshal failed, %v", string(data))
+	}
+	match = keyReg.FindStringSubmatch(string(data))
+	if len(match) > 1 {
+		res.Key = match[1]
+	} else {
+		return fmt.Errorf("Unmarshal failed, %v", string(data))
+	}
+	match = uploadIdReg.FindStringSubmatch(string(data))
+	if len(match) > 1 {
+		res.UploadID = match[1]
+	} else {
+		return fmt.Errorf("Unmarshal failed, %v", string(data))
+	}
+	return nil
+}
+
+func UnmarshalCompleteMultiUploadResult(data []byte, res *CompleteMultipartUploadResult) error {
+	match := locationReg.FindStringSubmatch(string(data))
+	if len(match) > 1 {
+		res.Location = match[1]
+	} else {
+		return fmt.Errorf("Unmarshal failed, %v", string(data))
+	}
+	match = bucketReg.FindStringSubmatch(string(data))
+	if len(match) > 1 {
+		res.Bucket = match[1]
+	} else {
+		return fmt.Errorf("Unmarshal failed, %v", string(data))
+	}
+	match = keyReg.FindStringSubmatch(string(data))
+	if len(match) > 1 {
+		res.Key = match[1]
+	} else {
+		return fmt.Errorf("Unmarshal failed, %v", string(data))
+	}
+	match = etagReg.FindStringSubmatch(string(data))
+	if len(match) > 1 {
+		res.ETag = "\"" + match[1] + "\""
+	} else {
+		return fmt.Errorf("Unmarshal failed, %v", string(data))
+	}
+
+	return nil
+}

object_part.go

@@ -33,15 +33,26 @@ type InitiateMultipartUploadResult struct {
 //
 // https://www.qcloud.com/document/product/436/7746
 func (s *ObjectService) InitiateMultipartUpload(ctx context.Context, name string, opt *InitiateMultipartUploadOptions) (*InitiateMultipartUploadResult, *Response, error) {
+	var buff bytes.Buffer
 	var res InitiateMultipartUploadResult
 	sendOpt := sendOptions{
 		baseURL:   s.client.BaseURL.BucketURL,
 		uri:       "/" + encodeURIComponent(name) + "?uploads",
 		method:    http.MethodPost,
 		optHeader: opt,
-		result:    &res,
+		result:    &buff,
 	}
 	resp, err := s.client.doRetry(ctx, &sendOpt)
+	if err == nil {
+		err = xml.Unmarshal(buff.Bytes(), &res)
+		if err != nil {
+			// xml body存在非法字符(key存在非法字符)
+			if _, ok := err.(*xml.SyntaxError); ok {
+				err = UnmarshalInitMultiUploadResult(buff.Bytes(), &res)
+				return &res, resp, err
+			}
+		}
+	}
 	return &res, resp, err
 }
 
@@ -233,20 +244,31 @@ func (o ObjectList) Less(i, j int) bool { // rewrite the Less method from small
 // https://www.qcloud.com/document/product/436/7742
 func (s *ObjectService) CompleteMultipartUpload(ctx context.Context, name, uploadID string, opt *CompleteMultipartUploadOptions) (*CompleteMultipartUploadResult, *Response, error) {
 	u := fmt.Sprintf("/%s?uploadId=%s", encodeURIComponent(name), uploadID)
+	var buff bytes.Buffer
 	var res CompleteMultipartUploadResult
 	sendOpt := sendOptions{
 		baseURL:   s.client.BaseURL.BucketURL,
 		uri:       u,
 		method:    http.MethodPost,
 		optHeader: opt,
 		body:      opt,
-		result:    &res,
+		result:    &buff,
 	}
 	resp, err := s.client.doRetry(ctx, &sendOpt)
 	// If the error occurs during the copy operation, the error response is embedded in the 200 OK response. This means that a 200 OK response can contain either a success or an error.
 	if err == nil && resp.StatusCode == 200 {
+		err = xml.Unmarshal(buff.Bytes(), &res)
+		if err != nil {
+			// xml body存在非法字符(key存在非法字符)
+			if _, ok := err.(*xml.SyntaxError); ok {
+				err = UnmarshalCompleteMultiUploadResult(buff.Bytes(), &res)
+				if err != nil {
+					return &res, resp, err
+				}
+			}
+		}
 		if res.ETag == "" {
-			return &res, resp, errors.New("response 200 OK, but body contains an error")
+			return &res, resp, fmt.Errorf("response 200 OK, but body contains an error, %v", buff.Bytes())
 		}
 	}
 	return &res, resp, err