mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-07-17 22:33:16 +02:00
Josh Patterson
c755c8bc61
The *.ssl x509.certificate_managed states hard-failed the state run when the CA/manager minion was unreachable (ca_server did not respond), and the paired private_key_managed states then failed on the prereq requisite. The - timeout: 30 on these states was a no-op (Salt has no per-state timeout requisite; only retry accepts until/attempts/interval/splay). Add an onlyif CA-reachability gate to every certificate_managed state so the state is skipped as a clean success when the CA does not answer a peer test.ping within 3s and the cert already exists. When the cert is missing (initial provisioning) the state still runs so the existing retry waits for the CA. The reachability command is centralized as CA.reachable_cmd in ca/map.jinja, and the master peer config now permits test.ping. The no-op - timeout: 30 is removed from all cert states.
68 lines
2.0 KiB
YAML+Jinja
68 lines
2.0 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.split('.')[0] in allowed_states %}
|
|
{% from 'vars/globals.map.jinja' import GLOBALS %}
|
|
{% from 'ca/map.jinja' import CA %}
|
|
|
|
# Create a cert for elasticsearch
|
|
elasticsearch_key:
|
|
x509.private_key_managed:
|
|
- name: /etc/pki/elasticsearch.key
|
|
- keysize: 4096
|
|
- backup: True
|
|
- new: True
|
|
{% if salt['file.file_exists']('/etc/pki/elasticsearch.key') -%}
|
|
- prereq:
|
|
- x509: /etc/pki/elasticsearch.crt
|
|
{%- endif %}
|
|
- retry:
|
|
attempts: 5
|
|
interval: 30
|
|
|
|
elasticsearch_crt:
|
|
x509.certificate_managed:
|
|
- name: /etc/pki/elasticsearch.crt
|
|
- ca_server: {{ CA.server }}
|
|
- signing_policy: registry
|
|
- private_key: /etc/pki/elasticsearch.key
|
|
- CN: {{ GLOBALS.hostname }}
|
|
- subjectAltName: DNS:{{ GLOBALS.hostname }}, IP:{{ GLOBALS.node_ip }}
|
|
- days_remaining: 7
|
|
- days_valid: 820
|
|
- backup: True
|
|
- onlyif:
|
|
- test ! -f /etc/pki/elasticsearch.crt || {{ CA.reachable_cmd }}
|
|
- retry:
|
|
attempts: 5
|
|
interval: 30
|
|
cmd.run:
|
|
- name: "/usr/bin/openssl pkcs12 -inkey /etc/pki/elasticsearch.key -in /etc/pki/elasticsearch.crt -export -out /etc/pki/elasticsearch.p12 -nodes -passout pass:"
|
|
- onchanges:
|
|
- x509: /etc/pki/elasticsearch.key
|
|
|
|
elastickeyperms:
|
|
file.managed:
|
|
- replace: False
|
|
- name: /etc/pki/elasticsearch.key
|
|
- mode: 640
|
|
- group: 930
|
|
|
|
elasticp12perms:
|
|
file.managed:
|
|
- replace: False
|
|
- name: /etc/pki/elasticsearch.p12
|
|
- mode: 640
|
|
- group: 930
|
|
|
|
{% else %}
|
|
|
|
{{sls}}_state_not_allowed:
|
|
test.fail_without_changes:
|
|
- name: {{sls}}_state_not_allowed
|
|
|
|
{% endif %}
|