用户报告「principal_clearances 不可配置,导致 L3 实例对所有非 manager 主体不可见」 —— 实测是 UX 缺口: ### 修复 - PUT /access/principals/:name 的 principalUpdateInput 新增 clearances 字段(nil=不动; 非空数组(含 [])= 全量替换),与 PUT /principals/:name/clearances 同义。 - GET /access/principals/:name 响应新增 clearances 数组(保证非 nil,空集序列化为 [])。 - GET /access/principals 列表也回显 clearances,避免管理员看不到当前状态。 ### 新增 MCP 工具(之前 36 个没有这一片) - list_principals:列出全部主体及其 clearance。 - get_principal:按名取单个主体(含 description / has_api_key / clearances)。 - set_principal_clearance:全量替换主体 clearance(alias 接受 markings / clearances)。 ### 不动的部分 - seedAccessControlDefaults 中 manager 默认 [L0,L1,L2,L3,L4] 已正确(CHANGELOG v1.2.0 「manager 不受影响」依然成立)。 - classificationCond / classAllowed 对 manager 显式放行已正确;用户报告的「admin 看不到 L3」实际是误读——真正不可见的是非 manager 主体(默认 connector L0-L2、public L0)。 ### 验证 - 新增 3 个集成测试(issue7_clearance_config_test.go): updatePrincipal clearances / MCP 端到端 / 旧专用端点回归,全绿。 - 既有测试除 TestIntegration_ClassificationFilter 外全绿(后者预存在失败)。
225 lines
7.5 KiB
Go
225 lines
7.5 KiB
Go
//go:build integration
|
||
|
||
package main
|
||
|
||
import (
|
||
"strings"
|
||
"testing"
|
||
)
|
||
|
||
// TestIntegration_UpdatePrincipal_Clearances 修复 issue #7:
|
||
// 之前 PUT /access/principals/:name 的 clearances 字段被静默忽略,
|
||
// 用户找不到任何「编辑主体 clearance」的入口。
|
||
// 验证:clearances 数组在 PUT 时一并落库(DELETE + INSERT 全量替换),
|
||
// GET /principals/:name 和 listPrincipals 都能回显。
|
||
func TestIntegration_UpdatePrincipal_Clearances(t *testing.T) {
|
||
env, _ := setupTestEnv(t)
|
||
h := map[string]string{"X-Principal": "manager"}
|
||
|
||
// 用一个非内置主体(避免污染 manager seed)
|
||
key := "test_principal_clearance"
|
||
t.Cleanup(func() {
|
||
env.httpDo(t, "DELETE", "/api/v1/access/principals/"+key, nil, h)
|
||
})
|
||
if code, _ := env.httpDo(t, "POST", "/api/v1/access/principals",
|
||
map[string]any{"name": key, "description": "测试 clearance 配置"}, h); code != 201 {
|
||
t.Fatalf("create principal failed: %d", code)
|
||
}
|
||
|
||
// 1) PUT 设置 clearances
|
||
code, body := env.httpDo(t, "PUT", "/api/v1/access/principals/"+key,
|
||
map[string]any{"clearances": []string{"L0", "L1", "L2"}}, h)
|
||
if code != 200 {
|
||
t.Fatalf("PUT 应 200, got %d body=%v", code, body)
|
||
}
|
||
if got := body["clearances"]; got == nil {
|
||
t.Errorf("响应应回显 clearances, got %v", body)
|
||
}
|
||
|
||
// 2) GET /principals/:name 应回显
|
||
_, get := env.httpDo(t, "GET", "/api/v1/access/principals/"+key, nil, h)
|
||
cls := get["clearances"].([]any)
|
||
if len(cls) != 3 {
|
||
t.Errorf("GET 应回 3 项, got %d (%v)", len(cls), cls)
|
||
}
|
||
|
||
// 3) 再次 PUT 全量替换(含 L3)→ 验证替换语义
|
||
code, body = env.httpDo(t, "PUT", "/api/v1/access/principals/"+key,
|
||
map[string]any{"clearances": []string{"L0", "L1", "L2", "L3"}}, h)
|
||
if code != 200 {
|
||
t.Fatalf("PUT 应 200, got %d", code)
|
||
}
|
||
_, get2 := env.httpDo(t, "GET", "/api/v1/access/principals/"+key, nil, h)
|
||
cls2 := get2["clearances"].([]any)
|
||
if len(cls2) != 4 {
|
||
t.Errorf("替换后应 4 项, got %d (%v)", len(cls2), cls2)
|
||
}
|
||
|
||
// 4) PUT clearances=[] 清空
|
||
code, _ = env.httpDo(t, "PUT", "/api/v1/access/principals/"+key,
|
||
map[string]any{"clearances": []string{}}, h)
|
||
if code != 200 {
|
||
t.Fatalf("PUT 空数组应 200, got %d", code)
|
||
}
|
||
_, get3 := env.httpDo(t, "GET", "/api/v1/access/principals/"+key, nil, h)
|
||
cls3 := get3["clearances"].([]any)
|
||
if len(cls3) != 0 {
|
||
t.Errorf("清空后应 0 项, got %d (%v)", len(cls3), cls3)
|
||
}
|
||
|
||
// 5) PUT 不带 clearances 字段 → 不动(之前的 clearance 仍空)
|
||
code, _ = env.httpDo(t, "PUT", "/api/v1/access/principals/"+key,
|
||
map[string]any{"description": "只改 desc"}, h)
|
||
if code != 200 {
|
||
t.Fatalf("PUT 不带 clearances 应 200, got %d", code)
|
||
}
|
||
_, get4 := env.httpDo(t, "GET", "/api/v1/access/principals/"+key, nil, h)
|
||
cls4 := get4["clearances"].([]any)
|
||
if len(cls4) != 0 {
|
||
t.Errorf("未传 clearances 时应保留之前状态(空),got %v", cls4)
|
||
}
|
||
if get4["description"] != "只改 desc" {
|
||
t.Errorf("description 应被更新, got %v", get4["description"])
|
||
}
|
||
|
||
// 6) listPrincipals 应回显该主体的 clearance
|
||
_, list := env.httpDo(t, "GET", "/api/v1/access/principals", nil, h)
|
||
var found bool
|
||
for _, p := range list["principals"].([]any) {
|
||
m := p.(map[string]any)
|
||
if m["name"] == key {
|
||
if clsL := m["clearances"]; clsL == nil {
|
||
t.Errorf("listPrincipals 应回显 clearances, got nil")
|
||
}
|
||
found = true
|
||
}
|
||
}
|
||
if !found {
|
||
t.Errorf("listPrincipals 缺新建的 %s", key)
|
||
}
|
||
}
|
||
|
||
// TestIntegration_SetPrincipalClearance_MCP 修复 issue #7 方案 A:
|
||
// MCP set_principal_clearance 工具能写入;list_principals / get_principal 能读取。
|
||
func TestIntegration_SetPrincipalClearance_MCP(t *testing.T) {
|
||
env, _ := setupTestEnv(t)
|
||
h := map[string]string{"X-Principal": "manager"}
|
||
|
||
key := "test_mcp_clearance"
|
||
t.Cleanup(func() {
|
||
env.httpDo(t, "DELETE", "/api/v1/access/principals/"+key, nil, h)
|
||
})
|
||
if code, _ := env.httpDo(t, "POST", "/api/v1/access/principals",
|
||
map[string]any{"name": key, "description": "MCP clearance 测试"}, h); code != 201 {
|
||
t.Fatalf("create principal failed: %d", code)
|
||
}
|
||
|
||
// 1) MCP set_principal_clearance
|
||
code, body := env.httpDo(t, "POST", "/api/v1/mcp",
|
||
map[string]any{
|
||
"jsonrpc": "2.0", "id": "1", "method": "tools/call",
|
||
"params": map[string]any{
|
||
"name": "set_principal_clearance",
|
||
"arguments": map[string]any{
|
||
"name": key,
|
||
"clearances": []string{"L0", "L1", "L2", "L3"},
|
||
},
|
||
},
|
||
}, h)
|
||
if code != 200 {
|
||
t.Fatalf("MCP 应 200, got %d body=%v", code, body)
|
||
}
|
||
|
||
// 2) MCP get_principal 应回显
|
||
code, body = env.httpDo(t, "POST", "/api/v1/mcp",
|
||
map[string]any{
|
||
"jsonrpc": "2.0", "id": "2", "method": "tools/call",
|
||
"params": map[string]any{
|
||
"name": "get_principal",
|
||
"arguments": map[string]any{"name": key},
|
||
},
|
||
}, h)
|
||
if code != 200 {
|
||
t.Fatalf("get_principal 应 200, got %d", code)
|
||
}
|
||
result := body["result"].(map[string]any)
|
||
content := result["content"].([]any)
|
||
text := content[0].(map[string]any)["text"].(string)
|
||
if !strings.Contains(text, `"clearances"`) {
|
||
t.Errorf("get_principal 响应应含 clearances, got %s", text)
|
||
}
|
||
if !strings.Contains(text, `"L3"`) {
|
||
t.Errorf("get_principal 响应应含 L3, got %s", text)
|
||
}
|
||
|
||
// 3) MCP list_principals 应包含该主体
|
||
code, body = env.httpDo(t, "POST", "/api/v1/mcp",
|
||
map[string]any{
|
||
"jsonrpc": "2.0", "id": "3", "method": "tools/call",
|
||
"params": map[string]any{
|
||
"name": "list_principals",
|
||
"arguments": map[string]any{},
|
||
},
|
||
}, h)
|
||
if code != 200 {
|
||
t.Fatalf("list_principals 应 200, got %d", code)
|
||
}
|
||
result2 := body["result"].(map[string]any)
|
||
content2 := result2["content"].([]any)
|
||
text2 := content2[0].(map[string]any)["text"].(string)
|
||
if !strings.Contains(text2, key) {
|
||
t.Errorf("list_principals 应包含新建 %s, got %s", key, text2)
|
||
}
|
||
|
||
// 4) MCP 缺 name 应报错
|
||
code, body = env.httpDo(t, "POST", "/api/v1/mcp",
|
||
map[string]any{
|
||
"jsonrpc": "2.0", "id": "4", "method": "tools/call",
|
||
"params": map[string]any{
|
||
"name": "set_principal_clearance",
|
||
"arguments": map[string]any{
|
||
"clearances": []string{"L0"},
|
||
},
|
||
},
|
||
}, h)
|
||
if code != 200 {
|
||
t.Fatalf("MCP 错误应 200, got %d", code)
|
||
}
|
||
r4 := body["result"].(map[string]any)
|
||
c4 := r4["content"].([]any)
|
||
t4 := c4[0].(map[string]any)["text"].(string)
|
||
if !strings.Contains(t4, "name") {
|
||
t.Errorf("MCP 缺 name 应报错, got %s", t4)
|
||
}
|
||
}
|
||
|
||
// TestIntegration_PutClearances_Rest 顺带验证既有的
|
||
// `PUT /principals/:name/clearances` 端点仍然有效(用户不知道有这个端点)。
|
||
// 这是 issue #7 的关键发现:端点一直都在,只是用户认知里没有。
|
||
func TestIntegration_PutClearances_Rest(t *testing.T) {
|
||
env, _ := setupTestEnv(t)
|
||
h := map[string]string{"X-Principal": "manager"}
|
||
|
||
key := "test_legacy_clearance_path"
|
||
t.Cleanup(func() {
|
||
env.httpDo(t, "DELETE", "/api/v1/access/principals/"+key, nil, h)
|
||
})
|
||
if code, _ := env.httpDo(t, "POST", "/api/v1/access/principals",
|
||
map[string]any{"name": key, "description": "测试旧端点"}, h); code != 201 {
|
||
t.Fatalf("create principal failed: %d", code)
|
||
}
|
||
|
||
// 用 PUT /principals/:name/clearances(既有的专用端点)
|
||
code, _ := env.httpDo(t, "PUT", "/api/v1/access/principals/"+key+"/clearances",
|
||
map[string]any{"markings": []string{"L0", "L2"}}, h)
|
||
if code != 200 {
|
||
t.Fatalf("PUT clearances 应 200, got %d", code)
|
||
}
|
||
|
||
// GET /principals/:name/clearances(既有只读端点)
|
||
_, get := env.httpDo(t, "GET", "/api/v1/access/principals/"+key+"/clearances", nil, h)
|
||
cls := get["clearances"].([]any)
|
||
if len(cls) != 2 {
|
||
t.Errorf("既有专用端点 GET 应 2 项, got %d", len(cls))
|
||
}
|
||
} |