June 2021 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit b0faf995b30bbff00da3499b544d5431ff7016a3 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 24 16:53:00 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- .../components/torconnect/content/aboutTorConnect.js | 2 +- browser/components/torpreferences/content/torPane.js | 20 ++++++++++++-------- .../components/torpreferences/content/torPane.xhtml | 9 ++++++++- browser/modules/TorStrings.jsm | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 5fb5b2924b94..657427767629 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -98,7 +98,7 @@ class AboutTorConnect { setInitialUI() { this.setTitle(this.torStrings.torConnect.torConnect); this.elemProgressDesc.textContent = - this.torStrings.settings.quickstartDescription; + this.torStrings.settings.torPreferencesDescription; this.showElem(this.elemConnectButton); this.showElem(this.elemAdvancedButton); this.hideElem(this.elemCopyLogLink); diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index d63b31c4c6f6..01609ddda090 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -75,11 +75,12 @@ const gTorPane = (function() { }, torPreferences: { header: "h1#torPreferences-header", + description: "span#torPreferences-description", + learnMore: "label#torPreferences-learnMore", }, quickstart: { header: "h2#torPreferences-quickstart-header", description: "span#torPreferences-quickstart-description", - learnMore: "label#torPreferences-quickstart-learnMore", enableQuickstartCheckbox: "checkbox#torPreferences-quickstart-toggle", }, bridges: { @@ -220,15 +221,11 @@ const gTorPane = (function() { // Heading prefpane.querySelector(selectors.torPreferences.header).innerText = TorStrings.settings.torPreferencesHeading; - - // Quickstart - prefpane.querySelector(selectors.quickstart.header).innerText = - TorStrings.settings.quickstartHeading; - prefpane.querySelector(selectors.quickstart.description).textContent = - TorStrings.settings.quickstartDescription; + prefpane.querySelector(selectors.torPreferences.description).textContent = + TorStrings.settings.torPreferencesDescription; { let learnMore = prefpane.querySelector( - selectors.quickstart.learnMore + selectors.torPreferences.learnMore ); learnMore.setAttribute("value", TorStrings.settings.learnMore); learnMore.setAttribute( @@ -236,6 +233,13 @@ const gTorPane = (function() { TorStrings.settings.learnMoreTorBrowserURL ); } + + // Quickstart + prefpane.querySelector(selectors.quickstart.header).innerText = + TorStrings.settings.quickstartHeading; + prefpane.querySelector(selectors.quickstart.description).textContent = + TorStrings.settings.quickstartDescription; + this._enableQuickstartCheckbox = prefpane.querySelector( selectors.quickstart.enableQuickstartCheckbox ); diff --git a/browser/components/torpreferences/content/torPane.xhtml b/browser/components/torpreferences/content/torPane.xhtml index 996325e08bf7..7c8071f2cf10 100644 --- a/browser/components/torpreferences/content/torPane.xhtml +++ b/browser/components/torpreferences/content/torPane.xhtml @@ -33,6 +33,14 @@ <html:h1 id="torPreferences-header"/> </hbox> +<groupbox data-category="paneTor" + hidden="true"> + <description flex="1"> + <html:span id="torPreferences-description" class="tail-with-learn-more"/> + <label id="torPreferences-learnMore" class="learnMore text-link" is="text-link"/> + </description> +</groupbox> +  <groupbox id="torPreferences-quickstart-group" data-category="paneTor" @@ -40,7 +48,6 @@ <html:h2 id="torPreferences-quickstart-header"/> <description flex="1"> <html:span id="torPreferences-quickstart-description"/> - <label id="torPreferences-quickstart-learnMore" class="learnMore text-link" is="text-link"/> </description> <checkbox id="torPreferences-quickstart-toggle"/> </groupbox> diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index e7597bbfa74f..c086d0fe3117 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -258,7 +258,7 @@ var TorStrings = { ), learnMore: getString("torPreferences.learnMore", "Learn More"), quickstartHeading: getString("torPreferences.quickstart", "Quickstart"), - quickstartDescription: getString("torPreferences.quickstartDescription", "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. Quickstart allows Tor Browser to connect automatically."), + quickstartDescription: getString("torPreferences.quickstartDescription", "Quickstart allows Tor Browser to connect automatically."), quickstartCheckbox : getString("torPreferences.quickstartCheckbox", "Always connect automatically"), bridgesHeading: getString("torPreferences.bridges", "Bridges"), bridgesDescription: getString(

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40481' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 287d6bbc24a94dd321731deb27e553920fc864fa Merge: 280556dc26c9 b0faf995b30b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 16:44:00 2021 +0000 Merge remote-tracking branch 'richardgl/40481' into tor-browser-78.11.0esr-10.5-1 .../components/torconnect/content/aboutTorConnect.js | 2 +- browser/components/torpreferences/content/torPane.js | 20 ++++++++++++-------- .../components/torpreferences/content/torPane.xhtml | 9 ++++++++- browser/modules/TorStrings.jsm | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --cc browser/components/torconnect/content/aboutTorConnect.js index 02ea82433a37,657427767629..1c574a5d07c9 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@@ -98,9 -98,8 +98,9 @@@ class AboutTorConnect setInitialUI() { this.setTitle(this.torStrings.torConnect.torConnect); this.elemProgressDesc.textContent = - this.torStrings.settings.quickstartDescription; + this.torStrings.settings.torPreferencesDescription; this.showElem(this.elemConnectButton); + this.elemConnectButton.focus(); this.showElem(this.elemAdvancedButton); this.hideElem(this.elemCopyLogLink); this.hideElem(this.elemCancelButton);

1 0

[tor-browser-build/master] Bug 40302: Update version of snowflake
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 4faacf83a969c590db643bfcd67d6b4859770d57 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Jun 1 15:03:50 2021 -0400 Bug 40302: Update version of snowflake --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 95ef549..6022b2c 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 1b29ad7de14fb0a6d2bf88aea38353733682cd26 +git_hash: ae7cc478fd345a1e588f8315ec980809c6806372 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'cohoshgl/issue/40302'
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 318a0923b373728fcdf3b2db84b0b61e1ccd8176 Merge: 2d69c71 4faacf8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 16:07:51 2021 +0000 Merge remote-tracking branch 'cohoshgl/issue/40302' projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit ccef7b35e20bd47dec7717bac2524b86878b2bd3 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 24 15:22:36 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- .../torconnect/content/aboutTorConnect.css | 24 ++++++++++++++++++++++ .../torconnect/content/aboutTorConnect.js | 1 + browser/themes/shared/onionPattern.inc.xhtml | 7 +++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css index eff767205266..a70904ca0b28 100644 --- a/browser/components/torconnect/content/aboutTorConnect.css +++ b/browser/components/torconnect/content/aboutTorConnect.css @@ -10,6 +10,30 @@ --onion-radius: 50px; } +/* override firefox's default blue focus coloring */ +:focus { + outline: none!important; + box-shadow: 0 0 0 3px #CD8CED !important; + border: 1px #59316B solid !important; +} + +@media (prefers-color-scheme: dark) +{ + :focus { + box-shadow: 0 0 0 3px #8C689E !important; + } +} + +/* override firefox's default blue border on hover */ +input[type="checkbox"]:not(:disabled):hover { + border-color: #59316B; +} + +/* fix checkbox visibility when dark mode enabled */ +input[type="checkbox"]:checked { + fill: var(--in-content-page-color); +} + #connectButton { background-color: #7D4698; } diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index a88a887c7878..5fb5b2924b94 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -278,6 +278,7 @@ class AboutTorConnect { this.elemConnectButton.addEventListener("click", () => { this.connect(); }); + this.elemConnectButton.focus(); this.elemCancelButton.textContent = this.torStrings.torConnect.cancel; this.elemCancelButton.addEventListener("click", () => { diff --git a/browser/themes/shared/onionPattern.inc.xhtml b/browser/themes/shared/onionPattern.inc.xhtml index 95f073e673b4..6bbde93684a2 100644 --- a/browser/themes/shared/onionPattern.inc.xhtml +++ b/browser/themes/shared/onionPattern.inc.xhtml @@ -12,8 +12,11 @@ --> <div class="onion-pattern-container"> - <div class="onion-pattern-crop"> - <div class="onion-pattern-column"> +  + <div class="onion-pattern-crop" tabindex="-1"> + <div class="onion-pattern-column" tabindex="-1"> <div class="onion-pattern-row"> <div class="circle solid"></div>

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40480' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit f6578c3e0085fbb401e7fa3d3e5e323b80962c01 Merge: 9cb771f3026c ccef7b35e20b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 14:06:01 2021 +0000 Merge remote-tracking branch 'richardgl/40480' into tor-browser-78.11.0esr-10.5-1 .../torconnect/content/aboutTorConnect.css | 24 ++++++++++++++++++++++ .../torconnect/content/aboutTorConnect.js | 1 + browser/themes/shared/onionPattern.inc.xhtml | 7 +++++-- 3 files changed, 30 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] squash! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 9cb771f3026c5303e2700e392826a9e028e9b2d5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 20:17:21 2021 +0000 squash! Bug 28005: Implement .onion alias urlbar rewrites Bug 40456: Update the SecureDrop HTTPS-Everywhere update channel Bug 40478: Onion alias url rewrite is broken --- .../onionservices/HttpsEverywhereControl.jsm | 32 ++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/browser/components/onionservices/HttpsEverywhereControl.jsm b/browser/components/onionservices/HttpsEverywhereControl.jsm index c91db3e8de87..d673de4cd6e5 100644 --- a/browser/components/onionservices/HttpsEverywhereControl.jsm +++ b/browser/components/onionservices/HttpsEverywhereControl.jsm @@ -10,7 +10,7 @@ const { ExtensionMessaging } = ChromeUtils.import( const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); const EXTENSION_ID = "https-everywhere-eff(a)eff.org"; -const SECUREDROP_TOR_ONION_CHANNEL = { +const SECUREDROP_TOR_ONION_CHANNEL_2020 = { name: "SecureDropTorOnion", jwk: { kty: "RSA", @@ -24,6 +24,20 @@ const SECUREDROP_TOR_ONION_CHANNEL = { replaces_default_rulesets: false, }; +const SECUREDROP_TOR_ONION_CHANNEL = { + name: "SecureDropTorOnion2021", + jwk: { + kty: "RSA", + e: "AQAB", + n: + "vsC7BNafkRe8Uh1DUgCkv6RbPQMdJgAKKnWdSqQd7tQzU1mXfmo_k1Py_2MYMZXOWmqSZ9iwIYkykZYywJ2VyMGve4byj1sLn6YQoOkG8g5Z3V4y0S2RpEfmYumNjTzfq8nxtLnwjaYd4sCUd5wa0SzeLrpRQuXo2bF3QuUF2xcbLJloxX1MmlsMMCdBc-qGNonLJ7bpn_JuyXlDWy1Fkeyw1qgjiOdiRIbMC1x302zgzX6dSrBrNB8Cpsh-vCE0ZjUo8M9caEv06F6QbYmdGJHM0ZZY34OHMSNdf-_qUKIV_SuxuSuFE99tkAeWnbWpyI1V-xhVo1sc7NzChP8ci2TdPvI3_0JyAuCvL6zIFqJUJkZibEUghhg6F09-oNJKpy7rhUJq7zZyLXJsvuXnn0gnIxfjRvMcDfZAKUVMZKRdw7fwWzwQril4Ib0MQOVda9vb_4JMk7Gup-TUI4sfuS4NKwsnKoODIO-2U5QpJWdtp1F4AQ1pBv8ajFl1WTrVGvkRGK0woPWaO6pWyJ4kRnhnxrV2FyNNt3JSR-0JEjhFWws47kjBvpr0VRiVRFppKA-plKs4LPlaaCff39TleYmY3mETe3w1GIGc2Lliad32Jpbx496IgDe1K3FMBEoKFZfhmtlRSXft8NKgSzPt2zkatM9bFKfaCYRaSy7akbk", + }, + update_path_prefix: "https://securedrop.org/https-everywhere-2021/", + scope: + "^https?:\\/\\/[a-z0-9-]+(?:\\.[a-z0-9-]+)*\\.securedrop\\.tor\\.onion\\/", + replaces_default_rulesets: false, +}; + class HttpsEverywhereControl { constructor() { this._extensionMessaging = null; @@ -56,6 +70,20 @@ class HttpsEverywhereControl { // for that here. await HttpsEverywhereControl.wait(); + try { + // Delete the previous channel signing key, and add the new one below. + await this._sendMessage( + "delete_update_channel", + SECUREDROP_TOR_ONION_CHANNEL_2020.name + ); + } catch (e) { + if (retries <= 0) { + throw new Error("Could not uninstall SecureDropTorOnion update channel"); + } + await this.installTorOnionUpdateChannel(retries - 1); + return; + } + try { // TODO: we may want a way to "lock" this update channel, so that it cannot be modified // by the user via UI, but I think this is not possible at the time of writing via @@ -89,7 +117,7 @@ class HttpsEverywhereControl { * Returns the timestamp of the last .tor.onion update channel update. */ async getRulesetTimestamp() { - const rulesets = await this._sendMessage("get_ruleset_timestamps"); + const rulesets = await this._sendMessage("get_update_channel_timestamps"); const securedrop = rulesets && rulesets.find(([{ name }]) => name === SECUREDROP_TOR_ONION_CHANNEL.name);

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit b61c939ceef2ed8e5cfa788f495a978883c02404 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 22 19:16:28 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/BrowserGlue.jsm | 19 ++++++++++++++++++- .../onionservices/HttpsEverywhereControl.jsm | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 2bd28ec1b04c..adc8e5edb07a 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2506,7 +2506,24 @@ BrowserGlue.prototype = { { task: () => { - OnionAliasStore.init(); + if (Services.io.offline === false) { + // we will take this path when the user is using the legacy tor launcher + OnionAliasStore.init(); + } else { + // this path is taken when using about:torconnect, we start in offline mode + // and only switch to online after bootstrapping completes + const topic = "network:offline-status-changed"; + let offlineStatusChangedObserver = { + observe(aSubject, aTopic, aData) { + if (aTopic === topic && aData === "online") { + OnionAliasStore.init(); + // we only need to init once, so remove ourselves as an obvserver + Services.obs.removeObserver(this, topic); + } + } + }; + Services.obs.addObserver(offlineStatusChangedObserver, topic); + } }, }, diff --git a/browser/components/onionservices/HttpsEverywhereControl.jsm b/browser/components/onionservices/HttpsEverywhereControl.jsm index 60c3b5fca282..c91db3e8de87 100644 --- a/browser/components/onionservices/HttpsEverywhereControl.jsm +++ b/browser/components/onionservices/HttpsEverywhereControl.jsm @@ -27,6 +27,7 @@ const SECUREDROP_TOR_ONION_CHANNEL = { class HttpsEverywhereControl { constructor() { this._extensionMessaging = null; + this._init(); } async _sendMessage(type, object) { @@ -47,7 +48,6 @@ class HttpsEverywhereControl { * Installs the .tor.onion update channel in https-everywhere */ async installTorOnionUpdateChannel(retries = 5) { - this._init(); // TODO: https-everywhere store is initialized asynchronously, so sending a message // immediately results in a `store.get is undefined` error. @@ -115,5 +115,20 @@ class HttpsEverywhereControl { if (!this._extensionMessaging) { this._extensionMessaging = new ExtensionMessaging(); } + + // update all of the existing https-everywhere channels + setTimeout(async () => { + let pinnedChannels = await this._sendMessage("get_pinned_update_channels"); + for(let channel of pinnedChannels.update_channels) { + this._sendMessage("update_update_channel", channel); + } + + let storedChannels = await this._sendMessage("get_stored_update_channels"); + for(let channel of storedChannels.update_channels) { + this._sendMessage("update_update_channel", channel); + } + }, 0); + + } }

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40455' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit d03456f9cd90665c20f146437962d6e8138cc754 Merge: 8157aa761f34 b61c939ceef2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 00:41:34 2021 +0000 Merge remote-tracking branch 'richardgl/40455' into tor-browser-78.11.0esr-10.5-1 browser/components/BrowserGlue.jsm | 19 ++++++++++++++++++- .../onionservices/HttpsEverywhereControl.jsm | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 40475: Include clearing CORS preflight cache
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 0f2ac709c04851627d75a7eb9ba32a4ecf7debf7 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 22 15:37:00 2021 +0200 fixup! Bug 40475: Include clearing CORS preflight cache --- netwerk/protocol/http/nsCORSListenerProxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index d9b658af881b..6d2e160c2a9b 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -348,7 +348,9 @@ void nsCORSListenerProxy::Shutdown() { /* static */ void nsCORSListenerProxy::Clear() { - sPreflightCache->Clear(); + if (sPreflightCache) { + sPreflightCache->Clear(); + } } nsCORSListenerProxy::nsCORSListenerProxy(nsIStreamListener* aOuter,

1 0