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 commit 120ba9e957)
115 lines
3.3 KiB
Go
115 lines
3.3 KiB
Go
package lua
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"sort"
|
|
)
|
|
|
|
// Access overrides are OPERATOR policy, not plugin data. They live in their own
|
|
// file rather than in each plugin's state because:
|
|
//
|
|
// - they describe the deployment, not the plugin, so a plugin upgrade that
|
|
// replaces its .state.json must not silently widen access again;
|
|
// - they must survive a restart. An in-memory map made "restrict billing to
|
|
// admin" look like it worked right up to the next deploy, at which point the
|
|
// restriction evaporated with nothing in the logs to say why;
|
|
// - the plugin_dir is the one place an operator already looks when asking
|
|
// "what does this plugin actually get to see", so the answer lives beside it.
|
|
//
|
|
// The file is a flat map of "name" (whole plugin) or "name#path" (one endpoint)
|
|
// to an access spec, which is the same shape the in-memory store uses, so load
|
|
// and save cannot disagree about what a key means.
|
|
|
|
const accessFileName = ".access.json"
|
|
|
|
func (ps *Plugins) accessFile() string {
|
|
if ps.dir == "" {
|
|
return ""
|
|
}
|
|
return ps.dir + string(os.PathSeparator) + accessFileName
|
|
}
|
|
|
|
// LoadAccessOverrides reads the persisted overrides into memory. A missing file
|
|
// is not an error: no operator has restricted anything yet, which is the
|
|
// default state of a fresh install.
|
|
//
|
|
// A corrupt file is also not fatal. Losing a restriction is bad, but refusing to
|
|
// start the gateway is worse, and an empty map plus a logged error leaves the
|
|
// operator with something to fix.
|
|
func (ps *Plugins) LoadAccessOverrides() error {
|
|
path := ps.accessFile()
|
|
if path == "" {
|
|
return nil
|
|
}
|
|
b, err := os.ReadFile(path)
|
|
if os.IsNotExist(err) {
|
|
return nil
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
m := map[string]string{}
|
|
if err := json.Unmarshal(b, &m); err != nil {
|
|
return err
|
|
}
|
|
ps.mu.Lock()
|
|
defer ps.mu.Unlock()
|
|
if ps.visibility == nil {
|
|
ps.visibility = visibilityOverrides{}
|
|
}
|
|
for k, v := range m {
|
|
ps.visibility[k] = v
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// saveAccessOverridesLocked flushes the whole override map. It is called on
|
|
// every change, and unlike plugin state the map is tiny and changes only when an
|
|
// operator clicks Save — so a synchronous write costs nothing that matters, and
|
|
// it means the change is durable the moment the API returns 200.
|
|
func (ps *Plugins) saveAccessOverridesLocked() {
|
|
path := ps.accessFile()
|
|
if path == "" {
|
|
return
|
|
}
|
|
out := make(map[string]string, len(ps.visibility))
|
|
for k, v := range ps.visibility {
|
|
if v != "" {
|
|
out[k] = v
|
|
}
|
|
}
|
|
if len(out) == 0 {
|
|
// Leave no empty file behind: its absence is the honest encoding of
|
|
// "nothing is overridden".
|
|
_ = os.Remove(path)
|
|
return
|
|
}
|
|
writeJSONAtomic(path, out)
|
|
}
|
|
|
|
// AccessOverrides returns a copy of every override in force, for the UI.
|
|
func (ps *Plugins) accessOverridesSnapshot() map[string]string {
|
|
ps.mu.RLock()
|
|
defer ps.mu.RUnlock()
|
|
if len(ps.visibility) == 0 {
|
|
return nil
|
|
}
|
|
out := make(map[string]string, len(ps.visibility))
|
|
for k, v := range ps.visibility {
|
|
out[k] = v
|
|
}
|
|
return out
|
|
}
|
|
|
|
// sortedOverrideKeys exists only so a debug dump is stable; map iteration order
|
|
// would otherwise make two identical states look different.
|
|
func (ps *Plugins) sortedOverrideKeys() []string {
|
|
m := ps.accessOverridesSnapshot()
|
|
keys := make([]string, 0, len(m))
|
|
for k := range m {
|
|
keys = append(keys, k)
|
|
}
|
|
sort.Strings(keys)
|
|
return keys
|
|
} |