Merge pull request #10621 from Security-Onion-Solutions/dev

2.3.260

VERIFY_ISO.md

@@ -1,18 +1,18 @@
-### 2.3.250-20230519 ISO image built on 2023/05/19
+### 2.3.260-20230620 ISO image built on 2023/06/20
 
 
 
 ### Download and Verify
 
-2.3.250-20230519 ISO image:  
-https://download.securityonion.net/file/securityonion/securityonion-2.3.250-20230519.iso
+2.3.260-20230620 ISO image:  
+https://download.securityonion.net/file/securityonion/securityonion-2.3.260-20230620.iso
 
-MD5: EBECF635FB8CFDDD5C0559D01C14E215  
-SHA1: 1C2BD45D080D6D99FD84C120827EA39817FCB078  
-SHA256: 748E9740077BCCAFDC67D15BA2D6A4B0539A29E4527715973E5BDDE5DCF565AD 
+MD5: E09BB9800BAE84E84511516952264F33  
+SHA1: DBDDFCE58B87F61F40BCE03840A749D8054B7AF1  
+SHA256: 06ED74278587B09167FBAC1E5796B666FC24AD15D06EA3CC36419D07967E06DD 
 
 Signature for ISO image:  
-https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.250-20230519.iso.sig
+https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.260-20230620.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.250-20230519.iso.sig
+wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.260-20230620.iso.sig
 ```
 
 Download the ISO image:  
 ```
-wget https://download.securityonion.net/file/securityonion/securityonion-2.3.250-20230519.iso
+wget https://download.securityonion.net/file/securityonion/securityonion-2.3.260-20230620.iso
 ```
 
 Verify the downloaded ISO image using the signature file:  
 ```
-gpg --verify securityonion-2.3.250-20230519.iso.sig securityonion-2.3.250-20230519.iso
+gpg --verify securityonion-2.3.260-20230620.iso.sig securityonion-2.3.260-20230620.iso
 ```
 
 The output should show "Good signature" and the Primary key fingerprint should match what's shown below:
 ```
-gpg: Signature made Sat 20 May 2023 09:16:02 AM EDT using RSA key ID FE507013
+gpg: Signature made Fri 16 Jun 2023 02:58:22 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.

VERSION

@@ -1 +1 @@
-2.3.250
+2.3.260

salt/common/tools/sbin/soup

@@ -557,6 +557,7 @@ preupgrade_changes() {
     [[ "$INSTALLEDVERSION" == 2.3.220 ]] && up_to_2.3.230
     [[ "$INSTALLEDVERSION" == 2.3.230 ]] && up_to_2.3.240
     [[ "$INSTALLEDVERSION" == 2.3.240 ]] && up_to_2.3.250
+    [[ "$INSTALLEDVERSION" == 2.3.250 ]] && up_to_2.3.260
     
     true
 }
@@ -587,6 +588,7 @@ postupgrade_changes() {
     [[ "$POSTVERSION" == 2.3.220 ]] && post_to_2.3.230
     [[ "$POSTVERSION" == 2.3.230 ]] && post_to_2.3.240
     [[ "$POSTVERSION" == 2.3.240 ]] && post_to_2.3.250
+    [[ "$POSTVERSION" == 2.3.250 ]] && post_to_2.3.260
 
     true
 }
@@ -735,6 +737,11 @@ post_to_2.3.250() {
   POSTVERSION=2.3.250
 }
 
+post_to_2.3.260() {
+  echo "Nothing to do for .260"
+  POSTVERSION=2.3.260
+}
+
 stop_salt_master() {
     # kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts
     set +e
@@ -1090,6 +1097,11 @@ up_to_2.3.250() {
   INSTALLEDVERSION=2.3.250
 }
 
+up_to_2.3.260() {
+  echo "Upgrading to 2.3.260"
+  INSTALLEDVERSION=2.3.260
+}
+
 verify_upgradespace() {
   CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//')
   if [ "$CURRENTSPACE" -lt "10" ]; then

salt/sensoroni/files/analyzers/emailrep/requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.27.1
+requests>=2.31.0
 pyyaml>=6.0

salt/sensoroni/files/analyzers/greynoise/requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.27.1
+requests>=2.31.0
 pyyaml>=6.0

salt/sensoroni/files/analyzers/localfile/requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.27.1
+requests>=2.31.0
 pyyaml>=6.0

salt/sensoroni/files/analyzers/malwarehashregistry/requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.27.1
+requests>=2.31.0
 python-whois>=0.7.3

salt/sensoroni/files/analyzers/otx/requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.27.1
+requests>=2.31.0
 pyyaml>=6.0

salt/sensoroni/files/analyzers/pulsedive/requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.27.1
+requests>=2.31.0
 pyyaml>=6.0

salt/sensoroni/files/analyzers/urlhaus/requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.27.1
+requests>=2.31.0
 pyyaml>=6.0

salt/sensoroni/files/analyzers/urlscan/requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.27.1
+requests>=2.31.0
 pyyaml>=6.0