隔离系统通知配置权限并保留各角色个人设置
Security Checks / security (push) Waiting to run

个人扫码绑定实现前检查点;补充权限与账户隔离回归用例,业务实机验收尚未执行。
This commit is contained in:
xuans committed 2026-09-28 20:57:56 +08:00
1 parent 39ac7d2d2c
commit 2a532b2224
9 files changed
+196 -19

No files matched your search

+68
View File
@@ -43,6 +43,74 @@ func TestConfigCredentialsAreEncryptedAtRest(t *testing.T) {
}
}
func TestNotificationSystemConfigurationRequiresSuperAdmin(t *testing.T) {
for _, id := range []string{"telegram_push", "wechat_push"} {
t.Run(id, func(t *testing.T) {
original := PluginInstance{Enabled: true, Settings: json.RawMessage(`{"recipient":"original","enabled":true}`)}
current := RuntimeConfig{Plugins: PluginsSectionConfig{Plugins: map[string]PluginInstance{id: original}}}
for _, tc := range []struct {
name string
modify func(*PluginInstance)
}{
{"enabled", func(p *PluginInstance) { p.Enabled = false }},
{"settings", func(p *PluginInstance) { p.Settings = json.RawMessage(`{"recipient":"changed"}`) }},
{"secret", func(p *PluginInstance) { p.Secret.Ciphertext = "changed" }},
{"executable", func(p *PluginInstance) { p.Executable = "changed" }},
{"capabilities", func(p *PluginInstance) { p.Permissions.Capabilities = []string{"network"} }},
{"network", func(p *PluginInstance) {
p.Permissions.Network = []PluginNetworkTarget{{Scheme: "https", Host: "example.com", Port: 443}}
}},
} {
t.Run(tc.name, func(t *testing.T) {
next := original
tc.modify(&next)
candidate := RuntimeConfig{Plugins: PluginsSectionConfig{Plugins: map[string]PluginInstance{id: next}}}
for _, role := range []string{"super_admin", "admin", "user"} {
err := AuthorizePluginChanges(AuditActor{UserID: "1", Role: role}, current, candidate)
if (err == nil) != (role == "super_admin") {
t.Fatalf("角色=%s,修改=%s,授权结果=%v", role, tc.name, err)
}
}
})
}
for _, role := range []string{"super_admin", "admin", "user"} {
actor := AuditActor{UserID: "1", Role: role}
if err := AuthorizePluginChanges(actor, RuntimeConfig{}, current); (err == nil) != (role == "super_admin") {
t.Fatalf("角色=%s,首次配置授权结果=%v", role, err)
}
if err := AuthorizePluginChanges(actor, current, RuntimeConfig{}); (err == nil) != (role == "super_admin") {
t.Fatalf("角色=%s,移除配置授权结果=%v", role, err)
}
}
})
}
}
func TestAdminCanCarryUnchangedNotificationConfiguration(t *testing.T) {
for _, id := range []string{"telegram_push", "wechat_push"} {
current := RuntimeConfig{Plugins: PluginsSectionConfig{Plugins: map[string]PluginInstance{
id: {Enabled: true, Settings: json.RawMessage(`{"recipient":"original","enabled":true}`)},
"spam_block": {Settings: json.RawMessage(`{"score":1}`)},
}}}
candidate := RuntimeConfig{Plugins: PluginsSectionConfig{Plugins: map[string]PluginInstance{
id: {Enabled: true, Settings: json.RawMessage(`{ "enabled": true, "recipient": "original" }`)},
"spam_block": {Settings: json.RawMessage(`{"score":2}`)},
}}}
if err := AuthorizePluginChanges(AuditActor{UserID: "2", Role: "admin"}, current, candidate); err != nil {
t.Fatalf("修改垃圾邮件参数不应误拦截未变化的渠道 %s:%v", id, err)
}
if err := AuthorizePluginChanges(AuditActor{UserID: "3", Role: "user"}, current, candidate); err == nil {
t.Fatal("普通用户不应修改系统插件配置")
}
invalid := candidate.Plugins.Plugins[id]
invalid.Settings = append(invalid.Settings, []byte(" {}")...)
candidate.Plugins.Plugins[id] = invalid
if err := AuthorizePluginChanges(AuditActor{UserID: "2", Role: "admin"}, current, candidate); err == nil {
t.Fatal("尾随 JSON 不应视为未变化的系统配置")
}
}
}
func TestConfigPrefixCredentialRoundTrip(t *testing.T) {
oldRoot := ROOT_PATH
root := t.TempDir()
+26 -1
View File
@@ -182,7 +182,7 @@ func DefaultConfigAuthorization(_ context.Context, actor AuditActor, operation C
return nil
}
// AuthorizePluginChanges 限制管理员只能修改已有插件参数,不允许安装、替换程序或提升权限。
// AuthorizePluginChanges 限制管理员只能修改普通插件参数;公众号和机器人始终由超级管理员配置。
func AuthorizePluginChanges(actor AuditActor, current, candidate RuntimeConfig) error {
if actor.Role == string(access.RoleSuperAdmin) {
return nil
@@ -195,10 +195,35 @@ func AuthorizePluginChanges(actor AuditActor, current, candidate RuntimeConfig)
if !ok || next.Executable != previous.Executable || !reflect.DeepEqual(next.Permissions, previous.Permissions) {
return ErrAuthorizationRequired
}
if id == "wechat_push" || id == "telegram_push" {
// 允许普通插件保存时原样携带共享配置,但不允许借整个分区绕过权限。
if !sameNotificationPlugin(previous, next) {
return ErrAuthorizationRequired
}
}
}
return nil
}
func sameNotificationPlugin(previous, next PluginInstance) bool {
var settings [2]any
for index, data := range []json.RawMessage{previous.Settings, next.Settings} {
if len(data) == 0 {
continue
}
if !json.Valid(data) {
return false
}
decoder := json.NewDecoder(strings.NewReader(string(data)))
decoder.UseNumber()
if err := decoder.Decode(&settings[index]); err != nil {
return false
}
}
previous.Settings, next.Settings = nil, nil
return reflect.DeepEqual(previous, next) && reflect.DeepEqual(settings[0], settings[1])
}
func DefaultConfigConfirmation(_ context.Context, _ AuditActor, confirmation StepUpConfirmation, operation ConfigOperation, _ Section) error {
if operation != ConfigOperationRollback && !strings.EqualFold(confirmation.Method, "webauthn") && !strings.EqualFold(confirmation.Method, "recent_auth") {
return nil
+2 -1
View File
@@ -25,7 +25,8 @@ func PluginSecret(ctx *appcontext.Context, w http.ResponseWriter, req *http.Requ
if req.Method == http.MethodPut {
capability = access.CapabilityPluginWriteGlobal
}
if ctx == nil || ctx.UserID <= 0 {
// 共享公众号和机器人密钥不属于分组管理员权限,首次配置和后续维护使用同一边界。
if ctx == nil || ctx.UserID <= 0 || ctx.EffectiveRole() != access.RoleSuperAdmin {
writeConfigAccessError(w, &access.Denial{Code: access.CodeAccessDenied})
return
}
+21 -10
View File
@@ -32,13 +32,16 @@ func TestPluginSecretAuthorization(t *testing.T) {
{"anonymous", nil, "ACCESS_DENIED"},
{"no session user", &appcontext.Context{Role: access.RoleSuperAdmin, RecentAuth: true, RecoveryCodeConfigured: true}, "ACCESS_DENIED"},
{"ordinary user", &appcontext.Context{UserID: 3, Role: access.RoleUser, RecentAuth: true, RecoveryCodeConfigured: true}, "ACCESS_DENIED"},
{"missing recent authentication", &appcontext.Context{UserID: 2, Role: access.RoleAdmin, RecoveryCodeConfigured: true}, "RECENT_AUTH_REQUIRED"},
{"missing recovery code", &appcontext.Context{UserID: 2, Role: access.RoleAdmin, RecentAuth: true}, "RECOVERY_CODE_REQUIRED"},
{"authenticated administrator", &appcontext.Context{UserID: 2, Role: access.RoleAdmin, RecentAuth: true, RecoveryCodeConfigured: true}, "ACCESS_DENIED"},
{"missing recent authentication", &appcontext.Context{UserID: 1, Role: access.RoleSuperAdmin, RecoveryCodeConfigured: true}, "RECENT_AUTH_REQUIRED"},
{"administrator without recovery code", &appcontext.Context{UserID: 2, Role: access.RoleAdmin, RecentAuth: true}, "ACCESS_DENIED"},
} {
t.Run(tc.name, func(t *testing.T) {
recorder := callPluginSecret(tc.ctx, http.MethodPut, "telegram_push", `{"version":0,"change":{"operation":"replace","value":{"plaintext":"test-only-secret"}}}`)
if recorder.Code != http.StatusForbidden || !strings.Contains(recorder.Body.String(), tc.code) {
t.Fatalf("status=%d response=%s", recorder.Code, recorder.Body.String())
for _, id := range []string{"telegram_push", "wechat_push"} {
recorder := callPluginSecret(tc.ctx, http.MethodPut, id, `{"version":0,"change":{"operation":"replace","value":{"plaintext":"test-only-secret"}}}`)
if recorder.Code != http.StatusForbidden || !strings.Contains(recorder.Body.String(), tc.code) {
t.Fatalf("渠道=%s,状态=%d,响应=%s", id, recorder.Code, recorder.Body.String())
}
}
})
}
@@ -46,10 +49,18 @@ func TestPluginSecretAuthorization(t *testing.T) {
if err != nil || count != 0 {
t.Fatalf("denied writes changed secrets: count=%d err=%v", count, err)
}
for _, role := range []access.Role{access.RoleAdmin, access.RoleSuperAdmin} {
recorder := callPluginSecret(&appcontext.Context{UserID: 2, Role: role}, http.MethodGet, "telegram_push", "")
if recorder.Code != http.StatusOK || !strings.Contains(recorder.Body.String(), `"configured":false`) {
t.Fatalf("read role=%s status=%d body=%s", role, recorder.Code, recorder.Body.String())
for _, id := range []string{"telegram_push", "wechat_push"} {
for _, role := range []access.Role{access.RoleUser, access.RoleAdmin, access.RoleSuperAdmin} {
recorder := callPluginSecret(&appcontext.Context{UserID: 2, Role: role}, http.MethodGet, id, "")
if role != access.RoleSuperAdmin {
if recorder.Code != http.StatusForbidden || !strings.Contains(recorder.Body.String(), "ACCESS_DENIED") {
t.Fatalf("角色=%s 不应读取系统渠道 %s 的密钥状态", role, id)
}
continue
}
if recorder.Code != http.StatusOK || !strings.Contains(recorder.Body.String(), `"configured":false`) {
t.Fatalf("超级管理员读取渠道=%s,状态=%d", id, recorder.Code)
}
}
}
recorder := callPluginSecret(&appcontext.Context{UserID: 3, Role: access.RoleUser}, http.MethodGet, "telegram_push", "")
@@ -63,7 +74,7 @@ func TestPluginSecretEncryptedLifecycleAndValidation(t *testing.T) {
previous := hooks.PluginConfigService()
hooks.SetPluginConfigService(service)
t.Cleanup(func() { hooks.SetPluginConfigService(previous) })
ctx := &appcontext.Context{UserID: 2, Role: access.RoleAdmin, RecentAuth: true, RecoveryCodeConfigured: true}
ctx := &appcontext.Context{UserID: 1, Role: access.RoleSuperAdmin, RecentAuth: true, RecoveryCodeConfigured: true}
for _, id := range []string{"telegram_push", "wechat_push"} {
t.Run(id, func(t *testing.T) {
for _, body := range []string{
+30
View File
@@ -91,6 +91,36 @@ func TestConfigServiceAllowsEmptyTelegramChatIDToDisablePush(t *testing.T) {
}
}
func TestEveryRoleKeepsIndependentOwnTelegramSettings(t *testing.T) {
service, engine := newPluginConfigService(t)
var users []models.User
for _, role := range []access.Role{access.RoleSuperAdmin, access.RoleAdmin, access.RoleUser} {
user := insertPluginTestUser(t, engine, "own-"+string(role), role)
users = append(users, user)
status, err := service.GetOwnTelegramSettings(user.ID)
if err != nil || status.Settings.ChatID != "" || status.Version != 0 {
t.Fatalf("角色=%s,不应自动绑定系统接收身份:%v", role, err)
}
}
chatIDs := []string{"10101", "20202", "30303"}
for index, user := range users {
status, err := service.UpdateOwnTelegramSettings(user.ID, TelegramUserSettings{ChatID: chatIDs[index]}, 0)
if err != nil || status.Settings.ChatID != chatIDs[index] || status.Version != 1 {
t.Fatalf("角色=%s,本人通知设置保存失败:%v", user.EffectiveRole(), err)
}
}
if _, err := service.UpdateOwnTelegramSettings(users[0].ID, TelegramUserSettings{ChatID: "40404"}, 1); err != nil {
t.Fatalf("超级管理员不能修改本人的通知设置:%v", err)
}
chatIDs[0] = "40404"
for index, user := range users {
status, err := service.GetOwnTelegramSettings(user.ID)
if err != nil || status.Settings.ChatID != chatIDs[index] {
t.Fatalf("角色=%s,个人通知设置发生跨账户串用:%v", user.EffectiveRole(), err)
}
}
}
func TestConfigServiceRejectsTrailingTelegramSettingsJSON(t *testing.T) {
service, engine := newPluginConfigService(t)
user := insertPluginTestUser(t, engine, "trailing-json", access.RoleUser)