- tbb-commits - lists.torproject.org

[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 bbbb7f4b0ca0fb9355a0840ecb5752fd3b4aa8fa Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:26 2021 +0000 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser This reverts commit 5d1c634d905f67c9fd53f5dd45133468f848b808. --- browser/modules/TorConnect.jsm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index 6444ab39e928..f2c92dcb8f21 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -241,7 +241,7 @@ const TorConnect = (() => { Services.obs.addObserver(this, BrowserTopics.ProfileAfterChange); }, - observe: function(subject, topic, data) { + observe: async function(subject, topic, data) { console.log(`TorConnect: observed ${topic}`); switch(topic) { @@ -306,7 +306,8 @@ const TorConnect = (() => { /* Handle bootstrap error*/ case TorTopics.BootstrapError: { const obj = subject?.wrappedJSObject; - TorProtocolService.torStopBootstrap().then(() => this.onError(obj.message, obj.details)); + await TorProtocolService.torStopBootstrap(); + this.onError(obj.message, obj.details); break; } case TorTopics.LogHasWarnOrErr: {

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 30237: Add v3 onion services client authentication prompt
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit b874d93d1e3346af21e7e5d64707d593cc68bd77 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Sep 22 16:53:18 2021 -0500 fixup! Bug 30237: Add v3 onion services client authentication prompt --- .../onionservices/content/netError/browser.svg | 4 +- .../onionservices/content/netError/network.svg | 4 +- .../content/netError/onionNetError.css | 55 +++++++++++++++------- .../content/netError/onionNetError.js | 9 ++-- .../onionservices/content/netError/onionsite.svg | 9 ++-- 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/browser/components/onionservices/content/netError/browser.svg b/browser/components/onionservices/content/netError/browser.svg index b4c433b37bbb..1359679f7171 100644 --- a/browser/components/onionservices/content/netError/browser.svg +++ b/browser/components/onionservices/content/netError/browser.svg @@ -1,3 +1,3 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="72" height="65" viewBox="0 0 72 65"> - <path fill="context-fill" fill-opacity="context-fill-opacity" d="M0.0 0.0C0.0 0.0 0.0 65.0 0.0 65.0C0.0 65.0 72.0 65.0 72.0 65.0C72.0 65.0 72.0 0.0 72.0 0.0C72.0 0.0 52.9019692 0.0 52.9019692 0.0C52.9019692 0.0 0.0 0.0 0.0 0.0C0.0 0.0 0.0 0.0 0.0 0.0M65.0 58.0C65.0 58.0 6.0 58.0 6.0 58.0C6.0 58.0 6.0 25.0 6.0 25.0C6.0 25.0 65.0 25.0 65.0 25.0C65.0 25.0 65.0 58.0 65.0 58.0C65.0 58.0 65.0 58.0 65.0 58.0M6.0 10.0C6.0 10.0 10.0 10.0 10.0 10.0C10.0 10.0 10.0 14.0 10.0 14.0C10.0 14.0 6.0 14.0 6.0 14.0C6.0 14.0 6.0 10.0 6.0 10.0C6.0 10.0 6.0 10.0 6.0 10.0M14.0 10.0C14.0 10.0 18.0 10.0 18.0 10.0C18.0 10.0 18.0 14.0 18.0 14.0C18.0 14.0 14.0 14.0 14.0 14.0C14.0 14.0 14.0 10.0 14.0 10.0C14.0 10.0 14.0 10.0 14.0 10.0M22.0 10.0C22.0 10.0 26.0 10.0 26.0 10.0C26.0 10.0 26.0 14.0 26.0 14.0C26.0 14.0 22.0 14.0 22.0 14.0C22.0 14.0 22.0 10.0 22.0 10.0C22.0 10.0 22.0 10.0 22.0 10.0" /> +<svg fill="none" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg"> + <path fill="context-fill" fill-opacity="context-fill-opacity" d="m49 6h-37.5c-1.98912 0-3.89678.79018-5.3033 2.1967s-2.1967 3.3142-2.1967 5.3033v33.75c0 1.9891.79018 3.8968 2.1967 5.3033s3.31418 2.1967 5.3033 2.1967h37.5c1.9891 0 3.8968-.7902 5.3033-2.1967s2.1967-3.3142 2.1967-5.3033v-33.75c0-1.9891-.7902-3.89678-2.1967-5.3033s-3.3142-2.1967-5.3033-2.1967zm-38.0625 4.6875h38.625l2.25 2.25v8.0625h-43.125v-8.0625zm38.625 39.375h-38.625l-2.25-2.25v-22.125h43.125v22.125z"/> </svg> diff --git a/browser/components/onionservices/content/netError/network.svg b/browser/components/onionservices/content/netError/network.svg index 808c53dedd09..68610e30bfca 100644 --- a/browser/components/onionservices/content/netError/network.svg +++ b/browser/components/onionservices/content/netError/network.svg @@ -1,3 +1,3 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="72" height="54" viewBox="0 0 72 54"> - <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.0487805 54.0C6.28990244 54.0 0.0 47.3306322 0.0 39.1034585C0.0 32.0105634 4.68716488 26.0867675 10.9481707 24.585103C10.6902 23.574652 10.5365854 22.5107596 10.5365854 21.4138156C10.5365854 14.7292347 15.6471278 9.3103384 21.9512195 9.3103384C24.8076351 9.3103384 27.4126741 10.4393194 29.4146341 12.2780088C32.1344254 5.0777841 38.77452 0.0 46.5365854 0.0C56.7201249 0.0 64.9756098 8.7536733 64.9756098 19.5517479C64.9756098 20.7691677 64.8471688 21.9453428 64.6463415 23.1013144C69.0576849 26.0679606 72.0 31.2693674 72.0 37.2413909C72.0 46.5256603 64.9510244 54.0 56.195122 54.0C56.195122 54.0 14.0487805 54.0 14.0487805 54.0C14.0487805 54.0 14.0487805 54.0 14.0487805 54.0" /> +<svg fill="none" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg"> + <path fill="context-fill" fill-opacity="context-fill-opacity" d="m30 1.875c-7.4592 0-14.6129 2.96316-19.8874 8.2376-5.27444 5.2745-8.2376 12.4282-8.2376 19.8874s2.96316 14.6129 8.2376 19.8874c5.2745 5.2744 12.4282 8.2376 19.8874 8.2376s14.6129-2.9632 19.8874-8.2376c5.2744-5.2745 8.2376-12.4282 8.2376-19.8874s-2.9632-14.6129-8.2376-19.8874c-5.2745-5.27444-12.4282-8.2376-19.8874-8.2376zm9.1762 6.5625c3.8504 1.6533 7.1876 4.3079 9.6646 7.6877 2.477 3.3799 4.0034 7.3615 4.4205 11.531h-8.3588c-.4617-6.9829-2.9858-13.6716-7.2525-19.2187zm-7.6837 0c5.0739 5.1814 8.1562 11.9874 8.7037 19.2187h-20.3924c.5475-7.2313 3.6298-14.0373 8.7037-19.2187zm-10.6725 0h1.53c-4.2651 5.548-6.789 12.2362-7.2525 19.2187h-8.35875c.41632-4.1692 1.942-8.1508 4.41835-11.5306 2.4764-3.3799 5.813-6.0346 9.6629-7.6881zm0 43.125c-3.8504-1.6528-7.1874-4.3074-9.6639-7.6874-2.47642-3.38-4.0018-7.3619-4.41735-11.5313h8.35875c.4617 6.9829 2.9858 13.6716 7.2525 19.2187zm7.6875 0c-5.0739-5.1814-8.1562-11.9874-8.7037-19.2 187h20.3887c-.5475 7.2313-3.6298 14.0373-8.7037 19.2187zm10.6725 0h-1.5338c4.2683-5.5462 6.7926-12.2354 7.2525-19.2187h8.3588c-.4156 4.1689-1.9406 8.1504-4.4163 11.5302-2.4757 3.3799-5.8118 6.0348-9.6612 7.6885z"/> </svg> diff --git a/browser/components/onionservices/content/netError/onionNetError.css b/browser/components/onionservices/content/netError/onionNetError.css index 58117ab93223..2c92b187b71c 100644 --- a/browser/components/onionservices/content/netError/onionNetError.css +++ b/browser/components/onionservices/content/netError/onionNetError.css @@ -1,15 +1,12 @@ /* Copyright (c) 2020, The Tor Project, Inc. */ -:root { - --grey-70: #38383d; -} - #onionErrorDiagramContainer { - margin: 60px auto; - width: 460px; /* 3 columns @ 140px plus 2 column gaps @ 20px */ + margin: 0px auto 40px 0px; + /* 3 icons 64px wide each seperated by a 64px gap */ + width: 384px; display: grid; grid-row-gap: 15px; - grid-column-gap: 20px; + grid-column-gap: 64px; grid-template-columns: 1fr 1fr 1fr; } @@ -19,12 +16,36 @@ } .onionErrorImage { - width: 72px; - height: 72px; + width: 64px; + height: 64px; + background-size: 64px 64px; background-position: center; background-repeat: no-repeat; -moz-context-properties: fill; - fill: var(--grey-70); + fill: var(--in-content-icon-color); + opacity: 50%; +} + +/* TODO: remove these --warning-color definitions after we + are esr92 based (tor-browser#40640 */ +.onionErrorImage { + --warning-color: #ffa436; +} + +@media (-moz-toolbar-prefers-color-scheme: dark) { + .onionErrorImage { + --warning-color: #ffbd4f; + } +} + +@media (prefers-contrast) { + .onionErrorImage { + --warning-color: var(--in-content-page-color); + } +} + +.onionErrorImage[status] { + opacity: 100%; } #onionErrorBrowserImage { @@ -43,13 +64,13 @@ .onionErrorImage[status]::after { content: " "; position: absolute; - left: -18px; - top: 18px; - width: 36px; - height: 36px; + left: -8px; + top: calc((64px - 24px) / 2); + width: 24px; + height: 24px; -moz-context-properties: fill; fill: var(--in-content-page-background); - background-color: var(--grey-70); + background-repeat: no-repeat; background-position: center; border: 3px solid var(--in-content-page-background); @@ -57,9 +78,11 @@ } .onionErrorImage[status="ok"]::after { + background-color: var(--in-content-icon-color); background-image: url("chrome://global/skin/icons/check.svg"); } .onionErrorImage[status="error"]::after { - background-image: url("chrome://browser/skin/stop.svg"); + background-color: var(--warning-color); + background-image: url("chrome://global/skin/icons/close.svg"); } diff --git a/browser/components/onionservices/content/netError/onionNetError.js b/browser/components/onionservices/content/netError/onionNetError.js index 8fabb3f38eb7..745c58ec6124 100644 --- a/browser/components/onionservices/content/netError/onionNetError.js +++ b/browser/components/onionservices/content/netError/onionNetError.js @@ -6,6 +6,7 @@ var OnionServicesAboutNetError = { _selector: { + textContainer: "div#text-container", header: ".title-text", longDesc: "#errorLongDesc", learnMoreContainer: "#learnMoreContainer", @@ -194,12 +195,10 @@ var OnionServicesAboutNetError = { labelDiv = this._createDiv(aDoc, undefined, undefined, container); labelDiv.textContent = this._strings.errorPage.onionSite; - const contentContainer = aDoc.querySelector( - this._selector.contentContainer + const textContainer = aDoc.querySelector( + this._selector.textContainer ); - if (contentContainer) { - contentContainer.insertBefore(container, contentContainer.firstChild); - } + textContainer?.insertBefore(container, textContainer.firstChild); }, // _insertDiagram() _createDiv(aDoc, aID, aClass, aParentElem) { diff --git a/browser/components/onionservices/content/netError/onionsite.svg b/browser/components/onionservices/content/netError/onionsite.svg index 1f2777e6acc7..c1b2d7382dc9 100644 --- a/browser/components/onionservices/content/netError/onionsite.svg +++ b/browser/components/onionservices/content/netError/onionsite.svg @@ -1,7 +1,8 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="70" height="63" viewBox="0 0 70 63"> +<svg fill="none" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg"> <g fill="context-fill" fill-opacity="context-fill-opacity"> - <path d="M64.0 2.0C64.0 2.0 4.0 2.0 4.0 2.0C2.8954305 2.0 2.0 2.81148389 2.0 3.8125C2.0 3.8125 2.0 58.1875 2.0 58.1875C2.0 59.1885161 2.8954305 60.0 4.0 60.0C4.0 60.0 36.0 60.0 36.0 60.0C36.0 60.0 36.0 56.375 36.0 56.375C36.0 56.375 6.0 56.375 6.0 56.375C6.0 56.375 6.0 41.875 6.0 41.875C6.0 41.875 38.0 41.875 38.0 41.875C38.0 41.875 38.0 38.25 38.0 38.25C38.0 38.25 6.0 38.25 6.0 38.25C6.0 38.25 6.0 23.75 6.0 23.75C6.0 23.75 62.0 23.75 62.0 23.75C62.0 23.75 62.0 36.4375 62.0 36.4375C62.0 36.4375 66.0 36.4375 66.0 36.4375C66.0 36.4375 66.0 3.8125 66.0 3.8125C66.0 2.81148389 65.1045695 2.0 64.0 2.0C64.0 2.0 64.0 2.0 64.0 2.0M62.0 20.125C62.0 20.125 6.0 20.125 6.0 20.125C6.0 20.125 6.0 5.625 6.0 5.625C6.0 5.625 62.0 5.625 62.0 5.625C62.0 5.625 62.0 20.125 62.0 20.125C62.0 20.125 62.0 20.125 62.0 20.125" /> - <path d="M24.0 47.0C24.0 47.0 24.0 51.0 24.0 51.0C24.0 51.0 20.0 51.0 20.0 51.0C20.0 51.0 20.0 47.0 20.0 47.0C20.0 47.0 24.0 47.0 24.0 47.0C24.0 47.0 24.0 47.0 24.0 47.0M16.0 47.0C16.0 47.0 16.0 51.0 16.0 51.0C16.0 51.0 12.0 51.0 12.0 51.0C12.0 51.0 12.0 47.0 12.0 47.0C12.0 47.0 16.0 47.0 16.0 47.0C16.0 47.0 16.0 47.0 16.0 47.0M56.0 29.0C56.0 29.0 56.0 33.0 56.0 33.0C56.0 33.0 52.0 33.0 52.0 33.0C52.0 33.0 52.0 29.0 52.0 29.0C52.0 29.0 56.0 29.0 56.0 29.0C56.0 29.0 56.0 29.0 56.0 29.0M48.0 29.0C48.0 29.0 48.0 33.0 48.0 33.0C48.0 33.0 12.0 33.0 12.0 33.0C12.0 33.0 12.0 29.0 12.0 29.0C12.0 29.0 48.0 29.0 48.0 29.0C48.0 29.0 48.0 29.0 48.0 29.0M22.0 11.0C22.0 11.0 22.0 15.0 22.0 15.0C22.0 15.0 10.0 15.0 10.0 15.0C10.0 15.0 10.0 11.0 10.0 11.0C10.0 11.0 22.0 11.0 22.0 11.0C22.0 11.0 22.0 11.0 22.0 11.0M70.0 0.0C70.0 0.0 70.0 36.5 70.0 36.5C70.0 36.5 65.0 36.5 65.0 36.5C65.0 36.5 65.0 4.5 65.0 4.5C65.0 4.5 5.0 4.5 5.0 4.5C5.0 4.5 5.0 58.5 5.0 58.5C5.0 58.5 36.0 58.5 36.0 58.5C36.0 58 .5 36.0 63.0 36.0 63.0C36.0 63.0 0.0 63.0 0.0 63.0C0.0 63.0 0.0 0.0 0.0 0.0C0.0 0.0 70.0 0.0 70.0 0.0C70.0 0.0 70.0 0.0 70.0 0.0M32.0 47.0C32.0 47.0 32.0 51.0 32.0 51.0C32.0 51.0 28.0 51.0 28.0 51.0C28.0 51.0 28.0 47.0 28.0 47.0C28.0 47.0 32.0 47.0 32.0 47.0C32.0 47.0 32.0 47.0 32.0 47.0M54.0 11.0C54.0 11.0 54.0 15.0 54.0 15.0C54.0 15.0 50.0 15.0 50.0 15.0C50.0 15.0 50.0 11.0 50.0 11.0C50.0 11.0 54.0 11.0 54.0 11.0C54.0 11.0 54.0 11.0 54.0 11.0M46.0 11.0C46.0 11.0 46.0 15.0 46.0 15.0C46.0 15.0 42.0 15.0 42.0 15.0C42.0 15.0 42.0 11.0 42.0 11.0C42.0 11.0 46.0 11.0 46.0 11.0C46.0 11.0 46.0 11.0 46.0 11.0M38.0 11.0C38.0 11.0 38.0 15.0 38.0 15.0C38.0 15.0 34.0 15.0 34.0 15.0C34.0 15.0 34.0 11.0 34.0 11.0C34.0 11.0 38.0 11.0 38.0 11.0C38.0 11.0 38.0 11.0 38.0 11.0M30.0 11.0C30.0 11.0 30.0 15.0 30.0 15.0C30.0 15.0 26.0 15.0 26.0 15.0C26.0 15.0 26.0 11.0 26.0 11.0C26.0 11.0 30.0 11.0 30.0 11.0C30.0 11.0 30.0 11.0 30.0 11.0" /> - <path d="M61.0 46.0C61.0 46.0 59.0 46.0 59.0 46.0C59.0 46.0 59.0 40.0 59.0 40.0C59.0 38.8954305 58.1045695 38.0 57.0 38.0C57.0 38.0 49.0 38.0 49.0 38.0C47.8954305 38.0 47.0 38.8954305 47.0 40.0C47.0 40.0 47.0 46.0 47.0 46.0C47.0 46.0 45.0 46.0 45.0 46.0C43.8954305 46.0 43.0 46.8954305 43.0 48.0C43.0 48.0 43.0 60.0 43.0 60.0C43.0 61.1045695 43.8954305 62.0 45.0 62.0C45.0 62.0 61.0 62.0 61.0 62.0C62.1045695 62.0 63.0 61.1045695 63.0 60.0C63.0 60.0 63.0 48.0 63.0 48.0C63.0 46.8954305 62.1045695 46.0 61.0 46.0C61.0 46.0 61.0 46.0 61.0 46.0M51.0 42.0C51.0 42.0 55.0 42.0 55.0 42.0C55.0 42.0 55.0 46.0 55.0 46.0C55.0 46.0 51.0 46.0 51.0 46.0C51.0 46.0 51.0 42.0 51.0 42.0C51.0 42.0 51.0 42.0 51.0 42.0M59.0 58.0C59.0 58.0 47.0 58.0 47.0 58.0C47.0 58.0 47.0 50.0 47.0 50.0C47.0 50.0 59.0 50.0 59.0 50.0C59.0 50.0 59.0 58.0 59.0 58.0C59.0 58.0 59.0 58.0 59.0 58.0" /> + <path clip-rule="evenodd" d="m11.25 6h37.5c1.9891 0 3.8968.79018 5.3033 2.1967s2.1967 3.3142 2.1967 5.3033v33.75c0 1.9891-.7902 3.8968-2.1967 5.3033s-3.3142 2.1967-5.3033 2.1967h-37.5c-1.98912 0-3.89678-.7902-5.3033-2.1967s-2.1967-3.3142-2.1967-5.3033v-33.75c0-1.9891.79018-3.89678 2.1967-5.3033s3.31418-2.1967 5.3033-2.1967zm-.5625 4.6875h38.625l2.25 2.25v34.875l-2.25 2.25h-38.625l-2.25-2.25v-34.875z" fill-rule="evenodd"/> + <path d="m15.9606 22c-.52 0-1.0187-.2107-1.3863-.5858-.3677-.3751-.5743-.8838-.5743-1.4142s.2066-1.0391.5743-1.4142c.3676-.3751.8663-.5858 1.3863-.5858h14.0788c.52 0 1.0187.2107 1.3863.5858.3677.3751.5743.8838.5743 1.4142s-.2066 1.0391-.5743 1.4142c-.3676.3751-.8663.5858-1.3863.5858z"/> + <path d="m44.0709 32h-28.1418c-.5116 0-1.0023-.2107-1.3641-.5858s-.565-.8838-.565-1.4142.2032-1.0391.565-1.4142.8525-.5858 1.3641-.5858h28.1418c.5116 0 1.0023.2107 1.3641.5858s.565.8838.565 1.4142-.2032 1.0391-.565 1.4142-.8525.5858-1.3641.5858z"/> + <path d="m44.0709 42h-28.1418c-.5116 0-1.0023-.2107-1.3641-.5858s-.565-.8838-.565-1.4142.2032-1.0391.565-1.4142.8525-.5858 1.3641-.5858h28.1418c.5116 0 1.0023.2107 1.3641.5858s.565.8838.565 1.4142-.2032 1.0391-.565 1.4142-.8525.5858-1.3641.5858z"/> </g> </svg>

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 1bdb305670d640670e549fc61be0a688d0a4be7b Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Sep 22 17:25:58 2021 -0500 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/torpreferences/content/torPreferences.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index e3cc429f5982..a977648f0810 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -70,7 +70,7 @@ #torPreferences-connectMessageBox-message { display: block; line-height: 16px; - font-size: 13px; + font-size: 1.0em; margin-right: 8px; padding-left: 4px!important; padding-top: 4px!important; @@ -83,15 +83,16 @@ line-height: 24px; min-height: 24px; max-height: 24px; + min-width: 0px; margin: 0px; - border-radius: 2px; + border-radius: 4px; border: 0; - padding: 0px 8px; + padding: 0px 1.25em; margin-left: auto; margin-right: 0px; - font-size: 11px; + font-size: 0.9em; font-weight: 600; white-space: nowrap;

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 687066c127e729b3073573a139b846af32e5162f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:28 2021 +0000 fixup! Bug 40597: Implement TorSettings module This reverts commit 01b4a0d839150192571a48b0bfe7e993f4e30919. --- .../components/torpreferences/content/torPane.js | 6 ++--- browser/modules/TorSettings.jsm | 30 ++++++++++------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index a975c93cb8ed..e4e75d440469 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -694,9 +694,9 @@ const gTorPane = (function() { TorSettings.bridges.source = TorBridgeSource.BridgeDB; TorSettings.bridges.bridge_strings = bridgeStrings; TorSettings.saveToPrefs(); - TorSettings.applySettings(); - - this._requestBridgeTextarea.value = bridgeStrings; + TorSettings.applySettings().then((result) => { + this._requestBridgeTextarea.value = bridgeStrings; + }); } } ); diff --git a/browser/modules/TorSettings.jsm b/browser/modules/TorSettings.jsm index d55a5fb5759c..f88b85647944 100644 --- a/browser/modules/TorSettings.jsm +++ b/browser/modules/TorSettings.jsm @@ -325,13 +325,11 @@ const TorSettings = (() => { 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 - this.loadLegacy(); - this.saveToPrefs(); + this.loadLegacy().then((result) => { this.saveToPrefs(); Services.obs.notifyObservers(null, TorSettingsTopics.Ready);}); } else { // push down settings to tor - this.applySettings(); + this.applySettings().then((result) => Services.obs.notifyObservers(null, TorSettingsTopics.Ready)); } - Services.obs.notifyObservers(null, TorSettingsTopics.Ready); }; switch (topic) { @@ -350,7 +348,7 @@ const TorSettings = (() => { // load our settings from old locations (misc prefs and from tor daemon) // TODO: remove this after some time has elapsed to ensure users have migrated to pref settings - loadLegacy: function() { + loadLegacy: async function() { console.log("TorSettings: loadLegacy()"); let settings = this.defaultSettings(); @@ -390,8 +388,8 @@ const TorSettings = (() => { } } else { // get our currently configured bridges from tor - let torrcBridgeStrings = (() => { - let bridgeList = TorProtocolService.readStringArraySetting(TorConfigKeys.bridgeList); + let torrcBridgeStrings = await (async () => { + let bridgeList = await TorProtocolService.readStringArraySetting(TorConfigKeys.bridgeList); let retval = []; for (const line of bridgeList) { let trimmedLine = line.trim(); @@ -455,7 +453,7 @@ const TorSettings = (() => { /* Proxy */ let proxyString = null; - if (proxyString = TorProtocolService.readStringSetting(TorConfigKeys.socks4Proxy)) { + if (proxyString = await TorProtocolService.readStringSetting(TorConfigKeys.socks4Proxy)) { let [address, port] = parseAddrPort(proxyString); settings.proxy.enabled = true; @@ -464,10 +462,10 @@ const TorSettings = (() => { settings.proxy.port = port; settings.proxy.username = null; settings.proxy.password = null; - } else if (proxyString = TorProtocolService.readStringSetting(TorConfigKeys.socks5Proxy)) { + } else if (proxyString = await TorProtocolService.readStringSetting(TorConfigKeys.socks5Proxy)) { let [address, port] = parseAddrPort(proxyString); - let username = TorProtocolService.readStringSetting(TorConfigKeys.socks5ProxyUsername); - let password = TorProtocolService.readStringSetting(TorConfigKeys.socks5ProxyPassword); + let username = await TorProtocolService.readStringSetting(TorConfigKeys.socks5ProxyUsername); + let password = await TorProtocolService.readStringSetting(TorConfigKeys.socks5ProxyPassword); settings.proxy.enabled = true; settings.proxy.type = TorProxyType.Socks5; @@ -475,9 +473,9 @@ const TorSettings = (() => { settings.proxy.port = port; settings.proxy.username = username; settings.proxy.password = password; - } else if (proxyString = TorProtocolService.readStringSetting(TorConfigKeys.httpsProxy)) { + } else if (proxyString = await TorProtocolService.readStringSetting(TorConfigKeys.httpsProxy)) { let [address, port] = parseAddrPort(proxyString); - let authenticator = TorProtocolService.readStringSetting(TorConfigKeys.httpsProxyAuthenticator); + let authenticator = await TorProtocolService.readStringSetting(TorConfigKeys.httpsProxyAuthenticator); let [username, password] = parseUsernamePassword(authenticator); settings.proxy.enabled = true; @@ -496,7 +494,7 @@ const TorSettings = (() => { } /* Firewall */ - let firewallString = TorProtocolService.readStringSetting(TorConfigKeys.reachableAddresses); + let firewallString = await TorProtocolService.readStringSetting(TorConfigKeys.reachableAddresses); if (firewallString) { let allowedPorts = parseAddrPortList(firewallString); settings.firewall.enabled = allowedPorts.length > 0; @@ -647,7 +645,7 @@ const TorSettings = (() => { }, // push our settings down to the tor daemon - applySettings: function() { + applySettings: async function() { console.log("TorSettings: applySettings()"); let settings = this._settings; let settingsMap = new Map(); @@ -699,7 +697,7 @@ const TorSettings = (() => { } /* Push to Tor */ - TorProtocolService.writeSettings(settingsMap); + await TorProtocolService.writeSettings(settingsMap); return this; },

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 b41844cf612c84dfb64719f83c913e4548b3c57d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 30 21:34:14 2021 +0000 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/urlbar/UrlbarInput.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index bab9bf1ad2b7..e7ab9db0a66c 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -32,7 +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); + console.log(e?.message ? e.message : e); } return openUILinkWhere;

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit d8c5e23811aa34d0478f037c32a004a394b1ee58 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 17:32:15 2021 +0000 squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider --- browser/components/search/extensions/startpage/manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/search/extensions/startpage/manifest.json b/browser/components/search/extensions/startpage/manifest.json index c9bd9e1848d0..18041d3a2f83 100644 --- a/browser/components/search/extensions/startpage/manifest.json +++ b/browser/components/search/extensions/startpage/manifest.json @@ -18,9 +18,9 @@ "chrome_settings_overrides": { "search_provider": { "name": "Startpage", - "search_url": "https://startpage.com/rto/search", - "search_form": "https://startpage.com/rto/search/", - "search_url_post_params": "q={searchTerms}" + "search_url": "https://startpage.com/sp/search", + "search_form": "https://startpage.com/sp/search/", + "search_url_post_params": "q={searchTerms}&segment=startpage.tor" } } -} \ No newline at end of file +}

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] fixup! Bug 40597: Implement TorSettings module
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 299c899dc7334b66f1e443ab7f1001c7a8b40a3a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:30 2021 +0000 fixup! Bug 40597: Implement TorSettings module This reverts commit 9bf09ae43912f868ff5ffdb2faba5469a6fdd2a7. --- browser/modules/TorSettings.jsm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/browser/modules/TorSettings.jsm b/browser/modules/TorSettings.jsm index f88b85647944..848925fd7b29 100644 --- a/browser/modules/TorSettings.jsm +++ b/browser/modules/TorSettings.jsm @@ -317,7 +317,7 @@ const TorSettings = (() => { }, /* wait for relevant life-cycle events to load and/or apply saved settings */ - observe: function(subject, topic, data) { + observe: async function(subject, topic, data) { console.log(`TorSettings: observed ${topic}`); // once the process is ready, we need to apply our settings @@ -325,11 +325,13 @@ const TorSettings = (() => { 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 - this.loadLegacy().then((result) => { this.saveToPrefs(); Services.obs.notifyObservers(null, TorSettingsTopics.Ready);}); + await this.loadLegacy(); + this.saveToPrefs(); } else { // push down settings to tor - this.applySettings().then((result) => Services.obs.notifyObservers(null, TorSettingsTopics.Ready)); + await this.applySettings(); } + Services.obs.notifyObservers(null, TorSettingsTopics.Ready); }; switch (topic) {

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