Skip to content

Migrate onion site strings to Fluent

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
  • 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

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

Change Description

Migrate the onion site strings in torbutton.dtd and torbutton.properties to Fluent.

Some further notes:

  • Use "onion site" instead of "onionsite" or "onion service".
  • Use sentence case by default.
  • Changed the prompt accept button from "Done" to "OK", in line with other prompts.
  • Re-ordered the saved keys dialog introduction text from "Keys for the following onionsite are..." to "The following onion site keys are..."
  • Use bold text for the prompt title, rather than just the onion site part.
  • Clear the error message in the saved key dialog whenever the user tries to remove a key (again).
  • Other small tidies in the touched areas.

How Tested

I used the pages in https://gitlab.torproject.org/tpo/applications/team/-/wikis/Development-Information/BadSSL-But-Onion, which were really useful. Thanks!

For the authentication prompt and settings I used http://pierovlcy7baatz7xcaccbf2kanct3hvkhcgedz4cbrmcg2ybmjalxad.onion/. I spoofed the errors from TorControlPort to get the error strings.

The strings page-info-onion-site-encryption-plain and page-info-onion-site-encryption-with-bits are shown in the "Page Info" window (Ctrl+I) in the Security tab under "Technical Details". The former is used for http://sanityunhavm6aolhyye4h6kbdlxjmc7zw2y7nadbni6vd43agm7xvid.onion/ and the latter for https://domain736gp5nirxh4iypjf2m42cy5sipj5vnecvexag6svvsi52ovyd.onion/ after you bypass the neterror page.

Edited by henry

Merge request reports