Enforce customer boundaries on token administration and finalize fleet navigation

This commit is contained in:
2026-11-17 22:05:44 +01:00
parent 0afaca1d64
commit 312da6f39e
25 changed files with 1207 additions and 208 deletions
+45 -1
View File
@@ -4,6 +4,9 @@ SELECT set_config('app.tenant_id','11111111-1111-4111-8111-111111111111',true);
INSERT INTO memberships(tenant_id,principal,kind,permissions) VALUES
('11111111-1111-4111-8111-111111111111','local:11112222-3333-4444-aaaa-000000000001','human',
ARRAY['tokens:manage','inventory:read','operations:read','operations:plan']);
INSERT INTO memberships(tenant_id,principal,kind,permissions) VALUES
('11111111-1111-4111-8111-111111111111','local:11112222-3333-4444-aaaa-000000000002','human',
ARRAY['tokens:manage','inventory:read']);
SELECT provision_customer_admin('11111111-1111-4111-8111-111111111111','local:11112222-3333-4444-aaaa-000000000001');
SET ROLE rmm_app;
DO $$
@@ -12,9 +15,11 @@ DECLARE
b constant uuid:='22222222-2222-4222-8222-222222222222';
c uuid:=gen_random_uuid();
actor text:='local:11112222-3333-4444-aaaa-000000000001';
limited_actor text:='local:11112222-3333-4444-aaaa-000000000002';
selected_id uuid:=gen_random_uuid();
both_id uuid:=gen_random_uuid();
all_id uuid:=gen_random_uuid();
expired_plan uuid:=gen_random_uuid();
selected_member text:='mcp:'||selected_id::text;
all_member text:='mcp:'||all_id::text;
scopes text[]:=ARRAY['inventory:read'];
@@ -36,6 +41,7 @@ BEGIN
PERFORM issue_customer_token(actor,selected_id,'Only B',repeat('1',64),scopes,now()+interval '1 day',false,ARRAY[b]);
PERFORM issue_customer_token(actor,both_id,'A+B',repeat('2',64),scopes,now()+interval '1 day',false,ARRAY[a,b]);
PERFORM issue_customer_token(actor,all_id,'Global',repeat('3',64),scopes,now()+interval '1 day',true,ARRAY[]::uuid[]);
PERFORM issue_customer_token(actor,gen_random_uuid(),'Global for grant removal',repeat('4',64),scopes,now()+interval '1 day',true,ARRAY[]::uuid[]);
IF mcp_credential_customers(repeat('1',64))<>ARRAY[b] OR mcp_principal_permission(selected_member,'inventory:read')
OR NOT mcp_principal_permission(all_member,'inventory:read') THEN RAISE EXCEPTION 'unexpected issuing-customer visibility'; END IF;
PERFORM manage_customer(actor,c,'New customer',true);
@@ -49,12 +55,50 @@ BEGIN
OR NOT EXISTS(SELECT 1 FROM tenant_limits)
OR NOT EXISTS(SELECT 1 FROM script_revisions)
THEN RAISE EXCEPTION 'invalid new customer contents/permissions'; END IF;
INSERT INTO operation_plans(tenant_id,plan_id,principal,payload,plan_hash,expires_at)
VALUES(c,expired_plan,actor,'{}','test-expired',now()-interval '1 minute');
INSERT INTO approval_requests(tenant_id,operation_id,plan_id,principal,idempotency_key,request_hash)
VALUES(c,gen_random_uuid(),expired_plan,actor,'test-expired','test-request');
PERFORM set_config('app.tenant_id',a::text,true);
PERFORM maintain_customers();
IF current_setting('app.tenant_id')<>a::text THEN RAISE EXCEPTION 'scheduler changed tenant context'; END IF;
PERFORM set_config('app.tenant_id',c::text,true);
IF NOT EXISTS(SELECT 1 FROM approval_requests WHERE plan_id=expired_plan AND approval_state='expired')
THEN RAISE EXCEPTION 'scheduler skipped future customer'; END IF;
PERFORM set_config('app.tenant_id',b::text,true);
IF NOT mcp_principal_permission(selected_member,'inventory:read') THEN RAISE EXCEPTION 'selected customer denied'; END IF;
PERFORM set_config('app.tenant_id',a::text,true);
PERFORM revoke_mcp_token(actor,all_id,gen_random_uuid());
IF can_manage_mcp_token(limited_actor,all_id,ARRAY[a])
OR can_manage_mcp_token(limited_actor,both_id,ARRAY[a])
OR can_manage_mcp_token(limited_actor,selected_id,ARRAY[a,b])
OR revoke_mcp_token(limited_actor,all_id,gen_random_uuid(),ARRAY[a])
OR revoke_mcp_token(limited_actor,selected_id,gen_random_uuid(),ARRAY[a])
OR has_function_privilege(current_user,'revoke_mcp_token_data(text,uuid,uuid)','EXECUTE')
THEN RAISE EXCEPTION 'home-only administrator has foreign credential metadata/revocation access'; END IF;
IF NOT revoke_mcp_token(actor,all_id,gen_random_uuid(),ARRAY[a,b,c]) THEN RAISE EXCEPTION 'global revoke denied'; END IF;
PERFORM set_config('app.tenant_id',c::text,true);
IF cardinality(mcp_credential_customers(repeat('3',64)))<>0 OR cardinality(mcp_current_scopes(all_member))<>0
THEN RAISE EXCEPTION 'revocation failed in foreign customer'; END IF;
END $$;
RESET ROLE;
DELETE FROM customer_admins WHERE principal='local:11112222-3333-4444-aaaa-000000000001';
SET ROLE rmm_app;
DO $$
DECLARE a constant uuid:='11111111-1111-4111-8111-111111111111';
BEGIN
IF cardinality(mcp_credential_customers(repeat('1',64)))<>0
OR mcp_credential_customers(repeat('2',64))<>ARRAY[a]
OR cardinality(mcp_credential_customers(repeat('4',64)))<>0 THEN
RAISE EXCEPTION 'platform-admin removal failed to restrict existing tokens';
END IF;
END $$;
RESET ROLE;
UPDATE memberships SET revoked_at=now() WHERE tenant_id='11111111-1111-4111-8111-111111111111'
AND principal='local:11112222-3333-4444-aaaa-000000000001';
SET ROLE rmm_app;
DO $$ BEGIN
IF cardinality(mcp_credential_customers(repeat('2',64)))<>0 THEN
RAISE EXCEPTION 'suspended token issuer still authorizes a credential';
END IF;
END $$;
ROLLBACK;