Skip to content

Bug 42343 (TB): Pass pt_config.json to the browser

Pier Angelo Vendrame requested to merge pierov/tor-browser-build:bug_42343_tb into main

Merge Info

Related Issues

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
  • Other: please explain

Issue Tracking

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 : boklm, dan, ma1, pierov, richard
    • security : ma1
    • signing : boklm, richard
    • updater : pierov
    • misc/other : pierov, richard

Change Description

We're modifying TorSettings to consume the bridge lines from pt_config.json.

So, we need to provide the pt_config.json to Firefox and GeckoView, which we do with this MR.

WARNING: This MR should not be merged if we decide we don't want !877 (merged).

How Tested

Built for Linux and macOS with Firefox's git_hash set to the HEAD of tor-browser!877 (merged), then:

  1. checked that chrome://global/content/pt_config.json doesn't have the special comment that we added for the developer builds
  2. checked that we can still use built-in PTs

Didn't check on Windows, but it's usually very similar to Linux (whereas macOS uses a different path for omni.ja).

For Android, I've copied the changes on top of tbb13.5a2-build1, because I didn't have time to build the whole updated GV, then I checked the file was added in assets/omni.ja (you need to extract the APK first).

Edited by Pier Angelo Vendrame

Merge request reports