fix(mention): 修复普通用户无法在聊天中唤出技能与MCP提及列表的Bug

原因:
1. 后端接口 GET /api/system/skills 与 GET /api/system/mcp-servers 之前被权限校验拦截。
2. 前端本地在调用拉取技能和MCP服务底集的方法时,前置调用了 apiAdminGet 会在本地硬性拦截非管理员权限的用户,导致请求被掐断并静默兜底返回空数组。

修改:
1. 后端放开此二接口路由为低特权只读访问,且对 MCP 服务器的敏感连接信息(如 url、command、args、env、headers)在 user 角色拉取时执行强力脱敏过滤,并补充相关单元测试。
2. 前端将 listSkills 与 getMcpServers 从 apiAdminGet 调整为 apiGet,绕过本地硬拦截。
3. 维护 roadmap.md 进度记录。
This commit is contained in:
supreme0597 2026-05-21 23:42:49 +08:00
parent 87977bb927
commit 261ea88b11
7 changed files with 125 additions and 13 deletions

View File

@ -17,7 +17,7 @@ from yuxi.services.mcp_service import (
)
from yuxi.storage.postgres.models_business import User
from yuxi.utils import logger
from server.utils.auth_middleware import get_admin_user, get_db
from server.utils.auth_middleware import get_admin_user, get_db, get_required_user
mcp = APIRouter(prefix="/system/mcp-servers", tags=["mcp"])
@ -80,13 +80,26 @@ async def get_server_or_404(db: AsyncSession, name: str):
@mcp.get("")
async def get_mcp_servers(
current_user: User = Depends(get_admin_user),
current_user: User = Depends(get_required_user),
db: AsyncSession = Depends(get_db),
):
"""获取所有 MCP 服务器配置"""
"""获取所有 MCP 服务器配置(普通用户仅获取脱敏的基础信息)"""
try:
servers = await get_all_mcp_servers(db)
return {"success": True, "data": [s.to_dict() for s in servers]}
if current_user.role in ["admin", "superadmin"]:
return {"success": True, "data": [s.to_dict() for s in servers]}
else:
# 普通用户仅返回展示类基础属性,脱敏敏感的连接环境配置
data = []
for s in servers:
d = s.to_dict()
d.pop("url", None)
d.pop("command", None)
d.pop("args", None)
d.pop("env", None)
d.pop("headers", None)
data.append(d)
return {"success": True, "data": data}
except Exception as e:
logger.error(f"Failed to get MCP servers: {e}")
raise HTTPException(status_code=500, detail=str(e))

View File

@ -9,7 +9,7 @@ from fastapi.responses import FileResponse
from pydantic import BaseModel, Field
from sqlalchemy.ext.asyncio import AsyncSession
from server.utils.auth_middleware import get_admin_user, get_db
from server.utils.auth_middleware import get_admin_user, get_db, get_required_user
from yuxi.services.remote_skill_install_service import install_remote_skill, install_remote_skills_batch, list_remote_skills
from yuxi.services.skill_service import (
BuiltinSkillUpdateConflictError,
@ -82,7 +82,7 @@ def _cleanup_export_file(path: str) -> None:
@skills.get("")
async def list_skills_route(
_current_user: User = Depends(get_admin_user),
_current_user: User = Depends(get_required_user),
db: AsyncSession = Depends(get_db),
):
"""获取技能列表(管理员可读)。"""

View File

@ -4,11 +4,11 @@ from fastapi import FastAPI
from fastapi.testclient import TestClient
from server.routers.mcp_router import mcp
from server.utils.auth_middleware import get_admin_user, get_db
from server.utils.auth_middleware import get_admin_user, get_db, get_required_user
from yuxi.storage.postgres.models_business import User
def _build_app() -> FastAPI:
def _build_app(*, allow_admin: bool = True) -> FastAPI:
app = FastAPI()
app.include_router(mcp, prefix="/api")
@ -16,6 +16,9 @@ def _build_app() -> FastAPI:
return None
async def fake_admin_user():
if not allow_admin:
from fastapi import HTTPException
raise HTTPException(status_code=403, detail="需要管理员权限")
return User(
username="admin",
user_id="admin",
@ -23,8 +26,17 @@ def _build_app() -> FastAPI:
role="admin",
)
async def fake_required_user():
return User(
username="admin" if allow_admin else "user",
user_id="admin" if allow_admin else "user",
password_hash="x",
role="admin" if allow_admin else "user",
)
app.dependency_overrides[get_db] = fake_db
app.dependency_overrides[get_admin_user] = fake_admin_user
app.dependency_overrides[get_required_user] = fake_required_user
return app
@ -65,3 +77,56 @@ def test_update_mcp_server_status_not_found(monkeypatch):
client = TestClient(_build_app())
resp = client.put("/api/system/mcp-servers/missing/status", json={"enabled": True})
assert resp.status_code == 404, resp.text
def test_get_mcp_servers_normal_user_is_stripped(monkeypatch):
class DummyServer:
def __init__(self):
self.name = "test-mcp"
self.description = "test mcp description"
self.transport = "stdio"
self.url = "http://localhost:8000"
self.command = "python"
self.args = ["-m", "mcp"]
self.env = {"API_KEY": "secret"}
self.headers = {"Auth": "Bearer secret"}
self.enabled = 1
def to_dict(self):
return {
"name": self.name,
"description": self.description,
"transport": self.transport,
"url": self.url,
"command": self.command,
"args": self.args,
"env": self.env,
"headers": self.headers,
"enabled": bool(self.enabled),
}
async def fake_get_all_mcp_servers(db):
return [DummyServer()]
monkeypatch.setattr("server.routers.mcp_router.get_all_mcp_servers", fake_get_all_mcp_servers)
# 1. 管理员请求,应该返回全部字段
client_admin = TestClient(_build_app(allow_admin=True))
resp_admin = client_admin.get("/api/system/mcp-servers")
assert resp_admin.status_code == 200
data_admin = resp_admin.json()["data"][0]
assert data_admin["url"] == "http://localhost:8000"
assert data_admin["command"] == "python"
assert data_admin["env"] == {"API_KEY": "secret"}
# 2. 普通用户请求,敏感字段应该被脱敏(剔除)
client_user = TestClient(_build_app(allow_admin=False))
resp_user = client_user.get("/api/system/mcp-servers")
assert resp_user.status_code == 200
data_user = resp_user.json()["data"][0]
assert "url" not in data_user
assert "command" not in data_user
assert "env" not in data_user
assert "headers" not in data_user
assert data_user["name"] == "test-mcp"
assert data_user["description"] == "test mcp description"

View File

@ -4,7 +4,7 @@ from fastapi import FastAPI, HTTPException
from fastapi.testclient import TestClient
from server.routers.skill_router import skills
from server.utils.auth_middleware import get_admin_user, get_db
from server.utils.auth_middleware import get_admin_user, get_db, get_required_user
from yuxi.storage.postgres.models_business import Skill, User
@ -25,8 +25,17 @@ def _build_app(*, allow_admin: bool = True) -> FastAPI:
role="admin",
)
async def fake_required_user():
return User(
username="admin" if allow_admin else "user",
user_id="admin" if allow_admin else "user",
password_hash="x",
role="admin" if allow_admin else "user",
)
app.dependency_overrides[get_db] = fake_db
app.dependency_overrides[get_admin_user] = fake_admin_user
app.dependency_overrides[get_required_user] = fake_required_user
return app
@ -240,3 +249,27 @@ def test_install_remote_skill_route(monkeypatch):
assert captured["source"] == "anthropics/skills"
assert captured["skill"] == "frontend-design"
assert captured["created_by"] == "admin"
def test_list_skills_route_normal_user_success(monkeypatch):
async def fake_list_skills(_db):
return [
Skill(
slug="test-skill",
name="test-skill-name",
description="test skill description",
dir_path="skills/test-skill",
)
]
monkeypatch.setattr("server.routers.skill_router.list_skills", fake_list_skills)
# 普通用户应该也能成功获取列表
app = _build_app(allow_admin=False)
client = TestClient(app)
resp = client.get("/api/system/skills")
assert resp.status_code == 200, resp.text
payload = resp.json()
assert payload["success"] is True
assert payload["data"][0]["slug"] == "test-skill"
assert payload["data"][0]["name"] == "test-skill-name"

View File

@ -39,6 +39,7 @@
<!-- 0.6.2 的内容请放在这里 -->
- 下放扩展管理权限:普通管理员现在可进入扩展管理并完整管理 Tools、MCP、SubAgent、Skills同步放开 Skill 管理接口权限并补充权限测试。
- 修复聊天中普通用户 `@` 提及出不来技能和 MCP 列表的 Bug将获取技能列表 `GET /api/system/skills` 与获取 MCP 服务器列表 `GET /api/system/mcp-servers` 的鉴权要求放宽至已登录的普通用户(`get_required_user`);同时为了确保敏感配置的安全性,当普通用户请求 MCP 列表时,后端会自动进行脱敏,剔除 `url`、`command`、`args`、`env` 和 `headers` 等敏感连接参数,并新增了对应的角色鉴权及脱敏剔除测试用例。
- 调整 Agent 知识库默认选择:未显式配置知识库时默认启用当前用户可访问的全部知识库,显式保存空列表仍表示不启用知识库。
- 优化评估基准自动生成:仅支持 commonrag/Milvus 知识库,默认参考 chunks 数量改为 1多 chunk 场景复用知识库向量检索选择相似 chunks不再对全量 chunks 重新计算 embedding并移除前端 Embedding 模型选择。
- 修复知识库文档入库状态回退:当已解析文件缺失 `markdown_file` 解析产物时,索引流程会将文件状态恢复为未解析,便于重新解析而不是停留在索引失败。

View File

@ -1,4 +1,4 @@
import { apiAdminGet, apiAdminPost, apiAdminPut, apiAdminDelete } from './base'
import { apiGet, apiAdminGet, apiAdminPost, apiAdminPut, apiAdminDelete } from './base'
/**
* MCP 服务器管理 API 模块
@ -16,7 +16,7 @@ const BASE_URL = '/api/system/mcp-servers'
* @returns {Promise} - 服务器列表
*/
export const getMcpServers = async () => {
return apiAdminGet(BASE_URL)
return apiGet(BASE_URL)
}
/**

View File

@ -1,9 +1,9 @@
import { apiAdminGet, apiAdminPost, apiAdminPut, apiAdminDelete } from './base'
import { apiGet, apiAdminGet, apiAdminPost, apiAdminPut, apiAdminDelete } from './base'
const BASE_URL = '/api/system/skills'
export const listSkills = async () => {
return apiAdminGet(BASE_URL)
return apiGet(BASE_URL)
}
export const importSkillZip = async (file) => {