From 63af44bfe15a249bd7ad8df213265ddaf30f6298 Mon Sep 17 00:00:00 2001
From: wangjia <809946525@qq.com>
Date: Fri, 10 Jul 2026 11:31:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(v2):=20webhook=20=E6=88=AA=E6=96=AD=20UTF-8?=
 =?UTF-8?q?=20=E5=AE=89=E5=85=A8=20+=20=E6=8A=95=E9=80=92=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81=E6=9F=A5=E5=BA=93=E5=A4=B1=E8=B4=A5=E8=90=BD=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97(=E4=B8=8E=E6=9C=AA=E4=BB=98=E5=8C=BA=E5=88=86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MarkFailed: truncateUTF8 避免截断中点 UTF-8 rune, last_error 安全 <=255B
- notifier truncate: 同上, 投递失败消息截断 UTF-8 安全
- deliverOne: 拆分 orderPaid 错误分支 — DB 错误落日志 [webhook] 投递门禁查单失败,与"订单未付"(静默)区分
- test: MarkFailed with long Chinese string, 验证 stored last_error 为有效 UTF-8 且 <=255B

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013nMthbVEmQquxBRKb9Fj8u
---
 internal/store/webhook.go      | 17 +++++++++++++---
 internal/store/webhook_test.go | 37 ++++++++++++++++++++++++++++++++++
 internal/webhook/notifier.go   | 16 ++++++++++++---
 3 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/internal/store/webhook.go b/internal/store/webhook.go
index 891ce5f..161db96 100644
--- a/internal/store/webhook.go
+++ b/internal/store/webhook.go
@@ -2,6 +2,7 @@ package store
 
 import (
 	"fmt"
+	"unicode/utf8"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
@@ -51,12 +52,22 @@ func (s *WebhookStore) MarkDelivered(id uint64) error {
 	return nil
 }
 
+// truncateUTF8 safely truncates a string to n bytes without splitting UTF-8 runes.
+func truncateUTF8(s string, n int) string {
+	if len(s) <= n {
+		return s
+	}
+	s = s[:n]
+	for len(s) > 0 && !utf8.ValidString(s) {
+		s = s[:len(s)-1]
+	}
+	return s
+}
+
 // MarkFailed increments attempts and records the last error, leaving the row
 // undelivered for the next retry sweep.
 func (s *WebhookStore) MarkFailed(id uint64, errMsg string) error {
-	if len(errMsg) > 255 {
-		errMsg = errMsg[:255]
-	}
+	errMsg = truncateUTF8(errMsg, 255)
 	if err := s.db.Model(&model.WebhookDelivery{}).Where("id = ?", id).
 		Updates(map[string]any{
 			"attempts":   gorm.Expr("attempts + 1"),
diff --git a/internal/store/webhook_test.go b/internal/store/webhook_test.go
index 6f51d53..162e3bc 100644
--- a/internal/store/webhook_test.go
+++ b/internal/store/webhook_test.go
@@ -2,6 +2,7 @@ package store_test
 
 import (
 	"testing"
+	"unicode/utf8"
 
 	"github.com/wangjia/pay/internal/model"
 	"github.com/wangjia/pay/internal/store"
@@ -42,3 +43,39 @@ func TestWebhookMarkFailed(t *testing.T) {
 		t.Fatalf("失败后应仍待投递且 attempts=1, got %+v", again)
 	}
 }
+
+func TestWebhookMarkFailedUTF8Truncation(t *testing.T) {
+	ws := store.NewWebhookStore(model.OpenTestDB(t))
+	_ = ws.EnqueueDelivery("PAY-3", "pangolin", "payment.succeeded", `{}`)
+	list, _ := ws.ListUndelivered(10)
+
+	// Create a long Chinese error message that exceeds 255 bytes
+	// Each Chinese character is typically 3 bytes in UTF-8
+	longChinese := "错误信息: " // "error message: " in Chinese (each char ~3 bytes)
+	for i := 0; i < 100; i++ {
+		longChinese += "中"
+	}
+	// longChinese is now > 300 bytes
+
+	if err := ws.MarkFailed(list[0].ID, longChinese); err != nil {
+		t.Fatalf("markFailed with long Chinese: %v", err)
+	}
+
+	again, _ := ws.ListUndelivered(10)
+	if len(again) != 1 {
+		t.Fatalf("expected 1 pending row, got %d", len(again))
+	}
+
+	stored := again[0].LastError
+	// Verify last_error is valid UTF-8
+	if !utf8.ValidString(stored) {
+		t.Fatalf("last_error is not valid UTF-8: %q", stored)
+	}
+
+	// Verify last_error is <= 255 bytes
+	if len(stored) > 255 {
+		t.Fatalf("last_error exceeds 255 bytes: %d", len(stored))
+	}
+
+	t.Logf("UTF-8 truncated error (%d bytes): %q", len(stored), stored)
+}
diff --git a/internal/webhook/notifier.go b/internal/webhook/notifier.go
index d2a9540..67ed598 100644
--- a/internal/webhook/notifier.go
+++ b/internal/webhook/notifier.go
@@ -13,6 +13,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 
 	"github.com/google/uuid"
 
@@ -69,7 +70,11 @@ func (n *Notifier) DeliverPending(limit int) (int, error) {
 func (n *Notifier) deliverOne(d *store.WebhookDeliveryRow) bool {
 	// 门禁:订单未付不投递(不计失败,等 settle 翻转后自然放行)。
 	paid, err := n.orderPaid(d.OutTradeNo)
-	if err != nil || !paid {
+	if err != nil {
+		log.Printf("[webhook] 投递门禁查单失败 %s: %v", d.OutTradeNo, err)
+		return false
+	}
+	if !paid {
 		return false
 	}
 	cfg, found := n.bizConfig(d.BizSystem)
@@ -109,9 +114,14 @@ func (n *Notifier) deliverOne(d *store.WebhookDeliveryRow) bool {
 	return false
 }
 
+// truncate safely truncates a string to n bytes without splitting UTF-8 runes.
 func truncate(s string, n int) string {
-	if len(s) > n {
-		return s[:n]
+	if len(s) <= n {
+		return s
+	}
+	s = s[:n]
+	for len(s) > 0 && !utf8.ValidString(s) {
+		s = s[:len(s)-1]
 	}
 	return s
 }