Jakob WennbergandClaude Fable 5
b27f6cdb04
The house guard 'p_company_id NOT IN (SELECT public.user_company_ids())' skips the deny branch on UNKNOWN (NULL on either side). Not exploitable today (company_members.company_id is NOT NULL) but a NULL p_company_id passes the guard, and the shape fails silently under change. 9 live functions carried it (link_*_to_voucher, reserve/release_voucher_range, mark_entry_as_opening_balance, retag_line_dimensions, ensure_company_dimensions, company_has_capability, rotate_company_inbox). - caller_is_company_member(uuid): NULL-safe membership predicate (NULL -> false, always). - Mechanical rewrite: every public function carrying the raw pattern is re-created via pg_get_functiondef with the guard swapped — deliberate over hand-copying 9 bodies (the stale-copy hazard behind the 07-03 constraint clobber). Probe-validated locally: pattern swapped, NULL denied. - pg-real ratchet: after full replay no public function may contain the raw pattern (also blocks future reintroduction); detector self-test; helper semantics (member/foreigner/NULL). Existing tenant-guard suites re-assert deny semantics on the rewritten functions in CI. Part of dev_docs/mcp_optimization_plan.md (P2-3 follow-up, PR #872 review). Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
77 lines
2.8 KiB
TypeScript
77 lines
2.8 KiB
TypeScript
import { afterAll, describe, expect, it } from 'vitest'
|
|
import { getPool, withUserContext } from './setup'
|
|
import { seedCompany, insertAuthUser } from './fixtures'
|
|
|
|
/**
|
|
* NULL-safe tenant guards (mcp_optimization_plan P2-3 / PR #872 review):
|
|
* `x NOT IN (SELECT public.user_company_ids())` skips the deny branch on
|
|
* UNKNOWN. Migration 20260703180000 introduces caller_is_company_member()
|
|
* and mechanically rewrites every public function carrying the raw pattern.
|
|
*
|
|
* The ratchet below runs after full migration replay in CI, so it both
|
|
* proves the rewrite worked and permanently blocks the pattern from
|
|
* returning in future migrations.
|
|
*/
|
|
|
|
const RAW_PATTERN = '%NOT IN (SELECT public.user_company_ids())%'
|
|
|
|
async function functionsWithRawPattern(): Promise<string[]> {
|
|
const { rows } = await getPool().query<{ proname: string }>(
|
|
`SELECT p.proname
|
|
FROM pg_proc p
|
|
JOIN pg_namespace n ON n.oid = p.pronamespace
|
|
WHERE n.nspname = 'public' AND p.prosrc LIKE $1
|
|
ORDER BY p.proname`,
|
|
[RAW_PATTERN],
|
|
)
|
|
return rows.map((r) => r.proname)
|
|
}
|
|
|
|
describe('NULL-safe tenant guards', () => {
|
|
afterAll(async () => {
|
|
await getPool().query('DROP FUNCTION IF EXISTS public._ratchet_probe_raw_guard(uuid)')
|
|
})
|
|
|
|
it('ratchet: no public function carries the raw NOT IN guard pattern', async () => {
|
|
const offenders = await functionsWithRawPattern()
|
|
expect(
|
|
offenders,
|
|
`Functions still using the NULL-unsafe guard — use public.caller_is_company_member() instead:\n${offenders.join('\n')}`,
|
|
).toEqual([])
|
|
})
|
|
|
|
it('the ratchet detector actually catches the pattern (test the test)', async () => {
|
|
await getPool().query(`
|
|
CREATE OR REPLACE FUNCTION public._ratchet_probe_raw_guard(p_company_id uuid)
|
|
RETURNS boolean LANGUAGE plpgsql AS $$
|
|
BEGIN
|
|
IF p_company_id NOT IN (SELECT public.user_company_ids()) THEN
|
|
RETURN false;
|
|
END IF;
|
|
RETURN true;
|
|
END;
|
|
$$`)
|
|
const offenders = await functionsWithRawPattern()
|
|
expect(offenders).toContain('_ratchet_probe_raw_guard')
|
|
await getPool().query('DROP FUNCTION public._ratchet_probe_raw_guard(uuid)')
|
|
})
|
|
|
|
it('caller_is_company_member: member true, foreigner false, NULL always false', async () => {
|
|
const { userId, companyId } = await seedCompany()
|
|
const strangerId = await insertAuthUser()
|
|
|
|
const asUser = async (uid: string, company: string | null) =>
|
|
withUserContext(uid, async (client) => {
|
|
const { rows } = await client.query<{ ok: boolean }>(
|
|
`SELECT public.caller_is_company_member($1) AS ok`,
|
|
[company],
|
|
)
|
|
return rows[0].ok
|
|
})
|
|
|
|
expect(await asUser(userId, companyId)).toBe(true)
|
|
expect(await asUser(strangerId, companyId)).toBe(false)
|
|
expect(await asUser(userId, null)).toBe(false)
|
|
})
|
|
})
|