mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
## 插件管理页(用户要求:权限不要只放 config.yaml) 插件页新增两列(可见性、端点)和一块访问控制编辑器,可直接改: - 每个插件的整体可见性(跟随插件 / 仅 admin / 仅 user / admin+user / 所有人) - 每个注册端点的可访问角色与密钥(admin, user, @homeagent, public) 原先这些能力后端齐全但 WebUI 零入口,唯一改法是手改 config.yaml。 ## 修掉的三个真缺陷 1. endpointAccess 读错了 override 的键 SetEndpointAccess 按 plugin#path 存,endpointAccess 却读 plugin 级。 后果:改了权限后 UI 仍显示插件声明的角色,再保存一次就把限制悄悄撤销。 鉴权一直是对的,只有显示和往返是坏的 —— 所以之前没被发现。 2. override 只在内存里 内存 map 让"billing 仅 admin"看着生效,直到下次重启限制凭空消失, 日志里没有任何线索。现在落盘到 plugin_dir/.access.json, 插件升级覆盖 .state.json 也不会连带放宽访问。删掉最后一个 override 就删文件, "没有覆盖"用文件不存在来诚实表达。 3. 可见性列表泄漏内部键 端点 override 与插件可见性共用一个 map,UI 因此会看到 "probe#hello" 并可能把它当 audience 存回去。现在按已注册端点集合过滤。 另外把整体可见性接到同一条 /access 通路(path 用 *),并修了可见性下拉的 集合比较:服务端原样存 "admin, user",而选项是 "user,admin",不相等就会 显示"跟随插件",用户一保存就把访问范围放宽回插件声明 —— 比显示错更糟。 ## 活跃请求:三个视图显示 0 active 是实时仪表,没有日历周期可过滤,但周期响应压根没带这个字段。 前端 `st.active || 0` 于是把"字段缺失"变成了一句自信的"0 活跃", 而 all 视图(响应里有该字段)显示真值 —— 三个视图 0、总视图正常。 现在周期响应带上 active,前端去掉 || 0 回退:缺失显示 — 而不是假装是 0。 判据:四个 period 都断言 active 存在且为数字;变异去掉字段即变红。 生产实测 day/week/month/all 均为 4。 Co-Authored-By: ModelRouter <noreply@modelrouter.dev> (cherry picked from commit120ba9e957) (cherry picked from commit3b28fde22e)
111 lines
3.6 KiB
Go
111 lines
3.6 KiB
Go
package lua
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
)
|
|
|
|
// TestAccessOverrideSurvivesReload is the test that matters for an access
|
|
// restriction. An in-memory map makes "billing is admin-only" look like it
|
|
// worked right up to the next restart, and then the restriction is simply gone
|
|
// with nothing in the logs to explain it. Both the plugin-level audience and
|
|
// the per-endpoint spec must come back.
|
|
func TestAccessOverrideSurvivesReload(t *testing.T) {
|
|
dir := t.TempDir()
|
|
src := `local P = {}
|
|
P.name = "api"
|
|
P.version = "1.0.0"
|
|
P.http = {
|
|
{ path = "health", handler = "health", roles = { "admin" } },
|
|
}
|
|
function P.health(req) return { json = { ok = true } } end
|
|
return P
|
|
`
|
|
first := NewPlugins(NewVM(dir), dir)
|
|
if err := first.LoadSource("api", src); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
first.SetPluginVisibility("api", "admin, user")
|
|
if err := first.SetEndpointAccess("api", "health", "@homeagent"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := os.Stat(filepath.Join(dir, accessFileName)); err != nil {
|
|
t.Fatalf("override was not written: %v", err)
|
|
}
|
|
|
|
// A fresh Plugins over the same dir is what a restart looks like.
|
|
second := NewPlugins(NewVM(dir), dir)
|
|
// The plugin source is on disk too, so this second instance sees both the
|
|
// plugin and the overrides — the same pair a restart sees. Loading only the
|
|
// overrides would leave no endpoints to walk, and the assertion below would
|
|
// pass vacuously.
|
|
if err := second.LoadSource("api", src); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := second.LoadAccessOverrides(); err != nil {
|
|
t.Fatalf("reload overrides: %v", err)
|
|
}
|
|
if got := second.VisibilityOverride("api"); got != "admin, user" {
|
|
t.Errorf("plugin visibility lost across reload: %q", got)
|
|
}
|
|
found := false
|
|
for _, e := range second.EndpointAccess() {
|
|
if e.Path == "health" && len(e.OverrideKeys) == 1 && e.OverrideKeys[0] == "homeagent" {
|
|
found = true
|
|
}
|
|
}
|
|
if !found {
|
|
t.Error("endpoint override lost across reload")
|
|
}
|
|
}
|
|
|
|
// TestAccessOverrideClearedRemovesFile keeps the "nothing overridden" state
|
|
// distinguishable from "overridden with something".
|
|
func TestAccessOverrideClearedRemovesFile(t *testing.T) {
|
|
dir := t.TempDir()
|
|
ps := NewPlugins(NewVM(dir), dir)
|
|
ps.SetPluginVisibility("api", "admin")
|
|
path := filepath.Join(dir, accessFileName)
|
|
if _, err := os.Stat(path); err != nil {
|
|
t.Fatalf("expected an access file: %v", err)
|
|
}
|
|
ps.SetPluginVisibility("api", "")
|
|
if _, err := os.Stat(path); !os.IsNotExist(err) {
|
|
t.Errorf("clearing the last override should remove the file, got %v", err)
|
|
}
|
|
}
|
|
|
|
// TestVisibilityOverridesExcludeEndpointKeys keeps endpoint policy out of the
|
|
// plugin-audience listing. Both live in one map, and reporting "probe#hello"
|
|
// under visibility is how the plugin page ends up offering to save an audience
|
|
// of that name — which nothing reads as an audience.
|
|
func TestVisibilityOverridesExcludeEndpointKeys(t *testing.T) {
|
|
dir := t.TempDir()
|
|
src := `local P = {}
|
|
P.name = "api"
|
|
P.version = "1.0.0"
|
|
P.http = { { path = "health", handler = "health", roles = { "admin" } } }
|
|
function P.health(req) return { json = { ok = true } } end
|
|
return P
|
|
`
|
|
ps := NewPlugins(NewVM(dir), dir)
|
|
if err := ps.LoadSource("api", src); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
ps.SetPluginVisibility("api", "admin, user")
|
|
if err := ps.SetEndpointAccess("api", "health", "@homeagent"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
got := ps.VisibilityOverrides()
|
|
if got["api"] != "admin, user" {
|
|
t.Errorf("plugin audience missing: %+v", got)
|
|
}
|
|
if _, leaked := got["api#health"]; leaked {
|
|
t.Errorf("endpoint override leaked into the audience map: %+v", got)
|
|
}
|
|
if len(got) != 1 {
|
|
t.Errorf("expected exactly the plugin audience, got %+v", got)
|
|
}
|
|
}
|