liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-08-17 15:59:20 +08:00
parent 2c262f51c5
commit 4330eed046
3 changed files with 94 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
platformapi/dingdingapi/callback.go
View File

@@ -4,11 +4,13 @@ import (
"bytes" "bytes"
"crypto/aes" "crypto/aes"
"crypto/cipher" "crypto/cipher"
"crypto/rand"
"crypto/sha1" "crypto/sha1"
"encoding/base64" "encoding/base64"
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt" "fmt"
r "math/rand"
"sort" "sort"
"strings" "strings"
"time" "time"
@@ -60,7 +62,7 @@ func (a *API) SetCallbackToken(token string) {
a.callbackToken = token a.callbackToken = token
} }
func (a *API) SetCallbackAESKey(b []byte) { func (a *API) SetCallbackAESKey(b string) {
a.locker.RLock() a.locker.RLock()
defer a.locker.RUnlock() defer a.locker.RUnlock()
a.callbackAESKey = b a.callbackAESKey = b
@@ -72,21 +74,24 @@ func (a *API) GetCallbackToken() string {
return a.callbackToken return a.callbackToken
} }
func (a *API) GetCallbackAESKey() []byte { func (a *API) GetCallbackAESKey() string {
a.locker.RLock() a.locker.RLock()
defer a.locker.RUnlock() defer a.locker.RUnlock()
return a.callbackAESKey return a.callbackAESKey
} }
func (a *API) PackCallbackResult(result string) (response *CallbackResponse) { func (a *API) PackCallbackResult(result string) (response *CallbackResponse) {
encryptedResult, err := a.Encrypt(result) timestamp := utils.Int64ToStr(time.Now().Unix())
nonce := utils.GetUUID()
encryptedResult, sign, err := a.Encrypt(result, timestamp, nonce)
if err == nil { if err == nil {
response = &CallbackResponse{ response = &CallbackResponse{
Encrypt: encryptedResult, Encrypt: encryptedResult,
Timestamp: utils.Int64ToStr(time.Now().Unix()), Timestamp: timestamp,
Nonce: utils.GetUUID(), Nonce: nonce,
MsgSignature: sign,
} }
response.MsgSignature = a.calculateCallbackSign(utils.Struct2MapByJson(response)) //response.MsgSignature = a.calculateCallbackSign(utils.Struct2MapByJson(response))
} }
return response return response
} }
@@ -104,16 +109,17 @@ func (a *API) calculateCallbackSign(data map[string]interface{}) (sign string) {
return fmt.Sprintf("%x", sha1.Sum([]byte(strings.Join(strList, "")))) return fmt.Sprintf("%x", sha1.Sum([]byte(strings.Join(strList, ""))))
} }
func (a *API) Encrypt(msg string) (encryptedMsg string, err error) { func (a *API) Encrypt(msg, timestamp, nonce string) (encryptedMsg, sign string, err error) {
aesKey := a.GetCallbackAESKey() //aesKey := a.GetCallbackAESKey()
buf := bytes.NewBuffer(nil) //buf := bytes.NewBuffer(nil)
buf.WriteString(utils.GetUUID()[:16]) //buf.WriteString(utils.GetUUID()[:16])
binary.Write(buf, binary.BigEndian, int32(len(msg))) //binary.Write(buf, binary.BigEndian, int32(len(msg)))
buf.WriteString(msg) //buf.WriteString(msg)
buf.WriteString(a.corpID) //buf.WriteString(a.corpID)
binResult, err := utils.AESCBCEncpryt(buf.Bytes(), aesKey, aesKey[:16]) //binResult, err := utils.AESCBCEncpryt(buf.Bytes(), []byte(aesKey), []byte(aesKey[:16]))
encryptedMsg = base64.StdEncoding.EncodeToString(binResult) //encryptedMsg = base64.StdEncoding.EncodeToString(binResult)
return encryptedMsg, err c := NewDingTalkCrypto(a.GetCallbackToken(), string(a.GetCallbackAESKey()), a.GetAppID())
return c.GetEncryptMsg(msg, timestamp, nonce)
} }
func (a *API) Decrypt(sign, timestr, nonce, msg string) (decryptedMsg string, err error) { func (a *API) Decrypt(sign, timestr, nonce, msg string) (decryptedMsg string, err error) {
@@ -138,7 +144,8 @@ func (a *API) RegisterCallback(callbackTagList []string, token, aesKey, urlStr s
// oldCallbackToken := a.callbackToken // oldCallbackToken := a.callbackToken
// oldCallbackAESKey := a.callbackAESKey // oldCallbackAESKey := a.callbackAESKey
a.callbackToken = token a.callbackToken = token
a.callbackAESKey, _ = base64.StdEncoding.DecodeString(aesKey + "=") data, _ := base64.StdEncoding.DecodeString(aesKey + "=")
a.callbackAESKey = string(data)
a.locker.Unlock() a.locker.Unlock()
if len(callbackTagList) > 0 { // 为0做测试用 if len(callbackTagList) > 0 { // 为0做测试用
@@ -171,7 +178,8 @@ func (a *API) UpdateCallback(callbackTagList []string, token, aesKey, urlStr str
oldCallbackToken := a.callbackToken oldCallbackToken := a.callbackToken
oldCallbackAESKey := a.callbackAESKey oldCallbackAESKey := a.callbackAESKey
a.callbackToken = token a.callbackToken = token
a.callbackAESKey, _ = base64.StdEncoding.DecodeString(aesKey + "=") data, _ := base64.StdEncoding.DecodeString(aesKey + "=")
a.callbackAESKey = string(data)
a.locker.Unlock() a.locker.Unlock()
if len(callbackTagList) > 0 { // 为0做测试用 if len(callbackTagList) > 0 { // 为0做测试用
@@ -228,9 +236,6 @@ func (a *API) GetCallbackMsg(formMap map[string]interface{}, bodyData []byte) (m
} }
func NewDingTalkCrypto(token, encodingAESKey, suiteKey string) *DingTalkCrypto { func NewDingTalkCrypto(token, encodingAESKey, suiteKey string) *DingTalkCrypto {
encodingAESKey = "EjTgnEa377fEcgzlQUbcgTzxPNznRjpOuSPgQAwv9aA"
token = "ITKIL2FeFHZa48fEK9g3dbJ1DOww7shOrIZ2f"
suiteKey = "ding7iu9cptairtcls0c"
bkey, _ := base64.StdEncoding.DecodeString(encodingAESKey + "=") bkey, _ := base64.StdEncoding.DecodeString(encodingAESKey + "=")
block, _ := aes.NewCipher(bkey) block, _ := aes.NewCipher(bkey)
c := &DingTalkCrypto{ c := &DingTalkCrypto{
@@ -242,6 +247,7 @@ func NewDingTalkCrypto(token, encodingAESKey, suiteKey string) *DingTalkCrypto {
} }
return c return c
} }
func (c *DingTalkCrypto) GetDecryptMsg(signature, timestamp, nonce, secretMsg string) (string, error) { func (c *DingTalkCrypto) GetDecryptMsg(signature, timestamp, nonce, secretMsg string) (string, error) {
if !c.VerificationSignature(c.Token, timestamp, nonce, secretMsg, signature) { if !c.VerificationSignature(c.Token, timestamp, nonce, secretMsg, signature) {
return "", errors.New("ERROR: 签名不匹配") return "", errors.New("ERROR: 签名不匹配")
@@ -253,11 +259,6 @@ func (c *DingTalkCrypto) GetDecryptMsg(signature, timestamp, nonce, secretMsg st
if len(decode) < aes.BlockSize { if len(decode) < aes.BlockSize {
return "", errors.New("ERROR: 密文太短") return "", errors.New("ERROR: 密文太短")
} }
fmt.Println("c", c)
fmt.Println("c.Block", c.Block)
fmt.Println("c.BKey", c.BKey)
fmt.Println("c.c.Block.BlockSize()", c.Block.BlockSize())
fmt.Println("c.BKey[:c.Block.BlockSize()]", c.BKey[:c.Block.BlockSize()])
blockMode := cipher.NewCBCDecrypter(c.Block, c.BKey[:c.Block.BlockSize()]) blockMode := cipher.NewCBCDecrypter(c.Block, c.BKey[:c.Block.BlockSize()])
plantText := make([]byte, len(decode)) plantText := make([]byte, len(decode))
blockMode.CryptBlocks(plantText, decode) blockMode.CryptBlocks(plantText, decode)
@@ -271,6 +272,22 @@ func (c *DingTalkCrypto) GetDecryptMsg(signature, timestamp, nonce, secretMsg st
return string(plantText[:size]), nil return string(plantText[:size]), nil
} }
func (c *DingTalkCrypto) GetEncryptMsg(msg, timestamp, nonce string) (string, string, error) {
size := make([]byte, 4)
binary.BigEndian.PutUint32(size, uint32(len(msg)))
msg = randomString(16) + string(size) + msg + c.SuiteKey
plantText := pkCS7Padding([]byte(msg), c.Block.BlockSize())
if len(plantText)%aes.BlockSize != 0 {
return "", "", errors.New("ERROR: 消息体size不为16的倍数")
}
blockMode := cipher.NewCBCEncrypter(c.Block, c.BKey[:c.Block.BlockSize()])
chipherText := make([]byte, len(plantText))
blockMode.CryptBlocks(chipherText, plantText)
outMsg := base64.StdEncoding.EncodeToString(chipherText)
signature := c.CreateSignature(c.Token, timestamp, nonce, string(outMsg))
return string(outMsg), signature, nil
}
// 数据签名 // 数据签名
func (c *DingTalkCrypto) CreateSignature(token, timestamp, nonce, msg string) string { func (c *DingTalkCrypto) CreateSignature(token, timestamp, nonce, msg string) string {
params := make([]string, 0) params := make([]string, 0)
@@ -307,3 +324,30 @@ func pkCS7Padding(ciphertext []byte, blockSize int) []byte {
padtext := bytes.Repeat([]byte{byte(padding)}, padding) padtext := bytes.Repeat([]byte{byte(padding)}, padding)
return append(ciphertext, padtext...) return append(ciphertext, padtext...)
} }
// 随机字符串
func randomString(n int, alphabets ...byte) string {
const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
var bytes = make([]byte, n)
var randby bool
if num, err := rand.Read(bytes); num != n || err != nil {
r.Seed(time.Now().UnixNano())
randby = true
}
for i, b := range bytes {
if len(alphabets) == 0 {
if randby {
bytes[i] = alphanum[r.Intn(len(alphanum))]
} else {
bytes[i] = alphanum[b%byte(len(alphanum))]
}
} else {
if randby {
bytes[i] = alphabets[r.Intn(len(alphabets))]
} else {
bytes[i] = alphabets[b%byte(len(alphabets))]
}
}
}
return string(bytes)
}

26
platformapi/dingdingapi/callback_test.go
View File

@@ -2,26 +2,24 @@ package dingdingapi
import ( import (
"testing" "testing"
"git.rosy.net.cn/baseapi"
) )
func TestCrypt(t *testing.T) { func TestCrypt(t *testing.T) {
api.RegisterCallback(nil, "token", "M3Z1b1FIXjlAWW84bEVxNENHSlZOUFJEbkAlRUZQXnE", "") //api.RegisterCallback(nil, "token", "M3Z1b1FIXjlAWW84bEVxNENHSlZOUFJEbkAlRUZQXnE", "")
encryptedMsg, err := api.Encrypt("hello") //encryptedMsg, err := api.Encrypt("hello")
decryptedMsg, err := api.Decrypt(encryptedMsg) //decryptedMsg, err := api.Decrypt(encryptedMsg)
t.Log(encryptedMsg, decryptedMsg, err) //t.Log(encryptedMsg, decryptedMsg, err)
} }
func TestDecrypt(t *testing.T) { func TestDecrypt(t *testing.T) {
api.RegisterCallback(nil, "j9JMGyaZs&vxqt&S", "VFFjTnZrZDJZZmZHJksxeTlxcnp5aG42WmRCbXl3REE", "") //api.RegisterCallback(nil, "j9JMGyaZs&vxqt&S", "VFFjTnZrZDJZZmZHJksxeTlxcnp5aG42WmRCbXl3REE", "")
encryptedMsg := "L+CkLbztRNz104HWXbFJInfrUuleuB7Q/Il1bgkMA4Ovy6OgObmL9o7smUTxzdNMRFrnjPSJ5Hmfzrsn3a1QVAWgRGJhPrc9mQcbb2rtNu9M0x9o+4xGKAWkb18Roqp4" //encryptedMsg := "L+CkLbztRNz104HWXbFJInfrUuleuB7Q/Il1bgkMA4Ovy6OgObmL9o7smUTxzdNMRFrnjPSJ5Hmfzrsn3a1QVAWgRGJhPrc9mQcbb2rtNu9M0x9o+4xGKAWkb18Roqp4"
decryptedMsg, err := api.Decrypt(encryptedMsg) //decryptedMsg, err := api.Decrypt(encryptedMsg)
if err != nil { //if err != nil {
t.Fatal(err) // t.Fatal(err)
} else { //} else {
baseapi.SugarLogger.Debugf("decryptedMsg:%s\n", decryptedMsg) // baseapi.SugarLogger.Debugf("decryptedMsg:%s\n", decryptedMsg)
} //}
} }
func TestPackCallbackResult(t *testing.T) { func TestPackCallbackResult(t *testing.T) {

20
platformapi/dingdingapi/dingdingapi.go
View File

@@ -42,25 +42,27 @@ type API struct {
locker sync.RWMutex locker sync.RWMutex
callbackToken string callbackToken string
callbackAESKey []byte callbackAESKey string
} }
func New(corpID, appID, secret string, config ...*platformapi.APIConfig) *API { func New(corpID, appID, secret string, config ...*platformapi.APIConfig) *API {
return NewWithAgentID(0, corpID, appID, secret, config...) return NewWithAgentID(0, corpID, appID, secret, "", "", config...)
} }
func NewWithAgentID(agentID int64, corpID, appID, secret string, config ...*platformapi.APIConfig) *API { func NewWithAgentID(agentID int64, corpID, appID, secret, callbackToken, callbackAESKey string, config ...*platformapi.APIConfig) *API {
curConfig := platformapi.DefAPIConfig curConfig := platformapi.DefAPIConfig
if len(config) > 0 { if len(config) > 0 {
curConfig = *config[0] curConfig = *config[0]
} }
return &API{ return &API{
agentID: agentID, agentID: agentID,
corpID: corpID, corpID: corpID,
appID: appID, appID: appID,
secret: secret, secret: secret,
client: &http.Client{Timeout: curConfig.ClientTimeout}, callbackToken: callbackToken,
config: &curConfig, callbackAESKey: callbackAESKey,
client: &http.Client{Timeout: curConfig.ClientTimeout},
config: &curConfig,
} }
} }