From 9a672cde0b410300fee41a49e3df891885dd1129 Mon Sep 17 00:00:00 2001
From: jojoliang <agin719@126.com>
Date: Wed, 25 Nov 2020 20:50:47 +0800
Subject: [PATCH] update presignedurl && copy

---
 helper.go | 14 +++++++++++++-
 object.go | 24 +++++++++++++++---------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/helper.go b/helper.go
index f0ed8f3..8e98348 100644
--- a/helper.go
+++ b/helper.go
@@ -45,7 +45,7 @@ func cloneRequest(r *http.Request) *http.Request {
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
 //
 // http://www.ecma-international.org/ecma-262/6.0/#sec-uri-syntax-and-semantics
-func encodeURIComponent(s string) string {
+func encodeURIComponent(s string, excluded ...[]byte) string {
 	var b bytes.Buffer
 	written := 0
 
@@ -71,6 +71,18 @@ func encodeURIComponent(s string) string {
 
 				continue
 			}
+			if len(excluded) > 0 {
+				conti := false
+				for _, ch := range excluded[0] {
+					if ch == c {
+						conti = true
+						break
+					}
+				}
+				if conti {
+					continue
+				}
+			}
 		}
 
 		b.WriteString(s[written:i])
diff --git a/object.go b/object.go
index 9b963ca..8933c69 100644
--- a/object.go
+++ b/object.go
@@ -115,12 +115,12 @@ func (s *ObjectService) GetPresignedURL(ctx context.Context, httpMethod, name, a
 		authTime = NewAuthTime(expired)
 	}
 	authorization := newAuthorization(ak, sk, req, authTime)
-	sign := encodeURIComponent(authorization)
+	sign := encodeURIComponent(authorization, []byte{'&','='})
 
 	if req.URL.RawQuery == "" {
-		req.URL.RawQuery = fmt.Sprintf("sign=%s", sign)
+		req.URL.RawQuery = fmt.Sprintf("%s", sign)
 	} else {
-		req.URL.RawQuery = fmt.Sprintf("%s&sign=%s", req.URL.RawQuery, sign)
+		req.URL.RawQuery = fmt.Sprintf("%s&%s", req.URL.RawQuery, sign)
 	}
 	return req.URL, nil
 
@@ -256,20 +256,26 @@ func (s *ObjectService) Copy(ctx context.Context, name, sourceURL string, opt *O
 	}
 
 	var res ObjectCopyResult
-	if opt == nil {
-		opt = new(ObjectCopyOptions)
+	copyOpt := &ObjectCopyOptions{
+		&ObjectCopyHeaderOptions{},
+		&ACLHeaderOptions{},
 	}
-	if opt.ObjectCopyHeaderOptions == nil {
-		opt.ObjectCopyHeaderOptions = new(ObjectCopyHeaderOptions)
+	if opt != nil {
+		if opt.ObjectCopyHeaderOptions != nil {
+			*copyOpt.ObjectCopyHeaderOptions = *opt.ObjectCopyHeaderOptions
+		}
+		if opt.ACLHeaderOptions != nil {
+			*copyOpt.ACLHeaderOptions = *opt.ACLHeaderOptions
+		}
 	}
-	opt.XCosCopySource = u
+	copyOpt.XCosCopySource = u
 
 	sendOpt := sendOptions{
 		baseURL:   s.client.BaseURL.BucketURL,
 		uri:       "/" + encodeURIComponent(name),
 		method:    http.MethodPut,
 		body:      nil,
-		optHeader: opt,
+		optHeader: copyOpt,
 		result:    &res,
 	}
 	resp, err := s.client.send(ctx, &sendOpt)