mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-10-05 22:14:51 +02:00
Josh Patterson
72f60fcaa9
so-telegraf mounted /var/run/docker.sock and joined the host docker group on every node type. The :ro flag blocks write() to the inode, not connect() plus HTTP over the socket, so any code execution inside the container could reach POST /containers/create with Privileged:true and become root on the host. No telegraf script used the socket; the only consumer was the native [[inputs.docker]] plugin, and group_add 920 existed solely to feed it. Container metrics now come from so-container-stats, a collector that runs on the host from cron and writes influx line protocol to a file telegraf already had mounted. This is the pattern so-status, so-raid-status and so-elasticagent-status already use, so the privileged docker access stays on the host side where root cron already ran it. The collector runs as somon, a service account in the docker group with no login shell and a locked password, rather than root. Docker group membership is still root-equivalent on the host, so this is defense in depth rather than a privilege boundary. The telegraf scripts were root:939 mode 770, letting socore rewrite them for code execution inside the container; they are now 750, which still allows the read and execute telegraf needs. The container also ran with no group, giving it gid 0, and now runs as 939:939. That alone would have broken lasthighstate.sh, which reached /opt/so/log/salt only via the root group and could not tell an unreadable file from a missing one, so it silently reported a 56 year highstate age. Only the lasthighstate file is bind mounted now, and the script tests readability instead of existence. Everything inputs.docker collected beyond the five fields the shipped dashboards query is available per stat under telegraf:container_stats, annotated for SOC so an operator can enable it without editing files. Defaults reproduce the previous output exactly. With every stat enabled the emitted field set matches what inputs.docker wrote, verified by running the plugin against the live socket and diffing: 53 fields, no type mismatches, no field present on one side only. Two deliberate differences: max_usage carries the real cgroup peak where the daemon reports 0 on cgroup v2, and host-network containers emit no docker_container_net row, matching inputs.docker. Docker label tags are not restored, since nothing queries them and they cost significant cardinality. so-status, the influxdb size cron, so-elasticagent-status, so-raid-status and so-common-status-check truncated their output in place while telegraf read it, so telegraf periodically saw an empty file and logged a parse error or emitted empty values. They now write aside and rename. Measured on a live manager, the old so-status cron left status.log empty for 215 of 10997 reads. Tested on a fresh install, a converted grid and a 3.0 upgrade.
276 lines
6.7 KiB
YAML+Jinja
276 lines
6.7 KiB
YAML+Jinja
# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
|
|
# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
|
|
# https://securityonion.net/license; you may not use this file except in compliance with the
|
|
# Elastic License 2.0.
|
|
|
|
{% from 'allowed_states.map.jinja' import allowed_states %}
|
|
{% if sls in allowed_states %}
|
|
{% from 'vars/globals.map.jinja' import GLOBALS %}
|
|
{% from 'manager/map.jinja' import MANAGERMERGED %}
|
|
|
|
include:
|
|
- salt.minion
|
|
- kibana.secrets
|
|
- manager.sync_es_users
|
|
- manager.elasticsearch
|
|
- manager.kibana
|
|
- manager.managed_soc_annotations
|
|
- manager.beacons
|
|
|
|
repo_log_dir:
|
|
file.directory:
|
|
- name: /opt/so/log/reposync
|
|
- user: socore
|
|
- group: socore
|
|
- recurse:
|
|
- user
|
|
- group
|
|
|
|
agents_log_dir:
|
|
file.directory:
|
|
- name: /opt/so/log/agents
|
|
- user: root
|
|
- group: root
|
|
- recurse:
|
|
- user
|
|
- group
|
|
|
|
agents_conf_dir:
|
|
file.directory:
|
|
- name: /opt/so/conf/agents
|
|
- user: root
|
|
- group: root
|
|
- recurse:
|
|
- user
|
|
- group
|
|
|
|
{% if MANAGERMERGED.agent_monitoring.config.critical_agents | length > 0 %}
|
|
critical_agents_patterns:
|
|
file.managed:
|
|
- name: /opt/so/conf/agents/critical-agents.txt
|
|
- contents: {{ MANAGERMERGED.agent_monitoring.config.critical_agents }}
|
|
{% else %}
|
|
remove_critical_agents_config:
|
|
file.absent:
|
|
- name: /opt/so/conf/agents/critical-agents.txt
|
|
{% endif %}
|
|
|
|
yara_log_dir:
|
|
file.directory:
|
|
- name: /opt/so/log/yarasync
|
|
- user: socore
|
|
- group: socore
|
|
- recurse:
|
|
- user
|
|
- group
|
|
|
|
install_createrepo:
|
|
pkg.installed:
|
|
- name: createrepo_c
|
|
|
|
repo_conf_dir:
|
|
file.directory:
|
|
- name: /opt/so/conf/reposync
|
|
- user: socore
|
|
- group: socore
|
|
- recurse:
|
|
- user
|
|
- group
|
|
|
|
repo_dir:
|
|
file.directory:
|
|
- name: /nsm/repo
|
|
- user: socore
|
|
- group: socore
|
|
- recurse:
|
|
- user
|
|
- group
|
|
- show_changes: False
|
|
|
|
kernelrepo_dir:
|
|
file.directory:
|
|
- name: /nsm/kernelrepo
|
|
- user: socore
|
|
- group: socore
|
|
- recurse:
|
|
- user
|
|
- group
|
|
- show_changes: False
|
|
|
|
# Ensure /nsm/kernelrepo is always a valid (if empty) repo before it is ever assigned to
|
|
# a client. Without repodata/repomd.xml an enabled file:///nsm/kernelrepo repo makes every
|
|
# dnf operation fail; so-repo-sync only populates it after the highstate, so seed an empty
|
|
# repo here. Only runs when repodata is missing, so it won't clobber a synced repo.
|
|
kernelrepo_init_empty:
|
|
cmd.run:
|
|
- name: createrepo /nsm/kernelrepo
|
|
- unless: 'test -e /nsm/kernelrepo/repodata/repomd.xml'
|
|
- require:
|
|
- file: kernelrepo_dir
|
|
- pkg: install_createrepo
|
|
|
|
manager_sbin:
|
|
file.recurse:
|
|
- name: /usr/sbin
|
|
- source: salt://manager/tools/sbin
|
|
- user: root
|
|
- group: root
|
|
- file_mode: 755
|
|
- exclude_pat:
|
|
- "*_test.py"
|
|
- show_changes: False
|
|
|
|
manager_sbin_jinja:
|
|
file.recurse:
|
|
- name: /usr/sbin/
|
|
- source: salt://manager/tools/sbin_jinja/
|
|
- user: root
|
|
- group: root
|
|
- file_mode: 755
|
|
- template: jinja
|
|
- show_changes: False
|
|
|
|
so-repo-file:
|
|
file.managed:
|
|
- name: /opt/so/conf/reposync/repodownload.conf
|
|
- source: salt://manager/files/repodownload.conf
|
|
- user: socore
|
|
- group: socore
|
|
- show_changes: False
|
|
|
|
so-repo-mirrorlist:
|
|
file.managed:
|
|
- name: /opt/so/conf/reposync/mirror.txt
|
|
- source: salt://manager/files/mirror.txt
|
|
- user: socore
|
|
- group: socore
|
|
|
|
so-repo-kernel-mirrorlist:
|
|
file.managed:
|
|
- name: /opt/so/conf/reposync/mirror-kernel.txt
|
|
- source: salt://manager/files/mirror-kernel.txt
|
|
- user: socore
|
|
- group: socore
|
|
|
|
so-repo-sync:
|
|
{% if MANAGERMERGED.reposync.enabled %}
|
|
cron.present:
|
|
{% else %}
|
|
cron.absent:
|
|
{% endif %}
|
|
- user: socore
|
|
- name: '/usr/sbin/so-repo-sync >> /opt/so/log/reposync/reposync.log 2>&1'
|
|
- identifier: so-repo-sync
|
|
- hour: '{{ MANAGERMERGED.reposync.hour }}'
|
|
- minute: '{{ MANAGERMERGED.reposync.minute }}'
|
|
|
|
so_fleetagent_status:
|
|
cron.present:
|
|
- name: '/usr/sbin/so-elasticagent-status > /opt/so/log/agents/agentstatus.log.tmp 2>&1; mv -f /opt/so/log/agents/agentstatus.log.tmp /opt/so/log/agents/agentstatus.log'
|
|
- identifier: so_fleetagent_status
|
|
- user: root
|
|
- minute: '*/5'
|
|
- hour: '*'
|
|
- daymonth: '*'
|
|
- month: '*'
|
|
- dayweek: '*'
|
|
|
|
so_fleetagent_monitor:
|
|
{% if MANAGERMERGED.agent_monitoring.enabled %}
|
|
cron.present:
|
|
{% else %}
|
|
cron.absent:
|
|
{% endif %}
|
|
- name: /bin/flock -n /opt/so/log/agents/agent-monitor.lock /usr/sbin/so-elastic-agent-monitor
|
|
- identifier: so_fleetagent_monitor
|
|
- user: root
|
|
- minute: '*/{{ MANAGERMERGED.agent_monitoring.config.run_interval }}'
|
|
- hour: '*'
|
|
- daymonth: '*'
|
|
- month: '*'
|
|
- dayweek: '*'
|
|
|
|
# This tree is the source of every root-executed script (/usr/sbin, reactors, _runners,
|
|
# engines, salt-relay.sh). SOC mounts /opt/so/saltstack rw as uid 939 but only writes
|
|
# under local/. Do not add dir_mode/file_mode here -- SOC reads default/ and 750/640
|
|
# would break its config load.
|
|
root_own_saltstack_default:
|
|
file.directory:
|
|
- name: /opt/so/saltstack/default
|
|
- user: root
|
|
- group: root
|
|
- recurse:
|
|
- user
|
|
- group
|
|
|
|
socore_own_saltstack_local:
|
|
file.directory:
|
|
- name: /opt/so/saltstack/local
|
|
- user: socore
|
|
- group: socore
|
|
- dir_mode: 750
|
|
- file_mode: 640
|
|
- replace: False
|
|
- recurse:
|
|
- user
|
|
- group
|
|
- mode
|
|
|
|
rules_dir:
|
|
file.directory:
|
|
- name: /nsm/rules/yara
|
|
- user: socore
|
|
- group: socore
|
|
- makedirs: True
|
|
|
|
nsm_playbooks_dir:
|
|
file.directory:
|
|
- name: /nsm/airgap-resources/playbooks
|
|
- user: socore
|
|
- group: socore
|
|
- makedirs: True
|
|
|
|
git_config_set_safe_dirs:
|
|
git.config_set:
|
|
- name: safe.directory
|
|
- global: True
|
|
- user: socore
|
|
- multivar:
|
|
- /nsm/rules/custom-local-repos/local-sigma
|
|
- /nsm/rules/custom-local-repos/local-yara
|
|
- /nsm/rules/custom-local-repos/local-suricata
|
|
- /nsm/securityonion-resources
|
|
- /opt/so/conf/soc/ai_summary_repos/securityonion-resources
|
|
- /nsm/airgap-resources/playbooks
|
|
- /opt/so/conf/soc/playbooks
|
|
|
|
surinsmrulesdir:
|
|
file.directory:
|
|
- name: /nsm/rules/suricata/etopen
|
|
- user: 939
|
|
- group: 939
|
|
- makedirs: True
|
|
|
|
suriextractionrules:
|
|
file.managed:
|
|
- name: /nsm/rules/suricata/so_extraction.rules
|
|
- source: salt://suricata/files/so_extraction.rules
|
|
- user: 939
|
|
- group: 939
|
|
|
|
surifiltersrules:
|
|
file.managed:
|
|
- name: /nsm/rules/suricata/so_filters.rules
|
|
- source: salt://suricata/files/so_filters.rules
|
|
- user: 939
|
|
- group: 939
|
|
|
|
|
|
{% else %}
|
|
|
|
{{sls}}_state_not_allowed:
|
|
test.fail_without_changes:
|
|
- name: {{sls}}_state_not_allowed
|
|
|
|
{% endif %}
|