- tbb-commits - lists.torproject.org

[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] 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: 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] 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] 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

[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

[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] 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/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