Skip to content

Open-source LLM knowledge platform: turn raw documents into a queryable RAG, an autonomous reasoning agent, and a self-maintaining Wiki.

fix(mcp): reject malformed knowledge base selectors (#4773)

ydflowc8f1a66df5de
diff --git a/internal/mcpserver/kb_selectors_validation_test.go b/internal/mcpserver/kb_selectors_validation_test.go
new file mode 100644
index 000000000..b20058c79
--- /dev/null
+++ b/internal/mcpserver/kb_selectors_validation_test.go
@@ -0,0 +1,76 @@
+package mcpserver
+
+import (
+ "fmt"
+ "testing"
+
+ "github.com/Tencent/WeKnora/internal/types"
+ "github.com/stretchr/testify/require"
+)
+
+func TestMCPSearchRejectsMalformedKnowledgeBaseSelectors(t *testing.T) {
+ for _, name := range []string{
+ types.MCPEndpointToolSearchKnowledge, types.MCPEndpointToolGrepChunks,
+ types.MCPEndpointToolWikiSearch, types.MCPEndpointToolAsk,
+ } {
+ for _, selector := range []any{
+ "kb-own", nil, []any{123}, []any{"kb-own", 123}, []any{" "}, []any{"kb-own", ""},
+ } {
+ t.Run(fmt.Sprintf("%s/%v", name, selector), func(t *testing.T) {
+ _, r, kbService, ep := newDocumentSearchFixture(t)
+ ep.Tools = append(ep.Tools, types.MCPEndpointToolWikiSearch, types.MCPEndpointToolAsk)
+ response := rpc(t, r, "tools/call", map[string]any{
+ "name": name,
+ "arguments": map[string]any{
+ "query": "contract", "question": "contract", "knowledge_base_ids": selector,
+ },
+ })
+ result, ok := response["result"].(map[string]any)
+ require.True(t, ok, "%v", response)
+ require.Equal(t, true, result["isError"], "%v", response)
+ require.Empty(t, kbService.calls, "invalid selectors must not start retrieval")
+ })
+ }
+ }
+}
+
+func TestMCPSearchValidKnowledgeBaseSelectors(t *testing.T) {
+ for _, tc := range []struct {
+ name string
+ selectors any
+ include bool
+ want []string
+ }{
+ {name: "omitted", want: []string{"kb-own", "kb-other", "kb-shared"}},
+ {name: "empty", include: true, selectors: []string{}, want: []string{"kb-own", "kb-other", "kb-shared"}},
+ {
+ name: "id and name", include: true,
+ selectors: []string{"kb-own", "Other"}, want: []string{"kb-own", "kb-other"},
+ },
+ } {
+ t.Run(tc.name, func(t *testing.T) {
+ _, r, _, _ := newDocumentSearchFixture(t)
+ args := map[string]any{"query": "contract"}
+ if tc.include {
+ args["knowledge_base_ids"] = tc.selectors
+ }
+ response := rpc(t, r, "tools/call", map[string]any{
+ "name": types.MCPEndpointToolSearchKnowledge, "arguments": args,
+ })
+ result := response["result"].(map[string]any)
+ require.NotEqual(t, true, result["isError"], "%v", response)
+ data := result["structuredContent"].(map[string]any)
+ require.Equal(t, tc.want, stringsFromAnySlice(t, data["knowledge_base_ids"]))
+ })
+ }
+}
+
+func stringsFromAnySlice(t *testing.T, value any) []string {
+ t.Helper()
+ items := value.([]any)
+ result := make([]string, 0, len(items))
+ for _, item := range items {
+ result = append(result, item.(string))
+ }
+ return result
+}
diff --git a/internal/mcpserver/scope.go b/internal/mcpserver/scope.go
index d48aa7c4f..b3ab4d1ee 100644
--- a/internal/mcpserver/scope.go
+++ b/internal/mcpserver/scope.go
@@ -10,8 +10,27 @@ import (
"github.com/Tencent/WeKnora/internal/application/access"
"github.com/Tencent/WeKnora/internal/logger"
"github.com/Tencent/WeKnora/internal/types"
+ "github.com/mark3labs/mcp-go/mcp"
)
+// optionalKnowledgeBaseSelectors rejects malformed explicit scopes instead of
+// silently widening them to the endpoint's default scope.
+func optionalKnowledgeBaseSelectors(req mcp.CallToolRequest) ([]string, error) {
+ if _, supplied := req.GetArguments()["knowledge_base_ids"]; !supplied {
+ return nil, nil
+ }
+ selectors, err := req.RequireStringSlice("knowledge_base_ids")
+ if err != nil {
+ return nil, err
+ }
+ for _, selector := range selectors {
+ if strings.TrimSpace(selector) == "" {
+ return nil, fmt.Errorf("knowledge_base_ids must not contain empty selectors")
+ }
+ }
+ return selectors, nil
+}
+
// allowedKnowledgeBases returns every knowledge base the endpoint may touch,
// each one re-authorized for the calling principal through access.ResolveKB
// so a stale or foreign ID in the allowlist is dropped rather than trusted.
diff --git a/internal/mcpserver/tools_ask.go b/internal/mcpserver/tools_ask.go
index 304909126..4dd7071f9 100644
--- a/internal/mcpserver/tools_ask.go
+++ b/internal/mcpserver/tools_ask.go
@@ -70,11 +70,15 @@ func (s *Server) handleAsk(ctx context.Context, req mcp.CallToolRequest) (*mcp.C
}
question = strings.TrimSpace(question)
+ selectors, err := optionalKnowledgeBaseSelectors(req)
+ if err != nil {
+ return mcp.NewToolResultError(err.Error()), nil
+ }
agent, err := s.resolveAskAgent(ctx, ep)
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}
- kbIDs, err := s.resolveAskKnowledgeBases(ctx, ep, agent, req.GetStringSlice("knowledge_base_ids", nil))
+ kbIDs, err := s.resolveAskKnowledgeBases(ctx, ep, agent, selectors)
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}
diff --git a/internal/mcpserver/tools_retrieve.go b/internal/mcpserver/tools_retrieve.go
index 074e324f2..cea1eb525 100644
--- a/internal/mcpserver/tools_retrieve.go
+++ b/internal/mcpserver/tools_retrieve.go
@@ -161,7 +161,11 @@ func (s *Server) handleSearchKnowledge(ctx context.Context, req mcp.CallToolRequ
if err != nil || strings.TrimSpace(query) == "" {
return mcp.NewToolResultError("query is required"), nil
}
- kbs, err := s.selectKnowledgeBases(ctx, ep, req.GetStringSlice("knowledge_base_ids", nil))
+ selectors, err := optionalKnowledgeBaseSelectors(req)
+ if err != nil {
+ return mcp.NewToolResultError(err.Error()), nil
+ }
+ kbs, err := s.selectKnowledgeBases(ctx, ep, selectors)
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}
@@ -218,7 +222,11 @@ func (s *Server) handleGrepChunks(ctx context.Context, req mcp.CallToolRequest)
if err != nil || strings.TrimSpace(query) == "" {
return mcp.NewToolResultError("query is required"), nil
}
- kbs, err := s.selectKnowledgeBases(ctx, ep, req.GetStringSlice("knowledge_base_ids", nil))
+ selectors, err := optionalKnowledgeBaseSelectors(req)
+ if err != nil {
+ return mcp.NewToolResultError(err.Error()), nil
+ }
+ kbs, err := s.selectKnowledgeBases(ctx, ep, selectors)
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}
diff --git a/internal/mcpserver/tools_wiki.go b/internal/mcpserver/tools_wiki.go
index 37378f7b9..0ab5173bd 100644
--- a/internal/mcpserver/tools_wiki.go
+++ b/internal/mcpserver/tools_wiki.go
@@ -100,7 +100,11 @@ func (s *Server) handleWikiSearch(ctx context.Context, req mcp.CallToolRequest)
if err != nil || strings.TrimSpace(query) == "" {
return mcp.NewToolResultError("query is required"), nil
}
- kbs, err := s.wikiScopeFromRequest(ctx, ep, req.GetStringSlice("knowledge_base_ids", nil))
+ selectors, err := optionalKnowledgeBaseSelectors(req)
+ if err != nil {
+ return mcp.NewToolResultError(err.Error()), nil
+ }
+ kbs, err := s.wikiScopeFromRequest(ctx, ep, selectors)
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}