修复微信绑定过期取消并补充会话隔离回归用例

This commit is contained in:
xuans committed 2026-09-28 21:53:23 +08:00
1 parent f5da65e69f
commit e84ed9b3c2
3 files changed
+43 -2

No files matched your search

+35
View File
@@ -4,6 +4,7 @@ import (
"context"
"errors"
"path/filepath"
"strings"
"testing"
"time"
@@ -202,6 +203,40 @@ func TestWeChatTestMessagesAreRateLimitedPerAccount(t *testing.T) {
}
}
func TestWeChatBindingCancellationAllowsExpiredAndMissingTickets(t *testing.T) {
service, engine := newPluginConfigService(t)
user := insertPluginTestUser(t, engine, "wechat-cancel", access.RoleSuperAdmin)
actor := NotificationBindingActor{UserID: user.ID, SessionHash: strings.Repeat("a", 64),
SessionVersion: user.SessionVersion, SecurityVersion: user.SecurityVersion}
service.wechatBindings = map[string]weChatBinding{
"expired": {Actor: actor, Status: WeChatBindingStatus{ExpiresAt: time.Now().Add(-time.Minute)}},
}
otherActor := actor
otherActor.SessionHash = strings.Repeat("b", 64)
if err := service.CancelWeChatBinding(otherActor, "expired"); !errors.Is(err, ErrWeChatBinding) {
t.Fatalf("不得撤销其他会话的绑定:%v", err)
}
if len(service.wechatBindings) != 1 {
t.Fatal("其他会话的取消请求不应删除原绑定")
}
if err := service.CancelWeChatBinding(actor, "expired"); err != nil {
t.Fatalf("过期请求应允许取消:%v", err)
}
if len(service.wechatBindings) != 0 {
t.Fatal("已取消的绑定不应残留")
}
if err := service.CancelWeChatBinding(actor, "expired"); err != nil {
t.Fatalf("重复取消应保持幂等:%v", err)
}
if err := service.CancelWeChatBinding(actor, "missing"); err != nil {
t.Fatalf("不存在的请求应允许关闭:%v", err)
}
actor.SecurityVersion++
if err := service.CancelWeChatBinding(actor, "missing"); !errors.Is(err, ErrWeChatBinding) {
t.Fatalf("幂等取消仍必须验证当前账户和会话:%v", err)
}
}
func TestEveryRoleKeepsIndependentOwnTelegramSettings(t *testing.T) {
service, engine := newPluginConfigService(t)
var users []models.User
+6 -2
View File
@@ -152,12 +152,16 @@ func (s *ConfigService) GetWeChatBinding(actor NotificationBindingActor, ticket
}
func (s *ConfigService) CancelWeChatBinding(actor NotificationBindingActor, ticket string) error {
if _, err := s.GetWeChatBinding(actor, ticket); err != nil {
if err := s.validateBindingActor(actor); err != nil {
return err
}
s.bindingMu.Lock()
defer s.bindingMu.Unlock()
// 过期、回调失败或重复取消都允许关闭页面,但不得撤销其他会话的请求。
if binding, found := s.wechatBindings[ticket]; found && binding.Actor != actor {
return ErrWeChatBinding
}
delete(s.wechatBindings, ticket)
s.bindingMu.Unlock()
return nil
}