Remove bionic / xenial support (#79)

* Remove bionic / xenial support * Fix tests and terminal requirements * Fix DBUS issue and dbus requirements * Forgot to remove previous DBUS entry
teamdfir · Jan 27, 2023 · 38d67f5 · 38d67f5
1 parent 65cc9dc
commit 38d67f5
Show file tree

Hide file tree

Showing 41 changed files with 41 additions and 390 deletions.
diff --git a/.ci/debug.sh b/.ci/debug.sh
@@ -2,7 +2,7 @@
 
 set -x
 
-DISTRO=${DISTRO:="bionic"}
+DISTRO=${DISTRO:="focal"}
 STATE=$1
 SIFT_VERSION=${2:-stable}
 

diff --git a/.ci/test-all.sh b/.ci/test-all.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
-SIFT_VERSION=${1:-stable}
+DISTRO=${DISTRO:="focal"}
+STATE=$1
 
-docker run -it --rm --name="sift-package-${STATE}" -v `pwd`/sift:/srv/salt/sift --cap-add SYS_ADMIN sift-saltstack:bionic /bin/bash
+docker run -it --rm --name="sift-package-${STATE}" -v `pwd`/sift:/srv/salt/sift --cap-add SYS_ADMIN teamdfir/sift-saltstack-tester:$DISTRO /bin/bash
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -32,11 +32,9 @@ jobs:
     strategy:
       matrix:
         salt: [3004, 3005]
-        os: [18.04, 20.04]
+        os: [20.04]
         state: ${{ fromJson(needs.changed_states.outputs.matrix) }}
         include:
-          - os: 18.04
-            code: bionic
           - os: 20.04
             code: focal
           #Note: disabled until we support jammy
@@ -45,8 +43,6 @@ jobs:
         exclude:
           - salt: 3004
             os: 22.04
-          - salt: 3005
-            os: 18.04
 
     container:
       image: docker://ghcr.io/teamdfir/sift-saltstack-tester:${{ matrix.salt }}-${{ matrix.code }}

diff --git a/.github/workflows/weekly-tests.yml b/.github/workflows/weekly-tests.yml
@@ -12,24 +12,20 @@ jobs:
     strategy:
       matrix:
         salt: [3004, 3005]
-        os: [18.04, 20.04]
+        os: [20.04]
         state:
           - sift.packages.python2
           - sift.packages.python3
           - sift.tests.gift
           - sift.config.user.pdfs
         include:
-          - os: 18.04
-            code: bionic
           - os: 20.04
             code: focal
           - os: 22.04
             code: jammy
         exclude:
           - salt: 3004
             os: 22.04
-          - salt: 3005
-            os: 18.04
 
     container:
       image: docker://ghcr.io/teamdfir/sift-saltstack-tester:${{ matrix.salt }}-${{ matrix.code }}

diff --git a/sift/config/user/files/rekall-profile.txt b/sift/config/user/files/rekall-profile.txt
diff --git a/...g/user/files/terminal-profiles_bionic.txt → sift/config/user/files/terminal-profiles.txt b/...g/user/files/terminal-profiles_bionic.txt → sift/config/user/files/terminal-profiles.txt
diff --git a/sift/config/user/files/terminal-profiles_xenial.txt b/sift/config/user/files/terminal-profiles_xenial.txt
diff --git a/sift/config/user/terminal.sls b/sift/config/user/terminal.sls
@@ -4,12 +4,15 @@
 {%- else -%}
   {%- set home = salt['user.info'](user).home -%}
 {%- endif -%}
-{%- set dbus_address = salt['cmd.run']("dbus-launch | grep DBUS_SESSION_BUS_ADDRESS | cut -d= -f2-", shell="/bin/bash", runas=user, cwd=home, python_shell=True) -%}
+
+include:
+  - sift.packages.dconf-cli
+  - sift.packages.dbus-x11
 
 sift-config-terminal-profiles-file:
   file.managed:
     - name: /usr/share/sift/terminal-profiles.txt
-    - source: salt://sift/config/user/files/terminal-profiles_bionic.txt
+    - source: salt://sift/config/user/files/terminal-profiles.txt
     - user: root
     - group: root
     - mode: 0644
@@ -21,9 +24,16 @@ sift-config-terminal-profiles-install:
     - runas: {{ user }}
     - cwd: {{ home }}
     - shell: /bin/bash
-    - env:
-      - DBUS_SESSION_BUS_ADDRESS: "{{ dbus_address }}"
+    - onlyif:
+      - fun: cmd.run
+        cmd: export DBUS_SESSION_BUS_ADDRESS=$(dbus-launch | grep DBUS_SESSION_BUS_ADDRESS | cut -d= -f2-)
+        shell: /bin/bash
+        python_shell: True
+        runas: {{ user }}
     - require:
       - file: sift-config-terminal-profiles-file
+      - sls: sift.packages.dconf-cli
+      - sls: sift.packages.dbus-x11
     - watch:
       - file: sift-config-terminal-profiles-file
+
diff --git a/sift/files/samba/smb.conf b/sift/files/samba/smb.conf
@@ -5,12 +5,6 @@ netbios name = SIFTWORKSTATION
 security = USER
 map to guest = Bad User 
 dns proxy = no
-{% if grains['oscodename'] == "xenial" -%}
-name resolve order = host bcast lmhost wins
-{% endif -%}
-{% if grains['oscodename'] == "bionic" -%}
-name resolve order = host bcast wins
-{% endif -%}
 
 include = /etc/samba/smb-%L.conf
 guest account = {{ user }}

diff --git a/sift/packages/absent/plaso.sls b/sift/packages/absent/plaso.sls
diff --git a/sift/packages/arc-icons.sls b/sift/packages/arc-icons.sls
diff --git a/sift/packages/arc-theme.sls b/sift/packages/arc-theme.sls
diff --git a/sift/packages/bcrypt.sls b/sift/packages/bcrypt.sls
diff --git a/sift/packages/dbus-x11.sls b/sift/packages/dbus-x11.sls
@@ -0,0 +1,2 @@
+dbus-x11:
+  pkg.installed
diff --git a/sift/packages/dconf-cli.sls b/sift/packages/dconf-cli.sls
@@ -0,0 +1,2 @@
+dconf-cli:
+  pkg.installed
diff --git a/sift/packages/dconf-tools.sls b/sift/packages/dconf-tools.sls
diff --git a/sift/packages/init.sls b/sift/packages/init.sls
@@ -7,7 +7,6 @@ include:
   - sift.packages.arp-scan
   - sift.packages.autopsy
   - sift.packages.avfs
-  - sift.packages.bcrypt
   - sift.packages.bless
   - sift.packages.blt
   - sift.packages.build-essential
@@ -23,7 +22,6 @@ include:
   - sift.packages.curl
   - sift.packages.dc3dd
   - sift.packages.dcfldd
-  - sift.packages.dconf-tools
   - sift.packages.default-jre
   - sift.packages.disktype
   - sift.packages.docker
@@ -144,8 +142,8 @@ include:
   - sift.packages.powershell
   - sift.packages.pv
   - sift.packages.python-flowgrep
-  - sift.packages.python-nids
   - sift.packages.python3
+  - sift.packages.python3-debian
   - sift.packages.python3-dev
   - sift.packages.python3-dfvfs
   - sift.packages.python3-fuse
@@ -175,7 +173,6 @@ include:
   - sift.packages.ssldump
   - sift.packages.sslsniff
   - sift.packages.stunnel4
-  - sift.packages.system-config-samba
   - sift.packages.tcl
   - sift.packages.tcpflow
   - sift.packages.tcpick
@@ -201,7 +198,6 @@ include:
   - sift.packages.xdot
   - sift.packages.xfsprogs
   - sift.packages.xmount
-  - sift.packages.xpdf
   - sift.packages.zenity
 
 sift-packages:
@@ -215,7 +211,6 @@ sift-packages:
       - sls: sift.packages.arp-scan
       - sls: sift.packages.autopsy
       - sls: sift.packages.avfs
-      - sls: sift.packages.bcrypt
       - sls: sift.packages.bless
       - sls: sift.packages.blt
       - sls: sift.packages.build-essential
@@ -231,7 +226,6 @@ sift-packages:
       - sls: sift.packages.curl
       - sls: sift.packages.dc3dd
       - sls: sift.packages.dcfldd
-      - sls: sift.packages.dconf-tools
       - sls: sift.packages.default-jre
       - sls: sift.packages.disktype
       - sls: sift.packages.docker
@@ -352,8 +346,8 @@ sift-packages:
       - sls: sift.packages.powershell
       - sls: sift.packages.pv
       - sls: sift.packages.python-flowgrep
-      - sls: sift.packages.python-nids
       - sls: sift.packages.python3
+      - sls: sift.packages.python3-debian
       - sls: sift.packages.python3-dev
       - sls: sift.packages.python3-dfvfs
       - sls: sift.packages.python3-fuse
@@ -383,7 +377,6 @@ sift-packages:
       - sls: sift.packages.ssldump
       - sls: sift.packages.sslsniff
       - sls: sift.packages.stunnel4
-      - sls: sift.packages.system-config-samba
       - sls: sift.packages.tcl
       - sls: sift.packages.tcpflow
       - sls: sift.packages.tcpick
@@ -409,5 +402,4 @@ sift-packages:
       - sls: sift.packages.xdot
       - sls: sift.packages.xfsprogs
       - sls: sift.packages.xmount
-      - sls: sift.packages.xpdf
       - sls: sift.packages.zenity
diff --git a/sift/packages/magnus.sls b/sift/packages/magnus.sls
@@ -6,17 +6,5 @@
 # License: MIT License (https://github.com/stuartlangridge/magnus/blob/master/LICENSE)
 # Notes: magnus
 
-{%- if grains['oscodename'] == "bionic" %}
-include:
-  - sift.repos.flexiondotorg
-
-magnus:
-  pkg.installed:
-    - require:
-      - sls: sift.repos.flexiondotorg
-
-{%- elif grains['oscodename'] == "focal" %}
 magnus:
   pkg.installed
-
-{%- endif -%}
diff --git a/sift/packages/netcat.sls b/sift/packages/netcat.sls
@@ -1,7 +1,2 @@
-{% if grains['oscodename'] == "bionic" -%}
-netcat-openbsd:
-  pkg.installed
-{% else %}
 netcat:
   pkg.installed
-{%- endif -%}
diff --git a/sift/packages/phonon.sls b/sift/packages/phonon.sls
@@ -1,8 +1,3 @@
-{% set package_name = salt['grains.filter_by']({
-  'bionic': 'phonon',
-  'focal': 'phonon4qt5'
-}, grain='oscodename') %}
-
 sift-package-phonon:
   pkg.installed:
-    - name: {{ package_name }}
+    - name: phonon4qt5