Build per-tenant ClickHouse write-routing for ingest (Tantivy still deferred)
ingest tags every record with a tenant_id Kafka header (built previously), but nothing consumed it to actually route the write. This closes that for ClickHouse: enterprise/cmd/enterprise-ingest (a second binary, mirroring enterprise-api) reuses ingest/consumer's own flush loop unchanged, with enterprise/internal/chwriter.Registry -- a per-tenant clickhousewriter.Writer registry -- swapped in as the writer. A batch pulled from the single shared Redpanda topic can mix records from many tenants, so WriteBatch groups by TenantID and dispatches each group to its own tenant's connection, fail- closed on an empty or unrecognized tenant_id. ingest/consumer and ingest/clickhousewriter move out of internal/ (same reason api/internal/* moved earlier this phase: enterprise/ can't import anything under another module's internal/). Their New() constructors now take small local Config structs instead of ingest/internal/config types, so enterprise/ doesn't need that import either. Building this surfaced a real bug: tenantprovision.ProvisionClickHouse only granted SELECT on a tenant's ClickHouse user, correct for chrunner's read-only use but not enough for chwriter reusing the same credential to write -- every real per-tenant write would have failed closed with a permission error. Fixed by widening the grant to SELECT, INSERT; no cross-tenant boundary is crossed by also allowing INSERT within a tenant's own database. Helm gates enterprise-ingest's Deployment on the same ingest.requireTenantCredential flag that already gates tag validation -- write-routing is meaningless without tagging already being required, so they're one decision, not two. docker-compose.yml's version is a disclosed, weaker approximation: it can't achieve Helm's genuine -mode=server/-mode=consumer split, so with the enterprise profile active both ingest and enterprise-ingest independently consume every message via different consumer groups -- harmless duplication for local verification only. Not built: Tantivy's independent Redpanda consumer (search/src/consumer.rs) still doesn't read the tenant_id header at all -- every record still lands in the one shared index regardless of tenant. Not run: the live-ClickHouse- gated tests (chwriter's cross-tenant routing test, tenantprovision's INSERT regression test) -- no Docker/database access in this environment; they're correct Go that has never executed, disclosed as such in docs/security/ threat-model.md and docs/phase-4-runbook.md §14.
This commit is contained in:
@@ -237,21 +237,30 @@ presents (minted via `enterprise-auth
|
||||
new `POST /internal/authorize-ingest` endpoint — never an `enterprise/`
|
||||
import, same boundary shape as `api/authz.Authorizer`), and the
|
||||
resolved tenant ID is attached to every record as a `tenant_id` Kafka
|
||||
message header before it's produced. **What's still deferred, clearly**:
|
||||
nothing downstream reads that header yet — neither `ingest`'s own
|
||||
ClickHouse writer nor `search`'s independent Redpanda consumer route a
|
||||
record's write into a per-tenant destination, so every record still
|
||||
lands in the one shared ClickHouse database/Tantivy index regardless of
|
||||
which tenant it's now correctly tagged with. That write-routing split
|
||||
(likely another "second binary," mirroring `enterprise-api`) is real,
|
||||
scoped, remaining work — attaching a verified tenant identity as early
|
||||
as possible was deliberately built as a self-contained first step, not
|
||||
the whole feature. What still keeps this phase from being done: the
|
||||
actual tenant-picker *page* doesn't exist (`web` has no session/cookie-
|
||||
handling code at all yet, and `enterprise-auth` has no CORS middleware
|
||||
for a cross-origin `fetch` with credentials — both real, separately-
|
||||
scoped frontend gaps), and per-tenant write-routing for ingest per the
|
||||
above. Full accounting:
|
||||
message header before it's produced. **ClickHouse write-routing is now
|
||||
built too**: `enterprise/cmd/enterprise-ingest` (another "second binary,"
|
||||
mirroring `enterprise-api`) reuses `ingest/consumer`'s own flush loop
|
||||
with `enterprise/internal/chwriter.Registry` swapped in as the writer —
|
||||
one dedicated ClickHouse connection per tenant, routing each batch's
|
||||
records by their `tenant_id` tag, fail-closed on an untagged or
|
||||
unprovisioned tenant. Building it found and fixed a real bug:
|
||||
`tenantprovision.ProvisionClickHouse` originally granted a tenant's
|
||||
ClickHouse user `SELECT` only, which would have made every real
|
||||
per-tenant write fail with a permission error — fixed by granting
|
||||
`SELECT, INSERT` (one credential, both directions; no cross-tenant
|
||||
boundary is crossed by also allowing INSERT within a tenant's own
|
||||
database). **What's still deferred, clearly**: Tantivy's side.
|
||||
`search/src/consumer.rs` is a completely independent Redpanda consumer
|
||||
(not called through `ingest` or `enterprise-ingest` at all) and still
|
||||
writes every record into the one shared (default) index regardless of
|
||||
tenant — a different codebase (Rust) and a different process, real,
|
||||
disclosed, separately-scoped remaining work, not just "the same fix
|
||||
applied twice." What still keeps this phase from being done: the actual
|
||||
tenant-picker *page* doesn't exist (`web` has no session/cookie-handling
|
||||
code at all yet, and `enterprise-auth` has no CORS middleware for a
|
||||
cross-origin `fetch` with credentials — both real, separately-scoped
|
||||
frontend gaps), and Tantivy write-routing per the above. Full
|
||||
accounting:
|
||||
`/docs/security/threat-model.md`; step-by-step verification procedure
|
||||
(not yet run against a live cluster in this environment):
|
||||
`/docs/phase-4-runbook.md`. The rest of this section describes the exit
|
||||
|
||||
Reference in New Issue
Block a user