[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40811: Make it easier to test the updater

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
7968b10a by Pier Angelo Vendrame at 2023-04-17T17:04:05+02:00
Bug 40811: Make it easier to test the updater

This commit adds a config variable to override the URL for the updater.
When it is defined, a user-provided certificate will replace the
default public keys used to sign nightly builds.

- - - - -


3 changed files:

- .gitignore
- projects/firefox/build
- projects/firefox/config


Changes:

=====================================
.gitignore
=====================================
@@ -14,3 +14,7 @@
 /release
 /alpha
 /nightly
+
+# This file is used to test the updater, and whoever is interested in doing so,
+# should provide their file.
+/projects/firefox/marsigner.der


=====================================
projects/firefox/build
=====================================
@@ -92,7 +92,10 @@ fi
   popd
 [% END %]
 
-[% IF c("var/nightly") && ! c("var/mullvad-browser") -%]
+[% IF c("var/override_updater_url") -%]
+  sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=[% c("var/override_updater_url") %]|' build/application.ini.in
+  cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
+[% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%]
   # Set update url for nightly (#33402 / #40033)
   sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torproject.org/nightly-updates/updates/nightly-[% c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
 [% END -%]


=====================================
projects/firefox/config
=====================================
@@ -30,6 +30,12 @@ var:
     - pkg-config
   has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]'
 
+  # Uncomment this if you want to test the updater. You will need to provide a
+  # marsigner.der in this directory, too. It will be used as a replacement for
+  # the nightly builds keys only. So, using this option for alphas and releases
+  # will not work (the browser will fail with a key/signature mismatch).
+  # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL'
+
   rezip: |
     rezip_tmpdir=$(mktemp -d)
     mkdir -p "$rezip_tmpdir/z"
@@ -199,6 +205,8 @@ input_files:
     name: translation-tor-browser
     pkg_type: tor-browser
     enable: '[% c("var/tor-browser") && c("var/has_l10n") %]'
+  - filename: marsigner.der
+    enable: '[% c("var/override_updater_url") %]'
   - filename: namecoin-torbutton.patch
     enable: '[% c("var/namecoin") %]'
     # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7968b10aab154582ac444daf6fe0a47bd26408c4

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7968b10aab154582ac444daf6fe0a47bd26408c4
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230417/5487651b/attachment-0001.htm>