4c46d673fb
Replaces the M5.1-skeleton handler set with the M4.2 spec from
IMPLEMENTATION_PLAN.md:
Endpoints (authoritative shape in openapi.yaml):
POST /v1/tenants
GET /v1/tenants/{id}
GET /v1/tenants/by-slug/{slug}
POST /v1/tenants/{id}/activate
POST /v1/tenants/{id}/cancel
GET /v1/entitlements?tenant_id=...
GET /v1/catalog
POST /v1/catalog/request
POST /v1/catalog/trial-request
POST /v1/api-keys returns plaintext ONCE
GET /v1/api-keys?tenant_id=...
DELETE /v1/api-keys/{id}
POST /v1/internal/api-keys/verify always 200; valid: bool
POST /v1/audit
GET /v1/audit?{tenant_id,product,actor_id,action,since,until,limit,cursor}
Architecture:
internal/store/store.go Store interface (CRUD + audit + ping)
internal/store/memory.go in-process impl, used when DATABASE_URL
is empty (seed acme tenant, no migrations)
internal/store/postgres.go pgxpool impl against the M4.1 schema
internal/server/server.go router + healthz/readyz
internal/server/{tenants,catalog,apikeys,audit}.go
per-concern handlers (≤250 LoC each)
internal/server/helpers.go writeJSON/writeError/error mapping/log mw
openapi.yaml 3.1 spec; openapi_test.go is the contract gate
API keys:
Plaintext format 'bp_<22-char base64>'. Prefix bp_<8> stored for UI.
Hash is argon2id(salt, time=1, mem=64MB, threads=4, len=32) encoded as
'argon2id|<salt-b64>|<hash-b64>'. Format-tagged so we can rotate
parameters without re-keying. Verify is constant-time.
Store selection:
cmd/server picks Postgres when DATABASE_URL is set, otherwise Memory.
Both implementations are exercised by the same eachStore test harness —
parity is enforced.
Audit:
Every state-changing endpoint emits via s.emitAudit() (fire-and-forget).
audit_log uses ON DELETE SET NULL on tenant_id so forensic history
outlives tenant deletes (per M4.1 schema).
Routing constraint:
Go 1.22 ServeMux can't disambiguate /v1/tenants/{id}/products from
/v1/tenants/by-slug/{slug=products}. Per-tenant subresources moved to
query-param top-level paths: /v1/entitlements?tenant_id=… and
/v1/api-keys?tenant_id=….
Tests:
Every endpoint exercised against both Memory and Postgres via the
eachStore harness. Includes happy paths, validation errors, conflicts,
404s, auto-audit-emit assertion. testcontainers-go for the postgres
harness; gated by -short.
TestOpenAPISpec is the contract gate: every documented operation must
resolve against the router. (kin-openapi v0.138.0.)
Refs: M4.2
108 lines
3.0 KiB
Go
108 lines
3.0 KiB
Go
package server
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"strconv"
|
|
"time"
|
|
|
|
"gitea.meghsakha.com/platform/tenant-registry/internal/store"
|
|
)
|
|
|
|
type appendAuditReq struct {
|
|
TenantID string `json:"tenant_id,omitempty"`
|
|
ProjectID string `json:"project_id,omitempty"`
|
|
ActorID string `json:"actor_id,omitempty"`
|
|
ActorName string `json:"actor_name,omitempty"`
|
|
ActorType string `json:"actor_type,omitempty"`
|
|
Action string `json:"action"`
|
|
TargetID string `json:"target_id,omitempty"`
|
|
TargetType string `json:"target_type,omitempty"`
|
|
TargetName string `json:"target_name,omitempty"`
|
|
Product string `json:"product,omitempty"`
|
|
Metadata map[string]interface{} `json:"metadata,omitempty"`
|
|
}
|
|
|
|
func (s *Server) appendAudit(w http.ResponseWriter, r *http.Request) {
|
|
var in appendAuditReq
|
|
if !decodeJSON(w, r, &in) {
|
|
return
|
|
}
|
|
if in.Action == "" {
|
|
writeError(w, http.StatusBadRequest, "invalid_action", "action is required")
|
|
return
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
|
|
defer cancel()
|
|
|
|
ev, err := s.Store.AppendAudit(ctx, store.AuditEvent{
|
|
TenantID: in.TenantID, ProjectID: in.ProjectID,
|
|
ActorID: in.ActorID, ActorName: in.ActorName, ActorType: in.ActorType,
|
|
Action: in.Action,
|
|
TargetID: in.TargetID, TargetType: in.TargetType, TargetName: in.TargetName,
|
|
Product: in.Product, Metadata: in.Metadata,
|
|
SourceIP: clientIP(r), UserAgent: r.UserAgent(),
|
|
})
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, "internal", err.Error())
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusCreated, ev)
|
|
}
|
|
|
|
func (s *Server) listAudit(w http.ResponseWriter, r *http.Request) {
|
|
q := r.URL.Query()
|
|
f := store.AuditFilter{
|
|
TenantID: q.Get("tenant_id"),
|
|
Product: q.Get("product"),
|
|
ActorID: q.Get("actor_id"),
|
|
Action: q.Get("action"),
|
|
}
|
|
if s := q.Get("since"); s != "" {
|
|
t, err := time.Parse(time.RFC3339, s)
|
|
if err != nil {
|
|
writeError(w, http.StatusBadRequest, "invalid_since", "must be RFC3339")
|
|
return
|
|
}
|
|
f.Since = &t
|
|
}
|
|
if s := q.Get("until"); s != "" {
|
|
t, err := time.Parse(time.RFC3339, s)
|
|
if err != nil {
|
|
writeError(w, http.StatusBadRequest, "invalid_until", "must be RFC3339")
|
|
return
|
|
}
|
|
f.Until = &t
|
|
}
|
|
if s := q.Get("limit"); s != "" {
|
|
n, err := strconv.Atoi(s)
|
|
if err != nil || n < 1 || n > 500 {
|
|
writeError(w, http.StatusBadRequest, "invalid_limit", "must be 1..500")
|
|
return
|
|
}
|
|
f.Limit = n
|
|
}
|
|
if s := q.Get("cursor"); s != "" {
|
|
n, err := strconv.ParseInt(s, 10, 64)
|
|
if err != nil {
|
|
writeError(w, http.StatusBadRequest, "invalid_cursor", "must be an integer")
|
|
return
|
|
}
|
|
f.Cursor = n
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
|
|
defer cancel()
|
|
items, next, err := s.Store.ListAudit(ctx, f)
|
|
if err != nil {
|
|
writeError(w, http.StatusInternalServerError, "internal", err.Error())
|
|
return
|
|
}
|
|
out := map[string]any{"items": items}
|
|
if next > 0 {
|
|
out["next_cursor"] = next
|
|
}
|
|
writeJSON(w, http.StatusOK, out)
|
|
}
|