refactor

Author: wxiaoguang

services/webhook/feishu.go

@@ -4,20 +4,17 @@
 package webhook
 
 import (
-	"bytes"
 	"context"
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 
 	webhook_model "code.gitea.io/gitea/models/webhook"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/json"
 	api "code.gitea.io/gitea/modules/structs"
 	webhook_module "code.gitea.io/gitea/modules/webhook"
 )
@@ -193,27 +190,17 @@ func (feishuConvertor) WorkflowJob(p *api.WorkflowJobPayload) (FeishuPayload, er
 	return newFeishuTextPayload(text), nil
 }
 
-// GenSign generates a signature for Feishu webhook
+// feishuGenSign generates a signature for Feishu webhook
 // https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot
-func GenSign(secret string, timestamp int64) (string, error) {
-	// timestamp + key do sha256, then base64 encode
+func feishuGenSign(secret string, timestamp int64) string {
+	// key="{timestamp}\n{secret}", then hmac-sha256, then base64 encode
 	stringToSign := fmt.Sprintf("%d\n%s", timestamp, secret)
-
 	h := hmac.New(sha256.New, []byte(stringToSign))
-	_, err := h.Write([]byte{})
-	if err != nil {
-		return "", err
-	}
-
-	signature := base64.StdEncoding.EncodeToString(h.Sum(nil))
-	return signature, nil
+	return base64.StdEncoding.EncodeToString(h.Sum(nil))
 }
 
 func newFeishuRequest(_ context.Context, w *webhook_model.Webhook, t *webhook_model.HookTask) (*http.Request, []byte, error) {
-	var pc payloadConvertor[FeishuPayload] = feishuConvertor{}
-
-	// Get the payload first
-	payload, err := newPayload(pc, []byte(t.PayloadContent), t.EventType)
+	payload, err := newPayload(feishuConvertor{}, []byte(t.PayloadContent), t.EventType)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -222,35 +209,10 @@ func newFeishuRequest(_ context.Context, w *webhook_model.Webhook, t *webhook_mo
 	if w.Secret != "" {
 		timestamp := time.Now().Unix()
 		payload.Timestamp = timestamp
-
-		// Generate signature
-		sign, err := GenSign(w.Secret, timestamp)
-		if err != nil {
-			return nil, nil, err
-		}
-		payload.Sign = sign
-	}
-
-	// Marshal the payload
-	body, err := json.MarshalIndent(payload, "", "  ")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// Create the request
-	method := w.HTTPMethod
-	if method == "" {
-		method = http.MethodPost
-	}
-
-	req, err := http.NewRequest(method, w.URL, bytes.NewReader(body))
-	if err != nil {
-		return nil, nil, err
+		payload.Sign = feishuGenSign(w.Secret, timestamp)
 	}
-	req.Header.Set("Content-Type", "application/json")
 
-	// Add default headers
-	return req, body, addDefaultHeaders(req, []byte(w.Secret), w, t, body)
+	return sendHTTPRequest(payload, w, t, false)
 }
 
 func init() {

services/webhook/feishu_test.go

@@ -190,3 +190,7 @@ func TestFeishuJSONPayload(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "[test/repo:test] \r\n[2020558](http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778) commit message - user1\r\n[2020558](http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778) commit message - user1", body.Content.Text)
 }
+
+func TestFeishuGenSign(t *testing.T) {
+	assert.Equal(t, "rWZ84lcag1x9aBFhn1gtV4ZN+4gme3pilfQNMk86vKg=", feishuGenSign("a", 1))
+}

services/webhook/payloader.go

@@ -95,7 +95,10 @@ func newJSONRequest[T any](pc payloadConvertor[T], w *webhook_model.Webhook, t *
 	if err != nil {
 		return nil, nil, err
 	}
+	return sendHTTPRequest(payload, w, t, withDefaultHeaders)
+}
 
+func sendHTTPRequest[T any](payload T, w *webhook_model.Webhook, t *webhook_model.HookTask, withDefaultHeaders bool) (*http.Request, []byte, error) {
 	body, err := json.MarshalIndent(payload, "", "  ")
 	if err != nil {
 		return nil, nil, err