公众号身份不匹配时阻止重新启用、测试发送与邮件通知,保留停用及解绑;新增身份匹配回归源码。全量编译和相关包静态检查通过,未执行回归和实机验收。作为修复全量静态检查发现的既有用例签名错误前检查点。
This commit is contained in:
parent
afc177132a
commit
7b6891fdbb
@ -57,7 +57,8 @@ func weChatRequestService(ctx *appcontext.Context, w http.ResponseWriter, recent
|
|||||||
|
|
||||||
func weChatPublicSettings(status pluginservice.WeChatUserSettingsStatus) map[string]any {
|
func weChatPublicSettings(status pluginservice.WeChatUserSettingsStatus) map[string]any {
|
||||||
return map[string]any{"version": status.Version, "bound": status.Settings.OpenID != "", "enabled": status.Settings.Enabled,
|
return map[string]any{"version": status.Version, "bound": status.Settings.OpenID != "", "enabled": status.Settings.Enabled,
|
||||||
"showContent": status.Settings.ShowContent, "displayName": status.Settings.DisplayName}
|
"showContent": status.Settings.ShowContent, "displayName": status.Settings.DisplayName,
|
||||||
|
"needsRebind": status.NeedsRebind}
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeWeChatSettings(w http.ResponseWriter, userID int, status pluginservice.WeChatUserSettingsStatus) {
|
func writeWeChatSettings(w http.ResponseWriter, userID int, status pluginservice.WeChatUserSettingsStatus) {
|
||||||
@ -175,7 +176,7 @@ func TestWeChatMessage(ctx *appcontext.Context, w http.ResponseWriter, req *http
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
status, err := service.GetOwnWeChatSettings(ctx.UserID)
|
status, err := service.GetOwnWeChatSettings(ctx.UserID)
|
||||||
if err != nil || status.Settings.OpenID == "" {
|
if err != nil || status.Settings.OpenID == "" || status.NeedsRebind {
|
||||||
writeWeChatError(w, pluginservice.WeChatNotice("请先绑定本人的微信"))
|
writeWeChatError(w, pluginservice.WeChatNotice("请先绑定本人的微信"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -129,7 +129,7 @@ func (h *HookSender) ReceiveSaveAfter(ctx *context.Context, email *parsemail.Ema
|
|||||||
}
|
}
|
||||||
// 发信前重新读取,停用、解绑或禁用账户后不能继续使用插件缓存中的旧接收人。
|
// 发信前重新读取,停用、解绑或禁用账户后不能继续使用插件缓存中的旧接收人。
|
||||||
status, err := pluginConfigService.GetOwnWeChatSettings(recipient.UserID)
|
status, err := pluginConfigService.GetOwnWeChatSettings(recipient.UserID)
|
||||||
if err != nil || !status.Settings.Enabled || status.Settings.OpenID == "" {
|
if err != nil || !status.Settings.Enabled || status.Settings.OpenID == "" || status.NeedsRebind {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
payload, err := json.Marshal(status.Settings)
|
payload, err := json.Marshal(status.Settings)
|
||||||
|
|||||||
@ -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) {
|
func TestWeChatBindingStatusRejectsOtherSessionsAndRevokedAccounts(t *testing.T) {
|
||||||
service, engine := newPluginConfigService(t)
|
service, engine := newPluginConfigService(t)
|
||||||
user := insertPluginTestUser(t, engine, "wechat-binding", access.RoleSuperAdmin)
|
user := insertPluginTestUser(t, engine, "wechat-binding", access.RoleSuperAdmin)
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"git.pcux.cn/xuans/Smail/config"
|
||||||
"git.pcux.cn/xuans/Smail/models"
|
"git.pcux.cn/xuans/Smail/models"
|
||||||
"git.pcux.cn/xuans/Smail/services/access"
|
"git.pcux.cn/xuans/Smail/services/access"
|
||||||
"git.pcux.cn/xuans/Smail/utils/credential"
|
"git.pcux.cn/xuans/Smail/utils/credential"
|
||||||
@ -29,8 +30,9 @@ type WeChatUserSettings struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type WeChatUserSettingsStatus struct {
|
type WeChatUserSettingsStatus struct {
|
||||||
Settings WeChatUserSettings
|
Settings WeChatUserSettings
|
||||||
Version uint64
|
Version uint64
|
||||||
|
NeedsRebind bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type WeChatUserSettingsEntry struct {
|
type WeChatUserSettingsEntry struct {
|
||||||
@ -61,7 +63,27 @@ func (s *ConfigService) GetOwnWeChatSettings(userID int) (WeChatUserSettingsStat
|
|||||||
return WeChatUserSettingsStatus{}, err
|
return WeChatUserSettingsStatus{}, err
|
||||||
}
|
}
|
||||||
settings, err := s.decodeWeChatSettings(record)
|
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) {
|
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{}, 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) {
|
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
|
return current, err
|
||||||
}
|
}
|
||||||
settings := current.Settings
|
settings := current.Settings
|
||||||
|
if !unbind && enabled && current.NeedsRebind {
|
||||||
|
return current, ErrWeChatBinding
|
||||||
|
}
|
||||||
if unbind {
|
if unbind {
|
||||||
settings = WeChatUserSettings{}
|
settings = WeChatUserSettings{}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user