jcoffey-dev
1d57e697b1
Closes the threat model's headline finding for the SQL query path:
enterprise/internal/tenantprovision does real CREATE DATABASE/USER/GRANT
against ClickHouse, and enterprise/internal/chrunner is a per-tenant
connection registry implementing api's SQLRunner interface, resolving
the tenant from the authenticated request identity -- never a
caller-suppliable parameter. Both are wired into a new binary,
enterprise/cmd/enterprise-api, alongside the unchanged single-tenant
api/cmd/api, since AGPL core can never import enterprise/ and Go's own
internal/ package visibility rules meant enterprise/ couldn't implement
core's SQLRunner interface without importing the package that defines
it. That required moving api/internal/{authz,queryapi,dashboards,
querylang/executor,searchclient,httpserver} out of internal/ -- the
minimal set enterprise-api needs to import; querylang's compiler
internals (planner/lexer/parser/ast/ir) and api's own config stay
internal, since nothing outside api needs them directly.
Also finally wires enterprise/internal/audit into queryapi.AuditLogger
(nil since Phase 4 task 4) via a new adapter, and adds live-ClickHouse
integration tests for two of the four adversarial probes named in
docs/phase-4-isolation-design.md's verification plan.
Corrected several overclaims in the docs while writing this up: an
earlier claim that rbacstore's CRUD was "verified against a live
Postgres" was never actually true in this environment (only
internal/audit was, earlier in this phase, before Docker access was
lost) -- threat-model.md, phase-4-runbook.md, CLAUDE.md, and
enterprise/README.md all now distinguish "a real integration test
exists" from "this was confirmed against a live database."
Still not built: Tantivy/free-text tenant isolation
(enterprise/internal/searchclient), and any deployment-topology
mechanism that actually routes traffic to enterprise-api instead of
plain api -- both binaries exist side by side today with nothing
enforcing or flagging which one a deployment runs.
80 lines
2.9 KiB
YAML
80 lines
2.9 KiB
YAML
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
name: {{ .Release.Name }}-api
|
|
labels:
|
|
{{- include "sentry.labels" . | nindent 4 }}
|
|
{{- include "sentry.selectorLabels" (list $ "api") | nindent 4 }}
|
|
spec:
|
|
replicas: {{ .Values.api.replicas }}
|
|
selector:
|
|
matchLabels:
|
|
{{- include "sentry.selectorLabels" (list $ "api") | nindent 6 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{- include "sentry.selectorLabels" (list $ "api") | nindent 8 }}
|
|
spec:
|
|
initContainers:
|
|
{{- include "sentry.waitForTCP" (list "clickhouse" (printf "%s-clickhouse" .Release.Name) "9000") | nindent 8 }}
|
|
{{- include "sentry.waitForTCP" (list "postgres" (printf "%s-postgres" .Release.Name) "5432") | nindent 8 }}
|
|
{{- include "sentry.waitForTCP" (list "search" (printf "%s-search" .Release.Name) "50052") | nindent 8 }}
|
|
containers:
|
|
- name: api
|
|
image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag }}"
|
|
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
|
|
env:
|
|
- name: CLICKHOUSE_ADDR
|
|
value: "{{ .Release.Name }}-clickhouse:9000"
|
|
- name: CLICKHOUSE_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ .Release.Name }}-clickhouse
|
|
key: password
|
|
- name: SEARCH_GRPC_ADDR
|
|
value: "{{ .Release.Name }}-search:50052"
|
|
- name: POSTGRES_ADDR
|
|
value: "{{ .Release.Name }}-postgres:5432"
|
|
- name: POSTGRES_DATABASE
|
|
value: sentry_metadata
|
|
- name: POSTGRES_USERNAME
|
|
value: sentry
|
|
- name: POSTGRES_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ .Release.Name }}-postgres
|
|
key: password
|
|
{{- if .Values.enterprise.enabled }}
|
|
# Turns on authz.RequireRole*/RequireRoleOrService enforcement
|
|
# on /query and /dashboards -- see api/authz and
|
|
# /docs/phase-4-rbac-design.md. Off (unset) when
|
|
# enterprise.enabled is false, matching every nil-authorizer
|
|
# no-op default in this codebase.
|
|
- name: ENTERPRISE_AUTH_URL
|
|
value: "http://{{ .Release.Name }}-enterprise-auth:8082"
|
|
{{- end }}
|
|
ports:
|
|
- name: http
|
|
containerPort: 8080
|
|
readinessProbe:
|
|
exec:
|
|
command: ["/api", "-healthcheck"]
|
|
initialDelaySeconds: 5
|
|
periodSeconds: 5
|
|
resources:
|
|
{{- toYaml .Values.api.resources | nindent 12 }}
|
|
---
|
|
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
name: {{ .Release.Name }}-api
|
|
labels:
|
|
{{- include "sentry.labels" . | nindent 4 }}
|
|
{{- include "sentry.selectorLabels" (list $ "api") | nindent 4 }}
|
|
spec:
|
|
selector:
|
|
{{- include "sentry.selectorLabels" (list $ "api") | nindent 4 }}
|
|
ports:
|
|
- name: http
|
|
port: 8080
|