fix(腾讯云): 修复A/B/D类签名查询参数重复编码的问题

Author: storezhang

changcache_c.go

@@ -27,18 +27,19 @@ func newChuangcacheC(token string) *chuangcacheC {
 	}
 }
 
-func (cc *chuangcacheC) sign(from *url.URL) (err error) {
+func (cc *chuangcacheC) sign(url *url.URL) (err error) {
 	now := time.Now().Unix()
-	key := fmt.Sprintf(cc.pattern, cc.token, from.Path, now)
-	sb := gox.StringBuilder(from.RawQuery)
-	if "" == from.RawQuery {
+	key := fmt.Sprintf(cc.pattern, cc.token, url.Path, now)
+	sign := cryptor.New(key).Md5().Hex()
+	sb := gox.StringBuilder(url.RawQuery)
+	if "" == url.RawQuery {
 		sb.Append(question)
 	} else {
 		sb.Append(and)
 	}
-	sb.Append(cc.signature).Append(equal).Append(cryptor.New(key).Md5().Hex())
+	sb.Append(cc.signature).Append(equal).Append(sign)
 	sb.Append(and).Append(cc.timestamp).Append(equal).Append(now)
-	from.RawQuery = sb.String()
+	url.RawQuery = sb.String()
 
 	return
 }

tencent_a.go

@@ -6,29 +6,37 @@ import (
 	"time"
 
 	"github.com/goexl/cryptor"
+	"github.com/goexl/gox"
 	"github.com/rs/xid"
 )
 
 var _ signer = (*tencentA)(nil)
 
 type tencentA struct {
-	pattern string
-	key     string
+	pattern   string
+	key       string
+	signature string
 }
 
 func newTencentA(key string) *tencentA {
 	return &tencentA{
-		pattern: "%s%d0%s%s",
-		key:     key,
+		pattern:   "%s%d0%s%s",
+		key:       key,
+		signature: "sign",
 	}
 }
 
-func (a *tencentA) sign(url *url.URL) (err error) {
-	nowHex := time.Now().Unix()
-	key := fmt.Sprintf(a.pattern, url.EscapedPath(), nowHex, xid.New().String(), a.key)
-	query := url.Query()
-	query.Add("sign", cryptor.New(key).Md5().Hex())
-	url.RawQuery = query.Encode()
+func (ta *tencentA) sign(url *url.URL) (err error) {
+	now := time.Now().Unix()
+	key := fmt.Sprintf(ta.pattern, url.EscapedPath(), now, xid.New().String(), ta.key)
+	sb := gox.StringBuilder(url.RawQuery)
+	if "" == url.RawQuery {
+		sb.Append(question)
+	} else {
+		sb.Append(and)
+	}
+	sb.Append(ta.signature).Append(equal).Append(cryptor.New(key).Md5().Hex())
+	url.RawQuery = sb.String()
 
 	return
 }

tencent_b.go

@@ -22,12 +22,12 @@ func newTencentB(key string) *tencentB {
 	}
 }
 
-func (b *tencentB) sign(url *url.URL) (err error) {
-	nowHex := time.Now().Format("20060102150405")
-	key := fmt.Sprintf(b.pattern, b.key, nowHex, url.EscapedPath())
+func (tb *tencentB) sign(url *url.URL) (err error) {
+	now := time.Now().Format("20060102150405")
+	key := fmt.Sprintf(tb.pattern, tb.key, now, url.EscapedPath())
 	sign := cryptor.New(key).Md5().Hex()
-	url.RawPath = fmt.Sprintf("%s/%s%s", nowHex, sign, url.EscapedPath())
-	url.Path = fmt.Sprintf("%s/%s%s", nowHex, sign, url.Path)
+	url.RawPath = fmt.Sprintf("%s/%s%s", now, sign, url.EscapedPath())
+	url.Path = fmt.Sprintf("%s/%s%s", now, sign, url.Path)
 
 	return
 }

tencent_c.go

@@ -23,12 +23,12 @@ func newTencentC(key string) *tencentC {
 	}
 }
 
-func (c *tencentC) sign(url *url.URL) (err error) {
-	nowHex := strconv.FormatInt(time.Now().Unix(), 16)
-	key := fmt.Sprintf(c.pattern, c.key, url.EscapedPath(), nowHex)
+func (tc *tencentC) sign(url *url.URL) (err error) {
+	now := strconv.FormatInt(time.Now().Unix(), 16)
+	key := fmt.Sprintf(tc.pattern, tc.key, url.EscapedPath(), now)
 	sign := cryptor.New(key).Md5().Hex()
-	url.RawPath = fmt.Sprintf("/%s/%s%s", sign, nowHex, url.EscapedPath())
-	url.Path = fmt.Sprintf("/%s/%s%s", sign, nowHex, url.Path)
+	url.RawPath = fmt.Sprintf("/%s/%s%s", sign, now, url.EscapedPath())
+	url.Path = fmt.Sprintf("/%s/%s%s", sign, now, url.Path)
 
 	return
 }

tencent_d.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/goexl/cryptor"
+	"github.com/goexl/gox"
 )
 
 var _ signer = (*tencentD)(nil)
@@ -27,14 +28,19 @@ func newTencentD(key string, signature string, timestamp string) *tencentD {
 	}
 }
 
-func (d *tencentD) sign(url *url.URL) (err error) {
-	nowHex := strconv.FormatInt(time.Now().Unix(), 16)
-	key := fmt.Sprintf(d.pattern, d.key, url.EscapedPath(), nowHex)
+func (td *tencentD) sign(url *url.URL) (err error) {
+	now := strconv.FormatInt(time.Now().Unix(), 16)
+	key := fmt.Sprintf(td.pattern, td.key, url.EscapedPath(), now)
 	sign := cryptor.New(key).Md5().Hex()
-	query := url.Query()
-	query.Add(d.signature, sign)
-	query.Add(d.timestamp, nowHex)
-	url.RawQuery = query.Encode()
+	sb := gox.StringBuilder(url.RawQuery)
+	if "" == url.RawQuery {
+		sb.Append(question)
+	} else {
+		sb.Append(and)
+	}
+	sb.Append(td.signature).Append(equal).Append(sign)
+	sb.Append(and).Append(td.timestamp).Append(equal).Append(now)
+	url.RawQuery = sb.String()
 
 	return
 }