mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-10-02 15:23:57 +00:00
feat: 设备鉴权迁移至客户端 + 插件卸载保护
安全修复（客户端鉴权）： - remotedevice 服务端移除授权状态存储（authorized map/SetAuthorized/handleDeviceAuth） - DeviceMeta.Authorized 改为设备 hello 自报，服务端仅透传展示 - device_ctl_* 工具移除服务端授权检查，无条件转发，设备端自行决定是否执行 - 共享设备桥库 Bridge 新增本地 authorized 状态，未授权收到 cmd 直接拒绝 - waiter: --device-authorized / device_authorized 配置控制本地授权 - GUI: 授权存 gui-prefs 本地文件；设备页仅本机可切换开关 - webui /device/auth 旧路径返回 410 Gone - 根因：agent 可经 config_set 篡改服务端授权配置自行授权设备 插件管理强化： - 内置插件禁止卸载（IsBuiltinPlugin + 409），外部插件卸载即时生效 - 卸载不存在插件返回 404；移除误导性 reload_required 提示 - webui 插件路由：名称白名单校验防路径穿越、保留字路径保护
This commit is contained in:
JianFeeeee
@ -39,18 +39,18 @@ func platformBinary() (zipName, canonicalName string) {
|
||||
|
||||
// validBinaries 是 .hmap 中所有可识别的文件入口（平台二进制或脚本）。
|
||||
var validBinaries = map[string]bool{
|
||||
"plugin.so": true,
|
||||
"plugin.so": true,
|
||||
"plugin.dylib": true,
|
||||
"plugin.dll": true,
|
||||
"main.lua": true,
|
||||
"SKILL.md": true,
|
||||
"plugin.dll": true,
|
||||
"main.lua": true,
|
||||
"SKILL.md": true,
|
||||
}
|
||||
|
||||
// platformBinaries 是平台特定的二进制，bundle 模式下仅当前平台的被解压。
|
||||
var platformBinaries = map[string]bool{
|
||||
"plugin.so": true,
|
||||
"plugin.so": true,
|
||||
"plugin.dylib": true,
|
||||
"plugin.dll": true,
|
||||
"plugin.dll": true,
|
||||
}
|
||||
|
||||
var downloadClient = &http.Client{
|
||||
@ -312,7 +312,16 @@ func (p *Plugin) handlePluginByID(w http.ResponseWriter, r *http.Request) {
|
||||
case http.MethodDelete:
|
||||
result, err := p.removePlugin(name)
|
||||
if err != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]interface{}{"error": err.Error()})
|
||||
// 内置插件禁卸 → 409 Conflict；不存在 → 404；其余删除失败 → 500
|
||||
msg := err.Error()
|
||||
switch {
|
||||
case strings.Contains(msg, "built-in plugin"):
|
||||
writeJSON(w, http.StatusConflict, map[string]interface{}{"error": msg, "name": name, "plugin_type": "builtin"})
|
||||
case strings.Contains(msg, "not found"):
|
||||
writeJSON(w, http.StatusNotFound, map[string]interface{}{"error": msg, "name": name})
|
||||
default:
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]interface{}{"error": msg, "name": name})
|
||||
}
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, result)
|
||||
@ -451,9 +460,14 @@ func (p *Plugin) listPlugins() (interface{}, error) {
|
||||
}
|
||||
|
||||
func (p *Plugin) removePlugin(name string) (interface{}, error) {
|
||||
// 内置插件只能禁用不能卸载：目录下无产物，且从注册表删除会破坏内核依赖。
|
||||
if p.sdk != nil && p.sdk.PluginMgr() != nil && p.sdk.PluginMgr().IsBuiltinPlugin(name) {
|
||||
return nil, fmt.Errorf("plugin %s is a built-in plugin and cannot be unloaded", name)
|
||||
}
|
||||
|
||||
dir := filepath.Join(p.pluginDir, name)
|
||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||
return map[string]interface{}{"error": "plugin not found", "name": name}, nil
|
||||
return nil, fmt.Errorf("plugin %s not found", name)
|
||||
}
|
||||
|
||||
// 先经内核卸载：停止插件（stop handlers + Stop）并执行插件注册的 onRemove 回调
|
||||
@ -464,7 +478,7 @@ func (p *Plugin) removePlugin(name string) (interface{}, error) {
|
||||
}
|
||||
|
||||
if err := os.RemoveAll(dir); err != nil {
|
||||
return map[string]interface{}{"error": err.Error()}, nil
|
||||
return nil, fmt.Errorf("remove plugin dir: %w", err)
|
||||
}
|
||||
|
||||
// 同步清理禁用表
|
||||
@ -474,10 +488,11 @@ func (p *Plugin) removePlugin(name string) (interface{}, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// 卸载已即时生效（停止+注册表移除+目录删除），无需 reload
|
||||
return map[string]interface{}{
|
||||
"status": "removed",
|
||||
"name": name,
|
||||
"action": "reload_required",
|
||||
"status": "removed",
|
||||
"name": name,
|
||||
"reload_required": false,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
@ -322,7 +322,6 @@ func TestScreenseeEndToEnd(t *testing.T) {
|
||||
if _, _, err := cli.readMsg(); err != nil {
|
||||
t.Fatalf("read hello_ack: %v", err)
|
||||
}
|
||||
reg.SetAuthorized("see-dev", true)
|
||||
|
||||
// 设备侧循环收命令并回执（模拟 GUI screensee 实现）
|
||||
go func() {
|
||||
@ -363,10 +362,10 @@ func TestScreenseeEndToEnd(t *testing.T) {
|
||||
t.Fatalf("handler received bad dataURL: %s", gotDataURL)
|
||||
}
|
||||
|
||||
// 未授权设备应拒绝
|
||||
reg.SetAuthorized("see-dev", false)
|
||||
if _, err := dev.Execute("screensee", map[string]interface{}{"device_id": "see-dev"}); err == nil {
|
||||
t.Fatal("expected unauthorized error")
|
||||
// 客户端鉴权模式：服务端不拦截，总是转发（设备端自行决定是否执行）。
|
||||
// see-dev 未声明 screensee 之外的问题，此处仅验证服务端不再因授权状态报错。
|
||||
if _, err := dev.Execute("screensee", map[string]interface{}{"device_id": "see-dev"}); err != nil {
|
||||
t.Fatalf("server should forward regardless of authorization, got: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
@ -389,7 +388,6 @@ func TestComputeruseEndToEnd(t *testing.T) {
|
||||
if _, _, err := cli.readMsg(); err != nil {
|
||||
t.Fatalf("read hello_ack: %v", err)
|
||||
}
|
||||
reg.SetAuthorized("cu-dev", true)
|
||||
|
||||
// 设备侧收 computeruse 命令并回执
|
||||
var receivedCmd string
|
||||
@ -480,7 +478,6 @@ func TestClipboardEndToEnd(t *testing.T) {
|
||||
if _, _, err := cli.readMsg(); err != nil {
|
||||
t.Fatalf("read hello_ack: %v", err)
|
||||
}
|
||||
reg.SetAuthorized("clip-dev", true)
|
||||
|
||||
// 设备侧响应剪贴板命令
|
||||
go func() {
|
||||
@ -553,11 +550,11 @@ func TestClipboardEndToEnd(t *testing.T) {
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("unauthorized_device_rejected", func(t *testing.T) {
|
||||
reg.SetAuthorized("clip-dev", false)
|
||||
defer reg.SetAuthorized("clip-dev", true)
|
||||
if _, err := dev.Execute("clipboardsee", map[string]interface{}{"device_id": "clip-dev"}); err == nil {
|
||||
t.Fatal("unauthorized should error")
|
||||
t.Run("server_forwards_regardless_of_authorization", func(t *testing.T) {
|
||||
// 客户端鉴权模式：服务端不再拦截未授权设备，由设备端自行拒绝。
|
||||
// 这里验证服务端能正常查询设备（不因授权状态报错）。
|
||||
if _, ok := reg.Get("clip-dev"); !ok {
|
||||
t.Fatal("device should be registered")
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -603,7 +600,6 @@ func TestCapabilityMatrix(t *testing.T) {
|
||||
if _, _, err := cli.readMsg(); err != nil {
|
||||
t.Fatalf("read hello_ack: %v", err)
|
||||
}
|
||||
reg.SetAuthorized("cam-only", true)
|
||||
|
||||
if _, err := dev.Execute("screensee", map[string]interface{}{"device_id": "cam-only"}); err == nil {
|
||||
t.Fatal("camera-only device should not support screensee")
|
||||
@ -640,8 +636,8 @@ func TestDeviceEventReport(t *testing.T) {
|
||||
// 设备主动上报：识别到未知人员驻留
|
||||
cli.sendText(mustJSON(map[string]interface{}{
|
||||
"op": "event", "device_id": "cam-watch",
|
||||
"type": "unknown_person_detected",
|
||||
"detail": "后门区域检测到陌生面孔，驻留超过30秒",
|
||||
"type": "unknown_person_detected",
|
||||
"detail": "后门区域检测到陌生面孔，驻留超过30秒",
|
||||
}))
|
||||
// 不带 device_id 时应回退到当前连接的设备
|
||||
cli.sendText(mustJSON(map[string]interface{}{
|
||||
|
||||
@ -12,10 +12,9 @@ import (
|
||||
|
||||
// devicectlDevice 把设备网关暴露为 IOManager 的一个 Device：
|
||||
// Tools() 提供 devicedetect / device_ctl_status / device_ctl_cmdrun / device_ctl_cmdresult / screensee，
|
||||
// Execute() 检查授权并路由到 WS 在线设备。
|
||||
// Execute() 推送命令到设备，设备端自行鉴权（客户端存储授权）。
|
||||
type devicectlDevice struct {
|
||||
reg *Registry
|
||||
persist func() // 授权变更后持久化
|
||||
reg *Registry
|
||||
|
||||
// screensee 回调：设备截屏回传后由 agent 核心消费（视觉描述）。
|
||||
// 由插件 Start 注入；nil 时退化为仅返回 base64 数据。
|
||||
@ -121,9 +120,9 @@ func (d *devicectlDevice) Tools() []agentIO.ToolDef {
|
||||
"properties": map[string]interface{}{
|
||||
"device_id": map[string]interface{}{"type": "string", "description": "目标设备 ID"},
|
||||
"action": map[string]interface{}{
|
||||
"type": "string",
|
||||
"type": "string",
|
||||
"description": "操作类型：click(单击) / doubleclick(双击) / rightclick(右键) / move(移动) / scroll(滚动) / keypress(按键) / type(输入文字)",
|
||||
"enum": []interface{}{"click", "doubleclick", "rightclick", "move", "scroll", "keypress", "type"},
|
||||
"enum": []interface{}{"click", "doubleclick", "rightclick", "move", "scroll", "keypress", "type"},
|
||||
},
|
||||
"x": map[string]interface{}{"type": "integer", "description": "鼠标 X 坐标（像素）。click/doubleclick/rightclick/move 必填"},
|
||||
"y": map[string]interface{}{"type": "integer", "description": "鼠标 Y 坐标（像素）。click/doubleclick/rightclick/move 必填"},
|
||||
@ -257,9 +256,7 @@ func (d *devicectlDevice) status(args map[string]interface{}) (interface{}, erro
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("device %s 不存在", id)
|
||||
}
|
||||
if !m.Authorized {
|
||||
return nil, fmt.Errorf("device %s 未授权，无法查询状态（需先在设备管理页或经 bind 授权）", id)
|
||||
}
|
||||
// 服务端不检查授权；设备端收到请求后自行决定是否执行。
|
||||
if !m.Online {
|
||||
return publicDevices([]DeviceMeta{m}), nil // 带 offline=true
|
||||
}
|
||||
@ -277,9 +274,7 @@ func (d *devicectlDevice) cmdrun(args map[string]interface{}) (interface{}, erro
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("device %s 不存在", id)
|
||||
}
|
||||
if !m.Authorized {
|
||||
return nil, fmt.Errorf("device %s 未授权，无法执行命令（请先在设备管理页授权）", id)
|
||||
}
|
||||
// 服务端不检查授权；设备端收到请求后自行决定是否执行。
|
||||
if !m.Online {
|
||||
return nil, fmt.Errorf("device %s 不在线，无法执行命令", id)
|
||||
}
|
||||
@ -328,13 +323,10 @@ func (d *devicectlDevice) cmdresult(args map[string]interface{}) (interface{}, e
|
||||
if deviceID != "" {
|
||||
// 返回该设备最近一次结果（简化：遍历 results 找 device_id 匹配的最近一条）
|
||||
// 说明：当前只按 req_id 查询；device_id 查询留给后续迭代。
|
||||
m, ok := d.reg.Get(deviceID)
|
||||
_, ok := d.reg.Get(deviceID)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("device %s 不存在", deviceID)
|
||||
}
|
||||
if !m.Authorized {
|
||||
return nil, fmt.Errorf("device %s 未授权", deviceID)
|
||||
}
|
||||
return map[string]interface{}{"device_id": deviceID, "note": "请用 device_ctl_cmdrun 返回的 req_id 查询命令结果"}, nil
|
||||
}
|
||||
return nil, fmt.Errorf("req_id 或 device_id 至少提供一个")
|
||||
@ -350,9 +342,6 @@ func (d *devicectlDevice) info(args map[string]interface{}) (interface{}, error)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("device %s 不存在", id)
|
||||
}
|
||||
if !m.Authorized {
|
||||
return nil, fmt.Errorf("device %s 未授权，无法探查信息（请先在设备管理页授权）", id)
|
||||
}
|
||||
out := map[string]interface{}{
|
||||
"device_id": m.DeviceID,
|
||||
"name": m.Name,
|
||||
@ -385,9 +374,7 @@ func (d *devicectlDevice) screensee(args map[string]interface{}) (interface{}, e
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("device %s 不存在", id)
|
||||
}
|
||||
if !m.Authorized {
|
||||
return nil, fmt.Errorf("device %s 未授权，无法查看屏幕（请先在设备管理页授权）", id)
|
||||
}
|
||||
// 服务端不检查授权；设备端收到请求后自行决定是否执行。
|
||||
if !m.Online {
|
||||
return nil, fmt.Errorf("device %s 不在线", id)
|
||||
}
|
||||
@ -436,9 +423,7 @@ func (d *devicectlDevice) computeruse(args map[string]interface{}) (interface{},
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("device %s 不存在", id)
|
||||
}
|
||||
if !m.Authorized {
|
||||
return nil, fmt.Errorf("device %s 未授权，无法远程操控（请先在设备管理页授权）", id)
|
||||
}
|
||||
// 服务端不检查授权；设备端收到请求后自行决定是否执行。
|
||||
if !m.Online {
|
||||
return nil, fmt.Errorf("device %s 不在线", id)
|
||||
}
|
||||
@ -508,9 +493,6 @@ func (d *devicectlDevice) clipboardCheck(id, verb, tool string) error {
|
||||
if !ok {
|
||||
return fmt.Errorf("device %s 不存在", id)
|
||||
}
|
||||
if !m.Authorized {
|
||||
return fmt.Errorf("device %s 未授权，无法%s剪切板（请先在设备管理页授权）", id, verb)
|
||||
}
|
||||
if !m.Online {
|
||||
return fmt.Errorf("device %s 不在线", id)
|
||||
}
|
||||
|
||||
@ -71,7 +71,8 @@ func (p *Plugin) Start(s *sdk.PluginSDK) error {
|
||||
// ---- 设置 ----------------
|
||||
s.Settings().RegisterDef(sdk.ConfigDef{Key: "listen_addr", Default: defaultAddr, Type: "string", DisplayName: "监听地址", Description: "设备网关 HTTP/WS 监听地址（默认 127.0.0.1:9890，仅本机）", Category: "remotedevice"})
|
||||
s.Settings().RegisterDef(sdk.ConfigDef{Key: "ws_token", Default: "", Type: "password", DisplayName: "接入 Token", Description: "设备绑定/接入时使用的令牌；留空启动时自动生成", Category: "remotedevice"})
|
||||
s.Settings().RegisterDef(sdk.ConfigDef{Key: "authorized_devices", Default: "", Type: "text", DisplayName: "已授权设备", Description: "逗号分隔的已授权设备 ID 列表（由系统维护）", Category: "remotedevice"})
|
||||
// 注意：不注册 authorized_devices 设置项 —— 鉴权在设备端执行（客户端存储），
|
||||
// 服务端不保存授权状态，避免 agent 经 config_set 工具自行授权。
|
||||
|
||||
p.addr = defaultAddr
|
||||
if v, _ := s.Settings().Get("listen_addr"); v != nil {
|
||||
@ -95,21 +96,8 @@ func (p *Plugin) Start(s *sdk.PluginSDK) error {
|
||||
return provided != "" && provided == p.token
|
||||
})
|
||||
|
||||
// 恢复已授权设备集合
|
||||
if v, _ := s.Settings().Get("authorized_devices"); v != nil {
|
||||
if s2, ok := v.(string); ok && s2 != "" {
|
||||
var ids []string
|
||||
for _, id := range strings.Split(s2, ",") {
|
||||
if id = strings.TrimSpace(id); id != "" {
|
||||
ids = append(ids, id)
|
||||
}
|
||||
}
|
||||
p.registry.RestoreAuthorized(ids)
|
||||
}
|
||||
}
|
||||
|
||||
// ---- devicectl Device（agent 工具） ----------------
|
||||
p.dev = &devicectlDevice{reg: p.registry, persist: p.persistAuthorized}
|
||||
p.dev = &devicectlDevice{reg: p.registry}
|
||||
// screensee 视觉描述回调：截屏回传后用视觉模型描述屏幕内容
|
||||
p.dev.SetSeeHandler(p.describeScreen)
|
||||
if err := s.RegisterChannel("devicectl", p.dev); err != nil {
|
||||
@ -171,24 +159,15 @@ func (p *Plugin) Start(s *sdk.PluginSDK) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// persistAuthorized 在授权变更后写回设置（持久化重启不丢）。
|
||||
func (p *Plugin) persistAuthorized() {
|
||||
if p.sdk == nil {
|
||||
return
|
||||
}
|
||||
ids := p.registry.AuthorizedIDs()
|
||||
_ = p.sdk.Settings().Set("authorized_devices", strings.Join(ids, ","))
|
||||
}
|
||||
|
||||
func (p *Plugin) registerRoutes() {
|
||||
// 设备通道（WS）
|
||||
p.mux.HandleFunc("/api/v1/device/ws", p.registry.ServeWS)
|
||||
// REST 管理面（全部需 token）
|
||||
// 注意：/api/v1/device/auth 已移除 —— 授权由设备端控制，服务端不提供授权接口。
|
||||
p.mux.HandleFunc("/api/v1/device", p.requireToken(p.handleDeviceList))
|
||||
p.mux.HandleFunc("/api/v1/device/online", p.requireToken(p.handleDeviceOnline))
|
||||
p.mux.HandleFunc("/api/v1/device/", p.requireToken(p.handleDeviceByID))
|
||||
p.mux.HandleFunc("/api/v1/device/push", p.requireToken(p.handleDevicePush))
|
||||
p.mux.HandleFunc("/api/v1/device/auth", p.requireToken(p.handleDeviceAuth))
|
||||
}
|
||||
|
||||
// requireToken 校验 REST 请求的接入令牌（X-API-Key header 或 ?token=）。
|
||||
@ -270,32 +249,6 @@ func (p *Plugin) handleDevicePush(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, http.StatusOK, map[string]interface{}{"status": "ok"})
|
||||
}
|
||||
|
||||
func (p *Plugin) handleDeviceAuth(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
var req struct {
|
||||
DeviceID string `json:"device_id"`
|
||||
Authorize bool `json:"authorize"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
writeJSON(w, http.StatusBadRequest, map[string]interface{}{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
if req.DeviceID == "" {
|
||||
writeJSON(w, http.StatusBadRequest, map[string]interface{}{"error": "device_id required"})
|
||||
return
|
||||
}
|
||||
if _, ok := p.registry.Get(req.DeviceID); !ok {
|
||||
writeJSON(w, http.StatusNotFound, map[string]interface{}{"error": "device not found"})
|
||||
return
|
||||
}
|
||||
p.registry.SetAuthorized(req.DeviceID, req.Authorize)
|
||||
p.persistAuthorized()
|
||||
writeJSON(w, http.StatusOK, map[string]interface{}{"device_id": req.DeviceID, "authorized": req.Authorize})
|
||||
}
|
||||
|
||||
// describeScreen 用视觉模型描述设备屏幕截图（screensee 回调）。
|
||||
// provider 为空时使用默认 LLM 源；模型不支持视觉时返回友好错误。
|
||||
func (p *Plugin) describeScreen(dataURL string, provider string) string {
|
||||
|
||||
@ -17,6 +17,8 @@ import (
|
||||
)
|
||||
|
||||
// DeviceMeta 描述一台接入了网关的设备。
|
||||
// Authorized 设备自报（由客户端存储和声明），服务端仅报告不决策。
|
||||
// 鉴权在设备端执行：服务端推送命令后，设备自行决定是否执行。
|
||||
type DeviceMeta struct {
|
||||
DeviceID string `json:"device_id"`
|
||||
Name string `json:"name"`
|
||||
@ -35,11 +37,11 @@ type wconn struct {
|
||||
w *bufio.Writer
|
||||
}
|
||||
|
||||
// Registry 是设备接入网关的注册表：管理在线连接、设备元数据与已授权集合。线程安全。
|
||||
// Registry 是设备接入网关的注册表：管理在线连接、设备元数据。线程安全。
|
||||
// 鉴权在设备端执行，服务端不存储授权状态。
|
||||
type Registry struct {
|
||||
mu sync.RWMutex
|
||||
devices map[string]*DeviceMeta // deviceID -> meta（在线/历史）
|
||||
authorized map[string]bool // deviceID -> 是否已授权（持久化恢复）
|
||||
conns map[string]*wconn // deviceID -> 活跃连接（支持 push）
|
||||
onlineCh chan string
|
||||
onStatus func(msg map[string]interface{})
|
||||
@ -62,9 +64,9 @@ type resultEntry struct {
|
||||
// （如旧版 GUI/waiter）视为全能力，保持向后兼容。
|
||||
var capabilityTools = map[string][]string{
|
||||
// 屏幕显示/查看
|
||||
"screen": {"screensue", "screensee"},
|
||||
"screensue": {"screensue"},
|
||||
"screensee": {"screensee"},
|
||||
"screen": {"screensue", "screensee"},
|
||||
"screensue": {"screensue"},
|
||||
"screensee": {"screensee"},
|
||||
// 鼠标键盘操控
|
||||
"computeruse": {"computeruse"},
|
||||
// 剪切板
|
||||
@ -121,7 +123,6 @@ func deviceSupportsTool(caps []string, tool string) bool {
|
||||
func NewRegistry() *Registry {
|
||||
return &Registry{
|
||||
devices: make(map[string]*DeviceMeta),
|
||||
authorized: make(map[string]bool),
|
||||
conns: make(map[string]*wconn),
|
||||
onlineCh: make(chan string, 16),
|
||||
cmdPending: make(map[string]chan map[string]interface{}),
|
||||
@ -172,21 +173,15 @@ func (r *Registry) Online(id string) bool {
|
||||
return ok && m.Online
|
||||
}
|
||||
|
||||
// Authorized 返回设备是否已授权。
|
||||
func (r *Registry) Authorized(id string) bool {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
return r.authorized[id]
|
||||
}
|
||||
// Authorized 已移除：授权状态由设备端自报（DeviceMeta.Authorized），服务端不存储。
|
||||
|
||||
// List 返回全部设备（在线或历史），合并授权态。
|
||||
// List 返回全部设备（在线或历史）。
|
||||
func (r *Registry) List() []DeviceMeta {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
out := make([]DeviceMeta, 0, len(r.devices))
|
||||
for _, m := range r.devices {
|
||||
c := *m
|
||||
c.Authorized = r.authorized[c.DeviceID]
|
||||
out = append(out, c)
|
||||
}
|
||||
return out
|
||||
@ -200,7 +195,6 @@ func (r *Registry) OnlineList() []DeviceMeta {
|
||||
for _, m := range r.devices {
|
||||
if m.Online {
|
||||
c := *m
|
||||
c.Authorized = r.authorized[c.DeviceID]
|
||||
out = append(out, c)
|
||||
}
|
||||
}
|
||||
@ -215,44 +209,12 @@ func (r *Registry) Get(id string) (DeviceMeta, bool) {
|
||||
if !ok {
|
||||
return DeviceMeta{}, false
|
||||
}
|
||||
c := *m
|
||||
c.Authorized = r.authorized[id]
|
||||
return c, true
|
||||
return *m, true
|
||||
}
|
||||
|
||||
// ============ 授权 ============
|
||||
|
||||
// SetAuthorized 标记某设备已授权/取消授权（持久化由插件负责）。
|
||||
func (r *Registry) SetAuthorized(id string, auth bool) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
r.authorized[id] = auth
|
||||
if m, ok := r.devices[id]; ok {
|
||||
m.Authorized = auth
|
||||
}
|
||||
}
|
||||
|
||||
// RestoreAuthorized 插件启动时从配置恢复已授权设备集合。
|
||||
func (r *Registry) RestoreAuthorized(ids []string) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
for _, id := range ids {
|
||||
r.authorized[id] = true
|
||||
}
|
||||
}
|
||||
|
||||
// AuthorizedIDs 返回全部已授权设备 ID（供插件持久化）。
|
||||
func (r *Registry) AuthorizedIDs() []string {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
var out []string
|
||||
for id, ok := range r.authorized {
|
||||
if ok {
|
||||
out = append(out, id)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
// 已移除服务端授权存储：设备在 hello/status 中自报 authorized，
|
||||
// 服务端仅透传展示；实际鉴权由设备端执行（收到 cmd 后自行决定是否执行）。
|
||||
|
||||
// ============ 在线状态维护 ============
|
||||
|
||||
@ -260,7 +222,7 @@ func (r *Registry) register(meta DeviceMeta) {
|
||||
r.mu.Lock()
|
||||
meta.Online = true
|
||||
meta.LastSeen = time.Now().Unix()
|
||||
meta.Authorized = r.authorized[meta.DeviceID]
|
||||
// 保留设备自报的授权状态（客户端鉴权，服务端不覆盖）
|
||||
r.devices[meta.DeviceID] = &meta
|
||||
r.mu.Unlock()
|
||||
r.notifyChange(meta.DeviceID)
|
||||
@ -335,7 +297,9 @@ func (r *Registry) PushCmd(deviceID, reqID, command, cmdType string) error {
|
||||
|
||||
// PushData 向设备分块下发二进制数据（网关→设备，如 TTS 音频）。
|
||||
// 协议（与 GUI 设备桥协商）：
|
||||
// 文本帧 cmd_speech_start {op, req_id, kind, mime, total} → N 个二进制帧(0x2, ≤8KB) → 文本帧 cmd_speech_end {op, req_id}
|
||||
//
|
||||
// 文本帧 cmd_speech_start {op, req_id, kind, mime, total} → N 个二进制帧(0x2, ≤8KB) → 文本帧 cmd_speech_end {op, req_id}
|
||||
//
|
||||
// kind 为语义标记（如 speech），mime 为数据 MIME 类型。设备聚合后按自身能力处理（播放等）。
|
||||
func (r *Registry) PushData(deviceID, reqID, kind, mime string, data []byte) error {
|
||||
r.mu.RLock()
|
||||
@ -813,6 +777,9 @@ func metaFromMsg(msg map[string]interface{}) DeviceMeta {
|
||||
}
|
||||
}
|
||||
}
|
||||
if v, ok := d["authorized"].(bool); ok {
|
||||
meta.Authorized = v
|
||||
}
|
||||
if info, ok := d["info"].(map[string]interface{}); ok {
|
||||
if len(info) > 0 {
|
||||
meta.Info = info
|
||||
|
||||
@ -4667,10 +4667,21 @@ background:
|
||||
return;
|
||||
}
|
||||
try {
|
||||
var r = await api("/plugins", {
|
||||
var raw = await api("/plugins", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ url: url }),
|
||||
raw: true,
|
||||
});
|
||||
var ct = raw.headers.get("content-type") || "";
|
||||
var r = ct.includes("json") ? await raw.json() : await raw.text();
|
||||
if (!raw.ok || (r && r.error)) {
|
||||
toast(
|
||||
__("安装失败: ", "Install failed: ") +
|
||||
((r && (r.error || r.details)) || "HTTP " + raw.status),
|
||||
true,
|
||||
);
|
||||
return;
|
||||
}
|
||||
toast(
|
||||
__("安装结果: ", "Install result: ") +
|
||||
(r.status || JSON.stringify(r)),
|
||||
@ -4683,7 +4694,7 @@ background:
|
||||
),
|
||||
false,
|
||||
);
|
||||
loadInstalledPlugins();
|
||||
await loadInstalledPlugins();
|
||||
renderPlugins();
|
||||
} catch (e) {
|
||||
toast(__("安装失败: ", "Install failed: ") + e.message, true);
|
||||
@ -4732,7 +4743,10 @@ background:
|
||||
renderPlugins();
|
||||
}
|
||||
|
||||
var removingPlugins = {};
|
||||
|
||||
async function removePlugin(name) {
|
||||
if (removingPlugins[name]) return; // 防重复点击
|
||||
if (
|
||||
!confirm(
|
||||
__("确定卸载插件", "Are you sure to unload plugin") +
|
||||
@ -4742,23 +4756,39 @@ background:
|
||||
)
|
||||
)
|
||||
return;
|
||||
removingPlugins[name] = true;
|
||||
try {
|
||||
var r = await api("/plugins/" + encodeURIComponent(name), {
|
||||
method: "DELETE",
|
||||
});
|
||||
toast(__("已卸载: ", "Unloaded: ") + (r.status || r.name));
|
||||
if (r.action === "reload_required")
|
||||
toast(
|
||||
__(
|
||||
"已卸载，请点击「重载插件」生效",
|
||||
'Unloaded, click "Reload Plugins" to apply',
|
||||
),
|
||||
false,
|
||||
);
|
||||
loadInstalledPlugins();
|
||||
var raw = await api(
|
||||
"/plugins/" + encodeURIComponent(name),
|
||||
{ method: "DELETE", raw: true },
|
||||
);
|
||||
var ct = raw.headers.get("content-type") || "";
|
||||
var body = ct.includes("json")
|
||||
? await raw.json()
|
||||
: await raw.text();
|
||||
if (!raw.ok) {
|
||||
var em =
|
||||
(body && (body.error || body.details)) ||
|
||||
("HTTP " + raw.status);
|
||||
toast(__("卸载失败: ", "Unload failed: ") + em, true);
|
||||
// 内置插件或路径错误时刷新一次列表保持状态一致
|
||||
loadInstalledPlugins();
|
||||
renderPlugins();
|
||||
return;
|
||||
}
|
||||
toast(__("已卸载: ", "Unloaded: ") + (body.name || body.status || name));
|
||||
await loadInstalledPlugins();
|
||||
// 同步内核插件/禁用列表，确保列表与工具立即消失
|
||||
try {
|
||||
state.kernel = await api("/kernel");
|
||||
var s = await api("/settings");
|
||||
state.disabledPlugins = s.disabled_plugins || [];
|
||||
} catch (e2) {}
|
||||
renderPlugins();
|
||||
} catch (e) {
|
||||
toast(__("卸载失败: ", "Unload failed: ") + e.message, true);
|
||||
} finally {
|
||||
delete removingPlugins[name];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -136,13 +136,13 @@ type Handler struct {
|
||||
chatHistory []ChatMsg
|
||||
pendingIdx int // chatHistory 中正在进行的 assistant 消息索引，-1 表示无
|
||||
|
||||
chatMsgMu sync.Mutex
|
||||
chatMsgCache map[string]*chatMsgEntry // client_msg_id -> 首次处理结果
|
||||
chatMsgOrder []string // FIFO 淘汰序
|
||||
cmdMu sync.Mutex
|
||||
cmdHistory []CmdExec
|
||||
termMu sync.Mutex
|
||||
termStates map[string]*termState
|
||||
chatMsgMu sync.Mutex
|
||||
chatMsgCache map[string]*chatMsgEntry // client_msg_id -> 首次处理结果
|
||||
chatMsgOrder []string // FIFO 淘汰序
|
||||
cmdMu sync.Mutex
|
||||
cmdHistory []CmdExec
|
||||
termMu sync.Mutex
|
||||
termStates map[string]*termState
|
||||
}
|
||||
|
||||
type ChatMsg struct {
|
||||
@ -243,23 +243,23 @@ func NewHandler(s *sdk.PluginSDK) *Handler {
|
||||
st, llm = s.Status(), s.LLM()
|
||||
}
|
||||
h := &Handler{
|
||||
sdk: s,
|
||||
supervisor: sup,
|
||||
memory: mem,
|
||||
indexer: idx,
|
||||
adapter: ad,
|
||||
config: cfg,
|
||||
startTime: time.Now(),
|
||||
textMem: tm,
|
||||
knowledge: ks,
|
||||
tracker: tr,
|
||||
settings: se,
|
||||
pluginMgr: pm,
|
||||
status: st,
|
||||
llm: llm,
|
||||
sessions: make(map[string]time.Time),
|
||||
termStates: make(map[string]*termState),
|
||||
pendingIdx: -1,
|
||||
sdk: s,
|
||||
supervisor: sup,
|
||||
memory: mem,
|
||||
indexer: idx,
|
||||
adapter: ad,
|
||||
config: cfg,
|
||||
startTime: time.Now(),
|
||||
textMem: tm,
|
||||
knowledge: ks,
|
||||
tracker: tr,
|
||||
settings: se,
|
||||
pluginMgr: pm,
|
||||
status: st,
|
||||
llm: llm,
|
||||
sessions: make(map[string]time.Time),
|
||||
termStates: make(map[string]*termState),
|
||||
pendingIdx: -1,
|
||||
chatMsgCache: make(map[string]*chatMsgEntry),
|
||||
sseEvents: newSSEEventRing(200),
|
||||
}
|
||||
@ -1247,8 +1247,8 @@ func (h *Handler) handleChat(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
var body struct {
|
||||
Message string `json:"message"`
|
||||
DeviceID string `json:"device_id"` // 消息来源设备（GUI/受控设备），可选
|
||||
DeviceName string `json:"device_name"` // 设备显示名，可选
|
||||
DeviceID string `json:"device_id"` // 消息来源设备（GUI/受控设备），可选
|
||||
DeviceName string `json:"device_name"` // 设备显示名，可选
|
||||
ClientMsgID string `json:"client_msg_id"` // 客户端唯一消息 ID（防断线重放/超时重试）
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||
@ -1848,6 +1848,14 @@ func (h *Handler) handleDeviceGatewayProxy(w http.ResponseWriter, r *http.Reques
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
// 客户端鉴权模式：服务端不再提供授权接口（授权由设备端本地控制）。
|
||||
// 拒绝旧的 /device/auth 调用，避免误导。
|
||||
if strings.HasSuffix(r.URL.Path, "/device/auth") {
|
||||
writeJSON(w, http.StatusGone, map[string]string{
|
||||
"error": "device authorization moved to client-side; the server no longer stores authorization state",
|
||||
})
|
||||
return
|
||||
}
|
||||
addr := deviceGatewayAddr
|
||||
if addr == "" {
|
||||
addr = "127.0.0.1:9890"
|
||||
@ -2053,6 +2061,23 @@ func (h *Handler) handlePluginByID(w http.ResponseWriter, r *http.Request) {
|
||||
path := strings.TrimPrefix(r.URL.Path, "/api/v1/plugins/")
|
||||
path = strings.TrimSuffix(path, "/")
|
||||
|
||||
// 插件名白名单：仅允许单段安全名称，阻断路径穿越/空名/嵌套路径
|
||||
validPluginName := func(s string) bool {
|
||||
if s == "" || len(s) > 128 {
|
||||
return false
|
||||
}
|
||||
// 禁止路径分隔符、连续点(父目录穿越)、冒号、空格等危险字符
|
||||
if strings.Contains(s, "..") || strings.ContainsAny(s, "/\\: \t\r\n\x00") {
|
||||
return false
|
||||
}
|
||||
for _, c := range s {
|
||||
if !(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c == '_' || c == '-' || c == '.') {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
if path == "disabled" && r.Method == http.MethodGet {
|
||||
if h.pluginMgr == nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "plugin manager not available"})
|
||||
@ -2062,16 +2087,21 @@ func (h *Handler) handlePluginByID(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
if path == "reload" && r.Method == http.MethodPost {
|
||||
if h.pluginMgr == nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "plugin registry not available"})
|
||||
if path == "reload" {
|
||||
if r.Method == http.MethodPost {
|
||||
if h.pluginMgr == nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "plugin registry not available"})
|
||||
return
|
||||
}
|
||||
if _, err := h.pluginMgr.ReloadPlugins(); err != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]string{"status": "reloaded"})
|
||||
return
|
||||
}
|
||||
if _, err := h.pluginMgr.ReloadPlugins(); err != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, map[string]string{"status": "reloaded"})
|
||||
// reload/disabled 是保留字，不允许 DELETE/GET 等其它操作误把其当作插件名
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
@ -2085,6 +2115,10 @@ func (h *Handler) handlePluginByID(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "plugin manager not available"})
|
||||
return
|
||||
}
|
||||
if !validPluginName(name) {
|
||||
writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid plugin name"})
|
||||
return
|
||||
}
|
||||
if err := h.pluginMgr.DisablePlugin(name, "webui"); err != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
|
||||
return
|
||||
@ -2097,6 +2131,10 @@ func (h *Handler) handlePluginByID(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "plugin manager not available"})
|
||||
return
|
||||
}
|
||||
if !validPluginName(name) {
|
||||
writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid plugin name"})
|
||||
return
|
||||
}
|
||||
if err := h.pluginMgr.EnablePlugin(name); err != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
|
||||
return
|
||||
@ -2105,6 +2143,14 @@ func (h *Handler) handlePluginByID(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
}
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
// 单段插件名路径（GET 详情 / DELETE 卸载）
|
||||
if !validPluginName(path) {
|
||||
writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid plugin name"})
|
||||
return
|
||||
}
|
||||
|
||||
switch r.Method {
|
||||
|
||||
195
internal/plugins/webui/handler_plugin_test.go
Normal file
195
internal/plugins/webui/handler_plugin_test.go
Normal file
@ -0,0 +1,195 @@
|
||||
package webui
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
sdk "gitcode.com/JianFeeeee/HomeAgent/internal/sdk"
|
||||
)
|
||||
|
||||
// mockPluginMgr 是 sdk.PluginManager 的最小实现，用于 handler 路由层测试。
|
||||
type mockPluginMgr struct {
|
||||
builtins map[string]bool
|
||||
disabled []sdk.DisabledPluginInfo
|
||||
isDisabled map[string]bool
|
||||
|
||||
removed []string
|
||||
reloadN int
|
||||
removeErr error
|
||||
}
|
||||
|
||||
func (m *mockPluginMgr) ListLoadedPlugins() []string { return nil }
|
||||
func (m *mockPluginMgr) ListDisabledPlugins() []sdk.DisabledPluginInfo {
|
||||
return m.disabled
|
||||
}
|
||||
func (m *mockPluginMgr) IsPluginDisabled(name string) bool {
|
||||
return m.isDisabled[name]
|
||||
}
|
||||
func (m *mockPluginMgr) IsBuiltinPlugin(name string) bool {
|
||||
return m.builtins[name]
|
||||
}
|
||||
func (m *mockPluginMgr) DisablePlugin(name, by string) error {
|
||||
if m.isDisabled == nil {
|
||||
m.isDisabled = map[string]bool{}
|
||||
}
|
||||
m.isDisabled[name] = true
|
||||
return nil
|
||||
}
|
||||
func (m *mockPluginMgr) EnablePlugin(name string) error {
|
||||
delete(m.isDisabled, name)
|
||||
return nil
|
||||
}
|
||||
func (m *mockPluginMgr) RemovePlugin(name string) error {
|
||||
if m.removeErr != nil {
|
||||
return m.removeErr
|
||||
}
|
||||
m.removed = append(m.removed, name)
|
||||
return nil
|
||||
}
|
||||
func (m *mockPluginMgr) ReloadPlugins() (string, error) {
|
||||
m.reloadN++
|
||||
return "reloaded", nil
|
||||
}
|
||||
func (m *mockPluginMgr) ReloadOne(name string) error { return nil }
|
||||
func (m *mockPluginMgr) PluginMetas() map[string]sdk.PluginMeta {
|
||||
return nil
|
||||
}
|
||||
func (m *mockPluginMgr) PluginDir() string { return "" }
|
||||
|
||||
// newHandlerWithMock 构造带 mock PluginManager 的 Handler（绕过 SDK 组装）。
|
||||
func newHandlerWithMock(m *mockPluginMgr) *Handler {
|
||||
h := NewHandler(nil)
|
||||
h.pluginMgr = m
|
||||
return h
|
||||
}
|
||||
|
||||
func TestHandlePluginByID_DisabledList(t *testing.T) {
|
||||
m := &mockPluginMgr{
|
||||
disabled: []sdk.DisabledPluginInfo{{Name: "foo"}},
|
||||
}
|
||||
h := newHandlerWithMock(m)
|
||||
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/plugins/disabled", nil)
|
||||
w := httptest.NewRecorder()
|
||||
h.handlePluginByID(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d", w.Code)
|
||||
}
|
||||
if body := w.Body.String(); len(body) == 0 || !contains(body, "foo") {
|
||||
t.Fatalf("expected disabled list with foo, got %s", body)
|
||||
}
|
||||
}
|
||||
|
||||
func contains(s, sub string) bool {
|
||||
return len(s) >= len(sub) && (func() bool {
|
||||
for i := 0; i+len(sub) <= len(s); i++ {
|
||||
if s[i:i+len(sub)] == sub {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
})()
|
||||
}
|
||||
|
||||
func TestHandlePluginByID_ReloadPost(t *testing.T) {
|
||||
m := &mockPluginMgr{}
|
||||
h := newHandlerWithMock(m)
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/plugins/reload", nil)
|
||||
w := httptest.NewRecorder()
|
||||
h.handlePluginByID(w, req)
|
||||
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d: %s", w.Code, w.Body.String())
|
||||
}
|
||||
if m.reloadN != 1 {
|
||||
t.Fatalf("expected ReloadPlugins called once, got %d", m.reloadN)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandlePluginByID_ReloadDeleteRejected(t *testing.T) {
|
||||
// DELETE /plugins/reload 不允许把保留字当插件名反代成卸载
|
||||
m := &mockPluginMgr{}
|
||||
h := newHandlerWithMock(m)
|
||||
|
||||
req := httptest.NewRequest(http.MethodDelete, "/api/v1/plugins/reload", nil)
|
||||
w := httptest.NewRecorder()
|
||||
h.handlePluginByID(w, req)
|
||||
|
||||
if w.Code != http.StatusMethodNotAllowed {
|
||||
t.Fatalf("expected 405, got %d", w.Code)
|
||||
}
|
||||
if len(m.removed) != 0 {
|
||||
t.Fatalf("expected no plugin removed, got %v", m.removed)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandlePluginByID_PathTraversalRejected(t *testing.T) {
|
||||
cases := []string{"../evil", "a/b", "a..b-ok-but-dots-only-check", "..%2Fetc"}
|
||||
for _, name := range cases {
|
||||
req := httptest.NewRequest(http.MethodDelete, "/api/v1/plugins/"+name, nil)
|
||||
w := httptest.NewRecorder()
|
||||
h := newHandlerWithMock(&mockPluginMgr{})
|
||||
h.handlePluginByID(w, req)
|
||||
// 含路径分隔符或以 .. 开头的名称必须被拒绝（400/405），绝不能反代到 pluginmgr
|
||||
if w.Code != http.StatusBadRequest && w.Code != http.StatusMethodNotAllowed && w.Code != http.StatusNotFound {
|
||||
t.Errorf("name %q: expected 4xx rejection, got %d", name, w.Code)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandlePluginByID_InvalidNamesRejected(t *testing.T) {
|
||||
cases := []string{"has%20space", "has%3Acolon", "back%5Cslash"}
|
||||
for _, name := range cases {
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/plugins/"+name, nil)
|
||||
w := httptest.NewRecorder()
|
||||
h := newHandlerWithMock(&mockPluginMgr{})
|
||||
h.handlePluginByID(w, req)
|
||||
if w.Code != http.StatusBadRequest {
|
||||
t.Errorf("name %q: expected 400, got %d", name, w.Code)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandlePluginByID_ValidNamePassesValidation(t *testing.T) {
|
||||
// 合法插件名（含点/横线/下划线）不应被名称校验拦截；
|
||||
// 这里 pluginmgr 未运行会得到 502 Bad Gateway，但绝不应该是 400。
|
||||
m := &mockPluginMgr{}
|
||||
h := newHandlerWithMock(m)
|
||||
|
||||
for _, name := range []string{"my-plugin", "plugin_v2", "weather.so"} {
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/plugins/"+name, nil)
|
||||
w := httptest.NewRecorder()
|
||||
h.handlePluginByID(w, req)
|
||||
if w.Code == http.StatusBadRequest {
|
||||
t.Errorf("valid name %q should pass validation, got 400", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandlePluginByID_DisableEnable(t *testing.T) {
|
||||
m := &mockPluginMgr{builtins: map[string]bool{"webui": true}}
|
||||
h := newHandlerWithMock(m)
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/v1/plugins/webui/disable", nil)
|
||||
w := httptest.NewRecorder()
|
||||
h.handlePluginByID(w, req)
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("disable: expected 200, got %d: %s", w.Code, w.Body.String())
|
||||
}
|
||||
if !m.isDisabled["webui"] {
|
||||
t.Fatal("webui should be disabled in mock")
|
||||
}
|
||||
|
||||
req = httptest.NewRequest(http.MethodPost, "/api/v1/plugins/webui/enable", nil)
|
||||
w = httptest.NewRecorder()
|
||||
h.handlePluginByID(w, req)
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("enable: expected 200, got %d: %s", w.Code, w.Body.String())
|
||||
}
|
||||
if m.isDisabled["webui"] {
|
||||
t.Fatal("webui should be re-enabled")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user