Addendum: per-index predicate check, live second-revocation and missing-table cases, test-live-pg prerequisites
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
767852ef96
commit
af554ca013
2 changed files with 42 additions and 7 deletions
|
|
@ -5,6 +5,19 @@
|
|||
# SOUL_PG_URL's test drops and recreates schema public, so it only ever sees
|
||||
# this disposable cluster.
|
||||
set -euo pipefail
|
||||
# Prerequisites, done here when missing (each step is skipped once it holds):
|
||||
# 1. the vendor/CultLib submodule checked out,
|
||||
# 2. its npm dependencies installed (the vendor packages build with its tsc),
|
||||
# 3. dist/ built for cultcache-ts, cultnet-ts and cultmesh-ts (package.json
|
||||
# points main at dist/index.js),
|
||||
# 4. this repo's pnpm install.
|
||||
cd "$(dirname "$0")/.."
|
||||
[ -f vendor/CultLib/package.json ] || git submodule update --init vendor/CultLib
|
||||
[ -d vendor/CultLib/node_modules/typescript ] || (cd vendor/CultLib && npm ci)
|
||||
for pkg in cultcache-ts cultnet-ts cultmesh-ts; do
|
||||
[ -f "vendor/CultLib/packages/$pkg/dist/index.js" ] || (cd "vendor/CultLib/packages/$pkg" && npm run build)
|
||||
done
|
||||
[ -d node_modules/vitest ] || pnpm install --frozen-lockfile
|
||||
export PATH="${PG_BIN:-/usr/lib/postgresql/16/bin}:$PATH"
|
||||
dir="$(mktemp -d)"
|
||||
port="${PG_PORT:-54329}"
|
||||
|
|
|
|||
|
|
@ -447,7 +447,13 @@ async function exerciseStore(store: PostgresStore): Promise<Set<string>> {
|
|||
expect(await s.claimOAuthStateUse(stateUse)).toBe(false);
|
||||
expect(await s.claimOAuthStateUse({ ...stateUse, phase: "callback" })).toBe(true);
|
||||
const { receipt: grant } = await s.createConsentReceipt({ kind: "grant", accountId: account.id, appSlug: "streampixels", provider: "joystick", createdAt: now, scopesAsked: ["a", "b"], scopesGranted: ["a"], consentPageDigest: "d", consentText: "t" });
|
||||
await s.createConsentReceipt({ kind: "revocation", accountId: account.id, appSlug: "streampixels", provider: "joystick", createdAt: later, revokesReceiptId: grant.id });
|
||||
const revocation = { kind: "revocation" as const, accountId: account.id, appSlug: "streampixels" as const, provider: "joystick" as const, createdAt: later, revokesReceiptId: grant.id };
|
||||
const first = await s.createConsentReceipt(revocation);
|
||||
// The second revocation of one grant hits ON CONFLICT DO NOTHING and reads the first back.
|
||||
const second = await s.createConsentReceipt(revocation);
|
||||
expect(first.created).toBe(true);
|
||||
expect(second.created).toBe(false);
|
||||
expect(second.receipt.id).toBe(first.receipt.id);
|
||||
expect((await s.listConsentReceipts(account.id)).map((r) => r.kind)).toEqual(["grant", "revocation"]);
|
||||
await s.createAuditEvent({ eventType: "probe", eventPayloadJson: {}, createdAt: now });
|
||||
return called;
|
||||
|
|
@ -608,12 +614,28 @@ describe.skipIf(!adminUrl)("startup against a live Postgres (HEIMDALL_TEST_PG_AD
|
|||
it("prints each declared predicate exactly as Postgres prints the applied index's", async () => {
|
||||
const { owner } = await appliedDatabase();
|
||||
const printed = await printedDeclaredPredicates(owner, HEIMDALL_SCHEMA_REQUIREMENTS);
|
||||
const applied = await owner.query<{ predicate: string }>(
|
||||
"SELECT pg_get_expr(indpred, indrelid) AS predicate FROM pg_index WHERE indexrelid = 'auth_completions_attempt_unconsumed_unique_idx'::regclass"
|
||||
);
|
||||
const attemptKey = REQUIRED_KEYS.findIndex((key) => key.predicate !== "");
|
||||
expect(printed[attemptKey]).toBe(applied.rows[0]!.predicate);
|
||||
expect(printed.filter((predicate) => predicate !== "")).toHaveLength(1);
|
||||
const appliedByIndex = {
|
||||
auth_completions_attempt_unconsumed_unique_idx: "auth_completions",
|
||||
consent_receipts_revokes_unique_idx: "consent_receipts",
|
||||
};
|
||||
const partialKeys = REQUIRED_KEYS.flatMap((key, index) => (key.predicate === "" ? [] : [{ key, index }]));
|
||||
expect(partialKeys.map(({ key }) => key.table).sort()).toEqual(Object.values(appliedByIndex).sort());
|
||||
for (const [indexName, table] of Object.entries(appliedByIndex)) {
|
||||
const applied = await owner.query<{ predicate: string }>(
|
||||
"SELECT pg_get_expr(indpred, indrelid) AS predicate FROM pg_index WHERE indexrelid = $1::regclass",
|
||||
[indexName]
|
||||
);
|
||||
const { index } = partialKeys.find(({ key }) => key.table === table)!;
|
||||
expect(printed[index], indexName).toBe(applied.rows[0]!.predicate);
|
||||
}
|
||||
expect(printed.filter((predicate) => predicate !== "")).toHaveLength(partialKeys.length);
|
||||
});
|
||||
|
||||
it("refuses to boot with consent_receipts missing when the schema is not applied on startup", async () => {
|
||||
const { name, owner } = await appliedDatabase();
|
||||
await owner.query("DROP TABLE consent_receipts");
|
||||
|
||||
expect(await start(urlFor(name), false)).toBe(refusal("SCHEMA_MISSING"));
|
||||
});
|
||||
|
||||
it("refuses a table whose primary key was dropped, even after applying the schema", async () => {
|
||||
|
|
|
|||
Loading…
Reference in a new issue