Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge in 2.4.111 #14036

Merged
merged 22 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3bdc034
Merge branch 'hotfix/2.4.30' into 2.4/main
TOoSmOotH Dec 19, 2023
6069c58
Merge branch '2.4/main' of github.com:Security-Onion-Solutions/securi…
TOoSmOotH Jan 24, 2024
21f78a0
Merge branch '2.4/main' of github.com:Security-Onion-Solutions/securi…
TOoSmOotH Apr 2, 2024
229cb1e
Merge branch '2.4/main' of github.com:Security-Onion-Solutions/securi…
TOoSmOotH Jun 21, 2024
9af3e36
Merge branch '2.4/main' of github.com:Security-Onion-Solutions/securi…
TOoSmOotH Jun 25, 2024
72146d9
Merge branch '2.4/dev' of github.com:Security-Onion-Solutions/securit…
TOoSmOotH Jun 27, 2024
e664f2d
Merge branch '2.4/dev' of github.com:Security-Onion-Solutions/securit…
TOoSmOotH Aug 15, 2024
306bd8f
Merge branch '2.4/dev' of github.com:Security-Onion-Solutions/securit…
TOoSmOotH Aug 29, 2024
38619ae
Merge branch '2.4/dev' of github.com:Security-Onion-Solutions/securit…
TOoSmOotH Sep 9, 2024
d005f0d
Merge branch '2.4/main' of github.com:Security-Onion-Solutions/securi…
TOoSmOotH Nov 17, 2024
e02cb30
Merge branch '2.4/dev' of github.com:Security-Onion-Solutions/securit…
TOoSmOotH Nov 17, 2024
5bc9fb1
Update VERSION
TOoSmOotH Dec 13, 2024
7d06dd4
Update HOTFIX
TOoSmOotH Dec 13, 2024
897e8f6
2.4.111
TOoSmOotH Dec 17, 2024
17405b8
Delete uneeded files
defensivedepth Dec 17, 2024
c6ebebc
Merge pull request #14033 from Security-Onion-Solutions/patchfix
defensivedepth Dec 17, 2024
3e04bfb
2.4.111
TOoSmOotH Dec 18, 2024
7d4c6b1
Merge branch 'patch/2.4.111' of https://github.com/Security-Onion-Sol…
TOoSmOotH Dec 18, 2024
93f3171
Merge pull request #14031 from Security-Onion-Solutions/patch/2.4.111
TOoSmOotH Dec 18, 2024
ec90adc
Merge branch '2.4/main' of github.com:Security-Onion-Solutions/securi…
TOoSmOotH Dec 18, 2024
72fed8d
Merge branch '2.4/dev' of github.com:Security-Onion-Solutions/securit…
TOoSmOotH Dec 18, 2024
9c10094
Fix conflict
TOoSmOotH Dec 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions DOWNLOAD_AND_VERIFY_ISO.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
### 2.4.110-20241010 ISO image released on 2024/10/10
### 2.4.111-20241217 ISO image released on 2024/12/18


### Download and Verify

2.4.110-20241010 ISO image:
https://download.securityonion.net/file/securityonion/securityonion-2.4.110-20241010.iso
2.4.111-20241217 ISO image:
https://download.securityonion.net/file/securityonion/securityonion-2.4.111-20241217.iso

MD5: A8003DEBC4510D538F06238D9DBB86C0
SHA1: 441DE90A192C8FE8BEBAB9ACE1A3CC18F71A2B1F
SHA256: B087A0D12FC2CA3CCD02BD52E52421F4F60DC09BF826337A057E05A04D114CCE
MD5: 767823D75EB76A6DC6132F799FD0E720
SHA1: 0A7B6918FE5D4BC89EE3F2E03B4F8F4D6255141D
SHA256: 394BFCED9B5EAA0788E2D04806231B3A170839394AAF8DD23B4CE0EB9D6EF727

Signature for ISO image:
https://github.com/Security-Onion-Solutions/securityonion/raw/2.4/main/sigs/securityonion-2.4.110-20241010.iso.sig
https://github.com/Security-Onion-Solutions/securityonion/raw/2.4/main/sigs/securityonion-2.4.111-20241217.iso.sig

Signing key:
https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/2.4/main/KEYS
Expand All @@ -25,22 +25,22 @@ wget https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/2.

Download the signature file for the ISO:
```
wget https://github.com/Security-Onion-Solutions/securityonion/raw/2.4/main/sigs/securityonion-2.4.110-20241010.iso.sig
wget https://github.com/Security-Onion-Solutions/securityonion/raw/2.4/main/sigs/securityonion-2.4.111-20241217.iso.sig
```

Download the ISO image:
```
wget https://download.securityonion.net/file/securityonion/securityonion-2.4.110-20241010.iso
wget https://download.securityonion.net/file/securityonion/securityonion-2.4.111-20241217.iso
```

Verify the downloaded ISO image using the signature file:
```
gpg --verify securityonion-2.4.110-20241010.iso.sig securityonion-2.4.110-20241010.iso
gpg --verify securityonion-2.4.111-20241217.iso.sig securityonion-2.4.111-20241217.iso
```

The output should show "Good signature" and the Primary key fingerprint should match what's shown below:
```
gpg: Signature made Thu 10 Oct 2024 07:05:30 AM EDT using RSA key ID FE507013
gpg: Signature made Tue 17 Dec 2024 04:33:10 PM EST using RSA key ID FE507013
gpg: Good signature from "Security Onion Solutions, LLC <[email protected]>"
gpg: WARNING: This key is not certified with a trusted signature!
gpg: There is no indication that the signature belongs to the owner.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.120
2.4.120
2 changes: 1 addition & 1 deletion salt/manager/tools/sbin/soup
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ update_airgap_rules() {
rsync -av $UPDATE_DIR/agrules/detect-sigma/* /nsm/rules/detect-sigma/
rsync -av $UPDATE_DIR/agrules/detect-yara/* /nsm/rules/detect-yara/
# Copy the securityonion-resorces repo over for SOC Detection Summaries and checkout the published summaries branch
rsync -av --chown=socore:socore $UPDATE_DIR/agrules/securityonion-resources /opt/so/conf/soc/ai_summary_repos
rsync -av --delete --chown=socore:socore $UPDATE_DIR/agrules/securityonion-resources /opt/so/conf/soc/ai_summary_repos
git config --global --add safe.directory /opt/so/conf/soc/ai_summary_repos/securityonion-resources
git -C /opt/so/conf/soc/ai_summary_repos/securityonion-resources checkout generated-summaries-published
# Copy the securityonion-resorces repo over to nsm
Expand Down
Binary file added sigs/securityonion-2.4.111-20241217.iso.sig
Binary file not shown.
Loading