Bug 42348: Do not use TorSettings.defaultSettings in Moat
Merge Info
Related Issues
- #42348 (closed), !882 (merged)
- mullvad-browser#xxxxx
- tor-browser-build#xxxxx
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-!fixupstotor-browser-specific commits, new features, security backports -
Merge to base-browser-!fixupstobase-browser-specific commits, new features to be shared withmullvad-browser, and security backports-
NOTE: if your changeset includes patches to both
base-browserandtor-browserplease clearly label in the change description which commits should be cherry-picked tobase-browserafter merging
-
NOTE: if your changeset includes patches to both
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
/ccall 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
-
NOTE: if the MR modifies multiple areas, please
Change Description
We removed TorSettings.defaultSettings in the TorSettings refactor, but it was still used in Moat.
However, we don't need to use it, and we can just start creating a settings object from scratch (especially after the fixes from #42359 (closed)).
Since I was at it, I deleted the code that didn't actually handle proxy and firewall, since Moat isn't going to send them, but I made it throw when it doesn't receive bridges.
This MR depends on !882 (merged), since it's a major cleanup on Moat.
How Tested
Called MoatRPC.circumvention_settings from the console and tried to run a censorship simulation.
Edited by Pier Angelo Vendrame