fix
This commit is contained in:
parent
e791002e2e
commit
2e47d654be
|
@ -6,7 +6,6 @@ import (
|
||||||
"crypto/cipher"
|
"crypto/cipher"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/hex"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
@ -146,12 +145,6 @@ func (l *WebhookLogic) CalculateFeiShuWebhookSignature(timestamp, nonce, encrypt
|
||||||
|
|
||||||
// 解密事件消息
|
// 解密事件消息
|
||||||
func (l *WebhookLogic) DecryptFeiShuWebhookMsg(encrypt string, encryptKey string) ([]byte, error) {
|
func (l *WebhookLogic) DecryptFeiShuWebhookMsg(encrypt string, encryptKey string) ([]byte, error) {
|
||||||
h := sha256.New()
|
|
||||||
_, err := h.Write([]byte(encryptKey))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
key := hex.EncodeToString(h.Sum(nil))
|
|
||||||
buf, err := base64.StdEncoding.DecodeString(encrypt)
|
buf, err := base64.StdEncoding.DecodeString(encrypt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("base64StdEncode Error[%v]", err)
|
return nil, fmt.Errorf("base64StdEncode Error[%v]", err)
|
||||||
|
@ -159,7 +152,7 @@ func (l *WebhookLogic) DecryptFeiShuWebhookMsg(encrypt string, encryptKey string
|
||||||
if len(buf) < aes.BlockSize {
|
if len(buf) < aes.BlockSize {
|
||||||
return nil, errors.New("cipher too short")
|
return nil, errors.New("cipher too short")
|
||||||
}
|
}
|
||||||
keyBs := sha256.Sum256([]byte(key))
|
keyBs := sha256.Sum256([]byte(encryptKey))
|
||||||
block, err := aes.NewCipher(keyBs[:sha256.Size])
|
block, err := aes.NewCipher(keyBs[:sha256.Size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("AESNewCipher Error[%v]", err)
|
return nil, fmt.Errorf("AESNewCipher Error[%v]", err)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user