From bde86e0383ed6673211a382850cf6202507d1131 Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Mon, 19 Jul 2021 12:42:46 -0400
Subject: [PATCH 1/3] Use http_auth instead of username/password until Curator
 is upgraded to next version

---
 salt/curator/files/curator.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/salt/curator/files/curator.yml b/salt/curator/files/curator.yml
index bdde14fc1..956f60491 100644
--- a/salt/curator/files/curator.yml
+++ b/salt/curator/files/curator.yml
@@ -18,17 +18,15 @@ client:
   hosts:
     - {{elasticsearch}}
   port: 9200
-{% if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %}
-  username: {{ ES_USER }}
-  password: {{ ES_PASS }}
-{% endif %}
+{%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %}
+  http_auth: {{ ES_USER }}:{{ ES_PASS }}
+{%- endif %}
   url_prefix:
   use_ssl: True
   certificate:
   client_cert:
   client_key:
   ssl_no_validate: True
-  http_auth:
   timeout: 30
   master_only: False
 

From 0669aa6bbdb6d9d924c4b6506e764d716320561c Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Mon, 19 Jul 2021 12:49:43 -0400
Subject: [PATCH 2/3] Update HOTFIX

---
 HOTFIX | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HOTFIX b/HOTFIX
index af7d2d9ae..31f81a97c 100644
--- a/HOTFIX
+++ b/HOTFIX
@@ -1 +1 @@
-ECSFIX HEAVYNODE_SSL_LOGSTASH_REDIS_PIPELINES FBPIPELINE
+ECSFIX HEAVYNODE_SSL_LOGSTASH_REDIS_PIPELINES FBPIPELINE CURATORAUTH

From 3b6e683d37b795943bf2116b6cc71cf21fb57008 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Tue, 20 Jul 2021 09:21:22 -0400
Subject: [PATCH 3/3] Curator Fix

---
 VERIFY_ISO.md                                 |  22 +++++++++---------
 sigs/securityonion-2.3.60-CURATORAUTH.iso.sig | Bin 0 -> 543 bytes
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 sigs/securityonion-2.3.60-CURATORAUTH.iso.sig

diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md
index b79f81c72..1e35ea1c7 100644
--- a/VERIFY_ISO.md
+++ b/VERIFY_ISO.md
@@ -1,18 +1,18 @@
-### 2.3.60-FBPIPELINE ISO image built on 2021/07/13
+### 2.3.60-CURATORAUTH ISO image built on 2021/07/19
 
 
 
 ### Download and Verify
 
-2.3.60-FBPIPELINE ISO image:  
-https://download.securityonion.net/file/securityonion/securityonion-2.3.60-FBPIPELINE.iso
+2.3.60-CURATORAUTH ISO image:  
+https://download.securityonion.net/file/securityonion/securityonion-2.3.60-CURATORAUTH.iso
 
-MD5: 2EA2B337289D0CFF0C7488E8E88FE7BE  
-SHA1: 7C22F16AD395E079F4C5345093AF26C105E36D4C  
-SHA256: 3B685BBD19711229C5FCD5D254BA5024AF0C36A3E379790B5E83037CE2668724 
+MD5: 953DD42AB3A3560BB35F4E9F69212AE3  
+SHA1: 5D18B98B19FD7F8C799E88FC28ABC46990FC6B9B  
+SHA256: E26F43F969241985DC74915842492F876EC7B8CBAF5F2F52405554E7C92408C2 
 
 Signature for ISO image:  
-https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.60-FBPIPELINE.iso.sig
+https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.60-CURATORAUTH.iso.sig
 
 Signing key:  
 https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS  
@@ -26,22 +26,22 @@ wget https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/ma
 
 Download the signature file for the ISO:  
 ```
-wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.60-FBPIPELINE.iso.sig
+wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.60-CURATORAUTH.iso.sig
 ```
 
 Download the ISO image:  
 ```
-wget https://download.securityonion.net/file/securityonion/securityonion-2.3.60-FBPIPELINE.iso
+wget https://download.securityonion.net/file/securityonion/securityonion-2.3.60-CURATORAUTH.iso
 ```
 
 Verify the downloaded ISO image using the signature file:  
 ```
-gpg --verify securityonion-2.3.60-FBPIPELINE.iso.sig securityonion-2.3.60-FBPIPELINE.iso
+gpg --verify securityonion-2.3.60-CURATORAUTH.iso.sig securityonion-2.3.60-CURATORAUTH.iso
 ```
 
 The output should show "Good signature" and the Primary key fingerprint should match what's shown below:
 ```
-gpg: Signature made Tue 13 Jul 2021 04:12:08 PM EDT using RSA key ID FE507013
+gpg: Signature made Mon 19 Jul 2021 01:25:34 PM EDT using RSA key ID FE507013
 gpg: Good signature from "Security Onion Solutions, LLC <info@securityonionsolutions.com>"
 gpg: WARNING: This key is not certified with a trusted signature!
 gpg:          There is no indication that the signature belongs to the owner.
diff --git a/sigs/securityonion-2.3.60-CURATORAUTH.iso.sig b/sigs/securityonion-2.3.60-CURATORAUTH.iso.sig
new file mode 100644
index 0000000000000000000000000000000000000000..b6213a63d68f1cc5eb07502cc7193d16ecc8c3f1
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p;98wT=J^2@re`V7LBIa1#f15B?;qEFC}ui!zZ*i3L+X
zJCL-0Z26gU(PHf&Ul9kjFI<#mJh2bji~}q@T%$C*vGN2clstW>&6cMy-`{?@e&gIg
z7}xPNP$!NqTpYsdIAdm63_Ryg54pNNevsnWV^D6g-~3F~`3_D`k5ZQ55D<Qx4Mh^d
zQWqls^=4fn+SPsNvv3{9Bdg7R#II}q$zYX`@JD>b){gvjPQV-cX`J$(qeL4B7Z<j}
zM?A^jMA-)WJc1-MmzCG)H(=dcc>MEnXV6;2Gv7PC#Ed(hx=_&%ezixwucVMGf_z$U
z%kJ+oGKiKKO0FJT|Cpis>2u*kw`k``b*oN2SD~dn&I|ktVH|MJGXX>RwK>Q$|C+e|
zAICSgCiV!3V|EFyqUy&(4xtL_BXQh-Lj0qINA4jh6;Nj~L0W%Su0-e$ky~g*rYSj5
zG$9E5n9l~h^yU{*+_UT$e}2T{3Dylr122{>08Yi0vXjeCtYe2aVvhY)W#o%_ofo~<
zd=qN6iR!x9)|a)0P<E?mHaf;xK_@wJ-(6>Os+HlDsO%wYJu))ayju>%{N9N6+9IGe
z^=1tcZX2@XW&g97uh|jdqkxqm$~2BW1b7oc<V25Ig4u8@wjR1`-x|6Ikt;^$-z+v&
hi_g=}Q@(rKv9a!}0vyq^3s5EiQDpQ|7yadn9}OLF1f2i?

literal 0
HcmV?d00001