Skip to content
Snippets Groups Projects

Add basic bridge address validation to user provided bridge dialog.

All threads resolved!

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) : 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

Add basic validation to user provide bridge dialog, and a confirmation step. This still only accepts bridge addresses, but was designed with the Lox invite in mind.

The validation just uses the existing parser, which isn't that comprehensive. E.g. just "0:0" would get a pass. But this is just a first step.

How Tested

Open the dialog with the "Add new bridges" or "Replace bridges" button, should see empty text with placeholder.

If you have existing bridges, use the "Edit bridges" option in the "..." menu instead and the text area should be pre-filled with the current bridges, and no placeholder.

Entering an invalid bridge should show an error with the error line.

Entering a valid bridge, and then the dialog should show a preview of the bridges.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • henry requested review from @richard

    requested review from @richard

  • henry assigned to @henry

    assigned to @henry

    • Author Maintainer
      Resolved by henry

      @jag this is just the first step for #41913, without Lox.

      Here are some screenshots:

      User provide dialog with empty text area

      With an invalid entry (only shown after pressing Next), that does not have focus:

      User provide dialog with invalid entry, which does not have focus

      With focus:

      User provide dialog with invalid entry, which does have focus

      Note that the error and the styling get cleared as soon as the user changes something. So they won't get error messages if they are half way through editing.

      For a valid entry, we show this final step:

      User provide dialog showing preview of added bridges

      Note, the main deviations from the design:

      1. Added a "Bridge addresses" label. Without a label, the placeholder would be used as the accessible name, but the placeholder is not a good label. In principle, we could hide the label, but I think it helps to have a permanent label. Maybe the placeholder is a bit redundant though.
      2. The error message gives the line number for the first invalid bridge address. I thought this might be helpful if the user has multiple lines.
      3. Connect button is not purple. Left for #41811 (closed)
  • morgan
  • morgan
  • first pass on the code looks good to me, but haven't run it locally yet

  • henry added 4 commits

    added 4 commits

    • 542a07d7 - fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
    • 2e7d9743 - fixup! Tor Browser strings
    • db931e11 - fixup! Bug 40597: Implement TorSettings module
    • 1f5fc9cb - fixup! Add TorStrings module for localization

    Compare with previous version

  • henry marked this merge request as draft from henry/tor-browser@542a07d7

    marked this merge request as draft from henry/tor-browser@542a07d7

  • henry resolved all threads

    resolved all threads

  • henry added 5 commits

    added 5 commits

    • 5898a9ab - 1 commit from branch tpo/applications:tor-browser-115.7.0esr-13.5-1
    • c99f1954 - fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
    • bcf1784d - fixup! Tor Browser strings
    • 809c07b3 - fixup! Bug 40597: Implement TorSettings module
    • e29ac959 - fixup! Add TorStrings module for localization

    Compare with previous version

  • henry marked this merge request as ready

    marked this merge request as ready

  • morgan approved this merge request

    approved this merge request

  • henry added 12 commits

    added 12 commits

    • e29ac959...478ddecb - 8 commits from branch tpo/applications:tor-browser-115.7.0esr-13.5-1
    • f4fc6f6d - fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
    • b4e736ea - fixup! Tor Browser strings
    • c8050644 - fixup! Bug 40597: Implement TorSettings module
    • 26ccf4b5 - fixup! Add TorStrings module for localization

    Compare with previous version

  • henry marked this merge request as draft from henry/tor-browser@f4fc6f6d

    marked this merge request as draft from henry/tor-browser@f4fc6f6d

  • henry resolved all threads

    resolved all threads

  • henry marked this merge request as ready

    marked this merge request as ready

  • morgan added 6 commits

    added 6 commits

    • 26ccf4b5...366c81df - 2 commits from branch tpo/applications:tor-browser-115.7.0esr-13.5-1
    • e16caa30 - fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
    • 6fe742ee - fixup! Tor Browser strings
    • 7abc2cc1 - fixup! Bug 40597: Implement TorSettings module
    • fd4565d1 - fixup! Add TorStrings module for localization

    Compare with previous version

  • morgan marked this merge request as draft from henry/tor-browser@e16caa30

    marked this merge request as draft from henry/tor-browser@e16caa30

  • morgan marked this merge request as ready

    marked this merge request as ready

  • merged

  • Please register or sign in to reply
    Loading