补充公众号变更后的个人重绑状态和发送限制

公众号身份不匹配时阻止重新启用、测试发送与邮件通知,保留停用及解绑;新增身份匹配回归源码。全量编译和相关包静态检查通过,未执行回归和实机验收。作为修复全量静态检查发现的既有用例签名错误前检查点。
This commit is contained in:
xuans committed 2026-09-28 21:31:37 +08:00
1 parent e79095d5f3
commit 0328b74173
4 files changed
+56 -7

No files matched your search

+22
View File
@@ -127,6 +127,28 @@ func TestEveryRoleKeepsIndependentOwnWeChatSettings(t *testing.T) {
}
}
func TestWeChatBindingIdentityMustMatchCurrentApplication(t *testing.T) {
for _, test := range []struct {
name string
settings WeChatUserSettings
appID string
want bool
}{
{name: "unbound"},
{name: "same-app", settings: WeChatUserSettings{AppID: "wx-original-app", OpenID: "openid-test-user", Enabled: true}, appID: "wx-original-app"},
{name: "changed-app", settings: WeChatUserSettings{AppID: "wx-original-app", OpenID: "openid-test-user", Enabled: true}, appID: "wx-replacement-app", want: true},
{name: "missing-app", settings: WeChatUserSettings{AppID: "wx-original-app", OpenID: "openid-test-user"}, want: true},
{name: "invalid-app", settings: WeChatUserSettings{AppID: "wx-original-app", OpenID: "openid-test-user"}, appID: "invalid", want: true},
{name: "disabled-same-app", settings: WeChatUserSettings{AppID: "wx-original-app", OpenID: "openid-test-user"}, appID: "wx-original-app"},
} {
t.Run(test.name, func(t *testing.T) {
if got := weChatBindingNeedsRebind(test.settings, test.appID); got != test.want {
t.Fatal(got, test.want)
}
})
}
}
func TestWeChatBindingStatusRejectsOtherSessionsAndRevokedAccounts(t *testing.T) {
service, engine := newPluginConfigService(t)
user := insertPluginTestUser(t, engine, "wechat-binding", access.RoleSuperAdmin)
+30 -4
View File
@@ -5,6 +5,7 @@ import (
"errors"
"strings"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/access"
"git.pcux.cn/xuans/Smail/utils/credential"
@@ -29,8 +30,9 @@ type WeChatUserSettings struct {
}
type WeChatUserSettingsStatus struct {
Settings WeChatUserSettings
Version uint64
Settings WeChatUserSettings
Version uint64
NeedsRebind bool
}
type WeChatUserSettingsEntry struct {
@@ -61,7 +63,27 @@ func (s *ConfigService) GetOwnWeChatSettings(userID int) (WeChatUserSettingsStat
return WeChatUserSettingsStatus{}, err
}
settings, err := s.decodeWeChatSettings(record)
return WeChatUserSettingsStatus{Settings: settings, Version: record.Version}, err
return WeChatUserSettingsStatus{Settings: settings, Version: record.Version,
NeedsRebind: weChatBindingNeedsRebind(settings, currentWeChatAppID())}, err
}
func currentWeChatAppID() string {
manager := config.CurrentManager()
if manager == nil {
return ""
}
instance, found := manager.Snapshot().Plugins.Plugins[weChatPluginID]
var settings struct {
AppID string `json:"appId"`
}
if !found || json.Unmarshal(instance.Settings, &settings) != nil {
return ""
}
return settings.AppID
}
func weChatBindingNeedsRebind(settings WeChatUserSettings, appID string) bool {
return settings.OpenID != "" && (!validWeChatIdentity(appID) || settings.AppID != appID)
}
func (s *ConfigService) decodeWeChatSettings(record models.PluginUserSetting) (WeChatUserSettings, error) {
@@ -147,7 +169,8 @@ func (s *ConfigService) saveWeChatSettings(userID int, settings WeChatUserSettin
return WeChatUserSettingsStatus{}, ErrPluginSettingConflict
}
}
return WeChatUserSettingsStatus{Settings: settings, Version: record.Version}, nil
return WeChatUserSettingsStatus{Settings: settings, Version: record.Version,
NeedsRebind: weChatBindingNeedsRebind(settings, currentWeChatAppID())}, nil
}
func (s *ConfigService) UpdateOwnWeChatPreferences(userID int, enabled, showContent, unbind bool, expectedVersion uint64) (WeChatUserSettingsStatus, error) {
@@ -156,6 +179,9 @@ func (s *ConfigService) UpdateOwnWeChatPreferences(userID int, enabled, showCont
return current, err
}
settings := current.Settings
if !unbind && enabled && current.NeedsRebind {
return current, ErrWeChatBinding
}
if unbind {
settings = WeChatUserSettings{}
} else {