From 883d9560a0097690b83406bc7e9521397b020012 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 26 Jun 2023 19:20:40 -0400 Subject: [PATCH 01/31] Initial Support --- setup/so-functions | 43 +++++++++++++++++++++++++++++++------------ setup/so-setup | 6 ++++-- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 814165fbb..39c4144db 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -950,6 +950,11 @@ detect_os() { OSVER=9 is_rocky=true pkgman="dnf" + elif grep -q "CentOS Stream release 9" /etc/redhat-release; then + OS=centos + OSVER=9 + is_centos=true + pkgman=dnf else info "We do not support the operating system you are trying to use." fail_setup @@ -1847,7 +1852,7 @@ reset_proxy() { [[ -f /etc/gitconfig ]] && rm -f /etc/gitconfig - if [[ $is_rocky ]]; then + if [[ $is_rocky || $is_centos ]]; then sed -i "/proxy=/d" /etc/dnf/dnf.conf else [[ -f /etc/apt/apt.conf.d/00-proxy.conf ]] && rm -f /etc/apt/apt.conf.d/00-proxy.conf @@ -1893,7 +1898,7 @@ drop_install_options() { remove_package() { local package_name=$1 - if [[ $is_rocky ]]; then + if [[ $is_rocky || $is_centos ]]; then if rpm -qa | grep -q "$package_name"; then logCmd "dnf remove -y $package_name" fi @@ -1914,7 +1919,7 @@ remove_package() { securityonion_repo() { # Remove all the current repos - if [[ $is_rocky ]]; then + if [[ $is_rocky || $is_centos ]]; then logCmd "dnf -v clean all" logCmd "mkdir -vp /root/oldrepos" logCmd "mv -v /etc/yum.repos.d/* /root/oldrepos/" @@ -1939,10 +1944,15 @@ securityonion_repo() { # update this package because the repo config files get added back # if the package is updated when the update_packages function is called if [ -f "/etc/yum.repos.d/rocky.repo" ]; then - info "Backing up the .repo files that were added by the centos-release package." + info "Backing up the .repo files that were added by the rocky-release package." logCmd "mv -bvf /etc/yum.repos.d/rocky* /root/oldrepos/" logCmd "dnf repolist all" fi + if [ -f "/etc/yum.repos.d/centos.repo" ]; then + info "Backing up the .repo files that were added by the centos-release package." + logCmd "mv -bvf /etc/yum.repos.d/centos* /root/oldrepos/" + logCmd "dnf repolist all" + fi if [[ $waitforstate ]]; then if [[ ! $is_airgap ]]; then # Build the repo locally so we can use it @@ -1959,8 +1969,13 @@ repo_sync_local() { info "Backing up old repos" mkdir -p /nsm/repo mkdir -p /opt/so/conf/reposync/cache - echo "https://repo.securityonion.net/file/so-repo/prod/2.4/rocky/9" > /opt/so/conf/reposync/mirror.txt - echo "https://so-repo-east.s3.us-east-005.backblazeb2.com/prod/2.4/rocky/9" >> /opt/so/conf/reposync/mirror.txt + if [[ $is_rocky ]]; then + echo "https://repo.securityonion.net/file/so-repo/prod/2.4/rocky/9" > /opt/so/conf/reposync/mirror.txt + echo "https://so-repo-east.s3.us-east-005.backblazeb2.com/prod/2.4/rocky/9" >> /opt/so/conf/reposync/mirror.txt + else + echo "https://repo.securityonion.net/file/so-repo/prod/2.4/centos/9" > /opt/so/conf/reposync/mirror.txt + echo "https://so-repo-east.s3.us-east-005.backblazeb2.com/prod/2.4/centos/9" >> /opt/so/conf/reposync/mirror.txt + fi echo "[main]" > /opt/so/conf/reposync/repodownload.conf echo "gpgcheck=1" >> /opt/so/conf/reposync/repodownload.conf echo "installonly_limit=3" >> /opt/so/conf/reposync/repodownload.conf @@ -1971,7 +1986,6 @@ repo_sync_local() { echo "keepcache=0" >> /opt/so/conf/reposync/repodownload.conf echo "[securityonionsync]" >> /opt/so/conf/reposync/repodownload.conf echo "name=Security Onion Repo repo" >> /opt/so/conf/reposync/repodownload.conf - echo "#baseurl=https://repo.securityonion.net/file/so-repo/2.4/" >> /opt/so/conf/reposync/repodownload.conf echo "mirrorlist=file:///opt/so/conf/reposync/mirror.txt" >> /opt/so/conf/reposync/repodownload.conf echo "enabled=1" >> /opt/so/conf/reposync/repodownload.conf echo "gpgcheck=1" >> /opt/so/conf/reposync/repodownload.conf @@ -2031,7 +2045,7 @@ saltify() { fi - if [[ $is_rocky ]]; then + if [[ $is_rocky || $is_centos ]]; then if [[ $waitforstate ]]; then # install all for a manager logCmd "dnf -y install salt-$SALTVERSION salt-master-$SALTVERSION salt-minion-$SALTVERSION" @@ -2169,7 +2183,7 @@ set_proxy() { "}" > /root/.docker/config.json # Set proxy for package manager - if [[ $is_rocky ]]; then + if [[ $is_rocky | $is_centos ]]; then echo "proxy=$so_proxy" >> /etc/yum.conf else # Set it up so the updates roll through the manager @@ -2364,11 +2378,16 @@ update_sudoers_for_testing() { } update_packages() { - if [[ $is_rocky ]]; then + if [[ $is_rocky || $is_centos ]]; then logCmd "dnf repolist" logCmd "dnf -y update --allowerasing --exclude=salt*,docker*,containerd*" - RMREPOFILES=("rocky-addons.repo" "rocky-devel.repo" "rocky-extras.repo" "rocky.repo") - info "Removing repo files added by rocky-repos package update" + if [[ $is_rocky ]]; then + RMREPOFILES=("rocky-addons.repo" "rocky-devel.repo" "rocky-extras.repo" "rocky.repo") + info "Removing repo files added by rocky-repos package update" + else + RMREPOFILES=("centos-addons.repo" "centos-devel.repo" "centos-extras.repo" "centos.repo") + info "Removing repo files added by centos-repos package update" + fi for FILE in ${RMREPOFILES[@]}; do logCmd "rm -f /etc/yum.repos.d/$FILE" done diff --git a/setup/so-setup b/setup/so-setup index 355c8eea2..8b06ea484 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -91,8 +91,10 @@ if [[ $is_desktop ]]; then title "This is a desktop install" # Make sure it's CentOS or Rocky Linux - if [[ ! $is_rocky ]]; then - info "Security Onion Desktop is only supported on Rocky Linux 9" + if [[ $is_rocky || $is_centos ]]; then + info "Security Onion Desktop is supported on this OS." + else + info "Security Onion Desktop is not supported on this OS." exit 1 fi From d519369c6ff2bb84fe1b983a68769e4e678895a7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 26 Jun 2023 19:22:33 -0400 Subject: [PATCH 02/31] Initial Support --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 39c4144db..53ce44a33 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -951,7 +951,7 @@ detect_os() { is_rocky=true pkgman="dnf" elif grep -q "CentOS Stream release 9" /etc/redhat-release; then - OS=centos + OS=centos OSVER=9 is_centos=true pkgman=dnf From c37a179a3c89b23e97969ee2fd0a77d0c2ba677a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 27 Jun 2023 12:46:13 -0400 Subject: [PATCH 03/31] Fix syntax error --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 53ce44a33..20a6e463b 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2183,7 +2183,7 @@ set_proxy() { "}" > /root/.docker/config.json # Set proxy for package manager - if [[ $is_rocky | $is_centos ]]; then + if [[ $is_rocky || $is_centos ]]; then echo "proxy=$so_proxy" >> /etc/yum.conf else # Set it up so the updates roll through the manager From 6b6724afcf9b62451898657cca552d58c91583a7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 27 Jun 2023 12:52:53 -0400 Subject: [PATCH 04/31] Fix whiptail logic --- setup/so-whiptail | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/so-whiptail b/setup/so-whiptail index 270d49cd5..4cb53be53 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -523,7 +523,7 @@ whiptail_install_type() { [ -n "$TESTING" ] && return # What kind of install are we doing? - if [[ $OS = 'rocky' ]]; then + if [[ $is_rocky || $is_centos ]]; then install_type=$(whiptail --title "$whiptail_title" --menu \ "What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \ "IMPORT" "Import PCAP or log files " \ @@ -563,7 +563,7 @@ whiptail_install_type_dist() { [ -n "$TESTING" ] && return - if [[ $OS = 'rocky' ]]; then + if [[ $is_rocky || $is_centos ]]; then dist_option=$(whiptail --title "$whiptail_title" --menu "Do you want to start a new deployment or join this box to \nan existing deployment?" 11 75 2 \ "New Deployment " "Create a new Security Onion deployment" \ "Existing Deployment " "Join to an existing Security Onion deployment " \ From cc3c28135d99aa08d945f41197107cec0fb6d875 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 27 Jun 2023 12:53:18 -0400 Subject: [PATCH 05/31] Fix whiptail logic --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 20a6e463b..b7878a882 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -680,7 +680,7 @@ configure_ntp() { 'rtcsync' \ 'logdir /var/log/chrony' >> $chrony_conf - if [ "$OS" == 'rocky' ]; then + if [[ $is_rocky || $is_centos ]]; then systemctl enable chronyd systemctl restart chronyd elif [ "$OS" == 'ubuntu' ]; then From 387ce2238592f5cb1ea0bbc7c0115cbaa3e2dbae Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 27 Jun 2023 13:57:53 -0400 Subject: [PATCH 06/31] Fix gpg things --- salt/common/tools/sbin/so-common | 29 +++++++------ salt/manager/tools/sbin/soup | 1 - .../files/centos/keys/RPM-GPG-KEY-EPEL-7 | 29 ------------- .../files/centos/keys/RPM-GPG-KEY-EPEL-9 | 29 +++++++++++++ .../keys/SALT-PROJECT-GPG-PUBKEY-2023.pub | 41 +++++++++++++++++++ .../files/centos/keys/SALTSTACK-GPG-KEY.pub | 31 -------------- .../files/centos/securityonionlocal.repo | 8 ---- setup/so-functions | 8 ++-- setup/so-whiptail | 4 +- 9 files changed, 92 insertions(+), 88 deletions(-) delete mode 100644 salt/repo/client/files/centos/keys/RPM-GPG-KEY-EPEL-7 create mode 100644 salt/repo/client/files/centos/keys/RPM-GPG-KEY-EPEL-9 create mode 100644 salt/repo/client/files/centos/keys/SALT-PROJECT-GPG-PUBKEY-2023.pub delete mode 100644 salt/repo/client/files/centos/keys/SALTSTACK-GPG-KEY.pub delete mode 100644 salt/repo/client/files/centos/securityonionlocal.repo diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index d41c8fc0c..9d15f0f95 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -199,11 +199,11 @@ get_random_value() { } gpg_rpm_import() { - if [[ "$OS" == "rocky" ]]; then + if [[ $is_rocky || $is_centos ]]; then if [[ "$WHATWOULDYOUSAYYAHDOHERE" == "setup" ]]; then - local RPMKEYSLOC="../salt/repo/client/files/rocky/keys" + local RPMKEYSLOC="../salt/repo/client/files/$OS/keys" else - local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/rocky/keys" + local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/$OS/keys" fi RPMKEYS=('RPM-GPG-KEY-rockyofficial' 'RPM-GPG-KEY-EPEL-9' 'SALT-PROJECT-GPG-PUBKEY-2023.pub' 'docker.pub' 'securityonion.pub') @@ -384,19 +384,22 @@ salt_minion_count() { } -set_cron_service_name() { - if [[ "$OS" == "rocky" ]]; then - cron_service_name="crond" - else - cron_service_name="cron" - fi -} - set_os() { if [ -f /etc/redhat-release ]; then - OS=rocky + if grep -q "Rocky Linux release 9" /etc/redhat-release; then + OS=rocky + OSVER=9 + is_rocky=true + elif grep -q "CentOS Stream release 9" /etc/redhat-release; then + OS=centos + OSVER=9 + is_centos=true + fi + cron_service_name="crond" else OS=ubuntu + is_ubuntu=true + cron_service_name="cron" fi } @@ -405,7 +408,7 @@ set_minionid() { } set_palette() { - if [ "$OS" == ubuntu ]; then + if [[ $is_ubuntu ]]; then update-alternatives --set newt-palette /etc/newt/palette.original fi } diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 3c565c760..4f113fab7 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -651,7 +651,6 @@ main() { echo "" set_os - set_cron_service_name if ! check_salt_master_status; then echo "Could not talk to salt master" echo "Please run 'systemctl status salt-master' to ensure the salt-master service is running and check the log at /opt/so/log/salt/master." diff --git a/salt/repo/client/files/centos/keys/RPM-GPG-KEY-EPEL-7 b/salt/repo/client/files/centos/keys/RPM-GPG-KEY-EPEL-7 deleted file mode 100644 index f205ede46..000000000 --- a/salt/repo/client/files/centos/keys/RPM-GPG-KEY-EPEL-7 +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (GNU/Linux) - -mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB -OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm -jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP -vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM -jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5 -S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ -n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB -9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95 -T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj -GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf -uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB -tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB -AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk -5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q -ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu -MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re -9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax -CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv -HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB -VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q -thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc -ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4 -vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt -RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw== -=hdPa ------END PGP PUBLIC KEY BLOCK----- diff --git a/salt/repo/client/files/centos/keys/RPM-GPG-KEY-EPEL-9 b/salt/repo/client/files/centos/keys/RPM-GPG-KEY-EPEL-9 new file mode 100644 index 000000000..0cc05ecb3 --- /dev/null +++ b/salt/repo/client/files/centos/keys/RPM-GPG-KEY-EPEL-9 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGE3mOsBEACsU+XwJWDJVkItBaugXhXIIkb9oe+7aadELuVo0kBmc3HXt/Yp +CJW9hHEiGZ6z2jwgPqyJjZhCvcAWvgzKcvqE+9i0NItV1rzfxrBe2BtUtZmVcuE6 +2b+SPfxQ2Hr8llaawRjt8BCFX/ZzM4/1Qk+EzlfTcEcpkMf6wdO7kD6ulBk/tbsW +DHX2lNcxszTf+XP9HXHWJlA2xBfP+Dk4gl4DnO2Y1xR0OSywE/QtvEbN5cY94ieu +n7CBy29AleMhmbnx9pw3NyxcFIAsEZHJoU4ZW9ulAJ/ogttSyAWeacW7eJGW31/Z +39cS+I4KXJgeGRI20RmpqfH0tuT+X5Da59YpjYxkbhSK3HYBVnNPhoJFUc2j5iKy +XLgkapu1xRnEJhw05kr4LCbud0NTvfecqSqa+59kuVc+zWmfTnGTYc0PXZ6Oa3rK +44UOmE6eAT5zd/ToleDO0VesN+EO7CXfRsm7HWGpABF5wNK3vIEF2uRr2VJMvgqS +9eNwhJyOzoca4xFSwCkc6dACGGkV+CqhufdFBhmcAsUotSxe3zmrBjqA0B/nxIvH +DVgOAMnVCe+Lmv8T0mFgqZSJdIUdKjnOLu/GRFhjDKIak4jeMBMTYpVnU+HhMHLq +uDiZkNEvEEGhBQmZuI8J55F/a6UURnxUwT3piyi3Pmr2IFD7ahBxPzOBCQARAQAB +tCdGZWRvcmEgKGVwZWw5KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAk4EEwEI +ADgWIQT/itE0RZcQbs6BO5GKOHK/MihGfAUCYTeY6wIbDwULCQgHAgYVCgkICwIE +FgIDAQIeAQIXgAAKCRCKOHK/MihGfFX/EACBPWv20+ttYu1A5WvtHJPzwbj0U4yF +3zTQpBglQ2UfkRpYdipTlT3Ih6j5h2VmgRPtINCc/ZE28adrWpBoeFIS2YAKOCLC +nZYtHl2nCoLq1U7FSttUGsZ/t8uGCBgnugTfnIYcmlP1jKKA6RJAclK89evDQX5n +R9ZD+Cq3CBMlttvSTCht0qQVlwycedH8iWyYgP/mF0W35BIn7NuuZwWhgR00n/VG +4nbKPOzTWbsP45awcmivdrS74P6mL84WfkghipdmcoyVb1B8ZP4Y/Ke0RXOnLhNe +CfrXXvuW+Pvg2RTfwRDtehGQPAgXbmLmz2ZkV69RGIr54HJv84NDbqZovRTMr7gL +9k3ciCzXCiYQgM8yAyGHV0KEhFSQ1HV7gMnt9UmxbxBE2pGU7vu3CwjYga5DpwU7 +w5wu1TmM5KgZtZvuWOTDnqDLf0cKoIbW8FeeCOn24elcj32bnQDuF9DPey1mqcvT +/yEo/Ushyz6CVYxN8DGgcy2M9JOsnmjDx02h6qgWGWDuKgb9jZrvRedpAQCeemEd +fhEs6ihqVxRFl16HxC4EVijybhAL76SsM2nbtIqW1apBQJQpXWtQwwdvgTVpdEtE +r4ArVJYX5LrswnWEQMOelugUG6S3ZjMfcyOa/O0364iY73vyVgaYK+2XtT2usMux +VL469Kj5m13T6w== +=Mjs/ +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/salt/repo/client/files/centos/keys/SALT-PROJECT-GPG-PUBKEY-2023.pub b/salt/repo/client/files/centos/keys/SALT-PROJECT-GPG-PUBKEY-2023.pub new file mode 100644 index 000000000..be55ef561 --- /dev/null +++ b/salt/repo/client/files/centos/keys/SALT-PROJECT-GPG-PUBKEY-2023.pub @@ -0,0 +1,41 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=ZKPF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/salt/repo/client/files/centos/keys/SALTSTACK-GPG-KEY.pub b/salt/repo/client/files/centos/keys/SALTSTACK-GPG-KEY.pub deleted file mode 100644 index 14bd7d98c..000000000 --- a/salt/repo/client/files/centos/keys/SALTSTACK-GPG-KEY.pub +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -mQENBFOpvpgBCADkP656H41i8fpplEEB8IeLhugyC2rTEwwSclb8tQNYtUiGdna9 -m38kb0OS2DDrEdtdQb2hWCnswxaAkUunb2qq18vd3dBvlnI+C4/xu5ksZZkRj+fW -tArNR18V+2jkwcG26m8AxIrT+m4M6/bgnSfHTBtT5adNfVcTHqiT1JtCbQcXmwVw -WbqS6v/LhcsBE//SHne4uBCK/GHxZHhQ5jz5h+3vWeV4gvxS3Xu6v1IlIpLDwUts -kT1DumfynYnnZmWTGc6SYyIFXTPJLtnoWDb9OBdWgZxXfHEcBsKGha+bXO+m2tHA -gNneN9i5f8oNxo5njrL8jkCckOpNpng18BKXABEBAAG0MlNhbHRTdGFjayBQYWNr -YWdpbmcgVGVhbSA8cGFja2FnaW5nQHNhbHRzdGFjay5jb20+iQE4BBMBAgAiBQJT -qb6YAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAOCKFJ3le/vhkqB/0Q -WzELZf4d87WApzolLG+zpsJKtt/ueXL1W1KA7JILhXB1uyvVORt8uA9FjmE083o1 -yE66wCya7V8hjNn2lkLXboOUd1UTErlRg1GYbIt++VPscTxHxwpjDGxDB1/fiX2o -nK5SEpuj4IeIPJVE/uLNAwZyfX8DArLVJ5h8lknwiHlQLGlnOu9ulEAejwAKt9CU -4oYTszYM4xrbtjB/fR+mPnYh2fBoQO4d/NQiejIEyd9IEEMd/03AJQBuMux62tjA -/NwvQ9eqNgLw9NisFNHRWtP4jhAOsshv1WW+zPzu3ozoO+lLHixUIz7fqRk38q8Q -9oNR31KvrkSNrFbA3D89uQENBFOpvpgBCADJ79iH10AfAfpTBEQwa6vzUI3Eltqb -9aZ0xbZV8V/8pnuU7rqM7Z+nJgldibFk4gFG2bHCG1C5aEH/FmcOMvTKDhJSFQUx -uhgxttMArXm2c22OSy1hpsnVG68G32Nag/QFEJ++3hNnbyGZpHnPiYgej3FrerQJ -zv456wIsxRDMvJ1NZQB3twoCqwapC6FJE2hukSdWB5yCYpWlZJXBKzlYz/gwD/Fr -GL578WrLhKw3UvnJmlpqQaDKwmV2s7MsoZogC6wkHE92kGPG2GmoRD3ALjmCvN1E -PsIsQGnwpcXsRpYVCoW7e2nW4wUf7IkFZ94yOCmUq6WreWI4NggRcFC5ABEBAAGJ -AR8EGAECAAkFAlOpvpgCGwwACgkQDgihSd5Xv74/NggA08kEdBkiWWwJZUZEy7cK -WWcgjnRuOHd4rPeT+vQbOWGu6x4bxuVf9aTiYkf7ZjVF2lPn97EXOEGFWPZeZbH4 -vdRFH9jMtP+rrLt6+3c9j0M8SIJYwBL1+CNpEC/BuHj/Ra/cmnG5ZNhYebm76h5f -T9iPW9fFww36FzFka4VPlvA4oB7ebBtquFg3sdQNU/MmTVV4jPFWXxh4oRDDR+8N -1bcPnbB11b5ary99F/mqr7RgQ+YFF0uKRE3SKa7a+6cIuHEZ7Za+zhPaQlzAOZlx -fuBmScum8uQTrEF5+Um5zkwC7EXTdH1co/+/V/fpOtxIg4XO4kcugZefVm5ERfVS -MA== -=dtMN ------END PGP PUBLIC KEY BLOCK----- diff --git a/salt/repo/client/files/centos/securityonionlocal.repo b/salt/repo/client/files/centos/securityonionlocal.repo deleted file mode 100644 index cd928eb79..000000000 --- a/salt/repo/client/files/centos/securityonionlocal.repo +++ /dev/null @@ -1,8 +0,0 @@ -[solocal] -name=Security Onion Repo -baseurl=file:///nsm/repo/ -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 - - diff --git a/setup/so-functions b/setup/so-functions index b7878a882..4310a7ef8 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -683,7 +683,7 @@ configure_ntp() { if [[ $is_rocky || $is_centos ]]; then systemctl enable chronyd systemctl restart chronyd - elif [ "$OS" == 'ubuntu' ]; then + elif [[ $is_ubuntu ]]; then systemctl enable chrony systemctl restart chrony fi @@ -1022,7 +1022,7 @@ installer_prereq_packages() { # logCmd "systemctl start NetworkManager" # el - if [ "$OS" == ubuntu ]; then + if [[ $is_ubuntu ]]; then # Print message to stdout so the user knows setup is doing something info "Running apt-get update" retry 150 10 "apt-get update" "" "Err:" >> "$setup_log" 2>&1 || fail_setup @@ -1831,7 +1831,7 @@ reinstall_init() { # Remove the old launcher package in case the config changes remove_package launcher-final - if [[ $OS == 'ubuntu' ]]; then + if [[ $is_ubuntu ]]; then info "Unholding previously held packages." apt-mark unhold $(apt-mark showhold) fi @@ -2355,7 +2355,7 @@ so_add_user() { } ubuntu_check() { - if [[ $OS == "ubuntu" ]]; then + if [[ $is_ubuntu ]]; then if [[ $waitforstate ]]; then whiptail_ubuntu_notsupported fail_setup diff --git a/setup/so-whiptail b/setup/so-whiptail index 4cb53be53..3ae14bf65 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -533,7 +533,7 @@ whiptail_install_type() { "OTHER" "Other install types" \ 3>&1 1>&2 2>&3 ) - elif [[ $OS = 'ubuntu' ]]; then + elif [[ $is_ubuntu ]]; then install_type=$(whiptail --title "$whiptail_title" --menu \ "What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \ "DISTRIBUTED" "Distributed install submenu " \ @@ -569,7 +569,7 @@ whiptail_install_type_dist() { "Existing Deployment " "Join to an existing Security Onion deployment " \ 3>&1 1>&2 2>&3 ) - elif [[ $OS = 'ubuntu' ]]; then + elif [[ $is_ubuntu ]]; then dist_option=$(whiptail --title "$whiptail_title" --menu "Since this is Ubuntu, this box can only be connected to \nan existing deployment." 11 75 2 \ "Existing Deployment " "Join to an existing Security Onion deployment " \ 3>&1 1>&2 2>&3 From 6fc988740d738245d22153e8c008c6e91d607e6a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 13:46:25 -0400 Subject: [PATCH 07/31] Fix keys --- salt/common/tools/sbin/so-common | 8 +- .../files/centos/keys/MariaDB-Server-GPG-KEY | 236 ++++++++++++++++++ 2 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 salt/repo/client/files/centos/keys/MariaDB-Server-GPG-KEY diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index 9d15f0f95..32fb513c5 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -205,9 +205,11 @@ gpg_rpm_import() { else local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/$OS/keys" fi - - RPMKEYS=('RPM-GPG-KEY-rockyofficial' 'RPM-GPG-KEY-EPEL-9' 'SALT-PROJECT-GPG-PUBKEY-2023.pub' 'docker.pub' 'securityonion.pub') - + if [[ $is_rocky ]]; then + RPMKEYS=('RPM-GPG-KEY-rockyofficial' 'RPM-GPG-KEY-EPEL-9' 'SALT-PROJECT-GPG-PUBKEY-2023.pub' 'docker.pub' 'securityonion.pub') + else + RPMKEYS=('RPM-GPG-KEY-EPEL-9' 'SALT-PROJECT-GPG-PUBKEY-2023.pub' 'docker.pub' 'securityonion.pub' 'MariaDB-Server-GPG-KEY') + fi for RPMKEY in "${RPMKEYS[@]}"; do rpm --import $RPMKEYSLOC/$RPMKEY echo "Imported $RPMKEY" diff --git a/salt/repo/client/files/centos/keys/MariaDB-Server-GPG-KEY b/salt/repo/client/files/centos/keys/MariaDB-Server-GPG-KEY new file mode 100644 index 000000000..f76d5f4ac --- /dev/null +++ b/salt/repo/client/files/centos/keys/MariaDB-Server-GPG-KEY @@ -0,0 +1,236 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.14 (GNU/Linux) + +mQGiBEtohJARBACxvZpWSIMTp/e7BUzSW+WDL7Pl0JDg6v7ZJFGJk9qo+5JXIiis +497Ul0FmVJ6EoyVzfpqe5FyUvqtLCkM6UP5adyvXTHi1KMiYacu2q5yRhDpMKbpM +LkAg23Yyz1yK/d0TsAkerLJ6K1Bh8NIm44Op+qFrDxeYZDIR5Q8WaCdK8wCg/jc8 +p/4XaKq74ghUHEX+35qk63UD/0YEsgHrsRQZ42wKNeO8ZUJKqCVHXYJrCq7DhRhn +U5aYnuK3op0JusPN5fdIGkKwJy24dWRoRfNIIg0WvM8qUNrC2NvhomnZNudsI0Jb +XapRemrIwbvrZToD6ei1awdVqa5fT6XIxV4MSQEwn47qmUNSz/0TkUmB3VZ2EL/j +zfHUA/91ZfAdWCmRemTLWRrzIYYJKyEInZ0qwZVrkyMY8+T7b2/6RGR0f2oV1dOx +cjbd0+N3vKrUkjuzkcVu/oB8wq9UBfuSHwsxYqub4gvIh0/LW+CsWa955sQ/Hj9H +48j3nUHaXqM9uJyMMgMlCdo3rLpnYCJH8w2kFfLHIDksMs1YtLQ9TWFyaWFEQiBQ +YWNrYWdlIFNpZ25pbmcgS2V5IDxwYWNrYWdlLXNpZ25pbmcta2V5QG1hcmlhZGIu +b3JnPohiBBMRAgAiBQJREUepAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK +CRDLywgqG7lD28y4AJ0aByfYvJWqBm5PZjusZiG0vo9SRwCeM0izj/oryMu0fJi3 +kRbTlojzCd2JAhwEEAECAAYFAlERSAgACgkQQd3AtA2lbyLlsQ/+KbSkMhjnZ73I +9XhndOX7USxIIumuVI2nU829+EiLhxYYcVJHUO5tO9rvRGgmSg0IhPSwEMK3GLC3 +P5v6gipyCKOAnx2T0qF2k8gq9YRVFd7LZqJsM06HuGsFG5SWieVjjjE0s7A/urLb +Uxa067pleZeKFCTTxTnar2eBKQAhwZkRSEBvvcAHkqQQAMwiAHvq2A0IjC3txqUF +iQbMouPCOJYA3Wn3NXKZwCxcyl2WwGSt7EwAs6C6d266QyWVQT+kZ6JFgRibcnfl +sNdniknGue5EKAj0nlhHGf6cyqJZ3AN4h+W40kKfIqnaeWkT0K+MnKp3Tah9y+h0 +u5buKfR5D/tK5ZYLUS0ujQJ0tlO1KpZuvTn13n7OMn7fOb3yqUcthnSTcuB/wpH2 +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 +=bSQ3 +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=mCOI +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file From 209aae50bcd3015ad1ac6035b3606210eaddd60e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 15:32:01 -0400 Subject: [PATCH 08/31] Add more packages --- salt/common/packages.sls | 3 +++ 1 file changed, 3 insertions(+) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index dff2e95c9..1f8819ce1 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -23,6 +23,9 @@ commonpkgs: - python3-lxml - git - vim + - fuse3 + - fuse-overlayfs + - fuse3-libs # since Ubuntu requires and internet connection we can use pip to install modules python3-pip: From 6d2e851a437b9d1b6d3a1e9d17f618c4ef7a1733 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 15:36:51 -0400 Subject: [PATCH 09/31] Add more packages --- salt/common/packages.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 1f8819ce1..fc5190b9d 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -23,9 +23,6 @@ commonpkgs: - python3-lxml - git - vim - - fuse3 - - fuse-overlayfs - - fuse3-libs # since Ubuntu requires and internet connection we can use pip to install modules python3-pip: @@ -67,4 +64,7 @@ commonpkgs: - python3-watchdog - python3-packaging - unzip + - fuse3 + - fuse-overlayfs + - fuse3-libs {% endif %} From d80c88f6138c180352f561cb9a0d1fe26ae1e5a9 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 15:43:56 -0400 Subject: [PATCH 10/31] Add more packages --- salt/common/packages.sls | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index fc5190b9d..bb4af8aa8 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -64,7 +64,33 @@ commonpkgs: - python3-watchdog - python3-packaging - unzip - - fuse3 - - fuse-overlayfs - - fuse3-libs + +{% elif GLOBALS.os == 'CentOS Stream' %} +commonpkgs: + pkg.installed: + - skip_suggestions: True + - pkgs: + - wget + - jq + - tcpdump + - httpd-tools + - net-tools + - curl + - sqlite + - mariadb-devel + - python3-dnf-plugin-versionlock + - nmap-ncat + - yum-utils + - device-mapper-persistent-data + - lvm2 + - openssl + - git + - python3-docker + - python3-m2crypto + - rsync + - python3-rich + - python3-pyyaml + - python3-watchdog + - python3-packaging + - unzip {% endif %} From 933f4fa6c83ed5e26b2543229f4c3b2df0c8960f Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 15:45:32 -0400 Subject: [PATCH 11/31] Add more packages --- salt/common/packages.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index bb4af8aa8..4a7bb0662 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -77,7 +77,7 @@ commonpkgs: - net-tools - curl - sqlite - - mariadb-devel + - MariaDB-devel - python3-dnf-plugin-versionlock - nmap-ncat - yum-utils From 0c320e3501601f8f16dda7c6b1097fe7e9b66aef Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 15:46:29 -0400 Subject: [PATCH 12/31] Add more packages --- salt/common/packages.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 4a7bb0662..518637844 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -90,7 +90,7 @@ commonpkgs: - rsync - python3-rich - python3-pyyaml - - python3-watchdog + #- python3-watchdog - python3-packaging - unzip {% endif %} From ae4befe377fb48e3a835cc176c9a672ed71db1de Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 15:57:43 -0400 Subject: [PATCH 13/31] add OS logic --- salt/_modules/needs_restarting.py | 8 ++++++++ salt/common/init.sls | 25 +++++++++++++++++++++++++ salt/desktop/trusted-ca.sls | 26 ++++++++++++++++++++++++++ salt/repo/client/map.jinja | 18 ++++++++++++++++++ salt/salt/map.jinja | 2 +- 5 files changed, 78 insertions(+), 1 deletion(-) diff --git a/salt/_modules/needs_restarting.py b/salt/_modules/needs_restarting.py index 8f5b50242..c2f7e8b12 100644 --- a/salt/_modules/needs_restarting.py +++ b/salt/_modules/needs_restarting.py @@ -10,6 +10,14 @@ def check(): if path.exists('/var/run/reboot-required'): retval = 'True' + elif os == 'CentOS Stream': + cmd = 'needs-restarting -r > /dev/null 2>&1' + + try: + needs_restarting = subprocess.check_call(cmd, shell=True) + except subprocess.CalledProcessError: + retval = 'True' + elif os == 'Rocky': cmd = 'needs-restarting -r > /dev/null 2>&1' diff --git a/salt/common/init.sls b/salt/common/init.sls index c23e82543..4fe150f02 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -242,6 +242,31 @@ soversionfile: {% endif %} +{% if GLOBALS.so_model and GLOBALS.so_model not in ['SO2AMI01', 'SO2AZI01', 'SO2GCI01'] %} + {% if GLOBALS.os == 'CentOS Stream' %} +# Install Raid tools +raidpkgs: + pkg.installed: + - skip_suggestions: True + - pkgs: + - securityonion-raidtools + - securityonion-megactl + {% endif %} + +# Install raid check cron +so-raid-status: + cron.present: + - name: '/usr/sbin/so-raid-status > /dev/null 2>&1' + - identifier: so-raid-status + - user: root + - minute: '*/15' + - hour: '*' + - daymonth: '*' + - month: '*' + - dayweek: '*' + +{% endif %} + {% if GLOBALS.so_model and GLOBALS.so_model not in ['SO2AMI01', 'SO2AZI01', 'SO2GCI01'] %} {% if GLOBALS.os == 'Rocky' %} # Install Raid tools diff --git a/salt/desktop/trusted-ca.sls b/salt/desktop/trusted-ca.sls index 352b747b6..18f5b16e0 100644 --- a/salt/desktop/trusted-ca.sls +++ b/salt/desktop/trusted-ca.sls @@ -27,6 +27,32 @@ update_ca_certs: - onchanges: - x509: trusted_ca +{% elif GLOBALS.os == 'CentOS Stream' %} + + {% set global_ca_text = [] %} + {% set global_ca_server = [] %} + {% set manager = GLOBALS.manager %} + {% set x509dict = salt['mine.get'](manager | lower~'*', 'x509.get_pem_entries') %} + {% for host in x509dict %} + {% if host.split('_')|last in ['manager', 'managersearch', 'standalone', 'import', 'eval'] %} + {% do global_ca_text.append(x509dict[host].get('/etc/pki/ca.crt')|replace('\n', '')) %} + {% do global_ca_server.append(host) %} + {% endif %} + {% endfor %} + {% set trusttheca_text = global_ca_text[0] %} + {% set ca_server = global_ca_server[0] %} + +trusted_ca: + x509.pem_managed: + - name: /etc/pki/ca-trust/source/anchors/ca.crt + - text: {{ trusttheca_text }} + +update_ca_certs: + cmd.run: + - name: update-ca-trust + - onchanges: + - x509: trusted_ca + {% else %} desktop_trusted-ca_os_fail: diff --git a/salt/repo/client/map.jinja b/salt/repo/client/map.jinja index 515ec515b..35f1b23d6 100644 --- a/salt/repo/client/map.jinja +++ b/salt/repo/client/map.jinja @@ -1,4 +1,22 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} + +{% if GLOBALS.os == 'CentOS Stream' %} + + {% set REPOPATH = '/etc/yum.repos.d/' %} + {% set ABSENTFILES = [ + 'centos-addons.repo', + 'centos-devel.repo', + 'centos-extras.repo', + 'centos.repo', + 'docker-ce.repo', + 'epel.repo', + 'epel-testing.repo', + 'saltstack.repo', + 'salt-latest.repo', + 'wazuh.repo' + ] + %} + {% if GLOBALS.os == 'Rocky' %} {% set REPOPATH = '/etc/yum.repos.d/' %} diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja index 14e735b56..b6b109c47 100644 --- a/salt/salt/map.jinja +++ b/salt/salt/map.jinja @@ -20,7 +20,7 @@ {% set INSTALLEDSALTVERSION = grains.saltversion %} {% if grains.saltversion|string != SALTVERSION|string %} - {% if grains.os|lower in ['Rocky', 'redhat'] %} + {% if grains.os|lower in ['Rocky', 'redhat', 'CentOS Stream'] %} {% 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 -r -F -x python3 stable ' ~ SALTVERSION %} From 5ab54fcfc5e1e02df4a9395d65a7be836eaa16b5 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 16:02:25 -0400 Subject: [PATCH 14/31] add OS logic --- salt/common/packages.sls | 3 +++ 1 file changed, 3 insertions(+) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 518637844..7cb767b19 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -93,4 +93,7 @@ commonpkgs: #- python3-watchdog - python3-packaging - unzip + - fuse3 + - fuse-libs + - fuse-overlayfs {% endif %} From 6545ae588dfcc07e96bd3c8268e44bd145937523 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 16:10:23 -0400 Subject: [PATCH 15/31] add fuse --- salt/common/packages.sls | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 7cb767b19..cb95c9b87 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -90,10 +90,9 @@ commonpkgs: - rsync - python3-rich - python3-pyyaml - #- python3-watchdog - python3-packaging - unzip - - fuse3 + - fuse - fuse-libs - fuse-overlayfs {% endif %} From 8a88b16b9eb86c4234aeea840c0b57f8d24f471f Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 28 Jun 2023 16:16:59 -0400 Subject: [PATCH 16/31] add fuse --- salt/common/packages.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index cb95c9b87..c22a980be 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -95,4 +95,5 @@ commonpkgs: - fuse - fuse-libs - fuse-overlayfs + - fuse-common {% endif %} From 884d669ae9850d1c10190e9cc3c7541031ec5891 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 29 Jun 2023 08:48:46 -0400 Subject: [PATCH 17/31] add more OS logic --- salt/ntp/init.sls | 2 ++ salt/repo/client/centos.sls | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/salt/ntp/init.sls b/salt/ntp/init.sls index 08f5e28b5..9c0c3dcb2 100644 --- a/salt/ntp/init.sls +++ b/salt/ntp/init.sls @@ -19,6 +19,8 @@ chronyconf: {% if GLOBALS.os == 'Rocky' %} chronyd: +{% elif GLOBALS.os == 'CentOS Stream' %} +chronyd: {% else %} chrony: {% endif %} diff --git a/salt/repo/client/centos.sls b/salt/repo/client/centos.sls index 7e077c1ce..2e1816bb3 100644 --- a/salt/repo/client/centos.sls +++ b/salt/repo/client/centos.sls @@ -7,7 +7,7 @@ {% from 'repo/client/map.jinja' import ABSENTFILES with context %} {% from 'repo/client/map.jinja' import REPOPATH with context %} -{% if GLOBALS.os == 'CentOS' %} +{% if GLOBALS.os == 'CentOS Stream' %} {% if ABSENTFILES|length > 0%} {% for file in ABSENTFILES %} From 17a04a75c9ed8d32b654db591a646306b43b5ee6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 29 Jun 2023 08:53:00 -0400 Subject: [PATCH 18/31] fix repo state --- salt/repo/client/init.sls | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/salt/repo/client/init.sls b/salt/repo/client/init.sls index 154867caf..a26342a06 100644 --- a/salt/repo/client/init.sls +++ b/salt/repo/client/init.sls @@ -1,2 +1,6 @@ include: + {% if GLOBALS.os == 'CentOS Stream' %} + - repo.client.centos + {% else %} - repo.client.{{grains.os | lower}} + {% endif %} \ No newline at end of file From 59191008a06b516919bc9c6f898ce065c3ec8123 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 29 Jun 2023 08:55:00 -0400 Subject: [PATCH 19/31] fix repo state --- salt/repo/client/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/repo/client/init.sls b/salt/repo/client/init.sls index a26342a06..9ca156a7c 100644 --- a/salt/repo/client/init.sls +++ b/salt/repo/client/init.sls @@ -1,3 +1,5 @@ +{% from 'vars/globals.map.jinja' import GLOBALS %} + include: {% if GLOBALS.os == 'CentOS Stream' %} - repo.client.centos From 34ab949dfc76f71ed12be2c8c8afc34ec09e488b Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 29 Jun 2023 08:56:38 -0400 Subject: [PATCH 20/31] fix repo state --- salt/repo/client/map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/repo/client/map.jinja b/salt/repo/client/map.jinja index 35f1b23d6..a70c8d476 100644 --- a/salt/repo/client/map.jinja +++ b/salt/repo/client/map.jinja @@ -17,7 +17,7 @@ ] %} -{% if GLOBALS.os == 'Rocky' %} +{% elif GLOBALS.os == 'Rocky' %} {% set REPOPATH = '/etc/yum.repos.d/' %} {% set ABSENTFILES = [ From 564ab105ba71ea595bad839eaefd3eb1696469e2 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Sun, 2 Jul 2023 09:34:14 -0400 Subject: [PATCH 21/31] Add some Ubuntu --- setup/so-functions | 11 ++++++++--- setup/so-whiptail | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 4310a7ef8..32eb351f9 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -964,6 +964,11 @@ detect_os() { OS=ubuntu if grep -q "UBUNTU_CODENAME=focal" /etc/os-release; then OSVER=focal + UBVER=20.04 + is_ubuntu=true + elif grep -q "UBUNTU_CODENAME=jammy" /etc/os-release; then + OSVER=jammy + UBVER=22.04 is_ubuntu=true else info "We do not support your current version of Ubuntu." @@ -2023,8 +2028,8 @@ saltify() { #logCmd "wget -q --inet4-only -O /opt/so/gpg/SALTSTACK-GPG-KEY.pub https://repo.securityonion.net/file/securityonion-repo/ubuntu/20.04/amd64/salt/SALTSTACK-GPG-KEY.pub" logCmd "wget -q --inet4-only -O /etc/apt/keyrings/docker.pub https://download.docker.com/linux/ubuntu/gpg" - logCmd "curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/minor/$SALTVERSION/SALT-PROJECT-GPG-PUBKEY-2023.gpg" - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg] https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/minor/$SALTVERSION/ focal main" | sudo tee /etc/apt/sources.list.d/salt.list + logCmd "curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/$UBVER/amd64/minor/$SALTVERSION/SALT-PROJECT-GPG-PUBKEY-2023.gpg" + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg] https://repo.saltproject.io/salt/py3/ubuntu/$UBVER/amd64/minor/$SALTVERSION/ focal main" | sudo tee /etc/apt/sources.list.d/salt.list logCmd "apt-key add /etc/apt/keyrings/salt-archive-keyring-2023.gpg" #logCmd "apt-key add /opt/so/gpg/SALTSTACK-GPG-KEY.pub" @@ -2045,7 +2050,7 @@ saltify() { fi - if [[ $is_rocky || $is_centos ]]; then + if [[ $is_rocky || $is_centos || $is_ubuntu ]]; then if [[ $waitforstate ]]; then # install all for a manager logCmd "dnf -y install salt-$SALTVERSION salt-master-$SALTVERSION salt-minion-$SALTVERSION" diff --git a/setup/so-whiptail b/setup/so-whiptail index 3ae14bf65..3d760b873 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -523,7 +523,7 @@ whiptail_install_type() { [ -n "$TESTING" ] && return # What kind of install are we doing? - if [[ $is_rocky || $is_centos ]]; then +# if [[ $is_rocky || $is_centos ]]; then install_type=$(whiptail --title "$whiptail_title" --menu \ "What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \ "IMPORT" "Import PCAP or log files " \ @@ -533,14 +533,14 @@ whiptail_install_type() { "OTHER" "Other install types" \ 3>&1 1>&2 2>&3 ) - elif [[ $is_ubuntu ]]; then - install_type=$(whiptail --title "$whiptail_title" --menu \ - "What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \ - "DISTRIBUTED" "Distributed install submenu " \ - "OTHER" "Other install types" \ - 3>&1 1>&2 2>&3 - ) - fi +# elif [[ $is_ubuntu ]]; then +# install_type=$(whiptail --title "$whiptail_title" --menu \ +# "What kind of installation would you like to do?\n\nFor more information, please see:\n$DOC_BASE_URL/architecture.html" 18 65 5 \ +# "DISTRIBUTED" "Distributed install submenu " \ +# "OTHER" "Other install types" \ +# 3>&1 1>&2 2>&3 +# ) +# fi local exitstatus=$? whiptail_check_exitstatus $exitstatus @@ -563,18 +563,18 @@ whiptail_install_type_dist() { [ -n "$TESTING" ] && return - if [[ $is_rocky || $is_centos ]]; then +# if [[ $is_rocky || $is_centos ]]; then dist_option=$(whiptail --title "$whiptail_title" --menu "Do you want to start a new deployment or join this box to \nan existing deployment?" 11 75 2 \ "New Deployment " "Create a new Security Onion deployment" \ "Existing Deployment " "Join to an existing Security Onion deployment " \ 3>&1 1>&2 2>&3 ) - elif [[ $is_ubuntu ]]; then - dist_option=$(whiptail --title "$whiptail_title" --menu "Since this is Ubuntu, this box can only be connected to \nan existing deployment." 11 75 2 \ - "Existing Deployment " "Join to an existing Security Onion deployment " \ - 3>&1 1>&2 2>&3 - ) - fi +# elif [[ $is_ubuntu ]]; then +# dist_option=$(whiptail --title "$whiptail_title" --menu "Since this is Ubuntu, this box can only be connected to \nan existing deployment." 11 75 2 \ +# "Existing Deployment " "Join to an existing Security Onion deployment " \ +# 3>&1 1>&2 2>&3 +# ) +# fi local exitstatus=$? whiptail_check_exitstatus $exitstatus From 8621352701bf90905e3c1cd2c4af94b197745d18 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 09:38:23 -0400 Subject: [PATCH 22/31] Add some Ubuntu --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 32eb351f9..bf7bfe91e 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2029,7 +2029,7 @@ saltify() { logCmd "wget -q --inet4-only -O /etc/apt/keyrings/docker.pub https://download.docker.com/linux/ubuntu/gpg" logCmd "curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/$UBVER/amd64/minor/$SALTVERSION/SALT-PROJECT-GPG-PUBKEY-2023.gpg" - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg] https://repo.saltproject.io/salt/py3/ubuntu/$UBVER/amd64/minor/$SALTVERSION/ focal main" | sudo tee /etc/apt/sources.list.d/salt.list + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg] https://repo.saltproject.io/salt/py3/ubuntu/$UBVER/amd64/minor/$SALTVERSION/ $OSVER main" | sudo tee /etc/apt/sources.list.d/salt.list logCmd "apt-key add /etc/apt/keyrings/salt-archive-keyring-2023.gpg" #logCmd "apt-key add /opt/so/gpg/SALTSTACK-GPG-KEY.pub" From 903de330c2ec8a60d373b54202685395a2e7804c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 09:49:24 -0400 Subject: [PATCH 23/31] Add some Ubuntu --- setup/so-functions | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index bf7bfe91e..70e2d08f0 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2044,13 +2044,17 @@ saltify() { # Ain't nothing but a GPG retry 150 20 "apt-get update" "" "Err:" || fail_setup - retry 150 20 "apt-get -y install salt-common=$SALTVERSION salt-minion=$SALTVERSION" || fail_setup - retry 150 20 "apt-mark hold salt-minion salt-common" || fail_setup - #retry 150 20 "apt-get -y install python3-pip python3-dateutil python3-m2crypto python3-mysqldb python3-packaging python3-influxdb python3-lxml" || exit 1 - + if [[ $waitforstate ]]; then + retry 150 20 "apt-get -y install salt-common=$SALTVERSION salt-minion=$SALTVERSION salt-master=$SALTVERSION" || fail_setup + retry 150 20 "apt-mark hold salt-minion salt-common salt-master" || fail_setup + retry 150 20 "apt-get -y install python3-pip python3-dateutil python3-m2crypto python3-mysqldb python3-packaging python3-influxdb python3-lxml" || exit 1 + else + retry 150 20 "apt-get -y install salt-common=$SALTVERSION salt-minion=$SALTVERSION" || fail_setup + retry 150 20 "apt-mark hold salt-minion salt-common" || fail_setup + fi fi - if [[ $is_rocky || $is_centos || $is_ubuntu ]]; then + if [[ $is_rocky || $is_centos ]]; then if [[ $waitforstate ]]; then # install all for a manager logCmd "dnf -y install salt-$SALTVERSION salt-master-$SALTVERSION salt-minion-$SALTVERSION" From ed1d2d0a8b494a2d25d722b8d901467e993f7bf9 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 10:06:16 -0400 Subject: [PATCH 24/31] Add some Ubuntu --- salt/docker/init.sls | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 5fa97c452..f3790cc2e 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -13,6 +13,17 @@ dockergroup: - gid: 920 {% if GLOBALS.os == 'Ubuntu' %} +{% if grains.oscodename == 'jammy' %} +dockerheldpackages: + pkg.installed: + - pkgs: + - containerd.io: 1.6.21-1 + - docker-ce: 5:24.0.2-1~ubuntu.22.04~jammy + - docker-ce-cli: 5:24.0.2-1~ubuntu.22.04~jammy + - docker-ce-rootless-extras: 5:24.0.2-1~ubuntu.22.04~jammy + - hold: True + - update_holds: True +{% else %} dockerheldpackages: pkg.installed: - pkgs: @@ -22,6 +33,7 @@ dockerheldpackages: - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal - hold: True - update_holds: True +{% endif %} {% else %} dockerheldpackages: pkg.installed: From c9d650f4c81ff3356aabbb3df3b957c45f2d93e8 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 11:59:07 -0400 Subject: [PATCH 25/31] Add some Ubuntu --- salt/common/packages.sls | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index c22a980be..fc9c43fe9 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -23,7 +23,13 @@ commonpkgs: - python3-lxml - git - vim + - tar + - unzip + {% if grains.oscodename == 'jammy' %} + - python3-rich + {% endif %} +{% if grains.oscodename == 'focal' %} # since Ubuntu requires and internet connection we can use pip to install modules python3-pip: pkg.installed @@ -34,7 +40,7 @@ python-rich: - target: /usr/local/lib/python3.8/dist-packages/ - require: - pkg: python3-pip - +{% endif %} {% elif GLOBALS.os == 'Rocky' %} commonpkgs: From a4d484ea47f88e90318815a121d5975afc1664ec Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 12:00:57 -0400 Subject: [PATCH 26/31] Add some Ubuntu --- salt/mysql/config.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/mysql/config.sls b/salt/mysql/config.sls index d8788c7c9..1396adb90 100644 --- a/salt/mysql/config.sls +++ b/salt/mysql/config.sls @@ -16,6 +16,8 @@ mysqlpkgs: {% if grains['oscodename'] == 'bionic' %} - python3-mysqldb {% elif grains['oscodename'] == 'focal' %} + - python3-mysqldb + {% elif grains['oscodename'] == 'jammy' %} - python3-mysqldb {% endif %} {% else %} From 02c9465dfbfb7fcdc8b5d6a5cea2d2b9ef73d1e8 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 12:30:53 -0400 Subject: [PATCH 27/31] Add some Ubuntu --- setup/so-functions | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/so-functions b/setup/so-functions index 70e2d08f0..932c2a50e 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -974,6 +974,7 @@ detect_os() { info "We do not support your current version of Ubuntu." fail_setup fi + installer_prereq_packages else info "We were unable to determine if you are using a supported OS." From 24e05c94918725e215ef93471a8db31daac23172 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 13:45:04 -0400 Subject: [PATCH 28/31] Add some Ubuntu --- salt/elasticfleet/enabled.sls | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/salt/elasticfleet/enabled.sls b/salt/elasticfleet/enabled.sls index f388cb1c7..bbdf80692 100644 --- a/salt/elasticfleet/enabled.sls +++ b/salt/elasticfleet/enabled.sls @@ -39,6 +39,9 @@ so-elastic-fleet: {% endfor %} - binds: - /etc/pki:/etc/pki:ro + {% if GLOBALS.os == 'Ubuntu' %} + - /etc/ssl:/etc/ssl:ro + {% endif %} #- /opt/so/conf/elastic-fleet/state:/usr/share/elastic-agent/state:rw {% if DOCKER.containers['so-elastic-fleet'].custom_bind_mounts %} {% for BIND in DOCKER.containers['so-elastic-fleet'].custom_bind_mounts %} @@ -54,7 +57,11 @@ so-elastic-fleet: - FLEET_SERVER_ELASTICSEARCH_CA=/etc/pki/tls/certs/intca.crt - FLEET_SERVER_CERT=/etc/pki/elasticfleet.crt - FLEET_SERVER_CERT_KEY=/etc/pki/elasticfleet.key + {% if GLOBALS.os == 'Ubuntu' %} + - FLEET_CA=/etc/ssl/certs/intca.crt + {% else %} - FLEET_CA=/etc/pki/tls/certs/intca.crt + {% endif %} {% if DOCKER.containers['so-elastic-fleet'].extra_env %} {% for XTRAENV in DOCKER.containers['so-elastic-fleet'].extra_env %} - {{ XTRAENV }} From 40540f47bf476bafb7ffdf96a67d35aa7368fef0 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Jul 2023 13:51:01 -0400 Subject: [PATCH 29/31] Add some Ubuntu --- salt/common/packages.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index fc9c43fe9..0ba0c7340 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -18,6 +18,7 @@ commonpkgs: - sqlite3 - libssl-dev - python3-dateutil + - python3-docker - python3-packaging - python3-watchdog - python3-lxml From 0d43f9aaf49e3b3c7c86314b722299fe6f05d90e Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 3 Jul 2023 14:23:24 -0400 Subject: [PATCH 30/31] add repo noninteractively --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 932c2a50e..411672910 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2040,7 +2040,7 @@ saltify() { #echo "deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/20.04/amd64/salt3004.2/ focal main" > /etc/apt/sources.list.d/saltstack.list # Add Docker Repo - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" # Ain't nothing but a GPG From df0e19ff80b57c31d99773d75723480daed1404e Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 3 Jul 2023 15:44:51 -0400 Subject: [PATCH 31/31] update-alternatives for python3.10 --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 411672910..9fae0c97a 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2012,7 +2012,7 @@ saltify() { if [[ $is_ubuntu ]]; then DEBIAN_FRONTEND=noninteractive retry 150 20 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || fail_setup - update-alternatives --install /usr/bin/python python /usr/bin/python3.8 10 + update-alternatives --install /usr/bin/python python /usr/bin/python3.10 10 local pkg_arr=( 'apache2-utils' 'ca-certificates'