Skip to content

Commit

Permalink
Fix downloads for Tor Browser 13 and test against Firefox 115 ESR
Browse files Browse the repository at this point in the history
As explained in
<https://blog.torproject.org/new-release-tor-browser-130/>, the filename
of Tor Browser 13.0 tarballs has changed so we need to update for that.

We can now update to the corresponding Firefox 115 ESR as well.

Fixes #6956.
  • Loading branch information
legoktm committed Oct 12, 2023
1 parent 6da5239 commit 8a5c243
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions securedrop/dockerfiles/focal/python3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
# Current versions of the test browser software. Tor Browser is based
# on a specific version of Firefox, noted in Help > About Tor Browser.
# Ideally we'll keep those in sync.
ENV FF_VERSION 102.15.1esr
ENV FF_VERSION 115.4.0esr
ENV GECKODRIVER_VERSION v0.33.0

# Import Tor release signing key
Expand All @@ -24,13 +24,13 @@ RUN curl -s https://openpgpkey.torproject.org/.well-known/openpgpkey/torproject.

# Fetch latest TBB version (obtained from https://github.com/micahflee/torbrowser-launcher/blob/develop/torbrowser_launcher/common.py#L198) and install Tor Browser
RUN TBB_VERSION=$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/Linux_x86_64-gcc3/x/ALL | grep -oP '(?<=appVersion=")[^"]*' | head -1) && \
wget https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-linux64-${TBB_VERSION}_ALL.tar.xz && \
wget https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-linux64-${TBB_VERSION}_ALL.tar.xz.asc && \
wget https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-linux-x86_64-${TBB_VERSION}.tar.xz && \
wget https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-linux-x86_64-${TBB_VERSION}.tar.xz.asc && \
gpg2 --output ./tor.keyring --export ${TOR_RELEASE_KEY_FINGERPRINT} && \
gpgv --keyring ./tor.keyring tor-browser-linux64-${TBB_VERSION}_ALL.tar.xz.asc tor-browser-linux64-${TBB_VERSION}_ALL.tar.xz && \
tar -xvJf tor-browser-linux64-${TBB_VERSION}_ALL.tar.xz && \
gpgv --keyring ./tor.keyring tor-browser-linux-x86_64-${TBB_VERSION}.tar.xz.asc tor-browser-linux-x86_64-${TBB_VERSION}.tar.xz && \
tar -xvJf tor-browser-linux-x86_64-${TBB_VERSION}.tar.xz && \
mkdir -p /root/.local/tbb && mv tor-browser /root/.local/tbb && \
rm -f tor.keyring tor-browser-linux64-${TBB_VERSION}_ALL.tar.xz.asc tor-browser-linux64-${TBB_VERSION}_ALL.tar.xz
rm -f tor.keyring tor-browser-linux-x86_64-${TBB_VERSION}.tar.xz.asc tor-browser-linux-x86_64-${TBB_VERSION}.tar.xz

# Import Mozilla release signing key
ENV MOZILLA_RELEASE_KEY_FINGERPRINT "14F26682D0916CDD81E37B6D61B7B526D98F0353"
Expand Down

0 comments on commit 8a5c243

Please sign in to comment.