Web 控制台此前所有 admin 角色用户共享全部设备。新增设备级归属:内置 admin 把设备绑定给一个用户名后,该设备对其他 admin/viewer 不可见不可控,只有 owner 与内置 admin 可见可控。 - 新增 device_acl.json(与 users.json 同目录,YAMA_DEVICE_ACL_FILE 可覆盖), 原子写、启动加载;文件损坏拒绝启动,避免私人设备变成公共。 - 可见性:内置 admin 全部;未绑定设备仅 admin 角色;绑定设备仅 owner。 覆盖 get_devices、/api/devices、屏幕墙,以及 connect/term_open/mouse/key/ clipboard/keyframe/rdp_reset 全部控制通道;device_update 也只推给可见者。 - 只有内置 admin(用户名 admin + role admin)能 bind/unbind;admin 角色保留 建用户、删设备、审计等既有功能。删设备清绑定。 - 审计日志也按归属过滤:非内置 admin 只能看到公共设备和自己绑定设备的记录 (device_id / device / devices 三种写法都识别);auditquery 增 DeviceAllowed 钩子,ACL 提供 Owner 快照,避免扫描时逐条加锁。 - 删用户会解绑其设备;但账号名下有绑定设备时只有内置 admin 能删,其他 admin 删除会把设备释放到公共池,属于越权。解绑在删除前完成,解绑失败中止删除; 删除失败时回滚绑定。 - 绑定/解绑后立即重新校验在线会话:失去权限的屏幕/终端会话被断开。 - 本地用户名禁止 '@'(保留给 SSO 邮箱);本地密码登录拒绝 '@' 用户名, SSO 拒绝名为 admin 的身份,避免绕过超级管理员判定。 - 前端:superadmin 卡片显示 owner、绑定按钮和弹窗(本地用户 datalist + SSO 邮箱自由输入);deviceAcl 能力位由服务端挑战下发,C++ 端无此位不显示; 设备 ID 经 jsAttr 转义后再进 onclick,修掉存储型 XSS。 验证:go build/test/vet 全绿;新增 ACL 持久化、可见性矩阵、控制通道拒绝、 绑定/解绑会话重校验、device_update 不泄露、分组过滤、删用户解绑与越权拒绝、 审计按归属过滤等测试;本地起 Go 服务 + WebSocket 探针验证 challenge、绑定、 非 superadmin 拒绝、解绑。 Model: deepseek-flash Co-Authored-By: Claude Code <noreply@anthropic.com>
104 lines
3.2 KiB
Go
104 lines
3.2 KiB
Go
package web
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
)
|
|
|
|
func TestDeviceACLPersistAndReload(t *testing.T) {
|
|
path := filepath.Join(t.TempDir(), "device_acl.json")
|
|
a := NewDeviceACL(path)
|
|
if err := a.Bind([]string{"dev1", "dev2"}, "a@corp.com", "admin"); err != nil {
|
|
t.Fatalf("Bind: %v", err)
|
|
}
|
|
if got := a.Owner("dev1"); got != "a@corp.com" {
|
|
t.Fatalf("Owner(dev1) = %q", got)
|
|
}
|
|
|
|
reloaded := NewDeviceACL(path)
|
|
if err := reloaded.Load(); err != nil {
|
|
t.Fatalf("Load: %v", err)
|
|
}
|
|
if got := reloaded.Owner("dev2"); got != "a@corp.com" {
|
|
t.Fatalf("reloaded Owner(dev2) = %q", got)
|
|
}
|
|
if got := reloaded.Owner("dev3"); got != "" {
|
|
t.Fatalf("reloaded Owner(dev3) = %q, want empty", got)
|
|
}
|
|
|
|
if err := reloaded.Unbind([]string{"dev1"}); err != nil {
|
|
t.Fatalf("Unbind: %v", err)
|
|
}
|
|
again := NewDeviceACL(path)
|
|
if err := again.Load(); err != nil {
|
|
t.Fatalf("Load after unbind: %v", err)
|
|
}
|
|
if got := again.Owner("dev1"); got != "" {
|
|
t.Fatalf("Owner(dev1) after unbind = %q", got)
|
|
}
|
|
if got := again.Owner("dev2"); got != "a@corp.com" {
|
|
t.Fatalf("Owner(dev2) after unbind = %q", got)
|
|
}
|
|
|
|
if err := again.Remove("dev2"); err != nil {
|
|
t.Fatalf("Remove: %v", err)
|
|
}
|
|
final := NewDeviceACL(path)
|
|
if err := final.Load(); err != nil {
|
|
t.Fatalf("Load after remove: %v", err)
|
|
}
|
|
if got := final.Snapshot(); len(got) != 0 {
|
|
t.Fatalf("snapshot = %+v, want empty", got)
|
|
}
|
|
}
|
|
|
|
func TestDeviceACLMalformedFileIsAnError(t *testing.T) {
|
|
path := filepath.Join(t.TempDir(), "device_acl.json")
|
|
if err := os.WriteFile(path, []byte("{not json"), 0o600); err != nil {
|
|
t.Fatalf("WriteFile: %v", err)
|
|
}
|
|
if err := NewDeviceACL(path).Load(); err == nil {
|
|
t.Fatal("Load accepted a malformed file; private devices would become public")
|
|
}
|
|
}
|
|
|
|
func TestDeviceAllowedMatrix(t *testing.T) {
|
|
acl := NewDeviceACL("")
|
|
if err := acl.Bind([]string{"a-dev"}, "a@corp.com", "admin"); err != nil {
|
|
t.Fatalf("Bind: %v", err)
|
|
}
|
|
if err := acl.Bind([]string{"b-dev"}, "b@corp.com", "admin"); err != nil {
|
|
t.Fatalf("Bind: %v", err)
|
|
}
|
|
|
|
tests := []struct {
|
|
name string
|
|
acl *DeviceACL
|
|
username string
|
|
role string
|
|
device string
|
|
want bool
|
|
}{
|
|
{"nil acl legacy allows all", nil, "any", "viewer", "pub", true},
|
|
{"superadmin sees public", acl, "admin", "admin", "pub", true},
|
|
{"superadmin sees bound", acl, "admin", "admin", "a-dev", true},
|
|
{"admin sees public", acl, "c@corp.com", "admin", "pub", true},
|
|
{"admin blocked on other's device", acl, "c@corp.com", "admin", "a-dev", false},
|
|
{"owner sees own device", acl, "a@corp.com", "admin", "a-dev", true},
|
|
{"owner blocked on other's device", acl, "a@corp.com", "admin", "b-dev", false},
|
|
{"viewer sees no public device", acl, "v@corp.com", "viewer", "pub", false},
|
|
{"viewer sees own device", acl, "a@corp.com", "viewer", "a-dev", true},
|
|
{"empty username blocked", acl, "", "viewer", "a-dev", false},
|
|
{"empty device blocked", acl, "admin", "admin", "", false},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if got := deviceAllowed(tt.acl, tt.username, tt.role, tt.device); got != tt.want {
|
|
t.Fatalf("deviceAllowed(%q,%q,%q) = %v, want %v",
|
|
tt.username, tt.role, tt.device, got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|