Skip to content

Commit 569be47

Browse files
authored
Fix security vulnerabilities & package errata (#484)
* Fix libpqquality package errata * Managing trivy vulns * More security patching * Pin Ansible to 3.4.0 due to unknown error
1 parent b2c9f0e commit 569be47

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.trivyignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# Both of these are coming from this file, but it's not actually installed in the container
1+
# These are coming from the file below, but it's not actually installed in the container
22
# /usr/lib/python3.7/site-packages/ansible_collections/netbox/netbox/poetry.lock
33
CVE-2020-36242
44
CVE-2020-14343
5+
CVE-2021-29510
56

67
# Downgraded to LOW severity by the Product Security team as the packages are not actually
78
# shipped with the release.
@@ -22,4 +23,7 @@ CVE-2020-25649
2223
# Fixed by Apache Spark in versions 3.0.3, 3.1.2, 3.2.0
2324
CVE-2020-27216
2425
CVE-2021-28165
25-
CVE-2020-27216
26+
CVE-2020-27216
27+
28+
# Ignoring for now -- escalated to ProdSec
29+
CVE-2021-27568

base/debian-10/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime
3333
apt-get install -y --no-install-recommends curl sudo libgssapi-krb5-2 busybox procps acl gcc make \
3434
libffi-dev libssl-dev make build-essential libbz2-dev \
3535
wget xz-utils ca-certificates zlib1g-dev python3-apt \
36-
p11-kit
36+
p11-kit lz4
3737

3838
# Install Python and necessary packages
3939
PY_SHORT=${PYTHON_VERSION%.*}

base/debian-9/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime
3232
# Install utility packages
3333
apt-get install -y --no-install-recommends curl sudo libgssapi-krb5-2 busybox procps acl gcc make \
3434
libffi-dev libssl-dev make build-essential libbz2-dev \
35-
wget xz-utils ca-certificates zlib1g-dev
35+
wget xz-utils ca-certificates zlib1g-dev lz4
3636

3737
# Install Python and necessary packages
3838
PY_SHORT=${PYTHON_VERSION%.*}

base/redhat-8/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export LANG=en_US.utf8
2929
microdnf -y --nodocs install wget sudo shadow-utils procps tar tzdata make gcc \
3030
openssl-devel bzip2-devel libffi-devel findutils
3131
# Patch security updates
32-
microdnf -y --nodocs update gnutls kernel-headers librepo libnghttp2 tzdata nettle
32+
microdnf -y --nodocs update gnutls kernel-headers librepo libnghttp2 tzdata nettle libpwquality
3333

3434
# Install Python and necessary packages
3535
PY_SHORT=${PYTHON_VERSION%.*}
@@ -51,7 +51,7 @@ ln -sf /usr/bin/python${PY_SHORT} /usr/bin/python
5151
ln -sf /usr/bin/pip${PY_SHORT} /usr/bin/pip
5252
# Install splunk-ansible dependencies
5353
cd /
54-
pip -q --no-cache-dir install six wheel requests cryptography==3.3.2 ansible jmespath --upgrade
54+
pip -q --no-cache-dir install six wheel requests cryptography==3.3.2 ansible==3.4.0 jmespath --upgrade
5555
# Remove tests packaged in python libs
5656
find /usr/lib/ -depth \( -type d -a -not -wholename '*/ansible/plugins/test' -a \( -name test -o -name tests -o -name idle_test \) \) -exec rm -rf '{}' \;
5757
find /usr/lib/ -depth \( -type f -a -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) -exec rm -rf '{}' \;
@@ -60,7 +60,7 @@ ldconfig
6060

6161
microdnf remove -y make gcc openssl-devel bzip2-devel libffi-devel findutils cpp binutils \
6262
glibc-devel keyutils-libs-devel krb5-devel libcom_err-devel libselinux-devel \
63-
libsepol-devel libverto-devel libxcrypt-devel pcre2-devel zlib-devel cracklib-dicts
63+
libsepol-devel libverto-devel libxcrypt-devel pcre2-devel zlib-devel
6464
microdnf clean all
6565

6666
# Install scloud

0 commit comments

Comments
 (0)