✨ feat(sender): Supported dingtalk sign and optimized feishu sign logic

Author: Cairry

pkg/sender/dingding.go

@@ -2,8 +2,12 @@ package sender
 
 import (
 	"bytes"
-	"errors"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/base64"
 	"fmt"
+	"net/url"
+	"time"
 	"watchAlert/pkg/tools"
 )
 
@@ -29,14 +33,19 @@ func NewDingSender() SendInter {
 }
 
 func (d *DingDingSender) Send(params SendParams) error {
-	return d.post(params.Hook, params.Content)
+	return d.post(params.Hook, params.Sign, params.Content)
 }
 
 func (d *DingDingSender) Test(params SendParams) error {
-	return d.post(params.Hook, DingTestContent)
+	return d.post(params.Hook, params.Sign, DingTestContent)
 }
 
-func (d *DingDingSender) post(hook, content string) error {
+func (d *DingDingSender) post(hook, sign, content string) error {
+	if sign != "" {
+		signature, timestamp := generateDingSignature(sign)
+		hook = fmt.Sprintf("%s&timestamp=%s&sign=%s", hook, timestamp, signature)
+	}
+
 	cardContentByte := bytes.NewReader([]byte(content))
 	res, err := tools.Post(nil, hook, cardContentByte, 10)
 	if err != nil {
@@ -45,11 +54,27 @@ func (d *DingDingSender) post(hook, content string) error {
 
 	var response DingResponse
 	if err := tools.ParseReaderBody(res.Body, &response); err != nil {
-		return errors.New(fmt.Sprintf("Error unmarshalling Dingding response: %s", err.Error()))
+		return fmt.Errorf("Error unmarshalling Dingding response: %s", err.Error())
 	}
 	if response.Code != 0 {
-		return errors.New(response.Msg)
+		return fmt.Errorf("%v", response.Msg)
 	}
 
 	return nil
 }
+
+// generateDingSignature 生成 Ding 签名
+func generateDingSignature(secret string) (string, string) {
+	// 1. Get millisecond timestamp
+	timestamp := fmt.Sprintf("%d", time.Now().UnixNano()/int64(time.Millisecond))
+
+	// 2. Prepare the string to sign: {timestamp}\n{secret}
+	stringToSign := fmt.Sprintf("%s\n%s", timestamp, secret)
+
+	// 3. Create HMAC-SHA256 hash
+	h := hmac.New(sha256.New, []byte(secret))
+	h.Write([]byte(stringToSign))
+	hmacCode := h.Sum(nil)
+
+	return url.QueryEscape(base64.StdEncoding.EncodeToString(hmacCode)), timestamp
+}

pkg/sender/feishu.go

@@ -55,11 +55,7 @@ func (f *FeiShuSender) Test(params SendParams) error {
 
 func (f *FeiShuSender) post(hook, sign string, msg map[string]any) error {
 	if sign != "" {
-		timestamp := strconv.FormatInt(time.Now().Unix(), 10)
-		signature, err := generateSignature(sign, timestamp)
-		if err != nil {
-			return err
-		}
+		signature, timestamp := generateFeishuSignature(sign)
 		msg["sign"] = signature
 		msg["timestamp"] = timestamp
 	}
@@ -81,16 +77,17 @@ func (f *FeiShuSender) post(hook, sign string, msg map[string]any) error {
 	return nil
 }
 
-// generateSignature 生成签名
-func generateSignature(secret string, timestamp string) (string, error) {
-	//timestamp + key 做sha256, 再进行base64 encode
-	stringToSign := fmt.Sprintf("%v", timestamp) + "\n" + secret
+// generateFeishuSignature 生成 Feishu 签名
+func generateFeishuSignature(secret string) (string, string) {
+	// 1. Get timestamp
+	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
+
+	// 2. Prepare the string to sign: {timestamp}\n{secret}
+	stringToSign := fmt.Sprintf("%s\n%s", timestamp, secret)
+
 	var data []byte
 	h := hmac.New(sha256.New, []byte(stringToSign))
-	_, err := h.Write(data)
-	if err != nil {
-		return "", err
-	}
-	signature := base64.StdEncoding.EncodeToString(h.Sum(nil))
-	return signature, nil
+	h.Write(data)
+
+	return base64.StdEncoding.EncodeToString(h.Sum(nil)), timestamp
 }