You've already forked DataMate
修复从全新部署到运行的完整流程中的配置和路由问题。 ## P0 修复(功能失效) ### P0-1: GraphRAG KG 服务 URL 错误 - config.py - GRAPHRAG_KG_SERVICE_URL 从 http://datamate-kg:8080 改为 http://datamate-backend:8080(容器名修正) - kg_client.py - 修复 API 路径:/knowledge-graph/... → /api/knowledge-graph/... - kb_access.py - 同类问题修复:/knowledge-base/... → /api/knowledge-base/... - test_kb_access.py - 测试断言同步更新 根因:容器名 datamate-kg 不存在,且 httpx 绝对路径会丢弃 base_url 中的 /api 路径 ### P0-2: Vite 开发代理剥离 /api 前缀 - vite.config.ts - 删除 /api/knowledge-graph 专用代理规则(剥离 /api 导致 404),统一走 ^/api 规则 ## P1 修复(功能受损) ### P1-1: Gateway 缺少 KG Python 端点路由 - ApiGatewayApplication.java - 添加 /api/kg/** 路由(指向 kg-extraction Python 服务) - ApiGatewayApplication.java - 添加 /api/graphrag/** 路由(指向 GraphRAG 服务) ### P1-2: DATA_MANAGEMENT_URL 默认值缺 /api - KnowledgeGraphProperties.java - dataManagementUrl 默认值 http://localhost:8080 → http://localhost:8080/api - KnowledgeGraphProperties.java - annotationServiceUrl 默认值 http://localhost:8081 → http://localhost:8080/api(同 JVM) - application-knowledgegraph.yml - YAML 默认值同步更新 ### P1-3: Neo4j k8s 安装链路失败 - Makefile - VALID_K8S_TARGETS 添加 neo4j - Makefile - %-k8s-install 添加 neo4j case(显式 skip,提示使用 Docker 或外部实例) - Makefile - %-k8s-uninstall 添加 neo4j case(显式 skip) 根因:install 目标无条件调用 neo4j-$(INSTALLER)-install,但 k8s 模式下 neo4j 不在 VALID_K8S_TARGETS 中,导致 "Unknown k8s target 'neo4j'" 错误 ## P2 修复(次要) ### P2-1: Neo4j 加入 Docker install 流程 - Makefile - install target 增加 neo4j-$(INSTALLER)-install,在 datamate 之前启动 - Makefile - VALID_SERVICE_TARGETS 增加 neo4j - Makefile - %-docker-install / %-docker-uninstall 增加 neo4j case ## 验证结果 - mvn test: 311 tests, 0 failures ✅ - eslint: 0 errors ✅ - tsc --noEmit: 通过 ✅ - vite build: 成功 (17.71s) ✅ - Python tests: 46 passed ✅ - make -n install INSTALLER=k8s: 不再报 unknown target ✅ - make -n neo4j-k8s-install: 正确显示 skip 消息 ✅
119 lines
4.2 KiB
Python
119 lines
4.2 KiB
Python
"""知识库访问权限校验。
|
|
|
|
在执行 GraphRAG 检索前,调用 Java rag-indexer-service 的
|
|
GET /knowledge-base/{id} 端点验证当前用户是否有权访问该知识库。
|
|
|
|
Java 侧实现参考:KnowledgeBaseService.getKnowledgeBaseWithAccessCheck()
|
|
- 查找 KB 是否存在
|
|
- 校验 createdBy == currentUserId(管理员跳过)
|
|
- 不满足则抛出 sys.0005 (INSUFFICIENT_PERMISSIONS)
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import httpx
|
|
|
|
from app.core.logging import get_logger
|
|
|
|
logger = get_logger(__name__)
|
|
|
|
|
|
class KnowledgeBaseAccessValidator:
|
|
"""通过 Java 后端校验用户是否有权访问指定知识库。"""
|
|
|
|
def __init__(
|
|
self,
|
|
*,
|
|
base_url: str = "http://datamate-backend:8080/api",
|
|
timeout: float = 10.0,
|
|
) -> None:
|
|
self._base_url = base_url.rstrip("/")
|
|
self._timeout = timeout
|
|
self._client: httpx.AsyncClient | None = None
|
|
|
|
@classmethod
|
|
def from_settings(cls) -> KnowledgeBaseAccessValidator:
|
|
from app.core.config import settings
|
|
|
|
return cls(base_url=settings.datamate_backend_base_url)
|
|
|
|
def _get_client(self) -> httpx.AsyncClient:
|
|
if self._client is None:
|
|
self._client = httpx.AsyncClient(
|
|
base_url=self._base_url,
|
|
timeout=self._timeout,
|
|
)
|
|
return self._client
|
|
|
|
async def check_access(
|
|
self,
|
|
knowledge_base_id: str,
|
|
user_id: str,
|
|
*,
|
|
collection_name: str | None = None,
|
|
) -> bool:
|
|
"""校验用户是否有权访问指定知识库。
|
|
|
|
调用 Java 后端 GET /knowledge-base/{id},该端点内部执行
|
|
owner 校验(createdBy == currentUserId,管理员跳过)。
|
|
|
|
当 *collection_name* 不为 None 时,还会校验请求中的
|
|
collection_name 与该知识库实际的 name 是否一致,防止
|
|
用户提交合法 KB ID 但篡改 collection_name 来访问
|
|
其他知识库的 Milvus 数据。
|
|
|
|
Returns:
|
|
True — 用户有权访问且 collection_name 匹配
|
|
False — 无权访问、collection_name 不匹配或校验失败
|
|
"""
|
|
try:
|
|
client = self._get_client()
|
|
resp = await client.get(
|
|
f"/api/knowledge-base/{knowledge_base_id}",
|
|
headers={"X-User-Id": user_id},
|
|
)
|
|
if resp.status_code == 200:
|
|
body = resp.json()
|
|
# Java 全局包装: {"code": 200, "data": {...}}
|
|
# code != 200 说明业务层拒绝(如权限不足)
|
|
code = body.get("code", resp.status_code)
|
|
if code != 200:
|
|
logger.warning(
|
|
"KB access denied: kb_id=%s, user=%s, biz_code=%s, msg=%s",
|
|
knowledge_base_id, user_id, code, body.get("message", ""),
|
|
)
|
|
return False
|
|
|
|
# 校验 collection_name 与 KB 实际名称的绑定关系
|
|
if collection_name is not None:
|
|
data = body.get("data") or {}
|
|
actual_name = data.get("name") if isinstance(data, dict) else None
|
|
if actual_name != collection_name:
|
|
logger.warning(
|
|
"KB collection_name mismatch: kb_id=%s, "
|
|
"expected=%s, actual=%s, user=%s",
|
|
knowledge_base_id, collection_name,
|
|
actual_name, user_id,
|
|
)
|
|
return False
|
|
|
|
return True
|
|
# HTTP 4xx/5xx
|
|
logger.warning(
|
|
"KB access check returned HTTP %d: kb_id=%s, user=%s",
|
|
resp.status_code, knowledge_base_id, user_id,
|
|
)
|
|
return False
|
|
except Exception:
|
|
# 网络异常时 fail-close:拒绝访问,防止绕过权限
|
|
logger.exception(
|
|
"KB access check failed (fail-close): kb_id=%s, user=%s",
|
|
knowledge_base_id, user_id,
|
|
)
|
|
return False
|
|
|
|
async def close(self) -> None:
|
|
if self._client is not None:
|
|
await self._client.aclose()
|
|
self._client = None
|