Bind the simulated Windows echo review to one persistent job scope
Rust development slice / linux (push) Failing after 7s
Rust development slice / linux (push) Failing after 7s
This commit is contained in:
@@ -0,0 +1,121 @@
|
||||
-- This table can narrow one previously blocked guest to one immutable test plan.
|
||||
-- Its lifetime is independent of the receipt expiry, API process and gateway image.
|
||||
CREATE TABLE windows_echo_probe_scopes (
|
||||
tenant_id uuid PRIMARY KEY CHECK (tenant_id='11111111-1111-4111-8111-111111111111'),
|
||||
asset_id uuid NOT NULL CHECK (asset_id='a176520e-8a91-4e93-a78b-8e7620f430e0'),
|
||||
agent_id uuid NOT NULL CHECK (agent_id='63ea15b2-0643-403d-b5b4-cba1288dbea3'),
|
||||
operation_id uuid NOT NULL, plan_id uuid NOT NULL, plan_hash text NOT NULL,
|
||||
job_id uuid NOT NULL, attempt_id uuid NOT NULL,
|
||||
job_bytes bytea NOT NULL, job_hash text NOT NULL CHECK (job_hash=encode(sha256(job_bytes),'hex')),
|
||||
request_id uuid NOT NULL, receipt_id uuid NOT NULL,
|
||||
receipt bytea NOT NULL, signature bytea NOT NULL CHECK (octet_length(signature)=64),
|
||||
confirmed_by text NOT NULL CHECK (confirmed_by='simulated-testprincipal-a'),
|
||||
session_hash text NOT NULL CHECK (session_hash ~ '^[0-9a-f]{64}$'),
|
||||
issued_at timestamptz NOT NULL, valid_until timestamptz NOT NULL
|
||||
CHECK (valid_until>issued_at AND valid_until<=issued_at+interval '10 minutes'),
|
||||
FOREIGN KEY (tenant_id,plan_id,plan_hash) REFERENCES operation_plans(tenant_id,plan_id,plan_hash),
|
||||
FOREIGN KEY (tenant_id,operation_id) REFERENCES approval_requests(tenant_id,operation_id),
|
||||
FOREIGN KEY (tenant_id,request_id) REFERENCES windows_checkpoint_reviews(tenant_id,request_id),
|
||||
FOREIGN KEY (tenant_id,agent_id) REFERENCES agent_installations(tenant_id,agent_id),
|
||||
FOREIGN KEY (tenant_id,asset_id) REFERENCES assets(tenant_id,asset_id)
|
||||
);
|
||||
ALTER TABLE windows_echo_probe_scopes ENABLE ROW LEVEL SECURITY;
|
||||
ALTER TABLE windows_echo_probe_scopes FORCE ROW LEVEL SECURITY;
|
||||
CREATE POLICY tenant_scope ON windows_echo_probe_scopes USING (tenant_id::text=current_setting('app.tenant_id',true))
|
||||
WITH CHECK (tenant_id::text=current_setting('app.tenant_id',true));
|
||||
GRANT SELECT,INSERT ON windows_echo_probe_scopes TO rmm_app;
|
||||
CREATE TRIGGER immutable_content BEFORE UPDATE OR DELETE ON windows_echo_probe_scopes
|
||||
FOR EACH ROW EXECUTE FUNCTION immutable_plan();
|
||||
|
||||
CREATE FUNCTION check_windows_echo_probe_scope() RETURNS trigger LANGUAGE plpgsql
|
||||
SET search_path=pg_catalog,public AS $$
|
||||
DECLARE p jsonb; r record; a jsonb;
|
||||
BEGIN
|
||||
SELECT ar.plan_id,ar.approval_state,op.payload AS plan INTO STRICT r FROM approval_requests ar
|
||||
JOIN operation_plans op USING(tenant_id,plan_id)
|
||||
WHERE ar.tenant_id=NEW.tenant_id AND ar.operation_id=NEW.operation_id FOR UPDATE OF ar;
|
||||
p=convert_from(NEW.job_bytes,'UTF8')::jsonb;
|
||||
a=jsonb_build_object('action','run_script','interpreter','powershell',
|
||||
'script_utf8',E'Write-Output ''Zeitprofil-Test''\r\n','arguments','[]'::jsonb,
|
||||
'expected_stdout',E'Zeitprofil-Test\r\n','windows_execution_profile','powershell_51_remote_signed');
|
||||
IF r.approval_state!='pending_approval' OR r.plan_id!=NEW.plan_id
|
||||
OR jsonb_array_length(convert_from(r.plan,'UTF8')::jsonb->'jobs') IS DISTINCT FROM 1
|
||||
OR convert_from(r.plan,'UTF8')::jsonb#>'{jobs,0,payload}' IS DISTINCT FROM p
|
||||
OR p->'action' IS DISTINCT FROM a OR p->>'execution_identity' IS DISTINCT FROM 'agent_service'
|
||||
OR p->>'max_runtime_seconds' IS DISTINCT FROM '60' OR p->>'max_output_bytes' IS DISTINCT FROM '65536'
|
||||
OR p->>'agent_id' IS DISTINCT FROM NEW.agent_id::text OR p->>'asset_id' IS DISTINCT FROM NEW.asset_id::text
|
||||
OR p->>'tenant_id' IS DISTINCT FROM NEW.tenant_id::text OR p->>'job_id' IS DISTINCT FROM NEW.job_id::text
|
||||
OR p->>'attempt_id' IS DISTINCT FROM NEW.attempt_id::text
|
||||
OR EXISTS(SELECT FROM jobs WHERE tenant_id=NEW.tenant_id AND (agent_id=NEW.agent_id OR asset_id=NEW.asset_id))
|
||||
THEN RAISE EXCEPTION 'WINDOWS_ECHO_SCOPE_MISMATCH'; END IF;
|
||||
RETURN NEW;
|
||||
END $$;
|
||||
CREATE TRIGGER validate_windows_echo_scope BEFORE INSERT ON windows_echo_probe_scopes
|
||||
FOR EACH ROW EXECUTE FUNCTION check_windows_echo_probe_scope();
|
||||
|
||||
-- The old gateway reads outbox/permits through foreign keys to immutable job
|
||||
-- payloads. Blocking every other job row at its creation also protects old code.
|
||||
CREATE FUNCTION restrict_windows_echo_probe_job() RETURNS trigger LANGUAGE plpgsql
|
||||
SET search_path=pg_catalog,public AS $$
|
||||
DECLARE s windows_echo_probe_scopes%ROWTYPE;
|
||||
BEGIN
|
||||
IF NEW.tenant_id='11111111-1111-4111-8111-111111111111' AND
|
||||
(NEW.agent_id='63ea15b2-0643-403d-b5b4-cba1288dbea3' OR NEW.asset_id='a176520e-8a91-4e93-a78b-8e7620f430e0') THEN
|
||||
SELECT * INTO s FROM windows_echo_probe_scopes WHERE tenant_id=NEW.tenant_id;
|
||||
IF FOUND AND (s.operation_id,s.job_id,s.attempt_id,s.agent_id,s.asset_id,s.job_hash,s.job_bytes)
|
||||
IS DISTINCT FROM (NEW.operation_id,NEW.job_id,NEW.attempt_id,NEW.agent_id,NEW.asset_id,NEW.payload_hash,NEW.payload)
|
||||
THEN RAISE EXCEPTION 'WINDOWS_ECHO_SCOPE_MISMATCH'; END IF;
|
||||
END IF;
|
||||
RETURN NEW;
|
||||
END $$;
|
||||
CREATE TRIGGER restrict_windows_echo_job BEFORE INSERT OR UPDATE OF payload,payload_hash,job_id,attempt_id,agent_id,asset_id,operation_id,tenant_id ON jobs
|
||||
FOR EACH ROW EXECUTE FUNCTION restrict_windows_echo_probe_job();
|
||||
|
||||
CREATE FUNCTION lock_windows_echo_probe_reviewer() RETURNS boolean LANGUAGE sql SECURITY DEFINER
|
||||
SET search_path=pg_catalog,public AS $$
|
||||
SELECT EXISTS(SELECT FROM public.memberships WHERE tenant_id='11111111-1111-4111-8111-111111111111'
|
||||
AND tenant_id::text=current_setting('app.tenant_id',true) AND principal='simulated-testprincipal-a'
|
||||
AND kind='test_human' AND revoked_at IS NULL AND 'plans:approve'=ANY(permissions) FOR SHARE);
|
||||
$$;
|
||||
REVOKE ALL ON FUNCTION lock_windows_echo_probe_reviewer() FROM PUBLIC;
|
||||
GRANT EXECUTE ON FUNCTION lock_windows_echo_probe_reviewer() TO rmm_app;
|
||||
|
||||
-- Outbox leases and permit persistence traverse this guard on both current
|
||||
-- and earlier gateway binaries, in their existing authorization transaction.
|
||||
CREATE FUNCTION restrict_windows_echo_delivery() RETURNS trigger LANGUAGE plpgsql
|
||||
SET search_path=pg_catalog,public AS $$
|
||||
DECLARE s windows_echo_probe_scopes%ROWTYPE; j jobs%ROWTYPE; approval authorizations%ROWTYPE; g jsonb; payload jsonb;
|
||||
BEGIN
|
||||
IF NEW.tenant_id!='11111111-1111-4111-8111-111111111111' THEN RETURN NEW; END IF;
|
||||
SELECT * INTO s FROM windows_echo_probe_scopes WHERE tenant_id=NEW.tenant_id;
|
||||
IF NOT FOUND THEN RETURN NEW; END IF;
|
||||
SELECT * INTO STRICT j FROM jobs WHERE tenant_id=NEW.tenant_id AND job_id=NEW.job_id AND attempt_id=NEW.attempt_id;
|
||||
IF j.agent_id!=s.agent_id AND j.asset_id!=s.asset_id THEN RETURN NEW; END IF;
|
||||
SELECT * INTO STRICT approval FROM authorizations WHERE tenant_id=NEW.tenant_id AND operation_id=s.operation_id;
|
||||
IF (s.operation_id,s.job_id,s.attempt_id,s.agent_id,s.asset_id,s.job_hash,s.job_bytes)
|
||||
IS DISTINCT FROM (j.operation_id,j.job_id,j.attempt_id,j.agent_id,j.asset_id,j.payload_hash,j.payload)
|
||||
OR (approval.plan_hash,approval.plan_id,approval.principal,approval.approval_origin,approval.testsimulation)
|
||||
IS DISTINCT FROM (s.plan_hash,s.plan_id,'simulated-testprincipal-a'::text,'dev_test_browser_simulation'::text,true)
|
||||
OR approval.revoked_at IS NOT NULL
|
||||
THEN RAISE EXCEPTION 'WINDOWS_ECHO_SCOPE_MISMATCH'; END IF;
|
||||
IF TG_TABLE_NAME='execution_permits' THEN
|
||||
g=convert_from(NEW.payload,'UTF8')::jsonb;
|
||||
payload=convert_from(j.payload,'UTF8')::jsonb;
|
||||
IF (g->>'grant_id',g->>'job_id',g->>'attempt_id',g->>'agent_id',g->>'asset_id',g->>'tenant_id',g->>'plan_hash',g->>'job_payload_hash',g->>'authorization_id')
|
||||
IS DISTINCT FROM (NEW.grant_id::text,s.job_id::text,s.attempt_id::text,s.agent_id::text,s.asset_id::text,s.tenant_id::text,s.plan_hash,s.job_hash,approval.authorization_id::text)
|
||||
OR g->>'domain' IS DISTINCT FROM 'rmm.execution-permit' OR g->>'schema_version' IS DISTINCT FROM '1'
|
||||
OR g->>'action' IS DISTINCT FROM 'run_script' OR g->>'execution_identity' IS DISTINCT FROM 'agent_service'
|
||||
OR g->>'enrollment_generation' IS DISTINCT FROM '1' OR g->>'assignment_version' IS DISTINCT FROM '1'
|
||||
OR g->>'max_runtime_seconds' IS DISTINCT FROM '60' OR g->>'not_before' IS NULL OR g->>'start_before' IS NULL
|
||||
OR (g->>'not_before')::timestamptz < (payload->>'not_before')::timestamptz
|
||||
OR (g->>'start_before')::timestamptz > (payload->>'start_before')::timestamptz
|
||||
OR (g->>'start_before')::timestamptz <= (g->>'not_before')::timestamptz
|
||||
OR (g->>'start_before')::timestamptz > (g->>'not_before')::timestamptz + interval '60 seconds'
|
||||
THEN RAISE EXCEPTION 'WINDOWS_ECHO_SCOPE_MISMATCH'; END IF;
|
||||
END IF;
|
||||
RETURN NEW;
|
||||
END $$;
|
||||
CREATE TRIGGER restrict_windows_echo_offer BEFORE INSERT OR UPDATE OF lease_until ON outbox
|
||||
FOR EACH ROW EXECUTE FUNCTION restrict_windows_echo_delivery();
|
||||
CREATE TRIGGER restrict_windows_echo_permit BEFORE INSERT ON execution_permits
|
||||
FOR EACH ROW EXECUTE FUNCTION restrict_windows_echo_delivery();
|
||||
Reference in New Issue
Block a user