Merge pull request #232 from tencentyun/feature_jojoliang_6052914a

update GetPresignedURL

Author: agin719

cos.go

@@ -24,7 +24,7 @@ import (
 
 const (
 	// Version current go sdk version
-	Version               = "0.7.46"
+	Version               = "0.7.47"
 	UserAgent             = "cos-go-sdk-v5/" + Version
 	contentTypeXML        = "application/xml"
 	defaultServiceBaseURL = "http://service.cos.myqcloud.com"
@@ -505,6 +505,9 @@ func addHeaderOptions(ctx context.Context, header http.Header, opt interface{})
 }
 
 func checkURL(baseURL *url.URL) bool {
+	if baseURL == nil {
+		return false
+	}
 	host := baseURL.String()
 	if hostSuffix.MatchString(host) && !hostPrefix.MatchString(host) {
 		return false

object.go

@@ -124,12 +124,7 @@ type PresignedURLOptions struct {
 // GetPresignedURL get the object presigned to down or upload file by url
 // 预签名函数，signHost: 默认签入Header Host, 您也可以选择不签入Header Host，但可能导致请求失败或安全漏洞
 func (s *ObjectService) GetPresignedURL(ctx context.Context, httpMethod, name, ak, sk string, expired time.Duration, opt interface{}, signHost ...bool) (*url.URL, error) {
-	// 兼容 name 以 / 开头的情况
-	if strings.HasPrefix(name, "/") {
-		name = encodeURIComponent("/") + encodeURIComponent(name[1:], []byte{'/'})
-	} else {
-		name = encodeURIComponent(name, []byte{'/'})
-	}
+	name = encodeURIComponent(name)
 
 	sendOpt := sendOptions{
 		baseURL:   s.client.BaseURL.BucketURL,
@@ -192,12 +187,7 @@ func (s *ObjectService) GetPresignedURL(ctx context.Context, httpMethod, name, a
 }
 
 func (s *ObjectService) GetPresignedURL2(ctx context.Context, httpMethod, name string, expired time.Duration, opt interface{}, signHost ...bool) (*url.URL, error) {
-	// 兼容 name 以 / 开头的情况
-	if strings.HasPrefix(name, "/") {
-		name = encodeURIComponent("/") + encodeURIComponent(name[1:], []byte{'/'})
-	} else {
-		name = encodeURIComponent(name, []byte{'/'})
-	}
+	name = encodeURIComponent(name)
 
 	cred := s.client.GetCredential()
 	if cred == nil {
@@ -271,11 +261,7 @@ func (s *ObjectService) GetPresignedURL2(ctx context.Context, httpMethod, name s
 
 func (s *ObjectService) GetSignature(ctx context.Context, httpMethod, name, ak, sk string, expired time.Duration, opt *PresignedURLOptions, signHost ...bool) string {
 	// 兼容 name 以 / 开头的情况
-	if strings.HasPrefix(name, "/") {
-		name = encodeURIComponent("/") + encodeURIComponent(name[1:], []byte{'/'})
-	} else {
-		name = encodeURIComponent(name, []byte{'/'})
-	}
+	name = encodeURIComponent(name)
 
 	sendOpt := sendOptions{
 		baseURL:   s.client.BaseURL.BucketURL,