morgan pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project /
Applications / Tor Browser
Commits:
65026e41 by Henry Wilkes at 2025-03-11T18:34:13+00:00
fixup! TB 40597: Implement TorSettings module
TB 42550: Move straight to FinalError when the user selects a specific
region.
Also fix the `simulateMoatResponse` value for the censorship levels.
Although it does not change the overall outcome (bootstrap fails) it
does change *how* it fails.
- - - - -
1 changed file:
- toolkit/modules/TorConnect.sys.mjs
Changes:
=====================================
toolkit/modules/TorConnect.sys.mjs
=====================================
@@ -1227,7 +1227,10 @@ export const TorConnect = {
bootstrapOptions.simulateCensorship = true;
bootstrapOptions.simulateMoatResponse = {
country: "fi",
- settings: [{}, {}],
+ bridgesList: [
+ { source: 0, builtin_type: "obfs4" },
+ { source: 0, builtin_type: "snowflake" },
+ ],
};
}
} else if (censorshipLevel === 3) {
@@ -1235,7 +1238,7 @@ export const TorConnect = {
bootstrapOptions.simulateCensorship = true;
bootstrapOptions.simulateMoatResponse = {
country: null,
- settings: [],
+ bridgesList: [],
};
}
},
@@ -1412,20 +1415,20 @@ export const TorConnect = {
this._setStage(TorConnectStage.ChooseRegion);
return;
case TorConnectStage.ChooseRegion:
- // TODO: Uncomment for behaviour in tor-browser#42550.
- /*
- if (regionCode !== "automatic") {
- // Not automatic. Go straight to the final error.
- this._setStage(TorConnectStage.FinalError);
+ if (regionCode === "automatic") {
+ // The automatic region failed.
+ if (bootstrapAttempt.detectedRegion) {
+ this._setStage(TorConnectStage.ConfirmRegion);
+ } else {
+ this._setStage(TorConnectStage.RegionNotFound);
+ }
return;
}
- */
- if (regionCode !== "automatic" || bootstrapAttempt.detectedRegion) {
- this._setStage(TorConnectStage.ConfirmRegion);
- return;
- }
- this._setStage(TorConnectStage.RegionNotFound);
- return;
+ // Else, not automatic. Go straight to the final error since the user
+ // is unlikely to succeed re-selecting the same region and it would
be
+ // unexpected for the user to select a different region.
+ // See tor-browser#42550.
+ break;
}
this._setStage(TorConnectStage.FinalError);
return;
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/65026e41ffe62fc527b4a8abf26e90e4e28e84b4
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/65026e41ffe62fc527b4a8abf26e90e4e28e84b4
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
