Jakob Wennberg
ec27228a8e
Em dashes (—) and en dashes (–) had spread across comments, docs, tests, and a few UI strings, reading as AI-generated boilerplate rather than house style. Replaced each with punctuation matching its context: colon for explanatory clauses, comma for asides, plain hyphen for numeric/legal ranges (e.g. "21-23§"), "to"/"till" for date ranges, parentheses for paired-dash asides. messages/en.json and messages/sv.json were fixed by hand together to keep sv/en in sync. Left untouched where the dash is the functional subject rather than decorative punctuation: date-range-parser.ts's separator regex, charset-repair.ts's CP1252 byte-mapping table (and its test), the SIE encoding mojibake docs, generic-csv.ts's minus-sign normalizer, the agent system-prompt files that already instruct against em dashes, and a golden iXBRL test fixture compared byte-for-byte. Also fixes two bugs surfaced along the way: an off-by-one in ApiKeysPanel's scope-label split (a leftover from an earlier partial pass), and a charset-repair test that had lost the literal en-dash it exists to verify. Regenerated the agent atom seed migration (skills:generate) since 27 SKILL.md files changed. Added a CLAUDE.md rule against em/en dashes, with an explicit carve-out for the functional-dash cases above. Co-authored-by: Claude Sonnet 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)
|
|
})
|
|
})
|