- tbb-commits - lists.torproject.org

[torbutton/master] Revert "Fix NoScript IPC for about:blank by whitelisting messages"
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 0a7d19da90202e5d40851432400444dd6287ffd9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 10:46:58 2018 +0000 Revert "Fix NoScript IPC for about:blank by whitelisting messages" This reverts commit efdc83fec6244d5f2e4b8880fef010a6e362d9dc. --- src/modules/noscript-control.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index c1442950..934a4ef0 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -129,9 +129,6 @@ var initialize = () => { // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); - if (a._messageName != "started" && a._messageName != "pageshow") { - return; - } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[tor-browser-build/master] Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3
by boklm＠torproject.org 18 Sep '18

18 Sep '18

commit 768e2c34a7516ab6e4ce2389d76c45603c3aa2fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:45:03 2018 +0000 Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 --- projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 2 ++ projects/tor-browser/gtk3-settings.ini | 2 ++ 3 files changed, 8 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4c228a9..85d7eaa 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -71,6 +71,10 @@ tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input [% INCLUDE 'RelativeLink/start-tor-browser' -%] RBM_TB_EOF chmod +x ${TB_STAGE_DIR}/Browser/start-tor-browser + # Make sure we get the desired scrollbar behavior with Gtk3, see bug 27546. + GTK_SETTINGS_DIR=${TB_STAGE_DIR}/Browser/.config/gtk-3.0 + mkdir -p $GTK_SETTINGS_DIR + cp $rootdir/gtk3-settings.ini $GTK_SETTINGS_DIR/settings.ini [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7d1720b..85754ae 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,6 +74,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' + - filename: 'gtk3-settings.ini' + enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' diff --git a/projects/tor-browser/gtk3-settings.ini b/projects/tor-browser/gtk3-settings.ini new file mode 100644 index 0000000..55c8e89 --- /dev/null +++ b/projects/tor-browser/gtk3-settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-primary-button-warps-slider = false

1 0

[tor-browser-build/master] Bug 27552: Use bundled dir on CentOS/RHEL 6
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit a0420227e3f10f159a40b08a70cbb8c66f64c342 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 17 12:37:17 2018 +0200 Bug 27552: Use bundled dir on CentOS/RHEL 6 On CentOS/RHEL 6, add the bundled directory from the firefox package to the LD_LIBRARY_PATH. In addition, we don't reset anymore the previous LD_LIBRARY_PATH value, but only add new directories to it. This allows users to set LD_LIBRARY_PATH before starting the browser if additional libraries are needed. --- projects/firefox/start-firefox | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/projects/firefox/start-firefox b/projects/firefox/start-firefox index dc30574..7e7685c 100644 --- a/projects/firefox/start-firefox +++ b/projects/firefox/start-firefox @@ -2,13 +2,46 @@ basedir=$(dirname "$0") -LD_LIBRARY_PATH="$basedir/TorBrowser/Tor/" +add_LD_LIBRARY_PATH() { + if test -z "$LD_LIBRARY_PATH" + then + LD_LIBRARY_PATH="$1" + else + LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH" + fi +} + +# Bug 27552: On CentOS/RHEL 6, we need to add the firefox bundled dir +# to LD_LIBRARY_PATH +if test -f /etc/system-release-cpe +then + if test "$(cut -d : -f 3 /etc/system-release-cpe)" = centos || \ + test "$(cut -d : -f 3 /etc/system-release-cpe)" = "enterprise_linux" + then + if test "$(cut -d : -f 5 /etc/system-release-cpe)" = "6" + then + if test -d /usr/lib64/firefox/bundled/lib64 + then + add_LD_LIBRARY_PATH /usr/lib64/firefox/bundled/lib64 + elif test -d /usr/lib/firefox/bundled/lib + then + add_LD_LIBRARY_PATH /usr/lib/firefox/bundled/lib + else + echo "Error: the firefox package (version 60 or more) is not installed." >&2 + echo "On CentOS/RHEL 6, Tor Browser requires the firefox package to be installed." >&2 + exit 1 + fi + fi + fi +fi + # Check if the system has a more recent version of libstdc++.so.6; if yes, use # that instead of the bundled version. "$basedir/abicheck" >/dev/null 2>&1 if [ $? -ne 0 ]; then - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$basedir/TorBrowser/Tor/libstdc++/" + add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/libstdc++/" fi +add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/" export LD_LIBRARY_PATH exec "$basedir/firefox.real" "$@"

1 0

[torbutton/master] Send updateSettings message using NoScript >= 10.1.9.2 protocol
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 866e3974597a3cc88a6ac9ef805de1b543eadbf7 Author: Rusty Bird <rustybird(a)net-c.com> Date: Fri Sep 14 13:05:10 2018 +0000 Send updateSettings message using NoScript >= 10.1.9.2 protocol --- src/modules/noscript-control.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 02fa1bc8..f6d5622b 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -51,8 +51,10 @@ const default_caps = [ // capabilities. Most things are blocked. let noscriptSettings = safetyLevel => ( { - "type": "NoScript.updateSettings", // backwards compatibility - "_messageName": "updateSettings", + "__meta": { + "name": "updateSettings", + "recipientInfo": null + }, "policy": { "DEFAULT": { "capabilities": default_caps[safetyLevel],

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/27427_alpha'
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit ec1c0f448893775b660313042709a9b057b3ab75 Merge: 59f3b783 866e3974 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:49:29 2018 +0000 Merge remote-tracking branch 'arthur/27427_alpha' src/modules/noscript-control.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Revert "Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages"
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 59f3b78349d8de267cf69fb8873971ff0d9ecf7b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:48:54 2018 +0000 Revert "Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages" This reverts commit 8ff3b44e478ebddf5a067d796f57a353beae2af0. --- src/modules/noscript-control.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index cd1a1237..66a00528 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -125,12 +125,8 @@ var initialize = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. - let messageListener = (message,b,c) => { - log(3, `Message received from NoScript: ${JSON.stringify([message,b,c])}`); - if (message._messageName !== "started" && - message._messageName !== "pageshow") { - return; - } + let messageListener = (a,b,c) => { + log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[torbutton/master] Fix NoScript IPC for about:blank by whitelisting messages
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit efdc83fec6244d5f2e4b8880fef010a6e362d9dc Author: Rusty Bird <rustybird(a)net-c.com> Date: Mon Sep 3 12:32:04 2018 +0000 Fix NoScript IPC for about:blank by whitelisting messages If about:blank is the homepage (or has been passed as a command line parameter), NoScript will send a message named "fetchChildPolicy" _before_ "started". Torbutton would then send its "updateSettings" too soon, resulting in the dreaded error "Could not establish connection. Receiving end does not exist" (see bug 26520). Fix this by whitelisting the relevant messages from NoScript: "started" and also "pageshow" for a slightly more graceful failure mode in case Torbutton somehow misses NoScript startup. --- src/modules/noscript-control.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index a03755de..02fa1bc8 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -127,6 +127,9 @@ var initialize = () => { // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); + if (a._messageName != "started" && a._messageName != "pageshow") { + return; + } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 26381: about:tor page does not load on first start on Windows
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 62001bb019dbf0956454f8fc550ccc1e81ee8d3c Author: Richard Pospesel <richard(a)torproject.org> Date: Sat Sep 15 04:01:17 2018 +0000 Bug 26381: about:tor page does not load on first start on Windows Child content processes require certain directories to be marked as readable or writeable when Sandboxing is enabled. The directories to be whitelisted are saved in static variables in sandboxBroker.cpp and are initialized in SandboxBroker::GeckoDependentInitialize(). Any child content process which is created before these directories are saved will be unable to read or write to them. The tor-launcher extension triggers the creation of a content process which hosts the tor network configuration settings window. This process is created before the whitelisted directories are saved. The network settings process doesn't need access to these directories to function, but subsequent content processes which are created once the settings window exits do need these directories to function. Sometimes, the creation of these subsequent processes is slow enough for the parent process to 'catch up' and create the whitelist resulting in the broken about:tor tab or broken white tab. A previous iteration of this patch moved the GeckoDependentInitialize() call directly above the call to DoStartup(). However, Mozilla dev Bob Owen objected to this since this places the call before various services are initialized which the SandboxBroker may depend on. Some experimentation would seem to confirm his objections: placing the whitelist init just prior to DoStartup() results in an empty value for the profile directory which prevents child processes reading the chrome and extensions directory. This patch inserts the GeckoDependentInitialize() call into DoStartup() just after the profile directory is known and queryable by the SandboxBroker, and before the 'profile-after-change' notification is fired. It also reverts the temp fix which reduced the sandbox level to 2 on windows. --- browser/app/profile/000-tor-browser.js | 5 ----- toolkit/xre/nsAppRunner.cpp | 6 ------ toolkit/xre/nsXREDirProvider.cpp | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bc7c4b05e3a1..38f72579760a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -329,11 +329,6 @@ pref("browser.onboarding.newtour", "welcome,privacy,tor-network,circuit-display, pref("browser.onboarding.updatetour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services"); pref("browser.onboarding.skip-tour-button.hide", true); -#ifdef XP_WIN -// For now, reduce sandboxing level to 2 (see #26381). -pref("security.sandbox.content.level", 2); -#endif - #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 1000014aedd0..7889919ca677 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5249,12 +5249,6 @@ XREMain::XRE_mainRun() // We intentionally leak the string here since it is required by PR_SetEnv. PR_SetEnv(saved.release()); } - -#if defined(MOZ_SANDBOX) - // Call SandboxBroker to initialize things that depend on Gecko machinery like - // the directory provider. - SandboxBroker::GeckoDependentInitialize(); -#endif #endif SaveStateForAppInitiatedRestart(); diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index b54985292e81..72545d0eb422 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -66,6 +66,10 @@ #include "UIKitDirProvider.h" #endif +#if defined(MOZ_SANDBOX) && defined(XP_WIN) +#include "sandboxBroker.h" +#endif + #if defined(MOZ_CONTENT_SANDBOX) #include "mozilla/SandboxSettings.h" #include "nsIUUIDGenerator.h" @@ -1003,6 +1007,21 @@ nsXREDirProvider::DoStartup() policies->Observe(nullptr, "policies-startup", nullptr); } + #if defined(MOZ_SANDBOX) && defined(XP_WIN) + // Call SandboxBroker to initialize things that depend on Gecko machinery like + // the directory provider. + + // We insert this initialization code here so that any child content processes spawned by + // extensions (such as tor-launcher launching the network configuration window) will have + // all the requisite directories white-listed for read/write access + + // It's inserted here (rather than in XREMain::XRE_mainRun) because we need + // NS_APP_USER_PROFILE_50_DIR to be known + + // See tor bug #26381 and mozilla bug #1485836 + SandboxBroker::GeckoDependentInitialize(); + #endif + // Init the Extension Manager nsCOMPtr<nsIObserver> em = do_GetService("@mozilla.org/addons/integration;1"); if (em) {

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.1
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 58526ef1fac442ce7424d9b1b5f9295c76ad68c7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:16:02 2018 +0000 Release preparations for 8.0.1 Versions bump and Changelog update --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 27 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 6 ++--- 6 files changed, 35 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 124de7a..ad9d7d8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c46f139..64ef362 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,30 @@ +Tor Browser 8.0.1 -- September 20 2018 + * All platforms + * Update Tor to 0.3.4.8 + * Update Torbutton to 2.0.7 + * Bug 27097: Tor News signup banner + * Bug 27663: Add New Identity menuitem again + * Bug 26624: Only block OBJECT on highest slider level + * Bug 26555: Don't show IP address for meek or snowflake + * Bug 27478: Torbutton icons for dark theme + * Bug 27506+14520: Move status version to upper left corner for RTL locales + * Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages + * Bug 27558: Update the link to "Your Guard note may not change" text + * Translations update + * Update Tor Launcher to 0.2.16.5 + * Bug 27469: Adapt Moat URLs + * Bug 25405: Cannot use Moat if a meek bridge is configured + * Translations update + * Clean-up + * Update NoScript to 10.1.9.6 + * Bug 27763: Restrict Torbutton signing exemption to mobile + * Bug 26146: Spoof HTTP User-Agent header for desktop platforms + * Bug 27543: QR code is broken on web.whatsapp.com + * Bug 27264: Bookmark items are not visible on the boomark toolbar + * Bug 27535: Enable TLS 1.3 draft version + * OS X + * Bug 27482: Fix crash during start-up on macOS 10.9.x systems + Tor Browser 8.0 -- September 5 2018 * All platforms * Update Firefox to 60.2.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7d1720b..e0581f4 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,9 +67,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 68c3ef1b753210d376ab9b9c73fa053043f4f0f4cab219e317759fb32b104a27 + sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 19f16bb..9e00653 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.3 +version: 0.2.16.5 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index f076b8f..2b2df85 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.6 +version: 2.0.7 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 5cc88e4..8ad5c34 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0' - torbrowser_build: 'build5' + torbrowser_version: '8.0.1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.6 + - 8.0 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] fixup! Bug 27220 - Don't verify signature for Tor Button
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit d53c662d2fbb8053908ba776a2dbddd4f9817d4f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:02:52 2018 +0000 fixup! Bug 27220 - Don't verify signature for Tor Button Fixes bug 27763. --- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index c696efc6fa57..40b3b1d6434e 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -1029,7 +1029,8 @@ function getSignedStatus(aRv, aCert, aAddonID) { } function shouldVerifySignedState(aAddon) { - if (aAddon.id === "torbutton(a)torproject.org") { + if (AppConstants.platform === "android" && + aAddon.id === "torbutton(a)torproject.org") { return false; }

1 0