mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 22:21:30 +00:00
69a508dfcf
# Phase 9 — approval-bypass closure (Decision 9, option a)
* Migration 000033_approval_kinds.up.sql: ALTER TABLE
issuance_approval_requests ADD COLUMN approval_kind +
payload JSONB; relax certificate_id + job_id to nullable;
CHECK (approval_kind IN ('cert_issuance','profile_edit'))
+ CHECK (per-kind nullability invariant) + index on
approval_kind. Idempotent throughout via DO blocks.
* domain.ApprovalKind enum (cert_issuance / profile_edit) +
IsValidApprovalKind. ApprovalRequest gains Kind +
Payload []byte for the pending profile diff.
* postgres.ApprovalRepository.Create + scanApprovalRow extended
to round-trip the new columns; certificate_id + job_id
switched to sql.NullString so profile_edit rows persist
cleanly. Default Kind=cert_issuance preserves back-compat
for every Phase-7-2026-05-03 caller.
* ApprovalService.RequestProfileEditApproval: new entry point
that creates a pending profile-edit row carrying the
serialized profile diff. Bypass mode (CERTCTL_APPROVAL_BYPASS)
short-circuits the same way it does for cert_issuance.
* ApprovalService.SetProfileEditApply hook: cmd/server/main.go
registers a closure that deserializes req.Payload + persists
via profileRepo.Update + emits a profile.edit_applied audit
row with category=auth. The hook avoids the Approval ↔
Profile import cycle.
* ProfileService.UpdateProfile: gates when (a) the live
profile carries RequiresApproval=true, OR (b) the proposed
edit would set it true. Returns ErrProfileEditPendingApproval
with the new approval ID; ProfileHandler maps to HTTP 202
Accepted + {pending_approval_id}. Both arms close the
flip-flop loophole because every transition through an
approval-tier profile fires the gate.
* TestProfileEdit_RequiresApprovalLoopholeClosed pins all 3
bypass attempts (flip-off / kept-on / flip-on) gated; nil-
approval-service preserves pre-Phase-9 direct-apply for
test fixtures.
* Approval service tests gain 4 profile_edit rows: pending row
shape; same-actor self-approve rejected with
ErrApproveBySameActor (load-bearing two-person integrity);
approve fails-closed when apply callback unwired;
apply callback invoked on approve.
* docs/reference/profiles.md (new) explains the gate +
edit response shape (202) + same-actor invariant + bypass
+ audit hooks.
# Phase 10 — RBAC management GUI
* useAuthMe hook (web/src/hooks/useAuthMe.ts): TanStack Query
fetches /api/v1/auth/me on app boot, caches for 60s, exposes
hasPerm(p) + hasAnyPerm + isAdmin predicates. Every Phase-10
page consumes this on mount + gates affordances against the
cached effective_permissions slice. Server-side enforcement
is the load-bearing gate; client-side hide/disable is UX.
* New routes:
- /auth/roles — list (auth.role.list); create-role modal
(auth.role.create) hidden when missing.
- /auth/roles/:id — detail + permissions; edit
(auth.role.edit), delete (auth.role.delete), add/remove
permission affordances each gated.
- /auth/keys — list of every actor with role grants; assign
+ revoke modals (auth.role.assign). actor-demo-anon
flagged system-managed; mutation buttons hidden for it.
- /auth/settings — stub showing /v1/auth/me identity +
bootstrap-endpoint availability via /v1/auth/bootstrap.
* AuditPage extended with category filter ('All categories'
+ the 3 enum values from migration 000032). Selection flows
to the API call params + the URL-driven query state.
* Layout: 3 new nav entries (Roles / API Keys / Auth Settings).
* api/client.ts: 12 new exported functions for the RBAC
surface (authMe, list/get/create/update/delete role,
list/add/remove role permissions, list keys, assign/revoke
key role, bootstrap-availability probe).
* data-testid attributes on every interactive element so a
future Playwright suite can assert behavior without brittle
CSS selectors.
* Empty state, error state, and unsaved-changes warnings on
every form per the prompt's implementation rules.
# Frontend tests
* RolesPage.test.tsx (6 tests): list render, empty state,
error state, hide-create-button-without-perm,
show-create-button-with-perm, submit-create-modal.
* KeysPage.test.tsx (3 tests): demo-anon flagged
system-managed (no buttons), permission-gated affordance
hide for auditor caller, assign-modal-POST contract.
* AuthSettingsPage.test.tsx (2 tests): identity surface,
bootstrap-OPEN-status surface.
* AuditPage.test.tsx (+1): category-filter select renders
with the 4 documented options.
15 frontend tests total in src/pages/auth/ + the audit
category-filter test; all pass via npx vitest run.
# Verifications
* go vet ./... clean.
* staticcheck across internal/auth + handler + router + cli +
service + repository + cmd + domain: clean.
* gofmt -l clean repo-wide.
* go test -short -count=1 green across internal/service,
internal/api/handler, internal/api/router, internal/auth,
internal/auth/bootstrap, internal/service/auth,
internal/domain/auth, cmd/server, cmd/cli, internal/cli.
* npx tsc --noEmit clean.
* npm run build green (vite build produces dist/index.html
+ 946KB JS bundle; chunk-size warning is pre-existing).
* npx vitest run src/pages/auth/ src/pages/AuditPage.test.tsx
green (15 tests, 4 files).
346 lines
10 KiB
Go
346 lines
10 KiB
Go
package postgres
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/lib/pq"
|
|
|
|
"github.com/certctl-io/certctl/internal/domain"
|
|
"github.com/certctl-io/certctl/internal/repository"
|
|
)
|
|
|
|
// ApprovalRepository is the postgres implementation of
|
|
// repository.ApprovalRepository. Rank 7 of the 2026-05-03 Infisical
|
|
// deep-research deliverable.
|
|
type ApprovalRepository struct {
|
|
db *sql.DB
|
|
}
|
|
|
|
// NewApprovalRepository constructs an ApprovalRepository against the
|
|
// given *sql.DB. The schema is defined by migration
|
|
// 000027_approval_workflow.up.sql.
|
|
func NewApprovalRepository(db *sql.DB) *ApprovalRepository {
|
|
return &ApprovalRepository{db: db}
|
|
}
|
|
|
|
// Create inserts a new ApprovalRequest at state=pending. Generates the
|
|
// ar-<slug> ID if req.ID is empty. Returns
|
|
// repository.ErrAlreadyExists if the partial-unique index
|
|
// (idx_approval_pending_per_job) trips — i.e., a pending request
|
|
// already exists for the given job_id.
|
|
func (r *ApprovalRepository) Create(ctx context.Context, req *domain.ApprovalRequest) error {
|
|
if req.ID == "" {
|
|
req.ID = "ar-" + uuid.NewString()
|
|
}
|
|
if req.State == "" {
|
|
req.State = domain.ApprovalStatePending
|
|
}
|
|
if !domain.IsValidApprovalState(req.State) {
|
|
return fmt.Errorf("invalid approval state %q", req.State)
|
|
}
|
|
now := time.Now().UTC()
|
|
if req.CreatedAt.IsZero() {
|
|
req.CreatedAt = now
|
|
}
|
|
if req.UpdatedAt.IsZero() {
|
|
req.UpdatedAt = now
|
|
}
|
|
|
|
metadataJSON, err := json.Marshal(req.Metadata)
|
|
if err != nil {
|
|
return fmt.Errorf("marshal approval metadata: %w", err)
|
|
}
|
|
if len(metadataJSON) == 0 || string(metadataJSON) == "null" {
|
|
metadataJSON = []byte("{}")
|
|
}
|
|
|
|
// Bundle 1 Phase 9: empty Kind defaults to cert_issuance to
|
|
// preserve back-compat for every Phase-7-2026-05-03 caller.
|
|
if req.Kind == "" {
|
|
req.Kind = domain.ApprovalKindCertIssuance
|
|
}
|
|
if !domain.IsValidApprovalKind(req.Kind) {
|
|
return fmt.Errorf("invalid approval kind %q", req.Kind)
|
|
}
|
|
|
|
// nullable cert_id / job_id for profile_edit rows.
|
|
var certID, jobID interface{}
|
|
if req.CertificateID != "" {
|
|
certID = req.CertificateID
|
|
}
|
|
if req.JobID != "" {
|
|
jobID = req.JobID
|
|
}
|
|
var payload interface{}
|
|
if len(req.Payload) > 0 {
|
|
payload = req.Payload
|
|
}
|
|
|
|
const q = `
|
|
INSERT INTO issuance_approval_requests
|
|
(id, certificate_id, job_id, profile_id, requested_by,
|
|
state, decided_by, decided_at, decision_note, metadata,
|
|
created_at, updated_at, approval_kind, payload)
|
|
VALUES
|
|
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
|
|
`
|
|
|
|
_, err = r.db.ExecContext(ctx, q,
|
|
req.ID, certID, jobID, req.ProfileID, req.RequestedBy,
|
|
string(req.State), req.DecidedBy, req.DecidedAt, req.DecisionNote, metadataJSON,
|
|
req.CreatedAt, req.UpdatedAt, string(req.Kind), payload,
|
|
)
|
|
if err != nil {
|
|
var pqErr *pq.Error
|
|
if errors.As(err, &pqErr) && pqErr.Code == "23505" { // unique_violation
|
|
return repository.ErrAlreadyExists
|
|
}
|
|
return fmt.Errorf("insert approval request: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Get returns the request by ID or repository.ErrNotFound.
|
|
func (r *ApprovalRepository) Get(ctx context.Context, id string) (*domain.ApprovalRequest, error) {
|
|
const q = `
|
|
SELECT id, certificate_id, job_id, profile_id, requested_by,
|
|
state, decided_by, decided_at, decision_note, metadata,
|
|
created_at, updated_at, approval_kind, payload
|
|
FROM issuance_approval_requests
|
|
WHERE id = $1
|
|
`
|
|
row := r.db.QueryRowContext(ctx, q, id)
|
|
return scanApprovalRow(row)
|
|
}
|
|
|
|
// GetByJobID returns the most-recently-created request for the given
|
|
// job_id, regardless of state.
|
|
func (r *ApprovalRepository) GetByJobID(ctx context.Context, jobID string) (*domain.ApprovalRequest, error) {
|
|
const q = `
|
|
SELECT id, certificate_id, job_id, profile_id, requested_by,
|
|
state, decided_by, decided_at, decision_note, metadata,
|
|
created_at, updated_at, approval_kind, payload
|
|
FROM issuance_approval_requests
|
|
WHERE job_id = $1
|
|
ORDER BY created_at DESC
|
|
LIMIT 1
|
|
`
|
|
row := r.db.QueryRowContext(ctx, q, jobID)
|
|
return scanApprovalRow(row)
|
|
}
|
|
|
|
// List returns approval requests filtered by repository.ApprovalFilter.
|
|
// Supports paginated dashboard queries.
|
|
func (r *ApprovalRepository) List(ctx context.Context, filter *repository.ApprovalFilter) ([]*domain.ApprovalRequest, error) {
|
|
if filter == nil {
|
|
filter = &repository.ApprovalFilter{}
|
|
}
|
|
page := filter.Page
|
|
if page < 1 {
|
|
page = 1
|
|
}
|
|
perPage := filter.PerPage
|
|
if perPage < 1 || perPage > 500 {
|
|
perPage = 50
|
|
}
|
|
|
|
q := `
|
|
SELECT id, certificate_id, job_id, profile_id, requested_by,
|
|
state, decided_by, decided_at, decision_note, metadata,
|
|
created_at, updated_at, approval_kind, payload
|
|
FROM issuance_approval_requests
|
|
WHERE 1 = 1
|
|
`
|
|
args := []interface{}{}
|
|
idx := 1
|
|
if filter.State != "" {
|
|
q += fmt.Sprintf(" AND state = $%d", idx)
|
|
args = append(args, filter.State)
|
|
idx++
|
|
}
|
|
if filter.CertificateID != "" {
|
|
q += fmt.Sprintf(" AND certificate_id = $%d", idx)
|
|
args = append(args, filter.CertificateID)
|
|
idx++
|
|
}
|
|
if filter.RequestedBy != "" {
|
|
q += fmt.Sprintf(" AND requested_by = $%d", idx)
|
|
args = append(args, filter.RequestedBy)
|
|
idx++
|
|
}
|
|
q += fmt.Sprintf(" ORDER BY created_at DESC LIMIT $%d OFFSET $%d", idx, idx+1)
|
|
args = append(args, perPage, (page-1)*perPage)
|
|
|
|
rows, err := r.db.QueryContext(ctx, q, args...)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list approval requests: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []*domain.ApprovalRequest
|
|
for rows.Next() {
|
|
req, err := scanApprovalRow(rows)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out = append(out, req)
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("iterate approval rows: %w", err)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// UpdateState transitions a row from state=pending to a terminal state.
|
|
// Returns repository.ErrNotFound if the ID does not exist.
|
|
//
|
|
// The schema's approval_decision_consistency CHECK constraint enforces
|
|
// that decided_by + decided_at MUST be non-null for terminal states,
|
|
// so a same-state update on an already-decided row returns a
|
|
// constraint-violation error from postgres.
|
|
func (r *ApprovalRepository) UpdateState(ctx context.Context, id string, state domain.ApprovalState,
|
|
decidedBy string, decidedAt time.Time, note string) error {
|
|
if !domain.IsValidApprovalState(state) {
|
|
return fmt.Errorf("invalid approval state %q", state)
|
|
}
|
|
if !state.IsTerminal() {
|
|
return fmt.Errorf("UpdateState only accepts terminal states; got %q", state)
|
|
}
|
|
|
|
var notePtr *string
|
|
if note != "" {
|
|
notePtr = ¬e
|
|
}
|
|
|
|
const q = `
|
|
UPDATE issuance_approval_requests
|
|
SET state = $2,
|
|
decided_by = $3,
|
|
decided_at = $4,
|
|
decision_note = $5,
|
|
updated_at = NOW()
|
|
WHERE id = $1
|
|
AND state = 'pending'
|
|
`
|
|
res, err := r.db.ExecContext(ctx, q, id, string(state), decidedBy, decidedAt, notePtr)
|
|
if err != nil {
|
|
return fmt.Errorf("update approval state: %w", err)
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return fmt.Errorf("update approval rows affected: %w", err)
|
|
}
|
|
if n == 0 {
|
|
// Either the ID does not exist, or the row is already terminal.
|
|
// Disambiguate via a follow-up Get.
|
|
existing, getErr := r.Get(ctx, id)
|
|
if getErr != nil {
|
|
return getErr // ErrNotFound or scan error
|
|
}
|
|
if existing.State.IsTerminal() {
|
|
return repository.ErrAlreadyExists // signals "already decided"
|
|
}
|
|
return repository.ErrNotFound
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ExpireStale transitions every row with state=pending and created_at <=
|
|
// before to state=expired. Returns the number of rows transitioned.
|
|
//
|
|
// The decided_at is stamped with time.Now() rather than `before` so
|
|
// audit dashboards see the actual reaper-firing wall-clock, not the
|
|
// reaper's deadline-cutoff input. The decided_by is set to a sentinel
|
|
// "system-reaper" so SELECT FROM audit_events WHERE actor matches both
|
|
// human-decided and reaper-decided rows for compliance review.
|
|
func (r *ApprovalRepository) ExpireStale(ctx context.Context, before time.Time) (int, error) {
|
|
const q = `
|
|
UPDATE issuance_approval_requests
|
|
SET state = 'expired',
|
|
decided_by = 'system-reaper',
|
|
decided_at = NOW(),
|
|
decision_note = 'auto-expired by scheduler reaper at CERTCTL_JOB_AWAITING_APPROVAL_TIMEOUT',
|
|
updated_at = NOW()
|
|
WHERE state = 'pending'
|
|
AND created_at <= $1
|
|
`
|
|
res, err := r.db.ExecContext(ctx, q, before)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("expire stale approvals: %w", err)
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return 0, fmt.Errorf("expire stale rows affected: %w", err)
|
|
}
|
|
return int(n), nil
|
|
}
|
|
|
|
// scanApprovalRow scans a single row into a *domain.ApprovalRequest.
|
|
// Used by Get / GetByJobID (sql.Row) + List (*sql.Rows) — accepts the
|
|
// rowScanner interface. JSONB metadata is unmarshaled defensively.
|
|
type rowScanner interface {
|
|
Scan(dest ...interface{}) error
|
|
}
|
|
|
|
func scanApprovalRow(row rowScanner) (*domain.ApprovalRequest, error) {
|
|
var (
|
|
req domain.ApprovalRequest
|
|
certID sql.NullString
|
|
jobID sql.NullString
|
|
stateStr string
|
|
decidedBy sql.NullString
|
|
decidedAt sql.NullTime
|
|
decisionNote sql.NullString
|
|
metadataJSON []byte
|
|
kindStr string
|
|
payload []byte
|
|
)
|
|
err := row.Scan(
|
|
&req.ID, &certID, &jobID, &req.ProfileID, &req.RequestedBy,
|
|
&stateStr, &decidedBy, &decidedAt, &decisionNote, &metadataJSON,
|
|
&req.CreatedAt, &req.UpdatedAt, &kindStr, &payload,
|
|
)
|
|
if err != nil {
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, repository.ErrNotFound
|
|
}
|
|
return nil, fmt.Errorf("scan approval row: %w", err)
|
|
}
|
|
|
|
req.State = domain.ApprovalState(stateStr)
|
|
req.Kind = domain.ApprovalKind(kindStr)
|
|
if certID.Valid {
|
|
req.CertificateID = certID.String
|
|
}
|
|
if jobID.Valid {
|
|
req.JobID = jobID.String
|
|
}
|
|
if len(payload) > 0 {
|
|
req.Payload = payload
|
|
}
|
|
if decidedBy.Valid {
|
|
s := decidedBy.String
|
|
req.DecidedBy = &s
|
|
}
|
|
if decidedAt.Valid {
|
|
t := decidedAt.Time
|
|
req.DecidedAt = &t
|
|
}
|
|
if decisionNote.Valid {
|
|
s := decisionNote.String
|
|
req.DecisionNote = &s
|
|
}
|
|
if len(metadataJSON) > 0 {
|
|
if err := json.Unmarshal(metadataJSON, &req.Metadata); err != nil {
|
|
return nil, fmt.Errorf("unmarshal approval metadata: %w", err)
|
|
}
|
|
}
|
|
return &req, nil
|
|
}
|