Bug 42332: Rebased Tor Browser Alpha onto 115.6.0esr

Merge Info

Related Issues

• #42332 (closed)
• mullvad-browser#xxxxx
• tor-browser-build#41021 (closed)

Backporting

Timeline

• Immediate: patchset needed as soon as possible
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport
• No Backport (preferred): patchset for the next major stable

(Optional) Justification

• Emergency security update: patchset fixes CVEs, 0-days, etc
• Censorship event: patchset enables censorship circumvention
• Critical bug-fix: patchset fixes a bug in core-functionality
• Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
• Sponsor required: patchset required for sponsor
• Localization: typos and other localization changes that should be also in the release branch
• Other: please explain

Merging

• Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
• Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
  • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from an applications developer depending on modified system:
  • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
  • accessibility : henry
  • android : clairehurst, dan
  • build system : boklm
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, richard
  • localization : henry, pierov
  • macos : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : dan, ma1, pierov, richard
  • security : ma1
  • signing : boklm, richard
  • updater : pierov
  • misc/other : pierov, richard

Change Description

Alpha rebase onto 115.6.0esr.

How Tested

Range-diff + diff-of-diffs.

On mobile/android/components/geckoview/GeckoViewStartup.jsm, I removed these lines because I thought they weren't needed anymore. I used them to gate the new backend on the update channel, but we decided to follow another plan.

+const { AppConstants } = ChromeUtils.importESModule(
+  "resource://gre/modules/AppConstants.sys.mjs"
+);
+

Also, TorProviderBuilder, TorConnect and TorSettings were added to that file in the tor-launcher commit, but modified in the new Tor Android Integration commit.

So, I added a new fixup! to remove them.

security/certverifier/CertVerifier.cpp is the other problem. We had a conflict with upstream (Bug 1611381), and my proposal in this MR is slightly different than the proposal in the stable MR.

I think we should restrict the acceptance of the self-signed onion certificate only to the original condition (Result::ERROR_UNKNOWN_ISSUER). ERROR_INADEQUATE_KEY_USAGE and ERROR_BAD_SIGNATURE should generate an error, in my opinion.

The range-diff has a lot of fun because of me moving files to toolkit and switching to modules. Also, a lot of removed strings that got squashed to the TorStrings commit. Apart from that, it looks clean enough.

assigned to @pierov

requested review from @richard

added 15 commits

• 61061cf1...593a9567 - 5 earlier commits
• 96eb2b88 - Bug 41435: Add a Tor Browser migration function
• e82b2828 - fixup! Bug 41435: Add a Tor Browser migration function
• 827ff94c - Bug 42110: Add TorUIUtils module for common tor component methods.
• b0765d8f - Bug 40701: Add security warning when downloading a file
• d69f6956 - Bug 41736: Customize toolbar for tor-browser.
• 5b8e8df4 - Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
• eea35072 - Customize moz-toggle for tor-browser.
• eb33d809 - Bug 41822: Unconditionally disable default browser UX in about:preferences
• 447ffbe8 - Bug 42072: 2023 year end campaign for about:tor.
• 4a8b44f2 - fixup! Bug 23247: Communicating security expectations for .onion

Compare with previous version

marked this merge request as draft from pierov/tor-browser@e82b2828

marked this merge request as ready

I moved the onion certificate thing to a fixup on its own at the end.

We'd need to do some testing about it. I think it's okay to modify our custom behavior to match what we were doing before, but it might even make sense to make the behavior with onion services stricter.

See my comment in #42334 (closed) for more details.

added 163 commits

• 4a8b44f2...c45c157f - 153 earlier commits
• 72fd55ba - Bug 41435: Add a Tor Browser migration function
• f97543c1 - fixup! Bug 41435: Add a Tor Browser migration function
• ce701ee6 - Bug 42110: Add TorUIUtils module for common tor component methods.
• 7c386320 - Bug 40701: Add security warning when downloading a file
• a08d2ab0 - Bug 41736: Customize toolbar for tor-browser.
• 32e4ee1a - Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
• 78809c7f - Customize moz-toggle for tor-browser.
• 746e7277 - Bug 41822: Unconditionally disable default browser UX in about:preferences
• 42096042 - Bug 42072: 2023 year end campaign for about:tor.
• f9029853 - fixup! Bug 23247: Communicating security expectations for .onion

Compare with previous version

marked this merge request as draft from pierov/tor-browser@98710058

marked this merge request as ready

added 48 commits

• 42096042...b0fcd280 - 38 earlier commits
• ad5ebfdc - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
• 4cdd5b2e - Bug 41435: Add a Tor Browser migration function
• a60e0310 - fixup! Bug 41435: Add a Tor Browser migration function
• 0f52050e - Bug 42110: Add TorUIUtils module for common tor component methods.
• 186bf17f - Bug 40701: Add security warning when downloading a file
• 48c7eb27 - Bug 41736: Customize toolbar for tor-browser.
• ef8cd521 - Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
• 0af1e6ad - Customize moz-toggle for tor-browser.
• a99971c9 - Bug 41822: Unconditionally disable default browser UX in about:preferences
• 15be3367 - Bug 42072: 2023 year end campaign for about:tor.

Compare with previous version

resolved all threads

marked this merge request as draft from pierov/tor-browser@a970113b

marked this merge request as ready

diff of diffs is good and comprehensible, range-diff was definitely fun.

approved this merge request

merged