Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Browsermob to the version without log4jshell #33

Merged
merged 4 commits into from
Feb 10, 2022
Merged

Update Browsermob to the version without log4jshell #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e0f7d8
Update Browsermob to the version without log4jshell
malaskowski Feb 3, 2022
1af533d
Update Dockerfile
malaskowski Feb 3, 2022
8f6bf0a
update changlog
malaskowski Feb 10, 2022
461077c
Merge branch 'master' into feature/upgrade-browsermob-log4jshell
malaskowski Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Not released yet
- [PR-33](https://github.com/malaskowski/aet-docker/pull/33) - Update BrowserMob Proxy image to the version without log4jshell vulnerability.
- [PR-34](https://github.com/malaskowski/aet-docker/pull/34) - build custom version of Apache Karaf 4.2.0 with updated pax.logging dependencies.

# 1.0.0
Expand Down
45 changes: 36 additions & 9 deletions browsermob/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,51 @@
# limitations under the License.
#

FROM openjdk:8-alpine
FROM maven:3.8.4-jdk-8 as builder
RUN apt-get update \
&& apt-get install git unzip tzdata \
&& update-ca-certificates

# Clone BMP Proxy fork with log4j fix, see https://github.com/lightbody/browsermob-proxy/pull/891
RUN mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts \
&& git clone git://github.com/cyberstormdotmu/browsermob-proxy.git \
&& cd browsermob-proxy \
&& git reset --hard 6e4afc39c7904f361a712dccff739fa9845cebdc \
&& git status

WORKDIR /browsermob-proxy
RUN mvn clean install -DskipTests

#################################################################################

FROM openjdk:8-alpine as final
LABEL maintainer="Maciej Laskowski <https://github.com/malaskowski>"

# Set the build params
ARG BMP_VERSION="2.1.4"
ARG BMP_DOWNLOAD_SHA256="27c4080411adff919586e909c664c73bebb8ba8bfcaea259ce58327222e5e8fb"
ARG DOWNLOAD_URL="https://github.com/lightbody/browsermob-proxy/releases/download/browsermob-proxy-${BMP_VERSION}/browsermob-proxy-${BMP_VERSION}-bin.zip"
# Until https://github.com/lightbody/browsermob-proxy/pull/891 is not merged and new BMP released
# Clone the repo with log4j update and build
# # Set the build params
# ARG BMP_VERSION="2.1.4"
# ARG BMP_DOWNLOAD_SHA256="27c4080411adff919586e909c664c73bebb8ba8bfcaea259ce58327222e5e8fb"
# ARG DOWNLOAD_URL="https://github.com/lightbody/browsermob-proxy/releases/download/browsermob-proxy-${BMP_VERSION}/browsermob-proxy-${BMP_VERSION}-bin.zip"

# make sure system is up-to-date
RUN apk update \
&& apk add ca-certificates curl unzip tzdata \
&& update-ca-certificates

# download and install BMP
RUN curl -fSL -o /tmp/browsermob-proxy.zip ${DOWNLOAD_URL} \
&& echo "${BMP_DOWNLOAD_SHA256} /tmp/browsermob-proxy.zip" | sha256sum -c - \
&& unzip /tmp/browsermob-proxy.zip -d / \
&& mv /browsermob-proxy-${BMP_VERSION} /browsermob-proxy \
# RUN curl -fSL -o /tmp/browsermob-proxy.zip ${DOWNLOAD_URL} \
# && echo "${BMP_DOWNLOAD_SHA256} /tmp/browsermob-proxy.zip" | sha256sum -c - \
# && unzip /tmp/browsermob-proxy.zip -d / \
# && mv /browsermob-proxy-${BMP_VERSION} /browsermob-proxy \
# && rm -f /tmp/browsermob-proxy.zip \
# && rm -rf /var/cache/apk/*

COPY --from=builder /browsermob-proxy/browsermob-dist/target/browsermob-proxy-2.1.6-SNAPSHOT-bin.zip /tmp/

# unzip and install BMP
RUN unzip /tmp/browsermob-proxy-2.1.6-SNAPSHOT-bin.zip -d / \
&& mv /browsermob-proxy-2.1.6-SNAPSHOT /browsermob-proxy \
&& rm -f /tmp/browsermob-proxy.zip \
&& rm -rf /var/cache/apk/*

Expand Down