mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-05-09 21:02:36 +02:00
Mike Reeves
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.
50 lines
2.0 KiB
SQL
50 lines
2.0 KiB
SQL
-- Views consumed by the Salt master's salt.pillar.postgres ext_pillar with
|
|
-- as_json=True. Each view exposes data ordered by (sort_key, pillar_path) so
|
|
-- the deep-merge in ext_pillar resolves precedence deterministically.
|
|
--
|
|
-- ext_pillar always binds exactly one parameter to the query: (minion_id,).
|
|
-- Master-config queries reference these views and add WHERE clauses, e.g.:
|
|
-- SELECT data FROM so_pillar.v_pillar_role WHERE minion_id = %s
|
|
-- SELECT data FROM so_pillar.v_pillar_minion WHERE minion_id = %s
|
|
-- For v_pillar_global the binding is satisfied with `WHERE %s IS NOT NULL`.
|
|
|
|
CREATE OR REPLACE VIEW so_pillar.v_pillar_global AS
|
|
SELECT pillar_path, sort_key, data
|
|
FROM so_pillar.pillar_entry
|
|
WHERE scope = 'global'
|
|
AND is_secret = false
|
|
ORDER BY sort_key, pillar_path;
|
|
|
|
-- Role view exposes minion_id so the master-config WHERE clause can filter to
|
|
-- the rows that apply to the requesting minion. JOIN to role_member fans out
|
|
-- one row per (role assignment, pillar entry) tuple.
|
|
CREATE OR REPLACE VIEW so_pillar.v_pillar_role AS
|
|
SELECT rm.minion_id,
|
|
pe.role_name,
|
|
pe.pillar_path,
|
|
pe.sort_key,
|
|
pe.data
|
|
FROM so_pillar.pillar_entry pe
|
|
JOIN so_pillar.role_member rm ON rm.role_name = pe.role_name
|
|
WHERE pe.scope = 'role'
|
|
AND pe.is_secret = false;
|
|
|
|
CREATE OR REPLACE VIEW so_pillar.v_pillar_minion AS
|
|
SELECT minion_id,
|
|
pillar_path,
|
|
sort_key,
|
|
data
|
|
FROM so_pillar.pillar_entry
|
|
WHERE scope = 'minion'
|
|
AND is_secret = false;
|
|
|
|
-- v_pillar_secrets is filled in by 004_secrets.sql once pgcrypto is available;
|
|
-- placeholder here returns no rows so initial schema deploy succeeds even on a
|
|
-- container that has not yet loaded pgcrypto.
|
|
CREATE OR REPLACE VIEW so_pillar.v_pillar_secrets AS
|
|
SELECT NULL::text AS minion_id,
|
|
NULL::text AS pillar_path,
|
|
NULL::int AS sort_key,
|
|
'{}'::jsonb AS data
|
|
WHERE false;
|