October 2021 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 74591f4b96daf7ccafbd291f795e46e39036bf85 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:21 2021 +0000 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor This reverts commit 84aa0573fb072665688c669b98032c3c561ee123. --- browser/components/torpreferences/content/torPane.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 6dbc6b3c0e91..cde424a3f32a 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -699,7 +699,6 @@ const gTorPane = (function() { case TorBridgeSource.BuiltIn: { // if there is a built-in bridge already selected, use that let bridgeType = this._builtinBridgeMenulist.value; - console.log(`bridge type: ${bridgeType}`); if (bridgeType) { TorSettings.bridges.enabled = true; TorSettings.bridges.source = TorBridgeSource.BuiltIn;

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27477: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 67e4e06d45d415c815f6b7c45d6a22b92379c384 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:25 2021 +0000 fixup! Bug 27477: Implement about:torconnect captive portal within Tor Browser This reverts commit ff3b679987ee9d5515508d94d78ed28166706249. --- .../components/torpreferences/content/torPane.js | 9 +++++---- browser/modules/TorConnect.jsm | 23 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index cde424a3f32a..afdb27351831 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -159,10 +159,11 @@ const gTorPane = (function() { this._messageBoxButton = prefpane.querySelector(selectors.messageBox.button); // wire up connect button this._messageBoxButton.addEventListener("click", () => { - TorConnect.beginBootstrap(); - let win = Services.wm.getMostRecentWindow("navigator:browser"); - // switch to existing about:torconnect tab or create a new one - win.switchToTabHavingURI("about:torconnect", true); + TorConnect.beginBootstrap().then((result) => { + let win = Services.wm.getMostRecentWindow("navigator:browser"); + // switch to existing about:torconnect tab or create a new one + win.switchToTabHavingURI("about:torconnect", true); + }); }); let populateMessagebox = () => { diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index 17a786dc31f0..6444ab39e928 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -167,19 +167,19 @@ const TorConnect = (() => { /* Initial is never transitioned to */ [TorConnectState.Initial, null], /* Configuring */ - [TorConnectState.Configuring, (self, prevState) => { + [TorConnectState.Configuring, async (self, prevState) => { // TODO move this to the transition function if (prevState === TorConnectState.Bootstrapping) { - TorProtocolService.torStopBootstrap(); + await TorProtocolService.torStopBootstrap(); } }], /* AutoConfiguring */ - [TorConnectState.AutoConfiguring, (self, prevState) => { + [TorConnectState.AutoConfiguring, async (self, prevState) => { }], /* Bootstrapping */ - [TorConnectState.Bootstrapping, (self, prevState) => { - let error = TorProtocolService.connect(); + [TorConnectState.Bootstrapping, async (self, prevState) => { + let error = await TorProtocolService.connect(); if (error) { self.onError(error.message, error.details); } else { @@ -187,12 +187,12 @@ const TorConnect = (() => { } }], /* Bootstrapped */ - [TorConnectState.Bootstrapped, (self,prevState) => { + [TorConnectState.Bootstrapped, async (self,prevState) => { // notify observers of bootstrap completion Services.obs.notifyObservers(null, TorConnectTopics.BootstrapComplete); }], /* Error */ - [TorConnectState.Error, (self, prevState, errorMessage, errorDetails, fatal) => { + [TorConnectState.Error, async (self, prevState, errorMessage, errorDetails, fatal) => { self._errorMessage = errorMessage; self._errorDetails = errorDetails; @@ -204,7 +204,7 @@ const TorConnect = (() => { } }], /* FatalError */ - [TorConnectState.FatalError, (self, prevState) => { + [TorConnectState.FatalError, async (self, prevState) => { Services.obs.notifyObservers(null, TorConnectTopics.FatalError); }], /* Disabled */ @@ -213,7 +213,7 @@ const TorConnect = (() => { }], ])), - _changeState: function(newState, ...args) { + _changeState: async function(newState, ...args) { const prevState = this._state; // ensure this is a valid state transition @@ -228,7 +228,7 @@ const TorConnect = (() => { this._state = newState; // call our transition function and forward any args - this._transitionCallbacks.get(newState)(this, prevState, ...args); + await this._transitionCallbacks.get(newState)(this, prevState, ...args); Services.obs.notifyObservers({state: newState}, TorConnectTopics.StateChange); }, @@ -306,8 +306,7 @@ const TorConnect = (() => { /* Handle bootstrap error*/ case TorTopics.BootstrapError: { const obj = subject?.wrappedJSObject; - TorProtocolService.torStopBootstrap(); - this.onError(obj.message, obj.details); + TorProtocolService.torStopBootstrap().then(() => this.onError(obj.message, obj.details)); break; } case TorTopics.LogHasWarnOrErr: {

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 49a17ed426b887a0c8cd3724d99a03333bc35231 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:19 2021 +0000 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor This reverts commit 48b88a65e95064d39c84650e4ee37dde7b0bda83. --- browser/modules/BridgeDB.jsm | 6 ++-- browser/modules/TorProtocolService.jsm | 58 +++++++++++++++++----------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/browser/modules/BridgeDB.jsm b/browser/modules/BridgeDB.jsm index 2caa26b4e2e0..9f76b4f05a69 100644 --- a/browser/modules/BridgeDB.jsm +++ b/browser/modules/BridgeDB.jsm @@ -26,7 +26,7 @@ var BridgeDB = { return this._bridges; }, - submitCaptchaGuess(aCaptchaSolution) { + async submitCaptchaGuess(aCaptchaSolution) { if (this._moatRequestor && this._currentCaptchaInfo) { return this._moatRequestor .finishFetch( @@ -49,11 +49,11 @@ var BridgeDB = { }); }, - requestNewCaptchaImage(aProxyURI) { + async requestNewCaptchaImage(aProxyURI) { // close and clear out existing state on captcha request this.close(); - let transportPlugins = TorProtocolService.readStringArraySetting( + let transportPlugins = await TorProtocolService.readStringArraySetting( TorStrings.configKeys.clientTransportPlugin ); diff --git a/browser/modules/TorProtocolService.jsm b/browser/modules/TorProtocolService.jsm index e6c78b9a0eb1..b8678fbca9aa 100644 --- a/browser/modules/TorProtocolService.jsm +++ b/browser/modules/TorProtocolService.jsm @@ -108,7 +108,7 @@ var TorProtocolService = { // takes a Map containing tor settings // throws on error - writeSettings(aSettingsObj) { + async writeSettings(aSettingsObj) { // only write settings that have changed let newSettings = new Map(); for (const [setting, value] of aSettingsObj) { @@ -157,7 +157,7 @@ var TorProtocolService = { } let errorObject = {}; - if (!this._TorLauncherProtocolService.TorSetConfWithReply(settingsObject, errorObject)) { + if (! await this._TorLauncherProtocolService.TorSetConfWithReply(settingsObject, errorObject)) { throw new Error(errorObject.details); } @@ -168,17 +168,17 @@ var TorProtocolService = { } }, - _readSetting(aSetting) { + async _readSetting(aSetting) { this._assertValidSettingKey(aSetting); - let reply = this._TorLauncherProtocolService.TorGetConf(aSetting); + let reply = await this._TorLauncherProtocolService.TorGetConf(aSetting); if (this._TorLauncherProtocolService.TorCommandSucceeded(reply)) { return reply.lineArray; } throw new Error(reply.lineArray.join("\n")); }, - _readBoolSetting(aSetting) { - let lineArray = this._readSetting(aSetting); + async _readBoolSetting(aSetting) { + let lineArray = await this._readSetting(aSetting); if (lineArray.length != 1) { throw new Error( `Expected an array with length 1 but received array of length ${ @@ -198,8 +198,8 @@ var TorProtocolService = { } }, - _readStringSetting(aSetting) { - let lineArray = this._readSetting(aSetting); + async _readStringSetting(aSetting) { + let lineArray = await this._readSetting(aSetting); if (lineArray.length != 1) { throw new Error( `Expected an array with length 1 but received array of length ${ @@ -210,32 +210,32 @@ var TorProtocolService = { return lineArray[0]; }, - _readStringArraySetting(aSetting) { - let lineArray = this._readSetting(aSetting); + async _readStringArraySetting(aSetting) { + let lineArray = await this._readSetting(aSetting); return lineArray; }, - readBoolSetting(aSetting) { - let value = this._readBoolSetting(aSetting); + async readBoolSetting(aSetting) { + let value = await this._readBoolSetting(aSetting); this._settingsCache.set(aSetting, value); return value; }, - readStringSetting(aSetting) { - let value = this._readStringSetting(aSetting); + async readStringSetting(aSetting) { + let value = await this._readStringSetting(aSetting); this._settingsCache.set(aSetting, value); return value; }, - readStringArraySetting(aSetting) { - let value = this._readStringArraySetting(aSetting); + async readStringArraySetting(aSetting) { + let value = await this._readStringArraySetting(aSetting); this._settingsCache.set(aSetting, value); return value; }, // writes current tor settings to disk - flushSettings() { - this.sendCommand("SAVECONF"); + async flushSettings() { + await this.sendCommand("SAVECONF"); }, getLog(countObj) { @@ -261,17 +261,17 @@ var TorProtocolService = { return true; }, - enableNetwork() { + async enableNetwork() { let settings = {}; settings.DisableNetwork = false; let errorObject = {}; - if (!this._TorLauncherProtocolService.TorSetConfWithReply(settings, errorObject)) { + if (! await this._TorLauncherProtocolService.TorSetConfWithReply(settings, errorObject)) { throw new Error(errorObject.details); } }, - sendCommand(cmd) { - return this._TorLauncherProtocolService.TorSendCommand(cmd); + async sendCommand(cmd) { + return await this._TorLauncherProtocolService.TorSendCommand(cmd); }, retrieveBootstrapStatus() { @@ -287,11 +287,11 @@ var TorProtocolService = { } }, - setConfWithReply(settings) { + async setConfWithReply(settings) { let result = false; const error = {}; try { - result = this._TorLauncherProtocolService.TorSetConfWithReply(settings, error); + result = await this._TorLauncherProtocolService.TorSetConfWithReply(settings, error); } catch (e) { console.log("TorSetConfWithReply error", e); error.details = this._GetSaveSettingsErrorMessage(e.message); @@ -312,16 +312,16 @@ var TorProtocolService = { }, // Resolves to null if ok, or an error otherwise - connect() { + async connect() { const kTorConfKeyDisableNetwork = "DisableNetwork"; const settings = {}; settings[kTorConfKeyDisableNetwork] = false; - const { result, error } = this.setConfWithReply(settings); + const { result, error } = await this.setConfWithReply(settings); if (!result) { return error; } try { - this.sendCommand("SAVECONF"); + await this.sendCommand("SAVECONF"); this.clearBootstrapError(); this.retrieveBootstrapStatus(); } catch (e) { @@ -334,14 +334,14 @@ var TorProtocolService = { return this._TorLauncherProtocolService.TorLogHasWarnOrErr; }, - torStopBootstrap() { + async torStopBootstrap() { // Tell tor to disable use of the network; this should stop the bootstrap // process. const kErrorPrefix = "Setting DisableNetwork=1 failed: "; try { let settings = {}; settings.DisableNetwork = true; - const { result, error } = this.setConfWithReply(settings); + const { result, error } = await this.setConfWithReply(settings); if (!result) { console.log( `Error stopping bootstrap ${kErrorPrefix} ${error.details}`

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 9049bf031e938af4dfc3b09c729cacd9bcc1b11b Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Sep 8 12:06:57 2021 -0500 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/torconnect/TorConnectParent.jsm | 8 +------- .../components/torconnect/content/aboutTorConnect.js | 18 ++++++++---------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/browser/components/torconnect/TorConnectParent.jsm b/browser/components/torconnect/TorConnectParent.jsm index b735d75c1a72..2fbc2a5c7c7c 100644 --- a/browser/components/torconnect/TorConnectParent.jsm +++ b/browser/components/torconnect/TorConnectParent.jsm @@ -25,7 +25,6 @@ class TorConnectParent extends JSWindowActorParent { this.state = { State: TorConnect.state, StateChanged: false, - Exit: false, ErrorMessage: TorConnect.errorMessage, ErrorDetails: TorConnect.errorDetails, BootstrapProgress: TorConnect.bootstrapProgress, @@ -65,12 +64,7 @@ class TorConnectParent extends JSWindowActorParent { break; } case TorConnectTopics.BootstrapComplete: { - // tells about:torconnect pages to close or redirect themselves - // this flag will only be set if an about:torconnect page - // reaches the Bootstrapped state, so if a user - // navigates to about:torconnect manually after bootstrap, the page - // will not auto-close on them - self.state.Exit = true; + // noop break; } case TorConnectTopics.BootstrapError: { diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 4eed3cf6a5c3..b53f8b13cb80 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -194,16 +194,10 @@ class AboutTorConnect { this.hide(this.elements.advancedButton); this.hide(this.elements.cancelButton); - // only exit about:torconnect if TorConnectParent directs us to - if (state.Exit) { - if (this.redirect) { - // first try to forward to final destination - document.location = this.redirect; - } else { - // or else close the window - window.close(); - } - } + // redirects page to the requested redirect url, removes about:torconnect + // from the page stack, so users cannot accidentally go 'back' to the + // now unresponsive page + window.location.replace(this.redirect); } update_Disabled(state) { @@ -283,6 +277,10 @@ class AboutTorConnect { if (params.has("redirect")) { const encodedRedirect = params.get("redirect"); this.redirect = decodeURIComponent(encodedRedirect); + } else { + // if the user gets here manually or via the button in the urlbar + // then we will redirect to about:tor + this.redirect = "about:tor"; } let args = await RPMSendQuery("torconnect:get-init-args");

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit c1843e4e494aa810be1a605edac827c766b8809a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 29 15:42:41 2021 +0000 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/urlbar/UrlbarInput.jsm | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index a118a6f76c19..bab9bf1ad2b7 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -32,6 +32,7 @@ function maybeUpdateOpenLocationForTorConnect(openUILinkWhere, currentURI, desti } catch (e) { // swallow exception and fall through returning original so we don't accidentally break // anything if an exception is thrown + console.log(e? e.message : e); } return openUILinkWhere;

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit d4b6078699c350ad6e2c1a94b985b0b170637ece Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Sep 14 15:07:30 2021 -0500 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- .../torconnect/content/aboutTorConnect.css | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css index 3bdc6ff22192..e5e0d7accac2 100644 --- a/browser/components/torconnect/content/aboutTorConnect.css +++ b/browser/components/torconnect/content/aboutTorConnect.css @@ -29,21 +29,25 @@ input[type="checkbox"]:not(:disabled):hover { border-color: var(--purple-70); } -/* fix checkbox visibility when dark mode enabled */ -input[type="checkbox"]:checked { - fill: var(--in-content-page-color); +#connectButton, +input[type="checkbox"]:not(:disabled) { + background-color: var(--purple-60)!important; + color: white; + fill: white; } -#connectButton { - background-color: var(--purple-60); -} - -#connectButton:hover { - background-color: var(--purple-70); +#connectButton:hover, +input[type="checkbox"]:not(:disabled):hover { + background-color: var(--purple-70)!important; + color: white; + fill: white; } -#connectButton:active { - background-color: var(--purple-80); +#connectButton:active, +input[type="checkbox"]:not(:disabled):active { + background-color: var(--purple-80)!important; + color: white; + fill: white; } #progressBackground {

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit f2584ebad73ada6b4b570ada7401e2d3b127a2ce Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:23 2021 +0000 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser This reverts commit 563c8779fef936a8bb5454578765843187be396b. --- browser/modules/TorConnect.jsm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index 2f947374797a..17a786dc31f0 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -472,7 +472,9 @@ const TorConnect = (() => { // will attempt to convert user-supplied string to a uri, fallback to about:tor if cannot convert // to valid uri object let uriStringToUri = (uriString) => { - let uri = Services.uriFixup.createFixupURI(uriString, 0); + const fixupFlags = Ci.nsIURIFixup.FIXUP_FLAG_NONE; + let uri = Services.uriFixup.getFixupURIInfo(uriString, fixupFlags) + .preferredURI; return uri ? uri : Services.io.newURI("about:tor"); }; let uris = uriStrings.map(uriStringToUri);

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit c962f24a8a8c7825ec18ce513d354f4093e78363 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Sep 10 11:42:55 2021 -0500 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- .../torconnect/content/torBootstrapUrlbar.js | 2 +- .../components/torpreferences/content/torPane.js | 51 ++++++++++++++-------- .../torpreferences/content/torPreferences.css | 9 ++-- browser/modules/TorConnect.jsm | 13 ++++-- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/browser/components/torconnect/content/torBootstrapUrlbar.js b/browser/components/torconnect/content/torBootstrapUrlbar.js index 7843b80be8b9..e6a88490f33d 100644 --- a/browser/components/torconnect/content/torBootstrapUrlbar.js +++ b/browser/components/torconnect/content/torBootstrapUrlbar.js @@ -76,7 +76,7 @@ var TorBootstrapUrlbar = { inputContainer: gURLBar._inputContainer, }) this.elements.torConnectBox.addEventListener("click", () => { - window.openTrustedLinkIn("about:torconnect", "tab"); + TorConnect.openTorConnect(); }); Services.obs.addObserver(this, TorConnectTopics.StateChange); this.observing = true; diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index afdb27351831..a975c93cb8ed 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -10,7 +10,7 @@ const { TorProtocolService } = ChromeUtils.import( "resource:///modules/TorProtocolService.jsm" ); -const { TorConnect } = ChromeUtils.import( +const { TorConnect, TorConnectTopics, TorConnectState } = ChromeUtils.import( "resource:///modules/TorConnect.jsm" ); @@ -159,35 +159,42 @@ const gTorPane = (function() { this._messageBoxButton = prefpane.querySelector(selectors.messageBox.button); // wire up connect button this._messageBoxButton.addEventListener("click", () => { - TorConnect.beginBootstrap().then((result) => { - let win = Services.wm.getMostRecentWindow("navigator:browser"); - // switch to existing about:torconnect tab or create a new one - win.switchToTabHavingURI("about:torconnect", true); - }); + TorConnect.beginBootstrap(); + TorConnect.openTorConnect(); }); - let populateMessagebox = () => { - if (TorConnect.shouldShowTorConnect) { + this._populateMessagebox = () => { + if (TorConnect.shouldShowTorConnect && + TorConnect.state === TorConnectState.Configuring) { // set messagebox style and text if (TorProtocolService.torBootstrapErrorOccurred()) { + this._messageBox.parentNode.style.display = null; this._messageBox.className = "error"; this._messageBoxMessage.innerText = TorStrings.torConnect.tryAgainMessage; this._messageBoxButton.innerText = TorStrings.torConnect.tryAgain; } else { + this._messageBox.parentNode.style.display = null; this._messageBox.className = "warning"; this._messageBoxMessage.innerText = TorStrings.torConnect.connectMessage; this._messageBoxButton.innerText = TorStrings.torConnect.torConnectButton; } } else { + // we need to explicitly hide the groupbox, as switching between + // the tor pane and other panes will 'unhide' (via the 'hidden' + // attribute) the groupbox, offsetting all of the content down + // by the groupbox's margin (even if content is 0 height) + this._messageBox.parentNode.style.display = "none"; this._messageBox.className = "hidden"; this._messageBoxMessage.innerText = ""; this._messageBoxButton.innerText = ""; } } - populateMessagebox(); + this._populateMessagebox(); + Services.obs.addObserver(this, TorConnectTopics.StateChange); + // update the messagebox whenever we come back to the page window.addEventListener("focus", val => { - populateMessagebox(); + this._populateMessagebox(); }); // Heading @@ -571,6 +578,7 @@ const gTorPane = (function() { uninit() { // unregister our observer topics Services.obs.removeObserver(TorSettingsTopics.SettingChanged, this); + Services.obs.removeObserver(TorConnectTopics.StateChange, this); }, // whether the page should be present in about:preferences @@ -582,15 +590,24 @@ const gTorPane = (function() { // Callbacks // - // callback for when the quickstart pref changes observe(subject, topic, data) { - if (topic === TorSettingsTopics.SettingChanged) { - let obj = subject?.wrappedJSObject; - switch(data) { - case TorSettingsData.QuickStartEnabled: { - this._enableQuickstartCheckbox.checked = obj.value; - break; + switch (topic) { + // triggered when a TorSettings param has changed + case TorSettingsTopics.SettingChanged: { + let obj = subject?.wrappedJSObject; + switch(data) { + case TorSettingsData.QuickStartEnabled: { + this._enableQuickstartCheckbox.checked = obj.value; + break; + } } + break; + } + // triggered when tor connect state changes and we may + // need to update the messagebox + case TorConnectTopics.StateChange: { + this._populateMessagebox(); + break; } } }, diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 47b8ff18e0af..e3cc429f5982 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -87,14 +87,15 @@ border-radius: 2px; border: 0; - padding-left: 8px; - padding-right: 8px; + padding: 0px 8px; margin-left: auto; margin-right: 0px; font-size: 11px; - font-weight: 400; + font-weight: 600; white-space: nowrap; + + color: white; } #torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-button { @@ -115,12 +116,10 @@ #torPreferences-connectMessageBox.warning #torPreferences-connectMessageBox-button:hover { background-color: var(--purple-80); - color: white!important; } #torPreferences-connectMessageBox.warning #torPreferences-connectMessageBox-button:active { background-color: var(--purple-90); - color: white!important; } /* Advanced Settings */ diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index f2c92dcb8f21..ddc14148eb88 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -329,8 +329,8 @@ const TorConnect = (() => { return (TorProtocolService.ownsTorDaemon && // and we're not using the legacy launcher !TorLauncherUtil.useLegacyLauncher && - // legacy checks, TODO: maybe this should be in terms of our own state? - (TorProtocolService.isNetworkDisabled() || !TorProtocolService.isBootstrapDone())); + // if we have succesfully bootstraped, then no need to show TorConnect + this.state != TorConnectState.Bootstrapped); }, get shouldQuickStart() { @@ -420,8 +420,13 @@ const TorConnect = (() => { Further external commands and helper methods */ openTorPreferences: function() { - const win = BrowserWindowTracker.getTopWindow() - win.openTrustedLinkIn("about:preferences#tor", "tab"); + const win = BrowserWindowTracker.getTopWindow(); + win.switchToTabHavingURI("about:preferences#tor", true); + }, + + openTorConnect: function() { + const win = BrowserWindowTracker.getTopWindow(); + win.switchToTabHavingURI("about:torconnect", true, {ignoreQueryString: true}); }, copyTorLogs: function() {

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 40597: Implement TorSettings module
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit b8f9308ed1ca29d3cf80d0e8f7230121f129f4c3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 05:06:54 2021 +0000 fixup! Bug 40597: Implement TorSettings module --- browser/modules/TorSettings.jsm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/modules/TorSettings.jsm b/browser/modules/TorSettings.jsm index 848925fd7b29..ae5d3d49f298 100644 --- a/browser/modules/TorSettings.jsm +++ b/browser/modules/TorSettings.jsm @@ -321,7 +321,7 @@ const TorSettings = (() => { console.log(`TorSettings: observed ${topic}`); // once the process is ready, we need to apply our settings - let handleProcessReady = () => { + let handleProcessReady = async () => { Services.obs.removeObserver(this, TorTopics.ProcessIsReady); if (this._settings == null) { // load settings from tor if our load in init() failed and save them to prefs @@ -337,12 +337,12 @@ const TorSettings = (() => { switch (topic) { case BrowserTopics.ProfileAfterChange: { if (TorProtocolService.torProcessStatus == TorProcessStatus.Running) { - handleProcessReady(); + await handleProcessReady(); } } break; case TorTopics.ProcessIsReady: { - handleProcessReady(); + await handleProcessReady(); } break; }

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] Bug 40253: Explicitly allow NoScript in Private Browsing mode.
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 08c3689b3fe87de65b992478acf71d7c72d3a1c3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 14:58:28 2021 +0000 Bug 40253: Explicitly allow NoScript in Private Browsing mode. --- toolkit/components/extensions/Extension.jsm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm index 69833684ca53..60b610768dfb 100644 --- a/toolkit/components/extensions/Extension.jsm +++ b/toolkit/components/extensions/Extension.jsm @@ -2644,6 +2644,15 @@ class Extension extends ExtensionData { this.permissions.add(PRIVATE_ALLOWED_PERMISSION); } + // Bug 40253: Explicitly allow NoScript in Private Browsing mode. + if (this.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}") { + ExtensionPermissions.add(this.id, { + permissions: [PRIVATE_ALLOWED_PERMISSION], + origins: [], + }); + this.permissions.add(PRIVATE_ALLOWED_PERMISSION); + } + // We only want to update the SVG_CONTEXT_PROPERTIES_PERMISSION during install and // upgrade/downgrade startups. if (INSTALL_AND_UPDATE_STARTUP_REASONS.has(this.startupReason)) {

1 0