From e08b13629ae971d446005241a011e0f3d96136d2 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 5 Apr 2022 13:41:26 -0400 Subject: [PATCH 1/8] manage repo conf for ubuntu --- salt/common/tools/sbin/soup | 3 + salt/repo/client/centos.sls | 98 +++++++++++++++++ .../client/files/ubuntu/18.04/saltstack.list | 1 + .../client/files/ubuntu/20.04/saltstack.list | 1 + salt/repo/client/init.sls | 100 +----------------- salt/repo/client/ubuntu.sls | 4 + salt/salt/map.jinja | 2 +- salt/top.sls | 3 +- setup/so-functions | 10 +- 9 files changed, 116 insertions(+), 106 deletions(-) create mode 100644 salt/repo/client/centos.sls create mode 100644 salt/repo/client/files/ubuntu/18.04/saltstack.list create mode 100644 salt/repo/client/files/ubuntu/20.04/saltstack.list create mode 100644 salt/repo/client/ubuntu.sls diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 5e813c2c8..a46938da9 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -934,6 +934,9 @@ update_repo() { yum clean all yum repolist fi + elif [[ "$OS" == "ubuntu" ]]; then + cp $UPDATE_DIR/salt/repo/client/files/ubuntu/$ubuntu_version/* /etc/apt/sources.list.d/ + apt-get update fi } diff --git a/salt/repo/client/centos.sls b/salt/repo/client/centos.sls new file mode 100644 index 000000000..160782267 --- /dev/null +++ b/salt/repo/client/centos.sls @@ -0,0 +1,98 @@ +{% from 'repo/client/map.jinja' import ABSENTFILES with context %} +{% from 'repo/client/map.jinja' import REPOPATH with context %} +{% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %} +{% set managerupdates = salt['pillar.get']('global:managerupdate', 0) %} +{% set role = grains.id.split('_') | last %} + +# from airgap state +{% if ISAIRGAP and grains.os == 'CentOS' %} +{% set MANAGER = salt['grains.get']('master') %} +airgapyum: + file.managed: + - name: /etc/yum/yum.conf + - source: salt://repo/client/files/centos/airgap/yum.conf + +airgap_repo: + pkgrepo.managed: + - humanname: Airgap Repo + - baseurl: https://{{ MANAGER }}/repo + - gpgcheck: 0 + - sslverify: 0 + +{% endif %} + +# from airgap and common +{% if ABSENTFILES|length > 0%} + {% for file in ABSENTFILES %} +{{ file }}: + file.absent: + - name: {{ REPOPATH }}{{ file }} + - onchanges_in: + - cmd: cleanyum + {% endfor %} +{% endif %} + +# from common state +# Remove default Repos +{% if grains['os'] == 'CentOS' %} +repair_yumdb: + cmd.run: + - name: 'mv -f /var/lib/rpm/__db* /tmp && yum clean all' + - onlyif: + - 'yum check-update 2>&1 | grep "Error: rpmdb open failed"' + +crsynckeys: + file.recurse: + - name: /etc/pki/rpm_gpg + - source: salt://repo/client/files/centos/keys/ + +{% if not ISAIRGAP %} + {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %} +remove_securityonionrepocache: + file.absent: + - name: /etc/yum.repos.d/securityonioncache.repo + {% endif %} + + {% if role not in ['eval', 'standalone', 'import', 'manager', 'managersearch'] and managerupdates == 1 %} +remove_securityonionrepo: + file.absent: + - name: /etc/yum.repos.d/securityonion.repo + {% endif %} + +crsecurityonionrepo: + file.managed: + {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %} + - name: /etc/yum.repos.d/securityonion.repo + - source: salt://repo/client/files/centos/securityonion.repo + {% else %} + - name: /etc/yum.repos.d/securityonioncache.repo + - source: salt://repo/client/files/centos/securityonioncache.repo + {% endif %} + - mode: 644 + +yumconf: + file.managed: + - name: /etc/yum.conf + - source: salt://repo/client/files/centos/yum.conf.jinja + - mode: 644 + - template: jinja + - show_changes: False + +cleanairgap: + file.absent: + - name: /etc/yum.repos.d/airgap_repo.repo +{% endif %} + +cleanyum: + cmd.run: + - name: 'yum clean metadata' + - onchanges: +{% if ISAIRGAP %} + - file: airgapyum + - pkgrepo: airgap_repo +{% else %} + - file: crsecurityonionrepo + - file: yumconf +{% endif %} + +{% endif %} diff --git a/salt/repo/client/files/ubuntu/18.04/saltstack.list b/salt/repo/client/files/ubuntu/18.04/saltstack.list new file mode 100644 index 000000000..b41f03856 --- /dev/null +++ b/salt/repo/client/files/ubuntu/18.04/saltstack.list @@ -0,0 +1 @@ +deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/18.04/amd64/salt/ bionic main diff --git a/salt/repo/client/files/ubuntu/20.04/saltstack.list b/salt/repo/client/files/ubuntu/20.04/saltstack.list new file mode 100644 index 000000000..bc7236d82 --- /dev/null +++ b/salt/repo/client/files/ubuntu/20.04/saltstack.list @@ -0,0 +1 @@ +deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/20.04/amd64/salt/ focal main diff --git a/salt/repo/client/init.sls b/salt/repo/client/init.sls index 160782267..154867caf 100644 --- a/salt/repo/client/init.sls +++ b/salt/repo/client/init.sls @@ -1,98 +1,2 @@ -{% from 'repo/client/map.jinja' import ABSENTFILES with context %} -{% from 'repo/client/map.jinja' import REPOPATH with context %} -{% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %} -{% set managerupdates = salt['pillar.get']('global:managerupdate', 0) %} -{% set role = grains.id.split('_') | last %} - -# from airgap state -{% if ISAIRGAP and grains.os == 'CentOS' %} -{% set MANAGER = salt['grains.get']('master') %} -airgapyum: - file.managed: - - name: /etc/yum/yum.conf - - source: salt://repo/client/files/centos/airgap/yum.conf - -airgap_repo: - pkgrepo.managed: - - humanname: Airgap Repo - - baseurl: https://{{ MANAGER }}/repo - - gpgcheck: 0 - - sslverify: 0 - -{% endif %} - -# from airgap and common -{% if ABSENTFILES|length > 0%} - {% for file in ABSENTFILES %} -{{ file }}: - file.absent: - - name: {{ REPOPATH }}{{ file }} - - onchanges_in: - - cmd: cleanyum - {% endfor %} -{% endif %} - -# from common state -# Remove default Repos -{% if grains['os'] == 'CentOS' %} -repair_yumdb: - cmd.run: - - name: 'mv -f /var/lib/rpm/__db* /tmp && yum clean all' - - onlyif: - - 'yum check-update 2>&1 | grep "Error: rpmdb open failed"' - -crsynckeys: - file.recurse: - - name: /etc/pki/rpm_gpg - - source: salt://repo/client/files/centos/keys/ - -{% if not ISAIRGAP %} - {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %} -remove_securityonionrepocache: - file.absent: - - name: /etc/yum.repos.d/securityonioncache.repo - {% endif %} - - {% if role not in ['eval', 'standalone', 'import', 'manager', 'managersearch'] and managerupdates == 1 %} -remove_securityonionrepo: - file.absent: - - name: /etc/yum.repos.d/securityonion.repo - {% endif %} - -crsecurityonionrepo: - file.managed: - {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %} - - name: /etc/yum.repos.d/securityonion.repo - - source: salt://repo/client/files/centos/securityonion.repo - {% else %} - - name: /etc/yum.repos.d/securityonioncache.repo - - source: salt://repo/client/files/centos/securityonioncache.repo - {% endif %} - - mode: 644 - -yumconf: - file.managed: - - name: /etc/yum.conf - - source: salt://repo/client/files/centos/yum.conf.jinja - - mode: 644 - - template: jinja - - show_changes: False - -cleanairgap: - file.absent: - - name: /etc/yum.repos.d/airgap_repo.repo -{% endif %} - -cleanyum: - cmd.run: - - name: 'yum clean metadata' - - onchanges: -{% if ISAIRGAP %} - - file: airgapyum - - pkgrepo: airgap_repo -{% else %} - - file: crsecurityonionrepo - - file: yumconf -{% endif %} - -{% endif %} +include: + - repo.client.{{grains.os | lower}} diff --git a/salt/repo/client/ubuntu.sls b/salt/repo/client/ubuntu.sls new file mode 100644 index 000000000..449b4ae14 --- /dev/null +++ b/salt/repo/client/ubuntu.sls @@ -0,0 +1,4 @@ +ubuntu_repo_files: + - file.recurse: + - name: /etc/apt/sources.list.d/ + - source: salt://repo/client/files/ubuntu/{{grains.osrelease}}/ diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja index b66ec23eb..eb9f5ae89 100644 --- a/salt/salt/map.jinja +++ b/salt/salt/map.jinja @@ -29,7 +29,7 @@ {% if grains.os|lower in ['centos', 'redhat'] %} {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -s 120 -r -F -x python3 stable ' ~ SALTVERSION %} {% elif grains.os|lower == 'ubuntu' %} - {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -s 120 -F -x python3 stable ' ~ SALTVERSION %} + {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -s 120 -r -F -x python3 stable ' ~ SALTVERSION %} {% endif %} {% else %} {% set UPGRADECOMMAND = 'echo Already running Salt Minion version ' ~ SALTVERSION %} diff --git a/salt/top.sls b/salt/top.sls index 67d717d3b..c20bf33b7 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -21,16 +21,15 @@ base: '*': - cron.running + - repo.client 'not G@saltversion:{{saltversion}}': - match: compound - salt.minion-state-apply-test - - repo.client - salt.minion 'G@os:CentOS and G@saltversion:{{saltversion}}': - match: compound - - repo.client - yum.packages '* and G@saltversion:{{saltversion}}': diff --git a/setup/so-functions b/setup/so-functions index 0047fe4a2..9d09e78a0 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2277,7 +2277,7 @@ saltify() { # Download Ubuntu Keys in case manager updates = 1 logCmd "mkdir -vp /opt/so/gpg" if [[ ! $is_airgap ]]; then - logCmd "wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/py3/ubuntu/18.04/amd64/archive/3004.1/SALTSTACK-GPG-KEY.pub" + logCmd "wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.securityonion.net/file/securityonion-repo/ubuntu/$ubuntu_version/amd64/salt/SALTSTACK-GPG-KEY.pub" logCmd "wget -q --inet4-only -O /opt/so/gpg/docker.pub https://download.docker.com/linux/ubuntu/gpg" logCmd "wget -q --inet4-only -O /opt/so/gpg/GPG-KEY-WAZUH https://packages.wazuh.com/key/GPG-KEY-WAZUH" fi @@ -2334,8 +2334,8 @@ saltify() { 'MANAGER' | 'EVAL' | 'MANAGERSEARCH' | 'STANDALONE' | 'IMPORT' | 'HELIXSENSOR') # Add saltstack repo(s) - wget -q --inet4-only -O - https://repo.saltstack.com/py3/ubuntu/"$ubuntu_version"/amd64/archive/3004.1/SALTSTACK-GPG-KEY.pub | apt-key add - >> "$setup_log" 2>&1 - echo "deb http://repo.saltstack.com/py3/ubuntu/$ubuntu_version/amd64/archive/3004.1 $OSVER main" > /etc/apt/sources.list.d/saltstack.list 2>> "$setup_log" + wget -q --inet4-only -O - https://repo.securityonion.net/file/securityonion-repo/ubuntu/"$ubuntu_version"/amd64/salt/SALTSTACK-GPG-KEY.pub | apt-key add - >> "$setup_log" 2>&1 + echo "https://repo.securityonion.net/file/securityonion-repo/ubuntu/$ubuntu_version/amd64/salt/ $OSVER main" > /etc/apt/sources.list.d/saltstack.list 2>> "$setup_log" # Add Docker repo curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - >> "$setup_log" 2>&1 @@ -2343,7 +2343,7 @@ saltify() { # Get gpg keys mkdir -p /opt/so/gpg >> "$setup_log" 2>&1 - wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.saltstack.com/py3/ubuntu/"$ubuntu_version"/amd64/archive/3004.1/SALTSTACK-GPG-KEY.pub >> "$setup_log" 2>&1 + wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.securityonion.net/file/securityonion-repo/ubuntu/"$ubuntu_version"/amd64/salt/SALTSTACK-GPG-KEY.pub >> "$setup_log" 2>&1 wget -q --inet4-only -O /opt/so/gpg/docker.pub https://download.docker.com/linux/ubuntu/gpg >> "$setup_log" 2>&1 wget -q --inet4-only -O /opt/so/gpg/GPG-KEY-WAZUH https://packages.wazuh.com/key/GPG-KEY-WAZUH >> "$setup_log" 2>&1 @@ -2367,7 +2367,7 @@ saltify() { echo "Using apt-key add to add SALTSTACK-GPG-KEY.pub and GPG-KEY-WAZUH" >> "$setup_log" 2>&1 apt-key add "$temp_install_dir"/gpg/SALTSTACK-GPG-KEY.pub >> "$setup_log" 2>&1 apt-key add "$temp_install_dir"/gpg/GPG-KEY-WAZUH >> "$setup_log" 2>&1 - echo "deb http://repo.saltstack.com/py3/ubuntu/$ubuntu_version/amd64/archive/3004.1/ $OSVER main" > /etc/apt/sources.list.d/saltstack.list 2>> "$setup_log" + echo "deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/$ubuntu_version/amd64/salt/ $OSVER main" > /etc/apt/sources.list.d/saltstack.list 2>> "$setup_log" echo "deb https://packages.wazuh.com/3.x/apt/ stable main" > /etc/apt/sources.list.d/wazuh.list 2>> "$setup_log" ;; esac From 020871ef61aacc94158841c5c96fe5149a0d82b0 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 5 Apr 2022 13:49:28 -0400 Subject: [PATCH 2/8] update hotfix version --- HOTFIX | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HOTFIX b/HOTFIX index 6711b0853..e4a42e6ac 100644 --- a/HOTFIX +++ b/HOTFIX @@ -1 +1 @@ -04012022 +04012022 04052022 From b467cde9ad4ae0cdb69103f6291c4ae5d453686b Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 5 Apr 2022 14:42:36 -0400 Subject: [PATCH 3/8] add deb to saltstack.list --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 9d09e78a0..2c3d2a649 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2335,7 +2335,7 @@ saltify() { # Add saltstack repo(s) wget -q --inet4-only -O - https://repo.securityonion.net/file/securityonion-repo/ubuntu/"$ubuntu_version"/amd64/salt/SALTSTACK-GPG-KEY.pub | apt-key add - >> "$setup_log" 2>&1 - echo "https://repo.securityonion.net/file/securityonion-repo/ubuntu/$ubuntu_version/amd64/salt/ $OSVER main" > /etc/apt/sources.list.d/saltstack.list 2>> "$setup_log" + echo "deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/$ubuntu_version/amd64/salt/ $OSVER main" > /etc/apt/sources.list.d/saltstack.list 2>> "$setup_log" # Add Docker repo curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - >> "$setup_log" 2>&1 From 1248ba892400369d5092cb1b3441b124b8cb9e79 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 5 Apr 2022 15:40:39 -0400 Subject: [PATCH 4/8] update update_repo function --- salt/common/tools/sbin/soup | 15 +++++++++++++-- .../repo/client/files/ubuntu/18.04/saltstack.list | 1 - .../repo/client/files/ubuntu/20.04/saltstack.list | 1 - salt/repo/client/ubuntu.sls | 9 +++++---- 4 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 salt/repo/client/files/ubuntu/18.04/saltstack.list delete mode 100644 salt/repo/client/files/ubuntu/20.04/saltstack.list diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index a46938da9..b64a778ea 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -935,8 +935,19 @@ update_repo() { yum repolist fi elif [[ "$OS" == "ubuntu" ]]; then - cp $UPDATE_DIR/salt/repo/client/files/ubuntu/$ubuntu_version/* /etc/apt/sources.list.d/ - apt-get update + ubuntu_version=$(grep VERSION_ID /etc/os-release | awk -F '[ "]' '{print $2}') + + if grep -q "UBUNTU_CODENAME=bionic" /etc/os-release; then + OSVER=bionic + elif grep -q "UBUNTU_CODENAME=focal" /etc/os-release; then + OSVER=focal + else + echo "We do not support your current version of Ubuntu." + exit 1 + fi + + echo "deb http://repo.saltstack.com/py3/ubuntu/$ubuntu_version/amd64/archive/3004.1 $OSVER main" > /etc/apt/sources.list.d/saltstack.list + apt-get update fi } diff --git a/salt/repo/client/files/ubuntu/18.04/saltstack.list b/salt/repo/client/files/ubuntu/18.04/saltstack.list deleted file mode 100644 index b41f03856..000000000 --- a/salt/repo/client/files/ubuntu/18.04/saltstack.list +++ /dev/null @@ -1 +0,0 @@ -deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/18.04/amd64/salt/ bionic main diff --git a/salt/repo/client/files/ubuntu/20.04/saltstack.list b/salt/repo/client/files/ubuntu/20.04/saltstack.list deleted file mode 100644 index bc7236d82..000000000 --- a/salt/repo/client/files/ubuntu/20.04/saltstack.list +++ /dev/null @@ -1 +0,0 @@ -deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/20.04/amd64/salt/ focal main diff --git a/salt/repo/client/ubuntu.sls b/salt/repo/client/ubuntu.sls index 449b4ae14..a7b7a90af 100644 --- a/salt/repo/client/ubuntu.sls +++ b/salt/repo/client/ubuntu.sls @@ -1,4 +1,5 @@ -ubuntu_repo_files: - - file.recurse: - - name: /etc/apt/sources.list.d/ - - source: salt://repo/client/files/ubuntu/{{grains.osrelease}}/ +saltstack.list: + - file.managed: + - name: /etc/apt/sources.list.d/saltstack.list + - contents: + - deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/{{grains.osrelease}}/amd64/salt/ {{grains.oscodename}} main From 89518b59397e50924f5aff70d5bdf0ee7c579bff Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 5 Apr 2022 15:44:06 -0400 Subject: [PATCH 5/8] proper salt format --- salt/repo/client/ubuntu.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/repo/client/ubuntu.sls b/salt/repo/client/ubuntu.sls index a7b7a90af..efc06b24a 100644 --- a/salt/repo/client/ubuntu.sls +++ b/salt/repo/client/ubuntu.sls @@ -1,5 +1,5 @@ saltstack.list: - - file.managed: - - name: /etc/apt/sources.list.d/saltstack.list - - contents: - - deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/{{grains.osrelease}}/amd64/salt/ {{grains.oscodename}} main + file.managed: + - name: /etc/apt/sources.list.d/saltstack.list + - contents: + - deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/{{grains.osrelease}}/amd64/salt/ {{grains.oscodename}} main From 89c7f5b356512bac2cb8d77eb10a4c3b1e7dbbb4 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 5 Apr 2022 17:28:47 -0400 Subject: [PATCH 6/8] point to so repo --- salt/common/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index b64a778ea..99074c6d4 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -946,7 +946,7 @@ update_repo() { exit 1 fi - echo "deb http://repo.saltstack.com/py3/ubuntu/$ubuntu_version/amd64/archive/3004.1 $OSVER main" > /etc/apt/sources.list.d/saltstack.list + echo "deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/$ubuntu_version/amd64/salt $OSVER main" > /etc/apt/sources.list.d/saltstack.list apt-get update fi } From cf68aeb36e4223cbe3f30583807892ab567be70d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 5 Apr 2022 17:35:03 -0400 Subject: [PATCH 7/8] use -r for bootstrap-salt for ubuntu --- salt/common/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 99074c6d4..8a6132898 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -885,7 +885,7 @@ upgrade_salt() { echo "" set +e run_check_net_err \ - "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -F -M -x python3 stable \"$NEWSALTVERSION\"" \ + "sh $UPDATE_DIR/salt/salt/scripts/bootstrap-salt.sh -X -r -F -M -x python3 stable \"$NEWSALTVERSION\"" \ "Could not update salt, please check $SOUP_LOG for details." set -e echo "Applying apt hold for Salt." From 79175b57fa2d3add592c58235fed3594bbaf727c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 5 Apr 2022 19:15:20 -0400 Subject: [PATCH 8/8] 2.3.110 hotfix 0405 --- VERIFY_ISO.md | 22 ++++++++++---------- sigs/securityonion-2.3.110-20220405.iso.sig | Bin 0 -> 543 bytes 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 sigs/securityonion-2.3.110-20220405.iso.sig diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index 08e02da0f..13999abee 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,18 +1,18 @@ -### 2.3.110-20220401 ISO image built on 2022/04/04 +### 2.3.110-20220405 ISO image built on 2022/04/05 ### Download and Verify -2.3.110-20220401 ISO image: -https://download.securityonion.net/file/securityonion/securityonion-2.3.110-20220401.iso +2.3.110-20220405 ISO image: +https://download.securityonion.net/file/securityonion/securityonion-2.3.110-20220405.iso -MD5: 17625039D4ED23EC217589A1681C4FDA -SHA1: 8244A7BE12F27E71721ADC699950BB27C5C03BF2 -SHA256: 76C135C3FDA8A28C13A142B944BE72E67192AC7C4BC85838230EFF45E8978BD1 +MD5: 9CE982FE45DC2957A3A6D376E6DCC048 +SHA1: 10E3FF28A69F9617D4CCD2F5061AA2DC062B8F94 +SHA256: 0C178A422ABF7B61C08728E32CE20A9F9C1EC65807EB67D06F1C23F7D1EA51A7 Signature for ISO image: -https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.110-20220401.iso.sig +https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.110-20220405.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.110-20220401.iso.sig +wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.110-20220405.iso.sig ``` Download the ISO image: ``` -wget https://download.securityonion.net/file/securityonion/securityonion-2.3.110-20220401.iso +wget https://download.securityonion.net/file/securityonion/securityonion-2.3.110-20220405.iso ``` Verify the downloaded ISO image using the signature file: ``` -gpg --verify securityonion-2.3.110-20220401.iso.sig securityonion-2.3.110-20220401.iso +gpg --verify securityonion-2.3.110-20220405.iso.sig securityonion-2.3.110-20220405.iso ``` The output should show "Good signature" and the Primary key fingerprint should match what's shown below: ``` -gpg: Signature made Mon 04 Apr 2022 02:08:59 PM EDT using RSA key ID FE507013 +gpg: Signature made Tue 05 Apr 2022 06:37:40 PM 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.110-20220405.iso.sig b/sigs/securityonion-2.3.110-20220405.iso.sig new file mode 100644 index 0000000000000000000000000000000000000000..bc4648f170e208b09d018af200ca617a16cce98d GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p;DB#Iyhk2@re`V7LBIa1#Rj5CD~~Z->xQCzGa%Q&QYU zG@wSy)a|Rp*fF%|6wbDlkN7BwzP}X6&p6WG32IZ(`sdfDG)%EMk=(8{1p1S7fM$oD z#csC--TYuGG^&h7X69T!*u$Sq#`%>*g%2z%Wo-&8p;nTynq*db-#2?LBH=nV4*8|5 z^w^u5WThDSLA>A@94bp9RD{L~UL;j# znTjw^wlmVW=PEE9L*~-?3u!s6b#Wvh_da`tPb7<{=~(+gqWOnB85FWG=S60P&Y9zY zP#+9VGW`ffhwcTMH`mnK2EQKP;>3~3X?oW2F0Wh=fxcAZJP_7;3pivo(jNMsOHo{i zF_B03Z*0&|OfJtrWt7bg>#l@8#S8MdqSjMCPzCfu)Y z`@vX5KHW8?3Zy;n^j;aB6bvvAQ#8d2SYUP`J2@EuA_)ID96T}I3}P;QH`$zukcxx