Merge pull request #300 from tencentyun/feature_jojoliang_79461466

严格签名修复Content-Length

Author: agin719

auth_test.go

@@ -126,6 +126,7 @@ func TestCVMCredentialTransport(t *testing.T) {
 		host := strings.TrimLeft(uri, "http://")
 		req, _ := http.NewRequest("GET", uri, nil)
 		req.Header.Add("Host", host)
+		req.Header.Add("x-cos-security-token", token)
 		expect := newAuthorization(ak, sk, req, authTime, true)
 		if expect != auth {
 			t.Errorf("CVMCredentialTransport Authorization error, want:%v, return:%v\n", expect, auth)
@@ -350,6 +351,7 @@ func TestStsCredentialTransport(t *testing.T) {
 		host := strings.TrimLeft(uri, "http://")
 		req, _ := http.NewRequest("GET", uri, nil)
 		req.Header.Add("Host", host)
+		req.Header.Add("x-cos-security-token", token)
 		expect := newAuthorization(ak, sk, req, authTime, true)
 		if expect != auth {
 			t.Errorf("StsCredentialTransport Authorization error, want:%v, return:%v\n", expect, auth)

cos.go

@@ -287,6 +287,7 @@ func (c *Client) newRequest(ctx context.Context, baseURL *url.URL, uri, method s
 	var reader io.Reader
 	contentType := ""
 	contentMD5 := ""
+	contentLength := int64(-1)
 	if body != nil {
 		// 上传文件
 		if r, ok := body.(io.Reader); ok {
@@ -299,6 +300,7 @@ func (c *Client) newRequest(ctx context.Context, baseURL *url.URL, uri, method s
 			contentType = contentTypeXML
 			reader = bytes.NewReader(b)
 			contentMD5 = base64.StdEncoding.EncodeToString(calMD5Digest(b))
+			contentLength = int64(len(b))
 		}
 	}
 
@@ -311,6 +313,9 @@ func (c *Client) newRequest(ctx context.Context, baseURL *url.URL, uri, method s
 	if err != nil {
 		return
 	}
+	if v := req.Header.Get("Content-Length"); v == "" && contentLength >= 0 {
+		req.Header.Set("Content-Length", strconv.FormatInt(contentLength, 10))
+	}
 	if v := req.Header.Get("Content-Length"); req.ContentLength == 0 && v != "" && v != "0" {
 		req.ContentLength, _ = strconv.ParseInt(v, 10, 64)
 	}