Merge pull request #7698 from freedomofpress/tb-15-ff-140-xz

build: as of Tor Browser 15 / Firefox 140, expect Firefox to be an xz rather than a bzip2 archive

Author: legoktm

securedrop/dockerfiles/noble/python3/Dockerfile

@@ -15,8 +15,8 @@ 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 - we download both for generic and TBB testing
 
-# We should use the version of geckodriver corresponding to the above Firefox version.
-ENV GECKODRIVER_VERSION v0.35.0
+# We should use the version of geckodriver corresponding to the correct Firefox version.
+ENV GECKODRIVER_VERSION v0.36.0
 
 # Import Tor release signing key
 ENV TOR_RELEASE_KEY_FINGERPRINT "EF6E286DDA85EA2A4BA7DE684E2C6E8793298290"
@@ -39,13 +39,13 @@ ENV MOZILLA_RELEASE_KEY_FINGERPRINT "14F26682D0916CDD81E37B6D61B7B526D98F0353"
 
 RUN FF_VERSION=$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/Linux_x86_64-gcc3/x/ALL | grep -oP '(?<=platformVersion=")[^"]*' | head -1)esr && \
 curl -s https://archive.mozilla.org/pub/firefox/releases/${FF_VERSION}/KEY | gpg2 --import - && \
-curl -LO https://archive.mozilla.org/pub/firefox/releases/${FF_VERSION}/linux-x86_64/en-US/firefox-${FF_VERSION}.tar.bz2 && \
-    curl -LO https://archive.mozilla.org/pub/firefox/releases/${FF_VERSION}/linux-x86_64/en-US/firefox-${FF_VERSION}.tar.bz2.asc && \
+curl -LO https://archive.mozilla.org/pub/firefox/releases/${FF_VERSION}/linux-x86_64/en-US/firefox-${FF_VERSION}.tar.xz && \
+    curl -LO https://archive.mozilla.org/pub/firefox/releases/${FF_VERSION}/linux-x86_64/en-US/firefox-${FF_VERSION}.tar.xz.asc && \
     gpg2 --output ./mozilla.keyring --export ${MOZILLA_RELEASE_KEY_FINGERPRINT} && \
-    gpgv --keyring ./mozilla.keyring firefox-${FF_VERSION}.tar.bz2.asc firefox-${FF_VERSION}.tar.bz2 && \
-    tar xjf firefox-*.tar.bz2 && \
+    gpgv --keyring ./mozilla.keyring firefox-${FF_VERSION}.tar.xz.asc firefox-${FF_VERSION}.tar.xz && \
+    tar -xvJf firefox-*.tar.xz && \
     mv firefox /usr/bin && \
-    rm -f firefox-${FF_VERSION}.tar.bz2.asc firefox-${FF_VERSION}.tar.bz2
+    rm -f firefox-${FF_VERSION}.tar.xz.asc firefox-${FF_VERSION}.tar.xz
 
 # Install geckodriver
 RUN wget https://github.com/mozilla/geckodriver/releases/download/${GECKODRIVER_VERSION}/geckodriver-${GECKODRIVER_VERSION}-linux64.tar.gz && \

securedrop/tests/functional/web_drivers.py

@@ -67,6 +67,7 @@ def _create_driver(
         pref_dict = {
             "network.proxy.no_proxies_on": "127.0.0.1",
             "browser.privatebrowsing.autostart": False,
+            "remote.system-access-check.enabled": False,
         }
 
         Path(_TBB_PATH).mkdir(parents=True, exist_ok=True)