添加 userbuf 版本的接口

weijunyi · weijunyi · commit c8fca8825af5 · 2019-06-19T15:22:14.000+08:00
diff --git a/README.md b/README.md
@@ -0,0 +1,24 @@
+## 说明
+此项目为 tls-sig-api-v2 （对称密钥版本）golang 实现版本，请注意，之前版本的非对称密钥无法使用此版 api，如需使用请查看[这里](https://github.com/tencentyun/tls-sig-api-golang)。
+
+## 使用
+``` go
+import (
+	"./tencentyun"
+	"fmt"
+)
+
+const (
+	sdkappid = 1400000000
+	key = "5bd2850fff3ecb11d7c805251c51ee463a25727bddc2385f3fa8bfee1bb93b5e"
+)
+
+func main()  {
+	sig, err := tencentyun.GenSig(sdkappid, key, "xiaojun", 86400*180)
+	if err != nil {
+		fmt.Println(err.Error())
+	} else {
+		fmt.Println(sig)
+	}
+}
+```
diff --git a/TLSSigAPITest.go b/TLSSigAPITest.go
@@ -17,4 +17,10 @@ func main()  {
 	} else {
 		fmt.Println(sig)
 	}
+	sig, err = tencentyun.GenSigWithUserBuf(sdkappid, key, "xiaojun", 86400*180, []byte("abc"))
+	if err != nil {
+		fmt.Println(err.Error())
+	} else {
+		fmt.Println(sig)
+	}
 }
diff --git a/tencentyun/TLSSigAPI.go b/tencentyun/TLSSigAPI.go
@@ -11,19 +11,22 @@ import (
 	"time"
 )
 
-func hmacsha256(sdkappid int, key string, identifier string, currTime int64, expire int) string {
+func hmacsha256(sdkappid int, key string, identifier string, currTime int64, expire int, base64UserBuf *string) string {
 	var contentToBeSigned string
 	contentToBeSigned = "TLS.identifier:" + identifier + "\n"
 	contentToBeSigned += "TLS.sdkappid:" + strconv.Itoa(sdkappid) + "\n"
 	contentToBeSigned += "TLS.time:" + strconv.FormatInt(currTime, 10) + "\n"
 	contentToBeSigned += "TLS.expire:" + strconv.Itoa(expire) + "\n"
+    if nil != base64UserBuf {
+        contentToBeSigned += "TLS.userbuf:" + *base64UserBuf + "\n"
+    }
 
 	h := hmac.New(sha256.New, []byte(key))
 	h.Write([]byte(contentToBeSigned))
 	return base64.StdEncoding.EncodeToString(h.Sum(nil))
 }
 
-func GenSig(sdkappid int, key string, identifier string, expire int) (string, error) {
+func genSig(sdkappid int, key string, identifier string, expire int, userbuf []byte) (string, error) {
 	currTime := time.Now().Unix()
 	var sigDoc map[string]interface{}
 	sigDoc = make(map[string]interface{})
@@ -32,7 +35,14 @@ func GenSig(sdkappid int, key string, identifier string, expire int) (string, er
 	sigDoc["TLS.sdkappid"] = sdkappid
 	sigDoc["TLS.expire"] = expire
 	sigDoc["TLS.time"] = currTime
-	sigDoc["TLS.sig"] = hmacsha256(sdkappid, key, identifier, currTime, expire)
+    var base64UserBuf string
+    if nil != userbuf {
+        base64UserBuf = base64.StdEncoding.EncodeToString(userbuf)
+        sigDoc["TLS.userbuf"] = base64UserBuf
+        sigDoc["TLS.sig"] = hmacsha256(sdkappid, key, identifier, currTime, expire, &base64UserBuf)
+    } else {
+        sigDoc["TLS.sig"] = hmacsha256(sdkappid, key, identifier, currTime, expire, nil)
+    }
 
 	data, err := json.Marshal(sigDoc)
 	if err != nil {
@@ -45,3 +55,12 @@ func GenSig(sdkappid int, key string, identifier string, expire int) (string, er
 	w.Close()
 	return base64urlEncode(b.Bytes()), nil
 }
+
+func GenSig(sdkappid int, key string, identifier string, expire int) (string, error) {
+    return genSig(sdkappid, key, identifier, expire, nil)
+}
+
+func GenSigWithUserBuf(sdkappid int, key string, identifier string, expire int, userbuf []byte) (string, error) {
+    return genSig(sdkappid, key, identifier, expire, userbuf)
+}
+

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,10 @@ func main() {`
`17`	`17`	`} else {`
`18`	`18`	`fmt.Println(sig)`
`19`	`19`	`}`
	`20`	`+ sig, err = tencentyun.GenSigWithUserBuf(sdkappid, key, "xiaojun", 86400*180, []byte("abc"))`
	`21`	`+ if err != nil {`
	`22`	`+ fmt.Println(err.Error())`
	`23`	`+ } else {`
	`24`	`+ fmt.Println(sig)`
	`25`	`+ }`
`20`	`26`	`}`