mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-05-08 12:27:52 +02:00
3d11694d51
Two coupled changes that together let so_pillar.* be the canonical config store, with config edits driving service reloads automatically: so-yaml PG-canonical mode - Adds /opt/so/conf/so-yaml/mode (and SO_YAML_BACKEND env override) with three values: dual (legacy), postgres (PG-only for managed paths), disk (emergency rollback). Bootstrap files (secrets.sls, ca/init.sls, *.nodes.sls, top.sls, ...) stay disk-only regardless via the existing SkipPath allowlist in so_yaml_postgres.locate. - loadYaml/writeYaml/purgeFile now route to so_pillar.* in postgres mode: replace/add/get all read+write the database with no disk file ever appearing. PG failure is fatal in postgres mode (no silent fallback); dual mode preserves the prior best-effort mirror. - so_yaml_postgres gains read_yaml(path), is_pg_managed(path), and is_enabled() so so-yaml can answer "is this path PG-managed and is PG up" without reaching into private helpers. - schema_pillar.sls writes /opt/so/conf/so-yaml/mode = postgres after the importer succeeds, so flipping postgres:so_pillar:enabled flips so-yaml's behavior in lockstep with the schema being live. pg_notify-driven change fan-out - 008_change_notify.sql adds so_pillar.change_queue + an AFTER trigger on pillar_entry that enqueues the locator and pg_notifies 'so_pillar_change'. Queue is drained at-least-once so engine restarts don't lose events; pg_notify is just the wakeup signal. - New salt-master engine pg_notify_pillar.py LISTENs on the channel, drains the queue with FOR UPDATE SKIP LOCKED, debounces bursts, and fires 'so/pillar/changed' events grouped by (scope, role, minion). - Reactor so_pillar_changed.sls catches the tag and dispatches to orch.so_pillar_reload, which carries a DISPATCH map of pillar-path prefix -> (state sls, role grain set) so adding a new service to the auto-reload list is a one-line edit instead of a new reactor. - Engine + reactor wiring is gated on the same postgres:so_pillar:enabled flag as the schema and ext_pillar config so the whole stack flips on/off together. Tests: 21 new cases (112 total, all passing) covering mode resolution, PG-managed detection, and PG-canonical read/write/purge routing with the PG client stubbed.
107 lines
4.8 KiB
SQL
107 lines
4.8 KiB
SQL
-- Roles + Row-Level Security policies for the so_pillar schema.
|
|
-- Three roles:
|
|
-- so_pillar_master — connected by salt-master ext_pillar. Read-only.
|
|
-- RLS forces it to skip is_secret rows; reads
|
|
-- encrypted secrets only via fn_pillar_secrets().
|
|
-- so_pillar_writer — connected by so-yaml dual-write and the SOC
|
|
-- PostgresConfigstore. Read+write on pillar_entry,
|
|
-- minion, role_member.
|
|
-- so_pillar_secret_owner — owns the master encryption key GUC; sole role
|
|
-- allowed to call fn_set_secret directly. Other
|
|
-- writers reach this function only via grants.
|
|
--
|
|
-- The existing app role so_postgres_user (created by init-users.sh) is granted
|
|
-- INTO so_pillar_writer so SOC keeps using its existing connection but inherits
|
|
-- pillar-write capability.
|
|
|
|
DO $$
|
|
BEGIN
|
|
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'so_pillar_master') THEN
|
|
CREATE ROLE so_pillar_master NOLOGIN;
|
|
END IF;
|
|
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'so_pillar_writer') THEN
|
|
CREATE ROLE so_pillar_writer NOLOGIN;
|
|
END IF;
|
|
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'so_pillar_secret_owner') THEN
|
|
CREATE ROLE so_pillar_secret_owner NOLOGIN;
|
|
END IF;
|
|
END
|
|
$$;
|
|
|
|
GRANT USAGE ON SCHEMA so_pillar TO so_pillar_master, so_pillar_writer, so_pillar_secret_owner;
|
|
|
|
-- Read access for ext_pillar through the views only.
|
|
GRANT SELECT ON so_pillar.v_pillar_global,
|
|
so_pillar.v_pillar_role,
|
|
so_pillar.v_pillar_minion
|
|
TO so_pillar_master;
|
|
GRANT EXECUTE ON FUNCTION so_pillar.fn_pillar_secrets(text) TO so_pillar_master;
|
|
|
|
-- Engine reads + drains the change queue from the salt-master process. It
|
|
-- needs SELECT to find unprocessed rows and UPDATE to mark them processed.
|
|
-- The queue contains only locator metadata (no pillar data), so the master
|
|
-- role's existing privilege footprint is unchanged in practice.
|
|
GRANT SELECT, UPDATE ON so_pillar.change_queue TO so_pillar_master;
|
|
GRANT USAGE ON SEQUENCE so_pillar.change_queue_id_seq TO so_pillar_master;
|
|
-- Writer needs INSERT (the trigger runs as table owner, so this is just for
|
|
-- direct testing / manual replays from psql).
|
|
GRANT INSERT ON so_pillar.change_queue TO so_pillar_writer;
|
|
|
|
-- Writer needs CRUD on pillar_entry/minion/role_member plus access to seed tables.
|
|
GRANT SELECT, INSERT, UPDATE, DELETE
|
|
ON so_pillar.pillar_entry,
|
|
so_pillar.minion,
|
|
so_pillar.role_member
|
|
TO so_pillar_writer;
|
|
GRANT SELECT ON so_pillar.role, so_pillar.scope TO so_pillar_writer;
|
|
GRANT SELECT, INSERT, UPDATE, DELETE ON so_pillar.drift_log TO so_pillar_writer;
|
|
GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA so_pillar TO so_pillar_writer;
|
|
GRANT SELECT ON so_pillar.pillar_entry_history TO so_pillar_writer;
|
|
|
|
-- Secret owner can call fn_set_secret directly; writer goes through it via the
|
|
-- function's SECURITY DEFINER attribute, which executes as the function owner.
|
|
GRANT EXECUTE ON FUNCTION so_pillar.fn_set_secret(text,text,text,text,jsonb,text)
|
|
TO so_pillar_writer, so_pillar_secret_owner;
|
|
|
|
-- so_postgres_user (SOC's existing app user, created by init-users.sh) inherits
|
|
-- writer privilege so the PostgresConfigstore in SOC can mutate pillars without
|
|
-- a second connection pool. Inheritance is per-PG default (NOINHERIT must be
|
|
-- explicit), so this just works.
|
|
DO $$
|
|
BEGIN
|
|
IF EXISTS (SELECT 1 FROM pg_roles WHERE rolname = current_setting('so_pillar.app_role', true))
|
|
THEN
|
|
EXECUTE format('GRANT so_pillar_writer TO %I',
|
|
current_setting('so_pillar.app_role', true));
|
|
ELSIF EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'so_postgres_user') THEN
|
|
GRANT so_pillar_writer TO so_postgres_user;
|
|
END IF;
|
|
END
|
|
$$;
|
|
|
|
-- RLS on pillar_entry: master sees only non-secret rows. Writer sees all
|
|
-- (it must, to UPDATE secret rows when so-yaml replaces them). Secret rows
|
|
-- still require fn_decrypt_jsonb to read plaintext.
|
|
ALTER TABLE so_pillar.pillar_entry ENABLE ROW LEVEL SECURITY;
|
|
ALTER TABLE so_pillar.pillar_entry FORCE ROW LEVEL SECURITY;
|
|
|
|
DROP POLICY IF EXISTS pillar_entry_master_read ON so_pillar.pillar_entry;
|
|
DROP POLICY IF EXISTS pillar_entry_writer_all ON so_pillar.pillar_entry;
|
|
DROP POLICY IF EXISTS pillar_entry_owner_all ON so_pillar.pillar_entry;
|
|
|
|
CREATE POLICY pillar_entry_master_read ON so_pillar.pillar_entry
|
|
FOR SELECT TO so_pillar_master
|
|
USING (NOT is_secret);
|
|
|
|
CREATE POLICY pillar_entry_writer_all ON so_pillar.pillar_entry
|
|
FOR ALL TO so_pillar_writer
|
|
USING (true)
|
|
WITH CHECK (true);
|
|
|
|
CREATE POLICY pillar_entry_owner_all ON so_pillar.pillar_entry
|
|
FOR ALL TO so_pillar_secret_owner
|
|
USING (true)
|
|
WITH CHECK (true);
|
|
|
|
-- minion / role_member do not need RLS — they hold no secrets.
|