diff options
| author | Zuul <zuul@review.opendev.org> | 2022-01-21 16:22:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-01-21 16:22:26 +0000 |
| commit | d7dde0265383e2498cfec9420b1a35d1f754b47f (patch) | |
| tree | d1668d6c5fffd6548b969d8df5629d68abbdc995 | |
| parent | f7ef6c243af0d648e2d32254c52d20e9d0343ed1 (diff) | |
| parent | 448e4f56aa6218a66b0074329d322c0b6089b2e6 (diff) | |
| download | kolla-d7dde0265383e2498cfec9420b1a35d1f754b47f.tar.gz kolla-d7dde0265383e2498cfec9420b1a35d1f754b47f.zip | |
Merge "Mitigate two Log4j vulnerabilities in Apache Storm"
| -rw-r--r-- | docker/storm/storm-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | releasenotes/notes/storm-log4j-vulnerability-mitigation-6746a8a0bb329485.yaml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/docker/storm/storm-base/Dockerfile.j2 b/docker/storm/storm-base/Dockerfile.j2 index 66c279484..3bb03e753 100644 --- a/docker/storm/storm-base/Dockerfile.j2 +++ b/docker/storm/storm-base/Dockerfile.j2 @@ -12,6 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set storm_packages = [ 'java-1.8.0-openjdk-headless', + 'zip', ] %} {% elif base_package_type == 'deb' %} @@ -23,6 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set storm_packages = [ 'openjdk-' + java_version + '-jre-headless', + 'zip', ] %} {% endif %} @@ -40,6 +42,9 @@ RUN curl -o /tmp/storm.tgz ${storm_url} \ && tar --strip 1 -xvf /tmp/storm.tgz -C /opt/storm \ && rm -f /tmp/storm.tgz +# Mitigation for CVE-2021-44228 and CVE-2021-45046: remove the JndiLookup class +# from the classpath +RUN zip -q -d /opt/storm/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class {% endblock %} {% block storm_python_version %} diff --git a/releasenotes/notes/storm-log4j-vulnerability-mitigation-6746a8a0bb329485.yaml b/releasenotes/notes/storm-log4j-vulnerability-mitigation-6746a8a0bb329485.yaml new file mode 100644 index 000000000..5126662ad --- /dev/null +++ b/releasenotes/notes/storm-log4j-vulnerability-mitigation-6746a8a0bb329485.yaml @@ -0,0 +1,5 @@ +--- +security: + - | + Adds mitigation for Apache Log4j 2 Remote Code Execution (RCE) + vulnerabilities CVE-2021-44228 and CVE-2021-45046 to Apache Storm. |