mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-05-09 04:42:40 +02:00
3fad895d6a
Lays the database-backed pillar foundation for the postsalt branch. Salt
continues to read on-disk SLS first; the new ext_pillar config overlays
values from the so_pillar.* schema in so-postgres.
- salt/postgres/files/schema/pillar/00{1..7}_*.sql: idempotent DDL for
scope/role/role_member/minion/pillar_entry/pillar_entry_history/
drift_log, secret pgcrypto helpers, RLS, pg_cron retention.
- salt/postgres/schema_pillar.sls: applies the SQL files inside the
so-postgres container after it's healthy, configures the master_key
GUC, and runs so-pillar-import once. Gated on
postgres:so_pillar:enabled feature flag (default false).
- salt/salt/master/ext_pillar_postgres.{sls,conf.jinja}: drops
/etc/salt/master.d/ext_pillar_postgres.conf with list-form ext_pillar
queries (global/role/minion/secrets) and ext_pillar_first: False so
bootstrap pillars on disk render before the PG overlay.
- salt/postgres/init.sls + salt/salt/master.sls: include the new states.
Both new state branches are guarded so a default install with the flag
off is a no-op.
97 lines
4.2 KiB
SQL
97 lines
4.2 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;
|
|
|
|
-- 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.
|