fix(supabase): V1-2.1 harden M5 after the security and verifier gates
Fresh security audit PASS; verifier ECARTS(10) addressed: - publish re-checks the approver's sheet_reviewer grant (publish.approval.invalid) - scope disclaimer enforced at approve and publish (publish.disclaimer.missing, O6) - to_confirm split from inherited (publish.to_confirm.open distinct from publish.inherited.present) - save_sheet_draft requires an active sheet; working copy adds the 2 MiB octet_length check - delete_sheet_asset EXECUTE revoked from service_role (§5.4 surface) - species table comment updated (§7.2); lease columns dropped from the reviews grant - lock order sheet->version->round in decide/publish; conflict_retry kind (40001/40P01) in sheets.ts Tests: pgTAP 016 (omitted status, separation, revoked-reviewer + renewal, ack carry, inactive-species publish refusal, deprecated-delete, schema_version 1, content-write without actor, working-copy positive), 001 census (no other writer of profile_roles). 871 real-stack pgTAP / 122 PGlite / 4 sandbox green; typecheck, lint, types drift clean.
This commit is contained in:
1 parent
77e5fa4cf5
commit
3914eaa866
5 files changed
+280
-14
No files matched your search
@@ -4,7 +4,7 @@
|
||||
-- worker of M6, as the contract allows until V1-2.3. Real GoTrue MFA and the
|
||||
-- concurrency cases run in tests/sandbox.
|
||||
begin;
|
||||
select plan(30);
|
||||
select plan(50);
|
||||
|
||||
-- Accounts: owner, editor+publisher, reviewer, and a reviewer who also edits
|
||||
-- (so becomes a round author -> separation of duties).
|
||||
@@ -105,7 +105,7 @@ set local role authenticated;
|
||||
-- Approval is refused while an element is to_confirm (D2: counts as not reviewed).
|
||||
select pg_temp.act('e0000000-0000-0000-0000-0000000000f1','e1000000-0000-0000-0000-0000000000f1');
|
||||
select throws_ok($$ select public.decide_sheet_review((select id from pg_temp.k where key='r1'), true, 'ok') $$,
|
||||
'P0001', 'publish.inherited.present', 'approval refused while an element is to_confirm');
|
||||
'P0001', 'publish.to_confirm.open', 'approval refused while an element is to_confirm (distinct code)');
|
||||
|
||||
-- Reviewer requests changes; editor marks reviewed and resubmits.
|
||||
select public.decide_sheet_review((select id from pg_temp.k where key='r1'), false, 'please mark reviewed');
|
||||
@@ -205,5 +205,164 @@ select throws_ok($$ update public.anatomical_sheet_versions set status='publishe
|
||||
where id=(select id from pg_temp.k where key='v2') $$,
|
||||
'42501', 'publish.review.missing', 'no direct UPDATE publishes a draft, even for the table owner');
|
||||
|
||||
-- ============ Declared status check: omitted status + disclaimer (§12.2, O6) ============
|
||||
-- Checked directly on the predicates (as the table owner): an omitted
|
||||
-- review_status counts as inherited (§12.2 mandates an omitted-status case).
|
||||
select ok(not private.sheet_all_reviewed(pg_temp.doc(null,'reviewed') #- '{annotations,0,review_status}'),
|
||||
'an omitted review_status counts as not reviewed (§12.2)');
|
||||
select ok(not private.sheet_has_to_confirm(pg_temp.doc(null,'reviewed') #- '{annotations,0,review_status}'),
|
||||
'an omitted status is inherited, never to_confirm');
|
||||
select ok(private.sheet_all_reviewed(pg_temp.doc(null,'reviewed')), 'a fully reviewed document passes the status check');
|
||||
select ok(private.sheet_has_to_confirm(pg_temp.doc(null,'to_confirm')), 'a to_confirm element is detected');
|
||||
select ok(not private.sheet_disclaimer_ok(jsonb_set(pg_temp.doc(null,'reviewed'), '{scope_disclaimer}', '{"fr":" ","en":"x"}')),
|
||||
'a blank FR scope disclaimer fails O6');
|
||||
select ok(private.sheet_disclaimer_ok(pg_temp.doc(null,'reviewed')), 'a present FR and EN disclaimer passes O6');
|
||||
|
||||
-- A content write with no authenticated actor is refused on a non-historical
|
||||
-- sheet (§5.5). The claim is cleared so auth.uid() is null; the content trigger
|
||||
-- raises before the one-draft unique index is reached.
|
||||
select set_config('request.jwt.claims', '', true);
|
||||
select throws_ok($$ insert into public.anatomical_sheet_versions (sheet_id, version_number, document_schema_version, content)
|
||||
values ((select id from pg_temp.k where key='sheet'), 99, 2, pg_temp.doc(null,'reviewed')) $$,
|
||||
'42501', null, 'a content write with no actor is refused on a non-historical sheet (§5.5)');
|
||||
|
||||
-- ============ schema_version: only 2 is stored (former 008 cases) ============
|
||||
set local role authenticated;
|
||||
select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
select throws_ok($$ select public.create_official_sheet('sv1', jsonb_set(pg_temp.doc(null,'reviewed'),'{schema_version}','1')) $$,
|
||||
'23514', null, 'a schema_version 1 document is refused at creation');
|
||||
|
||||
-- ============ Separation of duties + revoked-reviewer approval (§5.5, §6.7) ============
|
||||
insert into pg_temp.k select 'sheet3', public.create_official_sheet('wf-sep', pg_temp.doc(null,'reviewed'));
|
||||
insert into pg_temp.k select 'v3', id from public.anatomical_sheet_versions where sheet_id=(select id from pg_temp.k where key='sheet3');
|
||||
insert into pg_temp.k select 'asset3', public.register_sheet_asset((select id from pg_temp.k where key='sheet3'), repeat('8',64), 500, 's.svg');
|
||||
reset role;
|
||||
insert into storage.objects (bucket_id,name,metadata) values ('anatomical-sheet-assets', repeat('8',64)||'.svg','{"size":500}');
|
||||
set local role authenticated; select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
select public.confirm_sheet_asset_upload((select id from pg_temp.k where key='asset3'));
|
||||
select public.save_sheet_draft((select id from pg_temp.k where key='v3'), 0, pg_temp.doc((select id from pg_temp.k where key='asset3'),'reviewed'), 'wire');
|
||||
-- rev2 (reviewer + editor) edits the draft and so becomes an author of the round.
|
||||
select pg_temp.act('e0000000-0000-0000-0000-0000000000f2','e1000000-0000-0000-0000-0000000000f2');
|
||||
select public.save_sheet_draft((select id from pg_temp.k where key='v3'), 1,
|
||||
jsonb_set(pg_temp.doc((select id from pg_temp.k where key='asset3'),'reviewed'),'{description,fr}','"rev2 edit"'), 'rev2');
|
||||
select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
insert into pg_temp.k select 'r3', public.submit_sheet_review((select id from pg_temp.k where key='v3'), 2, 'sep round');
|
||||
reset role; select pg_temp.open_round((select id from pg_temp.k where key='r3'), (select id from pg_temp.k where key='asset3'), repeat('8',64));
|
||||
set local role authenticated;
|
||||
-- rev2 is an author of r3: it may neither acknowledge nor approve (review.separation, not rights.capability).
|
||||
select pg_temp.act('e0000000-0000-0000-0000-0000000000f2','e1000000-0000-0000-0000-0000000000f2');
|
||||
select throws_ok($$ select public.acknowledge_sheet_review_group((select id from pg_temp.k where key='r3'),'general',repeat('1',64)) $$,
|
||||
'42501','review.separation','an author who holds the reviewer capability cannot acknowledge its own round');
|
||||
select throws_ok($$ select public.decide_sheet_review((select id from pg_temp.k where key='r3'), true, 'self') $$,
|
||||
'42501','review.separation','an author who holds the reviewer capability cannot approve its own round');
|
||||
-- rev1 (not an author) comments, acknowledges and approves.
|
||||
select pg_temp.act('e0000000-0000-0000-0000-0000000000f1','e1000000-0000-0000-0000-0000000000f1');
|
||||
select is(public.comment_sheet_review((select id from pg_temp.k where key='r3'),'general group looks fine','general') is not null, true,
|
||||
'a reviewer comments on the round');
|
||||
select public.acknowledge_sheet_review_group((select id from pg_temp.k where key='r3'),'general',repeat('1',64));
|
||||
select public.acknowledge_sheet_review_group((select id from pg_temp.k where key='r3'),'view:main',repeat('2',64));
|
||||
select public.acknowledge_sheet_review_group((select id from pg_temp.k where key='r3'),'zone:z1',repeat('3',64));
|
||||
select public.decide_sheet_review((select id from pg_temp.k where key='r3'), true, 'approved by rev1');
|
||||
-- Revoke rev1's reviewer grant: the approval no longer carries a publication.
|
||||
reset role;
|
||||
update public.anatomical_catalog_grants set revoked_at=now(), revoked_by='e0000000-0000-0000-0000-000000000001', revocation_reason='rotation'
|
||||
where user_id='e0000000-0000-0000-0000-0000000000f1' and grant_kind='sheet_reviewer' and revoked_at is null;
|
||||
set local role authenticated; select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
select throws_ok($$ select public.publish_sheet_version((select id from pg_temp.k where key='r3')) $$,
|
||||
'P0001','publish.approval.invalid','a revoked reviewer''s approval does not carry a publication');
|
||||
-- Renew the grant: the approval counts again and publication succeeds.
|
||||
reset role;
|
||||
insert into public.anatomical_catalog_grants (user_id,grant_kind,reason,verification_note,granted_by)
|
||||
values ('e0000000-0000-0000-0000-0000000000f1','sheet_reviewer','renewed','checked','e0000000-0000-0000-0000-000000000001');
|
||||
set local role authenticated; select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
select is(public.publish_sheet_version((select id from pg_temp.k where key='r3')), (select id from pg_temp.k where key='v3'),
|
||||
'after the reviewer grant is renewed the approval counts again and publication succeeds');
|
||||
|
||||
-- ============ Acknowledgment carry across rounds (§6.3) ============
|
||||
-- A new draft of sheet3 from the published v3; change only the general group; the
|
||||
-- view and zone acknowledgments carry because their digests are unchanged.
|
||||
insert into pg_temp.k select 'v3b', public.create_sheet_draft((select id from pg_temp.k where key='sheet3'), (select id from pg_temp.k where key='v3'), 'edition 2');
|
||||
select public.save_sheet_draft((select id from pg_temp.k where key='v3b'), 0,
|
||||
jsonb_set(pg_temp.doc((select id from pg_temp.k where key='asset3'),'reviewed'),'{description,en}','"v3b"'), 'general only');
|
||||
insert into pg_temp.k select 'r3b', public.submit_sheet_review((select id from pg_temp.k where key='v3b'), 1, 'round b');
|
||||
reset role;
|
||||
-- Same view:main and zone:z1 digests as r3 (2,3); a new general digest (changed group).
|
||||
update public.anatomical_sheet_reviews set status='open', verified_at=now(), verified_with='test',
|
||||
verdict = jsonb_build_object('fingerprint', repeat('a',64),
|
||||
'drawings', jsonb_build_array(jsonb_build_object('asset_id',(select id from pg_temp.k where key='asset3'),'sha256',repeat('8',64))),
|
||||
'groups', jsonb_build_array(
|
||||
jsonb_build_object('key','general','digest',repeat('5',64),'coverable',true),
|
||||
jsonb_build_object('key','view:main','digest',repeat('2',64),'coverable',true),
|
||||
jsonb_build_object('key','zone:z1','digest',repeat('3',64),'coverable',true)))
|
||||
where id=(select id from pg_temp.k where key='r3b');
|
||||
set local role authenticated;
|
||||
select pg_temp.act('e0000000-0000-0000-0000-0000000000f1','e1000000-0000-0000-0000-0000000000f1');
|
||||
-- Only the changed general group is uncovered; view:main and zone:z1 carry from r3.
|
||||
select public.acknowledge_sheet_review_group((select id from pg_temp.k where key='r3b'),'general',repeat('5',64));
|
||||
select is(public.decide_sheet_review((select id from pg_temp.k where key='r3b'), true, 'approved; two groups carried') is not null, true,
|
||||
'the unchanged groups carry their acknowledgments from the previous round (§6.3)');
|
||||
|
||||
-- ============ Inactive species refused at publication (§6.7) ============
|
||||
-- Build an official sheet for the inactive 'tapir' created earlier... it was
|
||||
-- activated above, so create a fresh inactive species and a sheet on it.
|
||||
select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
select public.create_species('okapi','Okapi','Okapi',70);
|
||||
insert into pg_temp.k select 'sheet4', public.create_official_sheet('wf-okapi',
|
||||
jsonb_set(pg_temp.doc((select id from pg_temp.k where key='asset3'),'reviewed'),'{species_id}','"okapi"'));
|
||||
insert into pg_temp.k select 'v4', id from public.anatomical_sheet_versions where sheet_id=(select id from pg_temp.k where key='sheet4');
|
||||
-- register the shared drawing for sheet4 and confirm it
|
||||
insert into pg_temp.k select 'asset4', public.register_sheet_asset((select id from pg_temp.k where key='sheet4'), repeat('8',64), 500, 's.svg');
|
||||
reset role; set local role authenticated; select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
select public.confirm_sheet_asset_upload((select id from pg_temp.k where key='asset4'));
|
||||
select public.save_sheet_draft((select id from pg_temp.k where key='v4'), 0,
|
||||
jsonb_set(pg_temp.doc((select id from pg_temp.k where key='asset4'),'reviewed'),'{species_id}','"okapi"'), 'wire');
|
||||
insert into pg_temp.k select 'r4', public.submit_sheet_review((select id from pg_temp.k where key='v4'), 1, 'okapi round');
|
||||
reset role; select pg_temp.open_round((select id from pg_temp.k where key='r4'), (select id from pg_temp.k where key='asset4'), repeat('8',64));
|
||||
set local role authenticated;
|
||||
select pg_temp.act('e0000000-0000-0000-0000-0000000000f1','e1000000-0000-0000-0000-0000000000f1');
|
||||
select public.acknowledge_sheet_review_group((select id from pg_temp.k where key='r4'),'general',repeat('1',64));
|
||||
select public.acknowledge_sheet_review_group((select id from pg_temp.k where key='r4'),'view:main',repeat('2',64));
|
||||
select public.acknowledge_sheet_review_group((select id from pg_temp.k where key='r4'),'zone:z1',repeat('3',64));
|
||||
select public.decide_sheet_review((select id from pg_temp.k where key='r4'), true, 'approved');
|
||||
select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
select throws_ok($$ select public.publish_sheet_version((select id from pg_temp.k where key='r4')) $$,
|
||||
'P0001','publish.species.inactive','publication is refused while the species is inactive (§6.7)');
|
||||
|
||||
-- ============ Deprecated version deletion refused (F13) ============
|
||||
-- v3 is published; deprecate it, then a physical delete is refused for every role.
|
||||
select public.deprecate_sheet_version((select id from pg_temp.k where key='v3'), 'superseded');
|
||||
select throws_ok($$ select public.delete_sheet_version((select id from pg_temp.k where key='v3')) $$,
|
||||
'55000', null, 'a deprecated (once published) version cannot be deleted (F13)');
|
||||
|
||||
-- ============ Working copy of the historical sheet, positive path (§14.3) ============
|
||||
-- Confirm the seeded historical drawing object, then create the working copy.
|
||||
reset role;
|
||||
insert into storage.objects (bucket_id, name, metadata)
|
||||
select 'anatomical-sheet-assets', a.sha256 || '.svg', jsonb_build_object('size', a.byte_size)
|
||||
from public.anatomical_sheet_assets a where a.sheet_id = '503dc301-a8b1-50d4-9e44-0919b2fc2916'
|
||||
on conflict do nothing;
|
||||
update public.anatomical_sheet_assets set uploaded_at = now()
|
||||
where sheet_id = '503dc301-a8b1-50d4-9e44-0919b2fc2916' and uploaded_at is null;
|
||||
set local role authenticated; select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
insert into pg_temp.k select 'wc', public.create_sheet_working_copy(
|
||||
(select id from public.anatomical_sheet_versions where sheet_id='503dc301-a8b1-50d4-9e44-0919b2fc2916'), 'cheval-travail');
|
||||
reset role;
|
||||
select results_eq(
|
||||
$$ select is_official, working_copy_source_version_id is not null, status::text
|
||||
from public.anatomical_sheets where id = (select id from pg_temp.k where key='wc') $$,
|
||||
$$ values (true, true, 'active') $$,
|
||||
'the working copy is an official active sheet with its provenance set');
|
||||
select is(
|
||||
(select coalesce(array_length(authors,1),0) from public.anatomical_sheet_versions where sheet_id = (select id from pg_temp.k where key='wc')),
|
||||
1, 'the working-copy draft has one author (the caller), no base');
|
||||
select is(
|
||||
(select source_version_id from public.anatomical_sheet_versions where sheet_id = (select id from pg_temp.k where key='wc')),
|
||||
null, 'the working-copy draft has no base');
|
||||
-- a second active working copy of the historical sheet is refused
|
||||
set local role authenticated; select pg_temp.act('e0000000-0000-0000-0000-00000000000e','e1000000-0000-0000-0000-00000000000e');
|
||||
select throws_ok($$ select public.create_sheet_working_copy(
|
||||
(select id from public.anatomical_sheet_versions where sheet_id='503dc301-a8b1-50d4-9e44-0919b2fc2916'), 'cheval-2') $$,
|
||||
'P0001','working_copy.exists','only one active working copy of the historical sheet at a time');
|
||||
|
||||
select * from finish();
|
||||
rollback;
|
||||
Reference in new issue
Block a user