- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 12468: Send script output messages to stderr only in debug mode
by mikeperry＠torproject.org 26 Mar '15

26 Mar '15

commit b734892e76d0fd8d45fbd56da1cede14df8f86a9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 18 12:59:08 2015 -0700 Bug 12468: Send script output messages to stderr only in debug mode Unity in Ubuntu 14.04 reportedly allocates a pty for use as the stdout and stderr of all GUI programs (including programs run from Nautilus), and reportedly does not display messages sent to that pty to the user. This 'feature' of Ubuntu means that complain can no longer rely on any terminal to inform the user of an error, unless the user specifically requests debugging output using a command-line option. Based on patches from Robert Ransom in https://trac.torproject.org/projects/tor/ticket/12468. --- RelativeLink/start-tor-browser | 46 ++++++---------------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index d28c759..31ccb83 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -28,32 +28,6 @@ fi # Do not (try to) connect to the session manager unset SESSION_MANAGER -# Determine whether we are running in a terminal. If we are, we -# should send our error messages to stderr... -ARE_WE_RUNNING_IN_A_TERMINAL=0 -if [ -t 1 -o -t 2 ]; then - ARE_WE_RUNNING_IN_A_TERMINAL=1 -fi - -# ...unless we're running in the same terminal as startx or xinit. In -# that case, the user is probably running us from a GUI file manager -# in an X session started by typing startx at the console. -# -# Hopefully, the local ps command supports BSD-style options. (The ps -# commands usually used on Linux and FreeBSD do; do any other OSes -# support running Linux binaries?) -ps T 2>/dev/null |grep startx 2>/dev/null |grep -v grep 2>&1 >/dev/null -not_running_in_same_terminal_as_startx="$?" -ps T 2>/dev/null |grep xinit 2>/dev/null |grep -v grep 2>&1 >/dev/null -not_running_in_same_terminal_as_xinit="$?" - -# not_running_in_same_terminal_as_foo has the value 1 if we are *not* -# running in the same terminal as foo. -if [ "$not_running_in_same_terminal_as_startx" -eq 0 -o \ - "$not_running_in_same_terminal_as_xinit" -eq 0 ]; then - ARE_WE_RUNNING_IN_A_TERMINAL=0 -fi - # Complain about an error, by any means necessary. # Usage: complain message # message must not begin with a dash. @@ -61,8 +35,8 @@ complain () { # Trim leading newlines, to avoid breaking formatting in some dialogs. complain_message="`echo "$1" | sed '/./,$!d'`" - # If we're being run in a terminal, complain there. - if [ "$ARE_WE_RUNNING_IN_A_TERMINAL" -ne 0 ]; then + # If we're being run in debug mode, complain to stderr. + if [ "$debug" -eq 1 ]; then echo "$complain_message" >&2 return fi @@ -136,22 +110,14 @@ elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then exit 0 fi -# If the user hasn't requested 'debug mode', close whichever of stdout -# and stderr are not ttys, to keep Firefox and the stuff loaded by/for -# it (including the system's shared-library loader) from printing -# messages to $HOME/.xsession-errors . (Users wouldn't have seen +# If the user hasn't requested 'debug mode', close stdout and stderr, +# to keep Firefox and the stuff loaded by/for it (including the +# system's shared-library loader) from printing messages to +# $HOME/.xsession-errors or other files. (Users wouldn't have seen # messages there anyway.) -# -# If the user has requested 'debug mode', don't muck with the FDs. if [ "$debug" -ne 1 ]; then - if [ '!' -t 1 ]; then - # stdout is not a tty exec >/dev/null - fi - if [ '!' -t 2 ]; then - # stderr is not a tty exec 2>/dev/null - fi fi # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority

1 0

[tor-browser-bundle/master] Add latest stable changelogs
by gk＠torproject.org 26 Mar '15

26 Mar '15

commit 12664825bebd9b12cada5e279845f8e70ecae463 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 26 20:30:51 2015 +0000 Add latest stable changelogs --- Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0734bc9..e7464cf 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,15 @@ +Tor Browser 4.0.6 -- Mar 31 2015 + * All Platforms + * Update Firefox to 31.6.0esr + * Update OpenSSL to 1.0.1m + * Update meek to 0.16 + +Tor Browser 4.0.5 -- Mar 23 2015 + * All Platforms + * Update Firefox to 31.5.3esr + * Update Tor to 0.2.5.11 + * Update NoScript to 2.6.9.19 + Tor Browser 4.5a4 -- Feb 24 2015 * All Platforms * Update Firefox to 31.5.0esr

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] fixup! Bug #5926: Allow customization of content JS locale.
by mikeperry＠torproject.org 26 Mar '15

26 Mar '15

commit cc614e00508c5750741919a3a3890461ee0edbf2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 25 12:07:56 2015 -0700 fixup! Bug #5926: Allow customization of content JS locale. --- xpcom/build/nsXPComInit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp index 12e46d4..ebc3ff7 100644 --- a/xpcom/build/nsXPComInit.cpp +++ b/xpcom/build/nsXPComInit.cpp @@ -478,7 +478,7 @@ void UseUSEnglishLocalePrefChangedCallback(const char* /* pref */, void* /* clos // Read the pref to see if we will use US English locale. bool useUSEnglishLocale = mozilla::Preferences::GetBool(USE_US_ENGLISH_LOCALE_PREF, false); // Set the application-wide C-locale. Needed for Date.toLocaleFormat(). - setlocale(LC_ALL, useUSEnglishLocale ? "en_US" : sSystemLocale); + setlocale(LC_ALL, useUSEnglishLocale ? "C" : sSystemLocale); // Now override the JavaScript Runtime Locale that is used by the Intl API // as well as Date.toLocaleString, Number.toLocaleString, and String.localeCompare. JS_SetDefaultLocale(rt, useUSEnglishLocale ? "en-US" : sJSLocale);

1 0

[tor-browser-bundle/maint-4.0] Update changelog and OpenSSL sha256 sum
by gk＠torproject.org 26 Mar '15

26 Mar '15

commit 85ff14d79d9ccc8ab35fad52f0dd10f03090449a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 26 07:07:50 2015 +0000 Update changelog and OpenSSL sha256 sum --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index fa4b45d..e7707cb 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 4.0.6 -- Mar 31 2015 * All Platforms * Update Firefox to 31.6.0esr * Update OpenSSL to 1.0.1m + * Update meek to 0.16 Tor Browser 4.0.5 -- Mar 23 2015 * All Platforms diff --git a/gitian/versions b/gitian/versions index d27d77c..5d41491 100755 --- a/gitian/versions +++ b/gitian/versions @@ -76,7 +76,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 +OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/maint-4.0] TBB 4.0.6: Update changelog, versions, and update manifest.
by mikeperry＠torproject.org 26 Mar '15

26 Mar '15

commit a3798c52a08555e61782bc80d0e8935f4a8a7a0b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 21:48:24 2015 -0700 TBB 4.0.6: Update changelog, versions, and update manifest. Because 4.0.5 and 4.0.6 were so close together, let's make incrementals from both 4.0.4 and 4.0.5. --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ gitian/versions | 8 ++++---- tools/update-responses/config.yml | 9 +++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c8a2b5a..fa4b45d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 4.0.6 -- Mar 31 2015 + * All Platforms + * Update Firefox to 31.6.0esr + * Update OpenSSL to 1.0.1m + Tor Browser 4.0.5 -- Mar 23 2015 * All Platforms * Update Firefox to 31.5.3esr diff --git a/gitian/versions b/gitian/versions index 14354af..d27d77c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,10 +1,10 @@ -TORBROWSER_VERSION=4.0.5 +TORBROWSER_VERSION=4.0.6 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.5.3esr +FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=release @@ -30,10 +30,10 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1l +OPENSSL_VER=1.0.1m GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 93a372f..682f5cc 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,15 +6,16 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.5 + release: 4.0.6 alpha: 4.5-alpha-2 versions: - 4.0.5: - platformVersion: 31.5.3 + 4.0.6: + platformVersion: 31.6.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.5 + download_url: https://www.torproject.org/dist/torbrowser/4.0.6 incremental_from: - 4.0.4 + - 4.0.5 4.5-alpha-2: platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en

1 0

[torbutton/master] Bug 7255: Address Pearl Crescent's review comments
by gk＠torproject.org 25 Mar '15

25 Mar '15

commit d2c3f9e7dae61b5f18b83398d234ab75186a3e99 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 25 20:14:37 2015 +0000 Bug 7255: Address Pearl Crescent's review comments --- src/chrome/content/torbutton.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3158c04..83ea395 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -22,6 +22,9 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; +const k_tb_tor_resize_warn_pref = + "extensions.torbutton.startup_resize_period" + // status var m_tb_wasinited = false; var m_tb_prefs = false; @@ -1074,7 +1077,7 @@ function torbutton_on_abouttor_load(aDoc) { // OS-specific window maximization on start-up should be done by now. Disable // the respective preference to make sure the user is seeing our notification. - m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", false); + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, false); } function torbutton_is_abouttor_doc(aDoc) { @@ -3427,9 +3430,9 @@ var torbutton_resizelistener = if (m_tb_resize_date === null) { m_tb_resize_date = Date.now(); } else { - // We at least another second before we show a new notification. - // Should be enough to rule out OSes that call our handler rapidly - // due to internal workings. + // We wait at least another second before we show a new + // notification. Should be enough to rule out OSes that call our + // handler rapidly due to internal workings. if (Date.now() - m_tb_resize_date < 1000) { return; } @@ -3471,7 +3474,7 @@ var torbutton_resizelistener = // maximize the window. We don't want to do that AND don't want to // show the user our notification in this case. if (m_tb_prefs. - getBoolPref("extensions.torbutton.startup_resize_period")) { + getBoolPref(k_tb_tor_resize_warn_pref)) { window.addEventListener("resize", function() { win.resizeBy(width - win.innerWidth, height - win.innerHeight); @@ -3506,8 +3509,7 @@ var torbutton_resizelistener = // the window triggers more than one resize event the first being not the // one we need. Thus we can't remove the listener after the first resize // event got fired. Thus, we have the rather klunky setTimeout() call. - m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", - true); + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, true); window.addEventListener("sizemodechange", m_tb_resize_handler, false); // This is fun. any attempt to directly set the inner window actually

1 0

[torbutton/master] Bug 7255: Make maximize counter count down to 0.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 7d130aafe1f7c25e737173282b57511b8e8eba08 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:52:24 2015 -0700 Bug 7255: Make maximize counter count down to 0. --- src/chrome/content/torbutton.js | 6 +++--- src/defaults/preferences/preferences.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 77a388e..3158c04 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3421,7 +3421,7 @@ var torbutton_resizelistener = m_tb_resize_handler = function() { if (window.windowState === 1) { if (m_tb_prefs. - getIntPref("extensions.torbutton.maximize_warning_counter") < 3) { + getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { // Rate-limit showing our notification if needed. if (m_tb_resize_date === null) { @@ -3452,8 +3452,8 @@ var torbutton_resizelistener = popup: null, callback: function() { - m_tb_prefs.setIntPref("extensions.torbutton.maximize_warning_counter", - m_tb_prefs.getIntPref("extensions.torbutton.maximize_warning_counter") + 1); + m_tb_prefs.setIntPref("extensions.torbutton.maximize_warnings_remaining", + m_tb_prefs.getIntPref("extensions.torbutton.maximize_warnings_remaining") - 1); } }]; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index c85c7f4..2c109ee 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -118,7 +118,7 @@ pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the // user did not click on it by accident. -pref("extensions.torbutton.maximize_warning_counter", 0); +pref("extensions.torbutton.maximize_warnings_remaining", 3); pref("extensions.torbutton.startup_resize_period", true); // Security prefs:

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/ftp-isolation' into 1.9-next
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit ab5010d412d0ca0758122d3529ad3095954cdff4 Merge: dbe9a0d 0116a2a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:24:37 2015 -0700 Merge remote-tracking branch 'arthur/ftp-isolation' into 1.9-next src/components/domain-isolator.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_7255_v2' into 1.9-next
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 9a1a82e2ee6f7536bbc8fe91333e52157f61d219 Merge: ab5010d 52ab447 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:24:50 2015 -0700 Merge remote-tracking branch 'gk/bug_7255_v2' into 1.9-next src/chrome/content/torbutton.js | 109 ++++++++++++++++++++++------- src/chrome/locale/en/torbutton.properties | 2 + src/defaults/preferences/preferences.js | 6 ++ 3 files changed, 93 insertions(+), 24 deletions(-)

1 0

[torbutton/master] Bug 7255: Shorten and improve grammar of maximize message.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit aa74b99ee309108cbc82e53ff4ec5004cde91a9b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:51:45 2015 -0700 Bug 7255: Shorten and improve grammar of maximize message. --- src/chrome/locale/en/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index a3be7e0..ef1723e 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -58,7 +58,7 @@ torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. Al torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine information about your monitor size, which can be used to track you. We recommend you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?

1 0

[torbutton/master] Get ftp working in domain isolator
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 0116a2ac9597a20a0e9bb8910e8a1f5e477d4c32 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 25 09:14:29 2015 -0700 Get ftp working in domain isolator --- src/components/domain-isolator.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a05fee2..93c7f65 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -97,7 +97,7 @@ tor.newCircuitForDomain = function(domain) { tor.isolateCircuitsByDomain = function () { mozilla.registerProxyChannelFilter(function (aChannel, aProxy) { try { - let channel = aChannel.QueryInterface(Ci.nsIHttpChannel), + let channel = aChannel.QueryInterface(Ci.nsIChannel), firstPartyURI = mozilla.thirdPartyUtil.getFirstPartyURIFromChannel(channel, true) .QueryInterface(Ci.nsIURI), firstPartyDomain = mozilla.thirdPartyUtil @@ -108,6 +108,7 @@ tor.isolateCircuitsByDomain = function () { replacementProxy.username + ":" + replacementProxy.password); return replacementProxy; } catch (err) { + logger.eclog(3, err.message); if (Date.now() - tor.unknownDirtySince > 1000*10*60) { logger.eclog(3, "tor catchall circuit has been dirty for over 10 minutes. Rotating."); tor.newCircuitForDomain("--unknown--");

1 0

[torbutton/master] Bug 7255: Warn users about maximizing windows
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 52ab4472601dfb9f0c6d83966a55178b33149464 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 25 15:45:49 2015 +0000 Bug 7255: Warn users about maximizing windows Maximized windows are very likely not rounded to multiples of 200x100. Nevertheless, it is probably not uncommen for users to maximize their windows as they are used to. We should at least warn them until a proper fix is in place (see #14429 for an idea). --- src/chrome/content/torbutton.js | 109 ++++++++++++++++++++++------- src/chrome/locale/en/torbutton.properties | 2 + src/defaults/preferences/preferences.js | 6 ++ 3 files changed, 93 insertions(+), 24 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5eb704e..7e6149f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -22,7 +22,6 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; - // status var m_tb_wasinited = false; var m_tb_prefs = false; @@ -1072,6 +1071,10 @@ function torbutton_on_abouttor_load(aDoc) { m_tb_prefs. setBoolPref("extensions.torbutton.show_slider_notification", false); } + + // OS-specific window maximization on start-up should be done by now. Disable + // the respective preference to make sure the user is seeing our notification. + m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", false); } function torbutton_is_abouttor_doc(aDoc) { @@ -3094,6 +3097,9 @@ function torbutton_close_window(event) { torbutton_tor_check_observer.unregister(); torbutton_console_observer.unregister(); + window.removeEventListener("sizemodechange", m_tb_resize_handler, + false); + // TODO: This is a real ghetto hack.. When the original window // closes, we need to find another window to handle observing // unique events... The right way to do this is to move the @@ -3301,6 +3307,9 @@ var torbutton_weblistener = { /*torbutton_eclog(1, 'called linkIcon'); */ return 0; } } +var m_tb_resize_handler = null; +var m_tb_resize_date = null; + // Bug 1506 P1/P3: Setting a fixed window size is important, but // probably not for android. var torbutton_resizelistener = @@ -3410,30 +3419,87 @@ var torbutton_resizelistener = height = Math.floor(maxHeight/100.0)*100; } - var handler = function() { + m_tb_resize_handler = function() { if (window.windowState === 1) { - window.addEventListener("resize", - function() { - win.resizeBy(width - win.innerWidth, height - win.innerHeight); - var calling_function = arguments.callee; - setTimeout(function() { - torbutton_log(3, "Removing resize listener.."); - window.removeEventListener("resize", - calling_function, false); - }, 1000); - }, false); + if (m_tb_prefs. + getIntPref("extensions.torbutton.maximize_warning_counter") < 3) { + + // Rate-limit showing our notification if needed. + if (m_tb_resize_date === null) { + m_tb_resize_date = Date.now(); + } else { + // We at least another second before we show a new notification. + // Should be enough to rule out OSes that call our handler rapidly + // due to internal workings. + if (Date.now() - m_tb_resize_date < 1000) { + return; + } + // Resizing but we need to reset |m_tb_resize_date| now. + m_tb_resize_date = Date.now(); + } + + let sb = torbutton_get_stringbundle(); + // No need to get "OK" translated again. + let sbSvc = Cc["@mozilla.org/intl/stringbundle;1"]. + getService(Ci.nsIStringBundleService); + let bundle = sbSvc. + createBundle("chrome://global/locale/commonDialogs.properties"); + let button_label = bundle.GetStringFromName("OK"); + let box = gBrowser.getNotificationBox(); + + let buttons = [{ + label: button_label, + accessKey: 'O', + popup: null, + callback: + function() { + m_tb_prefs.setIntPref("extensions.torbutton.maximize_warning_counter", + m_tb_prefs.getIntPref("extensions.torbutton.maximize_warning_counter") + 1); + } + }]; + + let priority = box.PRIORITY_WARNING_LOW; + let message = + torbutton_get_property_string("torbutton.maximize_warning"); + + box.appendNotification(message, 'new-menu-notification', null, + priority, buttons); + + return; + } + // This is for some weird OS-specific behavior on start-up where, + // depending on the available screen size, the OS thinks it has to + // maximize the window. We don't want to do that AND don't want to + // show the user our notification in this case. + if (m_tb_prefs. + getBoolPref("extensions.torbutton.startup_resize_period")) { + window.addEventListener("resize", + function() { + win.resizeBy(width - win.innerWidth, height - win.innerHeight); + var calling_function = arguments.callee; + setTimeout(function() { + torbutton_log(3, "Removing resize listener.."); + window.removeEventListener("resize", + calling_function, false); + }, 1000); + }, false); + } } }; // We need to handle OSes that auto-maximize windows depending on user - // settings and/or screen resolution. We add a listener which is - // triggerred as soon as the window gets maximized (windowState = 1). + // settings and/or screen resolution in the start-up phase and users that + // try to shoot themselves in the foot by maximizing the window manually. + // We add a listener which is triggerred as soon as the window gets + // maximized (windowState = 1). We are resizing during start-up but not + // later as the user should see only a warning there as a stopgap before + // #14229 lands. // Alas, the Firefox window code is handling the event not itself: // "// Note the current implementation of SetSizeMode just stores // // the new state; it doesn't actually resize. So here we store // // the state and pass the event on to the OS." - // (See: https://mxr.mozilla.org/mozilla-esr24/source/xpfe/appshell/src/ - // nsWebShellWindow.cpp#353) + // (See: https://mxr.mozilla.org/mozilla-esr31/source/xpfe/appshell/src/ + // nsWebShellWindow.cpp#348) // This means we have to cope with race conditions and resizing in the // sizemodechange listener is likely to fail. Thus, we add a specific // resize listener that is doing the work for us. It seems (at least on @@ -3441,14 +3507,9 @@ var torbutton_resizelistener = // the window triggers more than one resize event the first being not the // one we need. Thus we can't remove the listener after the first resize // event got fired. Thus, we have the rather klunky setTimeout() call. - window.addEventListener("sizemodechange", handler, false); - - // We like to remove the sizemodechange listener for everybody again in - // order to allow resizing the window after the start-up - setTimeout(function() { - torbutton_log(3, "Removing sizemodechange listener.."); - window.removeEventListener("sizemodechange", handler, false); - }, 1000); + m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", + true); + window.addEventListener("sizemodechange", m_tb_resize_handler, false); // This is fun. any attempt to directly set the inner window actually // resizes the outer width to that value instead. Must use resizeBy() diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 8fc4600..a3be7e0 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -58,6 +58,8 @@ torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. Al torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings +torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine information about your monitor size, which can be used to track you. We recommend you leave Tor Browser windows in their original default size. + # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? canvas.notNow=Not Now diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index a8ed3e1..c85c7f4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -115,6 +115,12 @@ pref("extensions.torbutton.warned_ff3",false); pref("extensions.torbutton.inserted_button",false); pref("extensions.torbutton.prompted_language",false); +// TODO: This is just part of a stopgap until #14429 gets properly implemented. +// See #7255 for details. We display the warning three times to make sure the +// user did not click on it by accident. +pref("extensions.torbutton.maximize_warning_counter", 0); +pref("extensions.torbutton.startup_resize_period", true); + // Security prefs: pref("extensions.torbutton.no_tor_plugins",true); pref("extensions.torbutton.clear_cookies",false);

1 0

[torbutton/master] Bug 13019: Always explicitly set JS english pref.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit dbe9a0d1a60bae8d445a24eca5faf6f7f319ffd0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:04:35 2015 -0700 Bug 13019: Always explicitly set JS english pref. --- src/chrome/content/torbutton.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7ef610a..954af85 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2162,8 +2162,7 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); if(m_tb_prefs.prefHasUserValue("intl.accept_charsets")) m_tb_prefs.clearUserPref("intl.accept_charsets"); - if(m_tb_prefs.prefHasUserValue("javascript.use_us_english_locale")) - m_tb_prefs.clearUserPref("javascript.use_us_english_locale"); + m_tb_prefs.setBoolPref("javascript.use_us_english_locale", false); } } else { m_tb_prefs.setIntPref("browser.display.max_font_attempts",-1);

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/13019' into bug13019
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit ef23e342a458cc00d7c797baec632db893203a1e Merge: 270eed4 dcbd978 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 22:05:23 2015 -0700 Merge remote-tracking branch 'arthur/13019' into bug13019 src/chrome/content/torbutton.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[torbutton/master] Bug 13019: Change locale hiding pref to boolean
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit dcbd97834f991c6b4ef5f86154e6823251511075 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Mar 24 21:35:12 2015 -0700 Bug 13019: Change locale hiding pref to boolean --- src/chrome/content/torbutton.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 69efb5f..612a533 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2154,7 +2154,7 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setCharPref("intl.accept_languages", "en-us, en"); m_tb_prefs.setCharPref("intl.accept_charsets", "iso-8859-1,*,utf-8"); m_tb_prefs.setCharPref("intl.charsetmenu.browser.cache", "UTF-8"); - m_tb_prefs.setCharPref("javascript.default_locale", "en-US"); + m_tb_prefs.setBoolPref("javascript.use_us_english_locale", true); } else { if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) m_tb_prefs.clearUserPref("intl.accept_languages"); @@ -2162,8 +2162,8 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); if(m_tb_prefs.prefHasUserValue("intl.accept_charsets")) m_tb_prefs.clearUserPref("intl.accept_charsets"); - if(m_tb_prefs.prefHasUserValue("javascript.default_locale")) - m_tb_prefs.clearUserPref("javascript.default_locale"); + if(m_tb_prefs.prefHasUserValue("javascript.use_us_english_locale")) + m_tb_prefs.clearUserPref("javascript.use_us_english_locale"); } } else { m_tb_prefs.setIntPref("browser.display.max_font_attempts",-1);

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] fixup! Update 000-tor-browser.js
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 5b1cca491d297458b702db86af061a8ab2a3cf7e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:05:14 2015 -0700 fixup! Update 000-tor-browser.js Add JS english spoofing pref. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bf23c23..0198b98 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -83,6 +83,7 @@ pref("browser.zoom.siteSpecific", false); pref("intl.charset.default", "windows-1252"); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 +pref("javascript.use_us_english_locale", true); // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] fixup! Bug #5926: Allow customization of content JS locale.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 85253fe54b195202ee36907183c81bc8b79da7f4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Mar 23 00:18:37 2015 -0700 fixup! Bug #5926: Allow customization of content JS locale. See https://trac.torproject.org/projects/tor/ticket/13019#comment:17 This changes commit 6b90e18cd63c6dcad3b2bee1d3a45a7e3645ff50. --- browser/base/content/test/general/mochitest.ini | 1 + .../test/general/test_bug_jsdefaultlocale.html | 41 ++++++++++++++++++++ xpcom/build/nsXPComInit.cpp | 37 +++++++++--------- 3 files changed, 60 insertions(+), 19 deletions(-) diff --git a/browser/base/content/test/general/mochitest.ini b/browser/base/content/test/general/mochitest.ini index caccc6f..7f228fe 100644 --- a/browser/base/content/test/general/mochitest.ini +++ b/browser/base/content/test/general/mochitest.ini @@ -29,6 +29,7 @@ support-files = [test_bug364677.html] [test_bug395533.html] +[test_bug_jsdefaultlocale.html] [test_contextmenu.html] skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558 [test_contextmenu_input.html] diff --git a/browser/base/content/test/general/test_bug_jsdefaultlocale.html b/browser/base/content/test/general/test_bug_jsdefaultlocale.html new file mode 100644 index 0000000..6566ae0 --- /dev/null +++ b/browser/base/content/test/general/test_bug_jsdefaultlocale.html @@ -0,0 +1,41 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="utf-8"> + <title>Test for Tor Bug #13019: Prevent fingerprinting of JS-exposed locale</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> +</head> +<body> +<a target="_blank" href="https://bugs.torproject.org">Bug 13019</a> +<p id="display"></p> +<pre id="test"></pre> +<script type="application/javascript;version=1.8"> +let prefName = "javascript.use_us_english_locale", + originalPrefValue = null, + date = new Date(); +// Read the current pref value. +try { + originalPrefValue = SpecialPowers.getBoolPref(prefName); +} catch (e) { } +// Enable pref "javascript.use_us_english_locale". +SpecialPowers.setBoolPref(prefName, true); +// Test that we are getting en-US locale everywhere it is exposed in JavaScript +is(Intl.Collator().resolvedOptions().locale, "en-US", "content JS locale from Intl.Collator"); +is(Intl.DateTimeFormat().resolvedOptions().locale, "en-US", "content JS locale Intl.DateTimeFormat"); +is(Intl.NumberFormat().resolvedOptions().locale, "en-US", "content JS locale from Intl.NumberFormat"); +is(date.toLocaleString(), date.toLocaleString("en-US"), "Date formatted by JS locale"); +// Return pref to its original value, if it had one. +if (originalPrefValue === null) { + SpecialPowers.clearUserPref(prefName); +} else { + SpecialPowers.setBoolPref(prefName, originalPrefValue); +} + +</script> +</body> +</html> diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp index 979e10b..12e46d4 100644 --- a/xpcom/build/nsXPComInit.cpp +++ b/xpcom/build/nsXPComInit.cpp @@ -447,12 +447,12 @@ NS_IMPL_ISUPPORTS(NesteggReporter, nsIMemoryReporter) #endif /* MOZ_WEBM */ // Anonymous namespace for customizing the default locale that JavaScript -// uses, according to the value of the "javascript.default_locale" pref. +// uses, according to the value of the "javascript.use_us_english_locale" pref. // The current default locale can be detected in JavaScript by calling // `Intl.DateTimeFormat().resolvedOptions().locale` namespace { -#define DEFAULT_LOCALE_PREF "javascript.default_locale" +#define USE_US_ENGLISH_LOCALE_PREF "javascript.use_us_english_locale" static char* sSystemLocale; static char* sJSLocale; @@ -468,27 +468,26 @@ JSRuntime* GetRuntime() { return rt; } -// Takes the "javascript.default_locale" pref value and applies it. If the locale -// is empty, we fall back to the default system and JS locales. +// If the USE_US_ENGLISH_LOCALE_PREF is active, set all locales to US English. +// Otherwise, fall back to the default system and JS locales. static -void DefaultLocaleChangedCallback(const char* /* pref */, void* /* closure */) { +void UseUSEnglishLocalePrefChangedCallback(const char* /* pref */, void* /* closure */) { // Get a pointer to the default JS Runtime. JSRuntime* rt = GetRuntime(); if (rt) { - // Read the pref, which may contain a custom default locale to be used in JavaScript. - nsAutoCString prefLocale; - mozilla::Preferences::GetCString(DEFAULT_LOCALE_PREF, &prefLocale); + // Read the pref to see if we will use US English locale. + bool useUSEnglishLocale = mozilla::Preferences::GetBool(USE_US_ENGLISH_LOCALE_PREF, false); // Set the application-wide C-locale. Needed for Date.toLocaleFormat(). - setlocale(LC_ALL, prefLocale.IsEmpty() ? sSystemLocale : prefLocale.get()); + setlocale(LC_ALL, useUSEnglishLocale ? "en_US" : sSystemLocale); // Now override the JavaScript Runtime Locale that is used by the Intl API // as well as Date.toLocaleString, Number.toLocaleString, and String.localeCompare. - JS_SetDefaultLocale(rt, prefLocale.IsEmpty() ? sJSLocale : prefLocale.get()); + JS_SetDefaultLocale(rt, useUSEnglishLocale ? "en-US" : sJSLocale); } } static -void StartWatchingDefaultLocalePref() { - // Get the default system locale. To be used if pref is not available. +void StartWatchingUseUSEnglishLocalePref() { + // Get the default system locale. To be used if US English locale pref is deactivated. sSystemLocale = strdup(setlocale(LC_ALL,NULL)); // Store the default JavaScript locale. JSRuntime* rt = GetRuntime(); @@ -496,17 +495,17 @@ void StartWatchingDefaultLocalePref() { sJSLocale = strdup(JS_GetDefaultLocale(rt)); } // Now keep the locale updated with the current pref value. - mozilla::Preferences::RegisterCallbackAndCall(DefaultLocaleChangedCallback, DEFAULT_LOCALE_PREF); + mozilla::Preferences::RegisterCallbackAndCall(UseUSEnglishLocalePrefChangedCallback, USE_US_ENGLISH_LOCALE_PREF); } static -void StopWatchingDefaultLocalePref() { - mozilla::Preferences::UnregisterCallback(DefaultLocaleChangedCallback, DEFAULT_LOCALE_PREF); +void StopWatchingUseUSEnglishLocalePref() { + mozilla::Preferences::UnregisterCallback(UseUSEnglishLocalePrefChangedCallback, USE_US_ENGLISH_LOCALE_PREF); if (sSystemLocale) free(sSystemLocale); if (sJSLocale) JS_free(nullptr, sJSLocale); } -} // anonymous namespace for locale pref +} // anonymous namespace for locale hiding EXPORT_XPCOM_API(nsresult) NS_InitXPCOM2(nsIServiceManager* *result, @@ -766,8 +765,8 @@ NS_InitXPCOM2(nsIServiceManager* *result, mozilla::eventtracer::Init(); #endif - // Start watching the javascript.default_locale pref. - StartWatchingDefaultLocalePref(); + // Start watching the "javascript.use_us_english_locale" pref. + StartWatchingUseUSEnglishLocalePref(); return NS_OK; } @@ -1033,7 +1032,7 @@ ShutdownXPCOM(nsIServiceManager* servMgr) sExitManager = nullptr; } - StopWatchingDefaultLocalePref(); + StopWatchingUseUSEnglishLocalePref(); Omnijar::CleanUp();

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 10280: Don't load any plugins into the address space.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit eb596b885a5b8083a2789b837a59a0907f7bda0a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 11:02:32 2015 +0000 Bug 10280: Don't load any plugins into the address space. If the pref "plugin.disable" is set, the user has to click an extra button to cause Firefox to actually scan the filesystem for plugins. Note: The strings for this patch are actually present in Torbutton. Patch by 'disgleirio'. --- dom/plugins/base/nsPluginHost.cpp | 11 ++++ toolkit/mozapps/extensions/AddonManager.jsm | 5 ++ toolkit/mozapps/extensions/content/extensions.js | 68 ++++++++++++++++++++ toolkit/mozapps/extensions/content/extensions.xul | 21 ++++++ .../mozapps/extensions/internal/PluginProvider.jsm | 8 +++ 5 files changed, 113 insertions(+) diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index 1efe59f..72e3942 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -3105,6 +3105,7 @@ NS_IMETHODIMP nsPluginHost::Observe(nsISupports *aSubject, sInst->Release(); } if (!strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, aTopic)) { + NS_ConvertUTF16toUTF8 prefName(someData); mPluginsDisabled = Preferences::GetBool("plugin.disable", false); mPluginsClickToPlay = Preferences::GetBool("plugins.click_to_play", false); // Unload or load plugins as needed @@ -3113,6 +3114,16 @@ NS_IMETHODIMP nsPluginHost::Observe(nsISupports *aSubject, } else { LoadPlugins(); } + if (prefName.Equals("plugin.disable")) { + nsCOMPtr<nsIObserverService> obsService = + mozilla::services::GetObserverService(); + if (obsService) { + nsAutoString pluginPolicy; + pluginPolicy = mPluginsDisabled ? NS_LITERAL_STRING("disabled") + : NS_LITERAL_STRING("enabled"); + obsService->NotifyObservers(nullptr, "plugin-policy-changed", pluginPolicy.get()); + } + } } if (!strcmp("blocklist-updated", aTopic)) { nsPluginTag* plugin = mPlugins; diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm index 81f2670..03e5588 100644 --- a/toolkit/mozapps/extensions/AddonManager.jsm +++ b/toolkit/mozapps/extensions/AddonManager.jsm @@ -2364,6 +2364,11 @@ this.AddonManagerPrivate = { AddonManagerInternal.callAddonListeners.apply(AddonManagerInternal, aArgs); }, + callManagerListeners: function AMP_callManagerListeners(...aArgs) { + AddonManagerInternal.callManagerListeners.apply(AddonManagerInternal, + aArgs); + }, + AddonAuthor: AddonAuthor, AddonScreenshot: AddonScreenshot, diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 35d2392..775064e 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -820,6 +820,20 @@ var gViewController = { } }, + cmd_pluginEnable: { + isEnabled: function cmd_pluginEnable_isEnabled() true, + doCommand: function cmd_pluginEnable_doCommand() { + Services.prefs.setBoolPref("plugin.disable", false); + } + }, + + cmd_pluginDisable: { + isEnabled: function cmd_pluginDisable_isEnabled() true, + doCommand: function cmd_pluginDisable_doCommand() { + Services.prefs.setBoolPref("plugin.disable", true); + } + }, + cmd_toggleAutoUpdateDefault: { isEnabled: function cmd_toggleAutoUpdateDefault_isEnabled() true, doCommand: function cmd_toggleAutoUpdateDefault_doCommand() { @@ -2553,12 +2567,16 @@ var gListView = { node: null, _listBox: null, _emptyNotice: null, + _pluginEnableButton: null, + _pluginHeader: null, _type: null, initialize: function gListView_initialize() { this.node = document.getElementById("list-view"); this._listBox = document.getElementById("addon-list"); this._emptyNotice = document.getElementById("addon-list-empty"); + this._pluginEnableButton = document.getElementById("plugin-enable-button"); + this._pluginHeader = document.getElementsByClassName("plugin-info-container")[0]; var self = this; this._listBox.addEventListener("keydown", function listbox_onKeydown(aEvent) { @@ -2570,6 +2588,11 @@ var gListView = { }, false); }, + shutdown: function gListView_shutdown() { + AddonManager.removeAddonListener(this); + AddonManager.removeManagerListener(this); + }, + show: function gListView_show(aType, aRequest) { if (!(aType in AddonManager.addonTypes)) throw Components.Exception("Attempting to show unknown type " + aType, Cr.NS_ERROR_INVALID_ARG); @@ -2577,6 +2600,8 @@ var gListView = { this._type = aType; this.node.setAttribute("type", aType); this.showEmptyNotice(false); + this.showPluginHeader(false); + this.showPluginEnableButton(false); while (this._listBox.itemCount > 0) this._listBox.removeItemAt(0); @@ -2600,14 +2625,19 @@ var gListView = { for (let element of elements) self._listBox.appendChild(element); } + self.showPluginButton(); gEventManager.registerInstallListener(self); gViewController.updateCommands(); gViewController.notifyViewChanged(); + AddonManager.addAddonListener(self); /* for onUninstalled */ + AddonManager.addManagerListener(self); /* for onPluginPolicyChanged */ }); }, hide: function gListView_hide() { + AddonManager.removeAddonListener(this); + AddonManager.removeManagerListener(this); gEventManager.unregisterInstallListener(this); doPendingUninstalls(this._listBox); }, @@ -2658,6 +2688,44 @@ var gListView = { } }, + onUninstalled: function gListView_onUninstalled() { + this.showEmptyNotice(this._listBox.itemCount == 0); + }, + + showPluginEnableButton: function gListView_showPluginEnableButton(aShow) { + if (this._pluginEnableButton) + this._pluginEnableButton.hidden = !aShow; + }, + + showPluginHeader: function gListView_showPluginHeader(aShow) { + if (this._pluginHeader) + this._pluginHeader.hidden = !aShow; + }, + + showPluginButton: function gListView_showPluginButton() { + if (this._type == "plugin") { + var plugin_disable = false; + + try { + plugin_disable = Services.prefs.getBoolPref("plugin.disable") + } catch (e) {} + + if (plugin_disable == true) { + this.showPluginHeader(false); + this.showEmptyNotice(false); + this.showPluginEnableButton(true); + } else { + this.showPluginHeader(true); + this.showEmptyNotice(this._listBox.itemCount == 0); + this.showPluginEnableButton(false); + } + } + }, + + onPluginPolicyChanged: function gListView_onPluginPolicyChanged() { + this.showPluginButton(); + }, + addItem: function gListView_addItem(aObj, aIsInstall) { if (aObj.type != this._type) return; diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul index d247bdf..b64937b 100644 --- a/toolkit/mozapps/extensions/content/extensions.xul +++ b/toolkit/mozapps/extensions/content/extensions.xul @@ -86,6 +86,8 @@ <command id="cmd_forward"/> <command id="cmd_enableCheckCompatibility"/> <command id="cmd_pluginCheck"/> + <command id="cmd_pluginEnable"/> + <command id="cmd_pluginDisable"/> <command id="cmd_enableUpdateSecurity"/> <command id="cmd_toggleAutoUpdateDefault"/> <command id="cmd_resetAddonAutoUpdate"/> @@ -357,6 +359,14 @@ command="cmd_pluginCheck"/> <spacer flex="5000"/>  </hbox> + <vbox id="plugin-disable-button" class="global-info" flex="1" + align="end"> + <button class="button-plugin-disable" + label="&plugins.installed.disable;" + tooltiptext="&plugins.installed.disable.tip;" + command="cmd_pluginDisable"/> + <spacer flex="5000"/> + </vbox> </hbox> <hbox class="view-header global-info-container experiment-info-container"> <hbox class="global-info" flex="1" align="center"> @@ -386,6 +396,17 @@ </vbox> <spacer class="alert-spacer-after"/> </vbox> + <vbox id="plugin-enable-button" class="alert-container" flex="1" + hidden="true"> + <spacer class="alert-spacer-before"/> + <vbox class="alert"> + <label value="&plugins.installed.find;"/> + <button class="button-plugin-enable" + label="&plugins.installed.enable;" + command="cmd_pluginEnable"/> + </vbox> + <spacer class="alert-spacer-after"/> + </vbox> <richlistbox id="addon-list" class="list" flex="1"/> </vbox> diff --git a/toolkit/mozapps/extensions/internal/PluginProvider.jsm b/toolkit/mozapps/extensions/internal/PluginProvider.jsm index 7b6e335..65d41a7 100644 --- a/toolkit/mozapps/extensions/internal/PluginProvider.jsm +++ b/toolkit/mozapps/extensions/internal/PluginProvider.jsm @@ -52,6 +52,7 @@ var PluginProvider = { plugins: null, startup: function PL_startup() { + Services.obs.addObserver(this, "plugin-policy-changed", false); Services.obs.addObserver(this, LIST_UPDATED_TOPIC, false); Services.obs.addObserver(this, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED, false); }, @@ -64,6 +65,7 @@ var PluginProvider = { this.plugins = null; Services.obs.removeObserver(this, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED); Services.obs.removeObserver(this, LIST_UPDATED_TOPIC); + Services.obs.removeObserver(this, "plugin-policy-changed"); }, observe: function(aSubject, aTopic, aData) { @@ -89,6 +91,12 @@ var PluginProvider = { if (this.plugins) this.updatePluginList(); break; + case "plugin-policy-changed": + if (!this.plugins) + this.plugins ={}; + this.updatePluginList(); + AddonManagerPrivate.callManagerListeners("onPluginPolicyChanged"); + break; } },

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] fixup! Update 000-tor-browser.js
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 87c82921ca1f1f7064ca9c9751e574767236cd5f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 10:56:34 2015 +0000 fixup! Update 000-tor-browser.js Disable to search plugins on first start --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 2d93908..bf23c23 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -112,6 +112,7 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +pref("plugin.disable", true); // Disable to search plugins on first start pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); pref("plugins.hide_infobar_for_missing_plugin", true);

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Revert "Bug 10280: Don't load any plugins into the address space."
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit c7f790c503265c0b48a69668e34e65e8f7a8e5e5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 17:22:03 2015 -0700 Revert "Bug 10280: Don't load any plugins into the address space." This reverts commit 7c5fee267428865a1d93c9e44df5c373f8d01569. --- dom/plugins/base/nsPluginHost.cpp | 11 --- toolkit/mozapps/extensions/content/extensions.js | 75 +------------------- toolkit/mozapps/extensions/content/extensions.xul | 23 ------ .../mozapps/extensions/internal/PluginProvider.jsm | 11 --- 4 files changed, 3 insertions(+), 117 deletions(-) diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index 68ac197..1efe59f 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -3105,7 +3105,6 @@ NS_IMETHODIMP nsPluginHost::Observe(nsISupports *aSubject, sInst->Release(); } if (!strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, aTopic)) { - NS_ConvertUTF16toUTF8 prefName(someData); mPluginsDisabled = Preferences::GetBool("plugin.disable", false); mPluginsClickToPlay = Preferences::GetBool("plugins.click_to_play", false); // Unload or load plugins as needed @@ -3114,16 +3113,6 @@ NS_IMETHODIMP nsPluginHost::Observe(nsISupports *aSubject, } else { LoadPlugins(); } - if (prefName.Equals("plugin.disable")) { - nsCOMPtr<nsIObserverService> obsService = - mozilla::services::GetObserverService(); - if (obsService) { - nsAutoString pluginPolicy; - pluginPolicy = mPluginsDisabled ? NS_LITERAL_STRING("disabled") - : NS_LITERAL_STRING("enabled"); - obsService->NotifyObservers(nullptr, "plugins-policy-changed", pluginPolicy.get()); - } - } } if (!strcmp("blocklist-updated", aTopic)) { nsPluginTag* plugin = mPlugins; diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 6790841..35d2392 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -858,20 +858,6 @@ var gViewController = { } }, - cmd_goToEnablePlugins: { - isEnabled: function cmd_goToEnablePlugins_isEnabled() true, - doCommand: function cmd_goToEnablePlugins_doCommand() { - Services.prefs.setBoolPref("plugin.disable", false); - } - }, - - cmd_goToDisablePlugins: { - isEnabled: function cmd_goToDisablePlugins_isEnabled() true, - doCommand: function cmd_goToDisablePlugins_doCommand() { - Services.prefs.setBoolPref("plugin.disable", true); - } - }, - cmd_goToRecentUpdates: { isEnabled: function cmd_goToRecentUpdates_isEnabled() true, doCommand: function cmd_goToRecentUpdates_doCommand() { @@ -2567,17 +2553,12 @@ var gListView = { node: null, _listBox: null, _emptyNotice: null, - _pluginDisabledNotice: null, - _pluginEnabledNotice: null, _type: null, - _pluginListEmpty: false, initialize: function gListView_initialize() { this.node = document.getElementById("list-view"); this._listBox = document.getElementById("addon-list"); this._emptyNotice = document.getElementById("addon-list-empty"); - this._pluginDisabledNotice = document.getElementById("plugin-disabled"); - this._pluginEnabledNotice = document.getElementById("plugin-enabled"); var self = this; this._listBox.addEventListener("keydown", function listbox_onKeydown(aEvent) { @@ -2589,10 +2570,6 @@ var gListView = { }, false); }, - shutdown: function gListView_shutdown() { - AddonManager.removeAddonListener(this); - }, - show: function gListView_show(aType, aRequest) { if (!(aType in AddonManager.addonTypes)) throw Components.Exception("Attempting to show unknown type " + aType, Cr.NS_ERROR_INVALID_ARG); @@ -2600,12 +2577,9 @@ var gListView = { this._type = aType; this.node.setAttribute("type", aType); this.showEmptyNotice(false); - this.showPluginEnabledNotice(false); - this.showPluginDisabledNotice(false); while (this._listBox.itemCount > 0) this._listBox.removeItemAt(0); - this._pluginListEmpty = true; var self = this; getAddonsAndInstalls(aType, function show_getAddonsAndInstalls(aAddonsList, aInstallsList) { @@ -2620,22 +2594,20 @@ var gListView = { for (let installItem of aInstallsList) elements.push(createItem(installItem, true)); + self.showEmptyNotice(elements.length == 0); if (elements.length > 0) { sortElements(elements, ["uiState", "name"], true); for (let element of elements) self._listBox.appendChild(element); } - self.showAllNeedNotices(true); gEventManager.registerInstallListener(self); gViewController.updateCommands(); gViewController.notifyViewChanged(); - AddonManager.addAddonListener(self); }); }, hide: function gListView_hide() { - AddonManager.removeAddonListener(this); gEventManager.unregisterInstallListener(this); doPendingUninstalls(this._listBox); }, @@ -2644,43 +2616,6 @@ var gListView = { this._emptyNotice.hidden = !aShow; }, - showPluginDisabledNotice: function gListView_showPluginDisabledNotice(aShow) { - this._pluginDisabledNotice.hidden = !aShow; - }, - - showPluginEnabledNotice: function gListView_showPluginEnabledNotice(aShow) { - this._pluginEnabledNotice.hidden = !aShow; - }, - - showAllNeedNotices: function gListView_showAllNeedNotices(aShow) { - var empty_list = (this._listBox.itemCount == 0); - var show_empty_notice = true; - - if (this._type == "plugin") { - var update_notices = (this._pluginListEmpty != empty_list); - this._pluginListEmpty = empty_list; - - if (update_notices || aShow) { - var plugin_disable = false; - - try { - plugin_disable = Services.prefs.getBoolPref("plugin.disable") - } catch (e) {} - - if (plugin_disable == true) { - this.showPluginEnabledNotice(false); - this.showPluginDisabledNotice(true); - show_empty_notice = false; - } else { - this.showPluginDisabledNotice(false); - this.showPluginEnabledNotice(true); - } - } - } - if (show_empty_notice == true) - this.showEmptyNotice(empty_list); - }, - onSortChanged: function gListView_onSortChanged(aSortBy, aAscending) { sortList(this._listBox, aSortBy, aAscending); }, @@ -2723,10 +2658,6 @@ var gListView = { } }, - onUninstalled: function gListView_onUninstalled() { - this.showAllNeedNotices(false); - }, - addItem: function gListView_addItem(aObj, aIsInstall) { if (aObj.type != this._type) return; @@ -2742,7 +2673,7 @@ var gListView = { let item = createItem(aObj, aIsInstall); this._listBox.insertBefore(item, this._listBox.firstChild); - this.showAllNeedNotices(false); + this.showEmptyNotice(false); }, removeItem: function gListView_removeItem(aObj, aIsInstall) { @@ -2751,7 +2682,7 @@ var gListView = { for (let item of this._listBox.childNodes) { if (item[prop] == aObj) { this._listBox.removeChild(item); - this.showAllNeedNotices(false); + this.showEmptyNotice(this._listBox.itemCount == 0); return; } } diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul index 1c2bb07..d247bdf 100644 --- a/toolkit/mozapps/extensions/content/extensions.xul +++ b/toolkit/mozapps/extensions/content/extensions.xul @@ -79,8 +79,6 @@ <command id="cmd_findAllUpdates"/> <command id="cmd_restartApp"/> <command id="cmd_goToDiscoverPane"/> - <command id="cmd_goToEnablePlugins"/> - <command id="cmd_goToDisablePlugins"/> <command id="cmd_goToRecentUpdates"/> <command id="cmd_goToAvailableUpdates"/> <command id="cmd_installFromFile"/> @@ -388,28 +386,7 @@ </vbox> <spacer class="alert-spacer-after"/> </vbox> - <vbox id="plugin-disabled" class="alert-container" - flex="1" hidden="true"> - <spacer class="alert-spacer-before"/> - <vbox class="alert"> - <label value="&plugins.installed.find;"/> - <button class="button-enableplugin" - label="&plugins.installed.enable;" - command="cmd_goToEnablePlugins"/> - </vbox> - <spacer class="alert-spacer-after"/> - </vbox> <richlistbox id="addon-list" class="list" flex="1"/> - <vbox id="plugin-enabled" class="view-header global-info-container" - hidden="true"> - <vbox class="global-info" flex="1" align="center"> - <button class="button-disableplugin" - label="&plugins.installed.disable;" - tooltiptext="&plugins.installed.disable.tip;" - command="cmd_goToDisablePlugins"/> - <spacer flex="5000"/>  - </vbox> - </vbox> </vbox>  diff --git a/toolkit/mozapps/extensions/internal/PluginProvider.jsm b/toolkit/mozapps/extensions/internal/PluginProvider.jsm index 2cf2583..7b6e335 100644 --- a/toolkit/mozapps/extensions/internal/PluginProvider.jsm +++ b/toolkit/mozapps/extensions/internal/PluginProvider.jsm @@ -52,7 +52,6 @@ var PluginProvider = { plugins: null, startup: function PL_startup() { - Services.obs.addObserver(this, "plugins-policy-changed", false); Services.obs.addObserver(this, LIST_UPDATED_TOPIC, false); Services.obs.addObserver(this, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED, false); }, @@ -65,7 +64,6 @@ var PluginProvider = { this.plugins = null; Services.obs.removeObserver(this, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED); Services.obs.removeObserver(this, LIST_UPDATED_TOPIC); - Services.obs.removeObserver(this, "plugins-policy-changed"); }, observe: function(aSubject, aTopic, aData) { @@ -91,15 +89,6 @@ var PluginProvider = { if (this.plugins) this.updatePluginList(); break; - case "plugins-policy-changed": - var plugin_policy = aData - if (!this.plugins) - this.plugins =[]; - this.updatePluginList(); - Services.obs.notifyObservers(null, - "plugin-provider-after-changed-policy", - plugin_policy); - break; } },

1 0

[tor-browser-bundle/master] Bug 13766: Raise MaxCircuitDirtiness to 2 hours
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 824116042a03683ae20fa6e7d0768d8fd6fd6f95 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 21:43:03 2015 -0700 Bug 13766: Raise MaxCircuitDirtiness to 2 hours Well, 1 second shy, so we're sure the torbutton update pings go over new circuits. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 1 + Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 1 + Bundle-Data/windows/Data/Tor/torrc-defaults | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 819b9e8..e502356 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -8,3 +8,4 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 +MaxCircuitDirtiness 7199 diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index 819b9e8..e502356 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -8,3 +8,4 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 +MaxCircuitDirtiness 7199 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 819b9e8..e502356 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -8,3 +8,4 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 +MaxCircuitDirtiness 7199

1 0

[torbutton/master] Bug 13766: Raise update check frequency to 2 hours.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 270eed437c93987b8d0f31f52d3545321facb0e0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 21:12:56 2015 -0700 Bug 13766: Raise update check frequency to 2 hours. To match Nick's suggested 2 hour circuit dirtiness timeout in #13766. --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 69efb5f..5eb704e 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1175,7 +1175,7 @@ function torbutton_do_async_versioncheck() { } // Suppress update check if done recently. - const kMinSecsBetweenChecks = 90 * 60; // 1.5 hours + const kMinSecsBetweenChecks = 120 * 60; // 2.0 hours var now = Date.now() / 1000; var lastCheckTime; try {

1 0

[torbutton/master] Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 2359bd808367673ed7738a8b96b0fcb8571883dc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 20:27:20 2015 -0700 Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. This will allow us to raise the circuit dirty timeout value for all other circs. --- src/components/domain-isolator.js | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 6e6201e..a05fee2 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -53,6 +53,10 @@ let tor = tor || {}; // A mutable map that records what nonce we are using for each domain. tor.noncesForDomains = {}; +// __tor.unknownDirtySince__. +// Specifies when the current catch-all circuit was first used +tor.unknownDirtySince = Date.now(); + // __tor.socksProxyCredentials(originalProxy, domain)__. // Takes a proxyInfo object (originalProxy) and returns a new proxyInfo // object with the same properties, except the username is set to the @@ -74,6 +78,17 @@ tor.socksProxyCredentials = function (originalProxy, domain) { proxy.failoverProxy); }; +tor.newCircuitForDomain = function(domain) { + // Check if we already have a nonce. If not, create + // one for this domain. + if (!tor.noncesForDomains.hasOwnProperty(domain)) { + tor.noncesForDomains[domain] = 0; + } else { + tor.noncesForDomains[domain] += 1; + } + logger.eclog(3, "New domain isolation count " +tor.noncesForDomains[domain] + " for " + domain); +} + // __tor.isolateCircuitsByDomain()__. // For every HTTPChannel, replaces the default SOCKS proxy with one that authenticates // to the SOCKS server (the tor client process) with a username (the first party domain) @@ -93,8 +108,16 @@ tor.isolateCircuitsByDomain = function () { replacementProxy.username + ":" + replacementProxy.password); return replacementProxy; } catch (err) { - // If we fail, then just use the default proxyInfo. - return aProxy; + if (Date.now() - tor.unknownDirtySince > 1000*10*60) { + logger.eclog(3, "tor catchall circuit has been dirty for over 10 minutes. Rotating."); + tor.newCircuitForDomain("--unknown--"); + tor.unknownDirtySince = Date.now(); + } + let replacementProxy = tor.socksProxyCredentials(aProxy, "--unknown--"); + + logger.eclog(3, "tor SOCKS isolation catchall: " + aChannel.URI.spec + " via " + + replacementProxy.username + ":" + replacementProxy.password); + return replacementProxy; } }, 0); }; @@ -125,14 +148,7 @@ DomainIsolator.prototype = { } }, newCircuitForDomain: function (domain) { - // Check if we already have a nonce. If not, create - // one for this domain. - if (!tor.noncesForDomains.hasOwnProperty(domain)) { - tor.noncesForDomains[domain] = 0; - } else { - tor.noncesForDomains[domain] += 1; - } - logger.eclog(3, "New domain isolation count " +tor.noncesForDomains[domain] + " for " + domain); + tor.newCircuitForDomain(domain); }, wrappedJSObject: null

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 15406: Only include forced updates if extensions differ.
by mikeperry＠torproject.org 24 Mar '15

24 Mar '15

commit 39e3a2b282d4d89c8c6498162ae155c018d79a68 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 24 16:34:43 2015 -0400 Bug 15406: Only include forced updates if extensions differ. For the NoScript and HTTPS Everywhere extensions, only force files to be included in incremental MARs if the extension has changed. For NoScript we detect this by comparing the old and new .xpi files. For HTTPS Everywhere (which is unpacked) we only check install.rdf; our assumption is that the version number will be changed for each new release. --- tools/update-packaging/make_incremental_update.sh | 41 ++++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 010101c..10af358 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -69,12 +69,8 @@ if [ $# = 0 ]; then exit 1 fi -# TODO: it would be better to pass these paths via command line options. -ext_path='TorBrowser/Data/Browser/profile.default/extensions' -https_everywhere='https-everywhere(a)eff.org' -noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' -requested_forced_updates="$ext_path/$https_everywhere/* $ext_path/$noscript" -directories_to_remove="$ext_path/$https_everywhere" +requested_forced_updates="" +directories_to_remove="" while getopts "hqf:" flag do @@ -109,6 +105,39 @@ updatemanifestv2="$workdir/updatev2.manifest" updatemanifestv3="$workdir/updatev3.manifest" archivefiles="updatev2.manifest updatev3.manifest" +# If the NoScript or HTTPS Everywhere extensions have changed between +# releases, add them to the "force updates" list. +ext_path='TorBrowser/Data/Browser/profile.default/extensions' +https_everywhere='https-everywhere(a)eff.org' +noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' + +# NoScript is a packed extension, so we simply compare the old and the new +# .xpi files. +noscript_path="$ext_path/$noscript" +diff -a "$olddir/$noscript_path" "$newdir/$noscript_path" > /dev/null +rc=$? +if [ $rc -gt 1 ]; then + notice "Unexpected exit $rc from $noscript_path diff command" + exit 2 +elif [ $rc -eq 1 ]; then + requested_forced_updates="$requested_forced_updates $noscript_path" +fi + +# HTTPS Everywhere is an unpacked extension, so we need to determine if any of +# the unpacked files have changed. Since that is messy, we simply compare the +# old extension's install.rdf file to the new one. +https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" +diff "$olddir/$https_everywhere_install_rdf" \ + "$newdir/$https_everywhere_install_rdf" > /dev/null +rc=$? +if [ $rc -gt 1 ]; then + notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" + exit 2 +elif [ $rc -eq 1 ]; then + requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" + directories_to_remove="$directories_to_remove $ext_path/$https_everywhere" +fi + mkdir -p "$workdir" # On Mac, the precomplete file added by Bug 386760 will cause OS X to reload the

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 15406: Do not force updates for Torbutton and Tor Launcher.
by mikeperry＠torproject.org 24 Mar '15

24 Mar '15

commit 74d1e1309dd53363481140d463edae3a905cea97 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 24 11:12:35 2015 -0400 Bug 15406: Do not force updates for Torbutton and Tor Launcher. Since we have disabled updates for Torbutton and Tor Launcher, there is no need to force these extensions to be updated (replaced) when generating our incremental MAR files. Also, we no longer force an update to the pdf.js extension (it is now built into the browser) or to the firefox binary on Mac OS (Mozilla forces firefox to be replaced on Mac OS due to code signing / signature issues with partner builds; see https://bugzilla.mozilla.org/show_bug.cgi?id=770996) --- tools/update-packaging/make_incremental_update.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 60c5a4b..010101c 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -69,18 +69,12 @@ if [ $# = 0 ]; then exit 1 fi -# The last .xpi is NoScript. -ext_path='TorBrowser/Data/Browser/profile.default/extensions'; -# TODO: it would be better to pass this as a command line option. -exts='https-everywhere(a)eff.org/* tor-launcher(a)torproject.org.xpi torbutton(a)torproject.org.xpi uriloader(a)pdf.js.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' -requested_forced_updates='Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox' -for ext in $exts; do - requested_forced_updates="$requested_forced_updates $ext_path/$ext" -done - - -# TODO: it would be better to pass this as a command line option. -directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org' +# TODO: it would be better to pass these paths via command line options. +ext_path='TorBrowser/Data/Browser/profile.default/extensions' +https_everywhere='https-everywhere(a)eff.org' +noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' +requested_forced_updates="$ext_path/$https_everywhere/* $ext_path/$noscript" +directories_to_remove="$ext_path/$https_everywhere" while getopts "hqf:" flag do

1 0