From dc8520df42c9b31ff6fc46f0329b45649def9342 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 26 May 2021 18:04:30 -0400
Subject: [PATCH] user curl.config for curl and elasticscripts

---
 salt/elasticsearch/auth.map.jinja | 2 +-
 salt/elasticsearch/init.sls       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/salt/elasticsearch/auth.map.jinja b/salt/elasticsearch/auth.map.jinja
index 147b0157b..c6f099025 100644
--- a/salt/elasticsearch/auth.map.jinja
+++ b/salt/elasticsearch/auth.map.jinja
@@ -2,6 +2,6 @@
     True: {
       'user': salt['pillar.get']('elasticsearch:auth:user'), 
       'pass': salt['pillar.get']('elasticsearch:auth:pass'), 
-      'elasticcurl':'curl --user ' ~ salt['pillar.get']('elasticsearch:auth:user') ~ ':' ~ salt['pillar.get']('elasticsearch:auth:pass') },
+      'elasticcurl':'curl -K /opt/so/conf/elasticsearch/curl.config' },
     False: {'elasticcurl': 'curl'},
 }, pillar='elasticsearch:auth:enabled', default=False) %}
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 84de1fd0b..9c0372684 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -292,6 +292,7 @@ elastic_curl_config:
   file.managed:
     - name: /opt/so/conf/elasticsearch/curl.config
     - mode: 600
+    - contents: user = "{{ salt['pillar.get']('elasticsearch:auth:user') }}:{{ salt['pillar.get']('elasticsearch:auth:pass') }}"
     - show_changes: False
 
 {% endif %} {# if grains['role'] != 'so-helix' #}