- tbb-commits - lists.torproject.org

[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 23 Jun '21

23 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 23 Jun '21

23 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

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

22 Jun '21

commit 8157aa761f342864c3c8b6109b24758ae7ead1ea Merge: 9c9884c27d5a 0f2ac709c048 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 22 14:58:49 2021 +0000 Merge remote-tracking branch 'richardgl/40476' into tor-browser-78.11.0esr-10.5-1 netwerk/protocol/http/nsCORSListenerProxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40311'
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit b3629abd0fcd0a1b96c13e180031d3fe3f772260 Merge: 80e97dc dac2b35 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:53:26 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40311' projects/android-components/config | 4 ++-- projects/application-services/config | 2 +- projects/application-services/list_toolchain_updates_checks | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40313'
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 2d69c715c1fdaa4099cf0d4bc37ba36c58d68f83 Merge: b3629ab 8ec1d47 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:57:18 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40313' rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 8ec1d476c8a3b3e8a67a33964bb4e67f494efbf2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 15:14:52 2021 +0200 Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6d2a774..9a9339f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -351,7 +351,7 @@ targets: wget $OPENJDK_URL/openjdk-8-jre-headless_$JDK_VERSION.deb echo 92b4f8fb77d793a86e0b03b3b0750592b40a26a5d75956d10dd984a7b3aad4c9 openjdk-8-jdk-headless_$JDK_VERSION.deb | sha256sum -c echo 84bf52b6cce20ead08b0d5b9fd9b81b4aa3da385ca951b313fe11d5cb1aa4d17 openjdk-8-jre-headless_$JDK_VERSION.deb | sha256sum -c - dpkg -i ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb + apt-get install -y -q ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4)
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit dac2b35d64153c183165d0955b0e42f502798794 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 12:14:26 2021 +0200 Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4) --- projects/android-components/config | 4 ++-- projects/application-services/config | 2 +- projects/application-services/list_toolchain_updates_checks | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 0d8d88c..bf3b8a4 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,8 +58,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/android-components.git - #git_hash: v75.0.22 + git_url: https://github.com/mozilla-mobile/android-components.git + git_hash: v90.0.7 #tag_gpg_id: 0 var: container: diff --git a/projects/application-services/config b/projects/application-services/config index efbe321..93f8f5c 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -94,7 +94,7 @@ input_files: steps: list_toolchain_updates: - #git_hash: 'v74.0.1' + git_hash: 'v77.0.2' input_files: [] var: container: diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks index 69c232c..b028d10 100644 --- a/projects/application-services/list_toolchain_updates_checks +++ b/projects/application-services/list_toolchain_updates_checks @@ -74,7 +74,7 @@ check_update_needed sqlcipher "$needed" "$current" # android-gradle-plugin read -d '' p << 'EOF' || true -if (m/^\\s*ext\\.android_gradle_plugin_version\\s=\\s'([^']*)'/) { +if (m/^\\s*android_gradle_plugin_version\\s=\\s'([^']*)'/) { print $1; exit; } @@ -86,7 +86,7 @@ check_update_needed android-gradle-plugin "$needed" "$current" # android-components read -d '' p << 'EOF' || true -if (m/^\\s*ext\\.android_components_version\\s=\\s'([^']*)'/) { +if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) { print $1; exit; } diff --git a/projects/fenix/config b/projects/fenix/config index a25aaa0..296ab7c 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -56,8 +56,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/fenix.git - #git_hash: v89.1.1 + git_url: https://github.com/mozilla-mobile/fenix.git + git_hash: v90.0.0-beta.4 tag_gpg_id: 0 input_files: [] var: diff --git a/projects/geckoview/config b/projects/geckoview/config index 0695277..c46901e 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,9 +138,9 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - #git_url: https://github.com/mozilla/gecko-dev.git - # 89.0b10 - #git_hash: 702dfbec3d62823d0dfca870995540383ab39183 + git_url: https://github.com/mozilla/gecko-dev.git + # 90.0b9 + git_hash: 92485800ccb404788bfd215e59c3850b314d3905 tag_gpg_id: 0 input_files: [] var:

1 0