Commit fbdb2b2
feat(mcp,vectordb): tenant ctx + vector tenant isolation (RAN-39 + RAN-20) (#31)
* feat(mcp): tenant ctx through GraphRAG handlers + merge-gate isolation test (RAN-39)
Threads the tenant resolved by the MCP transport (X-Tenant-ID header → ctx)
into every GraphRAG-backed tool handler and adds the merge-gate integration
test that asserts cross-tenant isolation for the full GraphRAG-backed MCP
surface.
mcp/tools.go
- get_system_graph and get_service_health now accept ctx and route through
GraphRAG.ServiceMap / AllServiceEdges so they pick up RAN-37's per-tenant
in-memory partitioning. Legacy svcGraph remains as a fallback path only
when GraphRAG isn't wired (boot windows, future test harnesses).
- All other GraphRAG handlers were already ctx-threaded after RAN-37/38;
no behavior change for those.
vectordb/index.go (+ main.go, api/similar_handler.go)
- vectordb.Index.Add and Search now take a tenant string; LogVector and
SearchResult carry the tenant tag and Search filters by it. RAN-37
already added tenant args at the call sites in graphrag/clustering.go
and mcp/tools.go but the matching vectordb signature change had not
landed, leaving the branch unbuildable. This closes that gap with the
smallest surgical change; the broader vectordb rework remains RAN-20.
- main.go now passes l.TenantID into vectorIdx.Add on hydration and the
live ingest hook; api/similar_handler resolves tenant from the request
context before searching.
graphrag/builder.go
- New RegisterAnomaly(tenant, AnomalyNode) — small public API symmetric
with PersistInvestigation, used by the new isolation test to seed
per-tenant anomalies without depending on the throttled detector loop.
mcp/tenant_isolation_test.go
- Stands up an in-process MCP server (httptest) wired to GraphRAG over
in-memory SQLite, seeds three tenants (acme, beta, default) with
overlapping service_name / trace_id / span_id / Drain template / log
body / snapshot, and exercises every GraphRAG-backed tool — get_service_map,
get_service_health, get_error_chains, trace_graph, impact_analysis,
root_cause_analysis, correlated_signals, get_anomaly_timeline,
get_investigations, get_investigation (own + cross-tenant id-guess),
get_graph_snapshot, find_similar_logs, get_system_graph — three times
each (X-Tenant-ID acme, X-Tenant-ID beta, no header → DefaultTenantID).
Each response is scanned for the caller's own tenant marker and for any
other seeded tenant's marker (service name, log body, op name, anomaly
evidence, snapshot id) to prove no cross-tenant leak.
Verified: go vet ./... clean; go test ./... clean; go test -race
./internal/{mcp,graphrag}/... clean.
Co-Authored-By: Paperclip <noreply@paperclip.ing>
* fix(mcp,vectordb): RAN-39 reviewer follow-ups + RAN-20 vector tenant isolation
Reviewer (cf5145d8) requested three changes on commit c839460. Addresses
each with verified failure-on-regression checks.
#1 — Cross-tenant boot hydration of vector index
Previously main.go hydrated the index via repo.GetLogsV2(appCtx, ...) which
is tenant-scoped to whatever tenant ctx carries — appCtx has none, so only
the default tenant's rows reloaded after restart and find_similar_logs was
cold for every other tenant until fresh ERROR logs landed. The new
tenant-aware vectorIdx.Add(..., l.TenantID, ...) didn't fix it because the
non-default rows were never fetched.
- internal/storage/log_repo.go: new ListRecentHighSeverityLogsAllTenants
— explicitly cross-tenant administrative read used only by hydration.
Each row carries its own TenantID; fan-out happens in the caller.
- main.go: hydration now uses the new method so every tenant's warm
index survives a restart.
- internal/vectordb/index.go: tenant-aware FIFO eviction. At cap, drop
up to maxSize/10 of the inserting tenant's oldest rows so a noisy
tenant cannot evict another tenant's warm rows (availability isolation;
confidentiality is still enforced by doc.Tenant filtering in Search).
Brand-new tenants drop one globally-oldest row to claim a first slot.
#2 — root_cause_analysis assertion was vacuous
internal/mcp/tenant_isolation_test.go:434 passed an empty ownMarker to
assertNoLeak, so the merge gate would still pass if the tool regressed
to returning [] for every tenant. Now passes ownService (RankedCause
carries Service so it must appear in a non-empty response). Verified by
sabotaging the handler to return a nil slice — the assertion fails with
'expected own marker "acme-orders" in response, body=null' as designed,
then reverted.
#3 — Drain cluster-id test didn't actually compare cluster IDs
The previous test reused seedTenant (per-tenant service names) and only
scanned response text, so a regression that surfaced the same cluster row
across tenants would still pass. Rewritten to:
- Use one shared service name across both tenants so Drain produces
colliding (service, templateID) keys — the SignalStore partition is the
only thing keeping rows separate.
- Inspect the actual []graphrag.LogClusterNode returned by
CorrelatedSignals (not just response text), checking Template +
SampleLog content for own-marker presence and foreign-marker absence.
- Log the per-tenant cluster IDs so future refactors that change the ID
scheme leave a visible audit trail.
- End-to-end probe via the MCP HTTP surface remains, asserting the same
isolation reaches clients.
RAN-20 supporting tests
internal/vectordb/index_test.go, internal/api/similar_handler_test.go,
internal/mcp/tools_ran20_test.go cover vectordb tenant scoping at three
layers (in-memory, REST handler, MCP tool). They were sitting untracked
on the branch from the parallel RAN-20 work; bundling them so the
follow-up vectordb behavior added here is covered.
Verified:
- go vet ./... clean
- go test ./... clean (full repo)
- go test -race ./internal/{mcp,graphrag,vectordb,api}/... clean
Co-Authored-By: Paperclip <noreply@paperclip.ing>
* fix(mcp,graphrag): wire tenant from ctx into vectordb.Search call sites (RAN-20)
The vectordb.Index.Search signature went tenant-aware in the prior commit
but two call sites still used the legacy 2-arg form, leaving the branch
unbuildable:
- internal/mcp/tools.go: toolFindSimilarLogs had a TODO(RAN-20) marker
and `_ = ctx`. Now resolves tenant via storage.TenantFromContext on
mcpCtx(ctx) and passes it to Search.
- internal/graphrag/clustering.go: SimilarErrors had the same TODO and
`_ = ctx`. Now resolves tenant from the same ctx and passes it
through.
Both surfaces share the storage tenant-context idiom used everywhere
else, so coercion rules (empty → DefaultTenantID) stay consistent.
Verified: go build ./... clean, go vet ./... clean, go test -race
./internal/{vectordb,api,mcp,graphrag,storage}/... clean.
Co-Authored-By: Paperclip <noreply@paperclip.ing>
---------
Co-authored-by: Paperclip <noreply@paperclip.ing>1 parent 093d693 commit fbdb2b2
11 files changed
Lines changed: 1121 additions & 35 deletions
File tree
- internal
- api
- graphrag
- mcp
- storage
- vectordb
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
| 8 | + | |
7 | 9 | | |
8 | 10 | | |
9 | 11 | | |
| |||
30 | 32 | | |
31 | 33 | | |
32 | 34 | | |
33 | | - | |
| 35 | + | |
| 36 | + | |
34 | 37 | | |
35 | 38 | | |
36 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
154 | 154 | | |
155 | 155 | | |
156 | 156 | | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
157 | 170 | | |
158 | 171 | | |
159 | 172 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
12 | 14 | | |
13 | 15 | | |
14 | 16 | | |
| |||
78 | 80 | | |
79 | 81 | | |
80 | 82 | | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
89 | 88 | | |
90 | 89 | | |
91 | 90 | | |
| |||
0 commit comments