fix(auth): prepare narrow approved CI schema reconciliation

This commit is contained in:
devops committed 2026-10-25 12:43:20 +00:00
1 parent cf9b80bbb3
commit 688a0e4de5
7 files changed
+246

No files matched your search

+46
View File
@@ -0,0 +1,46 @@
-- Independently approved reconciliation; NOT a Prisma history migration.
-- Run with psql -X -v ON_ERROR_STOP=1. Do not wrap in migrate deploy/db push.
BEGIN;
SET LOCAL search_path = public, pg_catalog;
SET LOCAL lock_timeout = '3s';
SET LOCAL statement_timeout = '30s';
SET LOCAL idle_in_transaction_session_timeout = '60s';
SELECT pg_advisory_xact_lock(20261025, 1);
DO $$
DECLARE x record;
BEGIN
IF to_regclass('public.users') IS NULL THEN RAISE EXCEPTION 'users missing'; END IF;
FOR x IN SELECT * FROM (VALUES ('auth_expires_at','timestamp with time zone'),('stage_test_session','character varying(64)'),('stage_test_generation','uuid')) AS expected(name,typ) LOOP
IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid='public.users'::regclass AND attname=x.name AND NOT attisdropped) THEN
IF NOT EXISTS (SELECT 1 FROM pg_attribute a LEFT JOIN pg_attrdef d ON d.adrelid=a.attrelid AND d.adnum=a.attnum WHERE a.attrelid='public.users'::regclass AND a.attname=x.name AND NOT a.attisdropped AND format_type(a.atttypid,a.atttypmod)=x.typ AND NOT a.attnotnull AND d.oid IS NULL) THEN
RAISE EXCEPTION 'unexpected existing users column %',x.name;
END IF;
END IF;
END LOOP;
IF to_regclass('public.prepare_workflow_outbox') IS NOT NULL THEN
RAISE EXCEPTION 'outbox already exists: inspect equivalence before any repeat execution';
END IF;
FOR x IN SELECT * FROM (VALUES ('orchestration_tasks'),('orchestration_runs'),('orchestration_budget_ledger')) AS refs(name) LOOP
IF NOT EXISTS (SELECT 1 FROM pg_attribute a WHERE a.attrelid=to_regclass('public.'||x.name) AND a.attname='id' AND a.atttypid='uuid'::regtype AND NOT a.attisdropped AND a.attnotnull) THEN
RAISE EXCEPTION 'missing UUID reference %',x.name;
END IF;
END LOOP;
END $$;
ALTER TABLE public.users ADD COLUMN IF NOT EXISTS auth_expires_at timestamptz,
ADD COLUMN IF NOT EXISTS stage_test_session varchar(64),
ADD COLUMN IF NOT EXISTS stage_test_generation uuid;
CREATE TABLE public.prepare_workflow_outbox (
id uuid PRIMARY KEY,
task_id uuid NOT NULL UNIQUE REFERENCES public.orchestration_tasks(id) ON DELETE RESTRICT,
status varchar(20) NOT NULL DEFAULT 'PENDING' CHECK (status IN ('PENDING','DONE')),
attempts integer NOT NULL DEFAULT 0 CHECK (attempts BETWEEN 0 AND 3),
lease_owner varchar(100), lease_token uuid, lease_until timestamptz, heartbeat_at timestamptz,
run_id uuid REFERENCES public.orchestration_runs(id) ON DELETE RESTRICT,
reservation_id uuid REFERENCES public.orchestration_budget_ledger(id) ON DELETE RESTRICT,
created_at timestamptz NOT NULL DEFAULT now(),
not_before timestamptz
);
CREATE INDEX prepare_workflow_outbox_status_lease_until_idx ON public.prepare_workflow_outbox(status,lease_until);
CREATE INDEX prepare_workflow_outbox_due_idx ON public.prepare_workflow_outbox(status,not_before,created_at);
-- Deliberately no _prisma_migrations writes or unrelated DDL.
COMMIT;
+4
View File
@@ -0,0 +1,4 @@
BEGIN READ ONLY;
SET LOCAL search_path=public,pg_catalog;
SELECT jsonb_build_object('columns', (SELECT jsonb_agg(jsonb_build_array(c.relname,a.attname,format_type(a.atttypid,a.atttypmod),a.attnotnull,pg_get_expr(d.adbin,d.adrelid)) ORDER BY c.relname,a.attname) FROM pg_attribute a JOIN pg_class c ON c.oid=a.attrelid LEFT JOIN pg_attrdef d ON d.adrelid=a.attrelid AND d.adnum=a.attnum WHERE c.oid IN ('public.users'::regclass,'public.prepare_workflow_outbox'::regclass) AND a.attnum>0 AND NOT a.attisdropped AND (c.relname='prepare_workflow_outbox' OR a.attname IN ('auth_expires_at','stage_test_session','stage_test_generation'))), 'constraints',(SELECT jsonb_agg(jsonb_build_array(conname,pg_get_constraintdef(oid)) ORDER BY conname) FROM pg_constraint WHERE conrelid='public.prepare_workflow_outbox'::regclass), 'indexes',(SELECT jsonb_agg(jsonb_build_array(indexname,indexdef) ORDER BY indexname) FROM pg_indexes WHERE schemaname='public' AND tablename='prepare_workflow_outbox'));
COMMIT;
+58
View File
@@ -0,0 +1,58 @@
#!/usr/bin/env bash
# Executed on authenticated host by the dedicated CI workflow, never at app startup.
set -euo pipefail
set +x
[[ ${GITHUB_ACTIONS:-} == true && $# == 3 ]] || exit 2
environment=$1; sha=$2; approved_sql_sha=$3
[[ $sha =~ ^[0-9a-f]{40}$ && $approved_sql_sha =~ ^[0-9a-f]{64}$ ]] || exit 2
case "$environment" in stage) container=canino_db_stage;; production) container=canino_db_prod;; *) exit 2;; esac
root=$(git rev-parse --show-toplevel)
[[ $(git rev-parse HEAD) == "$sha" && -z $(git status --porcelain) ]] || exit 2
sql="$root/scripts/auth-schema-reconcile.sql"
[[ $(sha256sum "$sql" | cut -d' ' -f1) == "$approved_sql_sha" ]] || exit 2
umask 077
backup_root=/opt/backups/canina-auth-reconcile
mkdir -p "$backup_root"
exec 9>"$backup_root/operation.lock"
flock -n 9
receipt="$backup_root/stage-$approved_sql_sha.receipt"
if [[ $environment == production ]]; then
[[ -s $receipt ]] || { printf 'Missing Stage receipt\n' >&2; exit 2; }
[[ $(cat "$receipt") == "$sha" ]] || { printf 'Stage SHA mismatch\n' >&2; exit 2; }
# Auth acceptance is independently approved, never manufactured by this script.
[[ ${STAGE_AUTH_ACCEPTANCE_APPROVED:-} == "$sha:$approved_sql_sha" ]] || exit 2
[[ ${PRODUCTION_SCHEMA_APPROVED:-} == "$sha:$approved_sql_sha" ]] || exit 2
source_container=canino_db_prod
else
# Stage already contains these objects: rehearse the missing delta against a
# production backup, then compare exact Stage catalog to that rehearsed result.
source_container=canino_db_prod
fi
# Both approvals are supplied only by the reviewed protected workflow.
backup="$backup_root/$environment-$sha-$(date -u +%Y%m%dT%H%M%SZ).dump"
# Full backup remains restricted on host; never emitted to CI logs or artifacts.
docker exec "$source_container" sh -c 'PGOPTIONS="-c default_transaction_read_only=on" pg_dump -Fc --no-owner --no-privileges -U "$POSTGRES_USER" -d "$POSTGRES_DB"' > "$backup"
[[ -s $backup ]]
docker exec -i "$container" pg_restore --list < "$backup" > "$backup.toc"
[[ -s $backup.toc ]]
printf 'Backup verified: bytes=%s sha256=%s\n' "$(stat -c %s "$backup")" "$(sha256sum "$backup" | cut -d' ' -f1)"
# Restore the FULL backup into an isolated disposable database container first.
name="canina-auth-restore-${environment}-${sha:0:12}"
cleanup() { docker rm -f "$name" >/dev/null 2>&1 || true; }
trap cleanup EXIT
docker run -d --name "$name" --network none --tmpfs /var/lib/postgresql/data:rw,size=1g -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16-alpine >/dev/null
ready=false
for _ in {1..60}; do if docker exec "$name" pg_isready -U postgres >/dev/null 2>&1; then ready=true; break; fi; sleep 1; done
[[ $ready == true ]]
docker exec -i "$name" pg_restore --exit-on-error --no-owner --no-privileges -U postgres -d postgres < "$backup"
docker exec -i "$name" psql -X -v ON_ERROR_STOP=1 -U postgres < "$sql"
docker exec -i "$name" psql -X -qAt -v ON_ERROR_STOP=1 -U postgres < "$root/scripts/auth-schema-verify.sql" > "$backup.expected.json"
if [[ $environment == production ]]; then
# Only the reviewed SQL is executed. No Prisma CLI, seeds or ledger edits.
docker exec -i "$container" sh -c 'psql -X -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB"' < "$sql"
fi
docker exec -i "$container" sh -c 'PGOPTIONS="-c default_transaction_read_only=on" psql -X -qAt -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB"' < "$root/scripts/auth-schema-verify.sql" > "$backup.actual.json"
cmp "$backup.expected.json" "$backup.actual.json"
cleanup; trap - EXIT
if [[ $environment == stage ]]; then printf '%s\n' "$sha" > "$receipt"; fi
printf 'Narrow additive reconciliation complete: environment=%s commit=%s sql_sha256=%s\n' "$environment" "$sha" "$approved_sql_sha"
+29
View File
@@ -0,0 +1,29 @@
"""Offline safety-contract tests. DB execution evidence is in docs/auth-schema-rehearsal.json."""
import pathlib
import subprocess
import unittest
ROOT = pathlib.Path(__file__).resolve().parents[1]
class Safety(unittest.TestCase):
def test_shell_syntax(self):
subprocess.run(['bash', '-n', str(ROOT/'scripts/ci-auth-schema-reconcile.sh')], check=True)
def test_narrow_sql(self):
sql=(ROOT/'scripts/auth-schema-reconcile.sql').read_text()
for forbidden in ['DROP TABLE', 'DELETE FROM', 'UPDATE public.', 'INSERT INTO', 'migrate deploy', 'db push']:
self.assertNotIn(forbidden, '\n'.join(x for x in sql.splitlines() if not x.startswith('--')))
self.assertIn("lock_timeout = '3s'", sql)
self.assertIn("statement_timeout = '30s'", sql)
self.assertIn('COMMIT;', sql)
def test_fail_closed_approvals(self):
w=(ROOT/'.gitea/workflows/auth-schema-reconcile.yml').read_text()
for expected in ['REVIEWED_AUTH_SCHEMA_COMMIT','PRODUCTION_AUTH_SCHEMA_APPROVAL','STAGE_AUTH_SCHEMA_ACCEPTANCE','StrictHostKeyChecking=yes','IdentityAgent=none']:
self.assertIn(expected,w)
s=(ROOT/'scripts/ci-auth-schema-reconcile.sh').read_text()
self.assertLess(s.index('pg_restore --exit-on-error'),s.index('if [[ $environment == production ]]; then',s.index('pg_restore --exit-on-error')))
self.assertIn('cmp "$backup.expected.json" "$backup.actual.json"',s)
def test_real_rehearsal(self):
import json
r=json.loads((ROOT/'docs/auth-schema-rehearsal.json').read_text())
self.assertTrue(r['pre_patch_missing_columns_failed'])
self.assertFalse(r['production_writes'])
self.assertGreater(r['schema_backup_bytes'],90000)
if __name__=='__main__':unittest.main()