fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
laodaming 2023-11-07 14:15:28 +08:00
parent e5480583d9
commit 6bfcc53073
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/feishu-sync/internal/config/config.go
View File

@ -10,4 +10,9 @@ type Config struct {
SourceMysql string SourceMysql string
Auth types.Auth Auth types.Auth
SourceRabbitMq string SourceRabbitMq string
FeiShu struct {
ApiHost string
EncryptKey string
VerificationToken string
}
} }

9
server/feishu-sync/internal/logic/webhooklogic.go
View File

@ -61,9 +61,8 @@ func (l *WebhookLogic) Webhook(w http.ResponseWriter, r *http.Request) {
//计算签名 //计算签名
timestamp := r.Header.Get("X-Lark-Request-Timestamp") timestamp := r.Header.Get("X-Lark-Request-Timestamp")
nonce := r.Header.Get("X-Lark-Request-Nonce") nonce := r.Header.Get("X-Lark-Request-Nonce")
encryptKey := "DmiHQ2bHhKiR3KK4tIjLShbs13eErxKA"
signature := r.Header.Get("X-Lark-Signature") signature := r.Header.Get("X-Lark-Signature")
sign := l.CalculateFeiShuWebhookSignature(timestamp, nonce, encryptKey, bodyBytes) sign := l.CalculateFeiShuWebhookSignature(timestamp, nonce, l.svcCtx.Config.FeiShu.EncryptKey, bodyBytes)
if signature != sign { if signature != sign {
logx.Error("非法的消息，签名验证不通过", sign, "====", signature) logx.Error("非法的消息，签名验证不通过", sign, "====", signature)
return return
@ -78,7 +77,7 @@ func (l *WebhookLogic) Webhook(w http.ResponseWriter, r *http.Request) {
return return
} }
//解密 //解密
realMsgBytes, err := l.DecryptFeiShuWebhookMsg(encryptMsg.Encrypt, encryptKey) realMsgBytes, err := l.DecryptFeiShuWebhookMsg(encryptMsg.Encrypt, l.svcCtx.Config.FeiShu.EncryptKey)
if err != nil { if err != nil {
logx.Error(err) logx.Error(err)
return return
@ -144,8 +143,8 @@ func (l *WebhookLogic) CalculateFeiShuWebhookSignature(timestamp, nonce, encrypt
} }
// 解密事件消息 // 解密事件消息
func (l *WebhookLogic) DecryptFeiShuWebhookMsg(encrypt string, encryptKey string) ([]byte, error) { func (l *WebhookLogic) DecryptFeiShuWebhookMsg(encryptData string, encryptKey string) ([]byte, error) {
buf, err := base64.StdEncoding.DecodeString(encrypt) buf, err := base64.StdEncoding.DecodeString(encryptData)
if err != nil { if err != nil {
return nil, fmt.Errorf("base64StdEncode Error[%v]", err) return nil, fmt.Errorf("base64StdEncode Error[%v]", err)
} }