From ef73834d58bf2a16421c1f2cf942f7fe89f743a3 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 17 Apr 2023 10:55:38 -0400 Subject: [PATCH 1/5] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 02eba2fcf..f3f35fab2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.230 +2.3.240 From f1f79d55dced6c801781b6d6ead6eef56977ed68 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Mon, 24 Apr 2023 16:26:23 -0400 Subject: [PATCH 2/5] Detect cloud install on forced imdsv2 instances --- setup/so-functions | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index c3be68b73..1aff8bdf1 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1124,7 +1124,16 @@ create_repo() { detect_cloud() { echo "Testing if setup is running on a cloud instance..." | tee -a "$setup_log" - if ( curl --fail -s -m 5 http://169.254.169.254/latest/meta-data/instance-id > /dev/null ) || ( dmidecode -s bios-vendor | grep -q Google > /dev/null) || [ -f /var/log/waagent.log ]; then export is_cloud="true"; fi + if ( curl --fail -s -m 5 http://169.254.169.254/latest/meta-data/instance-id > /dev/null ) || \ + ( curl --fail -s -m 5 -H "X-aws-ec2-metadata-token: $(curl -s -X PUT 'http://169.254.169.254/latest/api/token' -H 'X-aws-ec2-metadata-token-ttl-seconds: 30')" http://169.254.169.254/latest/meta-data/instance-id > /dev/null) || \ + (dmidecode -s bios-vendor | grep -q Google > /dev/null) || \ + [ -f /var/log/waagent.log ]; then + + echo "Detected a cloud installation." | tee -a "$setup_log" + export is_cloud="true" + else + echo "This does not appear to be a cloud installation." | tee -a "$setup_log" + fi } detect_os() { From 71ab8ddf1d94bb4b3b80b0f33e4478ed3d920361 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 25 Apr 2023 09:42:14 -0400 Subject: [PATCH 3/5] soup update for 2.3.240 --- salt/common/tools/sbin/soup | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 254ea6580..51cb37241 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -555,6 +555,7 @@ preupgrade_changes() { [[ "$INSTALLEDVERSION" == 2.3.200 ]] && up_to_2.3.210 [[ "$INSTALLEDVERSION" == 2.3.210 ]] && up_to_2.3.220 [[ "$INSTALLEDVERSION" == 2.3.220 ]] && up_to_2.3.230 + [[ "$INSTALLEDVERSION" == 2.3.230 ]] && up_to_2.3.240 true } @@ -583,6 +584,7 @@ postupgrade_changes() { [[ "$POSTVERSION" == 2.3.200 ]] && post_to_2.3.210 [[ "$POSTVERSION" == 2.3.210 ]] && post_to_2.3.220 [[ "$POSTVERSION" == 2.3.220 ]] && post_to_2.3.230 + [[ "$POSTVERSION" == 2.3.230 ]] && post_to_2.3.240 true } @@ -721,6 +723,11 @@ post_to_2.3.230() { POSTVERSION=2.3.230 } +post_to_2.3.240() { + echo "Nothing to do for .240" + POSTVERSION=2.3.240 +} + stop_salt_master() { # kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts set +e @@ -1066,6 +1073,11 @@ up_to_2.3.230() { INSTALLEDVERSION=2.3.230 } +up_to_2.3.240() { + echo "Upgrading to 2.3.240" + INSTALLEDVERSION=2.3.240 +} + verify_upgradespace() { CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') if [ "$CURRENTSPACE" -lt "10" ]; then From b440ab5c02f316c1616206379ee108a0a63991dc Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Wed, 26 Apr 2023 07:57:23 -0400 Subject: [PATCH 4/5] timeout more quickly on aws imdsv2 detection --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 1aff8bdf1..fdbf233be 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1125,7 +1125,7 @@ create_repo() { detect_cloud() { echo "Testing if setup is running on a cloud instance..." | tee -a "$setup_log" if ( curl --fail -s -m 5 http://169.254.169.254/latest/meta-data/instance-id > /dev/null ) || \ - ( curl --fail -s -m 5 -H "X-aws-ec2-metadata-token: $(curl -s -X PUT 'http://169.254.169.254/latest/api/token' -H 'X-aws-ec2-metadata-token-ttl-seconds: 30')" http://169.254.169.254/latest/meta-data/instance-id > /dev/null) || \ + ( curl --fail -s -m 5 -H "X-aws-ec2-metadata-token: $(curl -s -X PUT -m 5 'http://169.254.169.254/latest/api/token' -H 'X-aws-ec2-metadata-token-ttl-seconds: 30')" http://169.254.169.254/latest/meta-data/instance-id > /dev/null) || \ (dmidecode -s bios-vendor | grep -q Google > /dev/null) || \ [ -f /var/log/waagent.log ]; then From 884f5cd3a6771ac1595c4c55f5318a98cd7da6fd Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 26 Apr 2023 09:55:19 -0400 Subject: [PATCH 5/5] 2.3.240 --- VERIFY_ISO.md | 22 ++++++++++---------- sigs/securityonion-2.3.240-20230426.iso.sig | Bin 0 -> 543 bytes 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 sigs/securityonion-2.3.240-20230426.iso.sig diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index b13c645e4..19f3a963b 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,18 +1,18 @@ -### 2.3.230-20230417 ISO image built on 2023/04/17 +### 2.3.240-20230426 ISO image built on 2023/04/26 ### Download and Verify -2.3.230-20230417 ISO image: -https://download.securityonion.net/file/securityonion/securityonion-2.3.230-20230417.iso +2.3.240-20230426 ISO image: +https://download.securityonion.net/file/securityonion/securityonion-2.3.240-20230426.iso -MD5: EBE7E5407AF9AF6F1ADCB9A8E011729B -SHA1: EC101F5C633D368205F5B756F063308A0BE0466E -SHA256: CBB9BE490AB44BCC2C8CAB8AAE65288BE130B43927DFA4DFBDD9D95B3564D65F +MD5: 1935B559A9181522E83DA64C0A095A7A +SHA1: 84A865A8F880036A5F04990CAAC36093744E8CF7 +SHA256: 1CC1173A403EE0CEA05EFB4708E7A4AEA70CEAAF1E3B51B861410F7634A776AF Signature for ISO image: -https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.230-20230417.iso.sig +https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.240-20230426.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.230-20230417.iso.sig +wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.240-20230426.iso.sig ``` Download the ISO image: ``` -wget https://download.securityonion.net/file/securityonion/securityonion-2.3.230-20230417.iso +wget https://download.securityonion.net/file/securityonion/securityonion-2.3.240-20230426.iso ``` Verify the downloaded ISO image using the signature file: ``` -gpg --verify securityonion-2.3.230-20230417.iso.sig securityonion-2.3.230-20230417.iso +gpg --verify securityonion-2.3.240-20230426.iso.sig securityonion-2.3.240-20230426.iso ``` The output should show "Good signature" and the Primary key fingerprint should match what's shown below: ``` -gpg: Signature made Fri 14 Apr 2023 11:12:57 AM EDT using RSA key ID FE507013 +gpg: Signature made Wed 26 Apr 2023 08:55:32 AM EDT using RSA key ID FE507013 gpg: Good signature from "Security Onion Solutions, LLC " 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.240-20230426.iso.sig b/sigs/securityonion-2.3.240-20230426.iso.sig new file mode 100644 index 0000000000000000000000000000000000000000..d689878d1364ecb6f1f0335989c7fde6ea58b596 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p;JAA4C8O2@re`V7LBIa1)Ie5CFdf1q2(NMOj$0$aV)u z{$@$MGPI&nxR~QabLEob4$g*uJ!!JO7Q?3I^dlfokzEyK@l!Tg;LsV}1MKAlW5{tj zez2+WWs)VX2%zq&RdL)!c6c_YL5pwEZzZKHx|q6Bc5rZ$XbS13(bM{UQPvI%M)_>| zO9|Q1)|a+VqVa{4zQ#8jtlE+k@#*qjQuXx|LC6Og9B{V&i}G@f52%HQyaJ}RQ=IQ0 zrnE%3Q<}`1s%bxiX67R1;kVAsz#%Z`m7LsH0!V0>+eWmi_^OWtVPm`70~cu5jib_j!qGs{SN=M%q54eLtC86 z>M5ui0BhjaTM2V0-^IrNVS;TWq$dLIKC@(jrd(^i@!-jA*Vhs<-}O2f%?~dSjLw@V zio<1cDxHnLs`kYA{CyxlA1^d!u^gYhrLra?d(8_isu^Pi`LWL^X#r(+V@_MCLbG&R{Ad?wPgWY%i1gjXtcGIAp hYx?E8WTf6OgsA@`d>lH&m|$>i>_E*5q}_@VkH(^e4fOy3 literal 0 HcmV?d00001