Skip to content

Draft: BB 43525: Move part of the search engine customization to Base Browser

Pier Angelo Vendramerequested to merge
pierov/tor-browser:43525-shared-search-customization into tor-browser-140.2.0esr-15.0-1

Merge Info

Issues

Resolves

  • tor-browser#xxxxx
  • mullvad-browser#xxxxx
  • tor-browser-build#xxxxx

Related

Merging

Target Branches

  • tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Target Channels

  • Alpha: esr140-15.0
  • Stable: esr128-14.5
  • Legacy: esr115-13.5

Backporting

Timeline

  • No Backport (preferred): patchset for the next major stable
  • Immediate: patchset needed as soon as possible (fixes CVEs, 0-days, etc)
  • 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

(Optional) Justification

  • Security update: patchset contains a security fix (be sure to select the correct item in Timeline)
  • 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

Upstream

  • Patchset is a candidate for uplift to Firefox
  • Patchset is a backport from Firefox
    • Bugzilla link:
    • Upstream commit:

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /request_review all the relevant reviewers
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • ci/cd: brizental, henry
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, morgan
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : brizental, clairehurst, dan, ma1, pierov, morgan
    • security : jwilde, ma1
    • signing : boklm, morgan
    • updater : pierov
    • windows : jwilde, morgan
    • misc/other : pierov, morgan

Change Description

As discussed, split the Tor Browser search engine commit into a Tor Browser and a Base Browser part.

Commits:

  1. Reverts the part we're going to move. Should be dropped at the next rebase, it's there only to make our life simpler in this MR.
  2. Reverts 1, and renames the torBrowser* files to base-browser-.... Also, moves an early return inside an if to remove console noise.
  3. Removes Wikipedia and the onions from 2, as Mullvad Browser doesn't have them.
  4. Reverts 3 to add these search engines back. Since TB's commit will be mostly this (and the copy of Wikipedia's icon), drop most of the description of the original commit by using an amend!.

I can squash 3 and 2, if preferred.

In any case, I expect them to be cherry-pickable to Mullvad Browser as they are, even though we'll need commits equivalent to 1 and 4.

How Tested

The diffs are pretty small, so it's easy to tell that everything will keep working.

I ran a build and tested anyway that we still have our 5 search engines and they work.

Merge request reports