March 2015 - tor-commits - lists.torproject.org

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

[stem/master] Read multiple descriptors from files with bridge descriptors
by atagar＠torproject.org 25 Mar '15

25 Mar '15

commit 91103d1a7d94bdde7edfa537ee62554891bbc54f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 25 09:27:17 2015 -0700 Read multiple descriptors from files with bridge descriptors Usually descriptors have a keyword that indicates the end of the descriptor. Sanitized bridge descriptors, however, omit the keyword we check for so they have no defined ending. This caused our parser to treat the whole file as one big bridge descriptor. To fix this we're now splitting these up by their @type annotation. This is a bit of a hack, but in practice metrics is the only place that provides sanitized bridge descriptors so should be fine. --- docs/change_log.rst | 1 + stem/descriptor/__init__.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 15 +++-- stem/descriptor/server_descriptor.py | 16 +++-- .../data/extrainfo_bridge_descriptor_multiple | 62 ++++++++++++++++++++ test/unit/descriptor/extrainfo_descriptor.py | 16 +++++ 6 files changed, 103 insertions(+), 9 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index d6bbec1..6a6c23c 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -60,6 +60,7 @@ conversion (:trac:`14075`). * Lazy-loading descriptors, improving performance by 25-70% depending on what type it is (:trac:`14011`) * Added `support for hidden service descriptors <api/descriptor/hidden_service_descriptor.html>`_ (:trac:`15004`) + * When reading sanitised bridge descriptors (server or extrainfo), :func:`~stem.descriptor.__init__.parse_file` treated the whole file as a single descriptor * The :class:`~stem.descriptor.networkstatus.DirectoryAuthority` 'fingerprint' attribute was actually its 'v3ident' * Added consensus' new package attribute (:spec:`ab64534`) * Added extra info' new hs_stats_end, hs_rend_cells, hs_rend_cells_attr, hs_dir_onions_seen, and hs_dir_onions_seen_attr attributes (:spec:`ddb630d`) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 8c0df9d..1ebe578 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -651,7 +651,7 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi if ignore_first: first_line = descriptor_file.readline() - if first_line is not None: + if first_line: content_append(first_line) keyword_match = re.compile(SPECIFIC_KEYWORD_LINE % '|'.join(keywords)) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index e255320..716340e 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -178,11 +178,18 @@ def _parse_file(descriptor_file, is_bridge = False, validate = False, **kwargs): """ while True: - extrainfo_content = _read_until_keywords('router-signature', descriptor_file) + if not is_bridge: + extrainfo_content = _read_until_keywords('router-signature', descriptor_file) - # we've reached the 'router-signature', now include the pgp style block - block_end_prefix = PGP_BLOCK_END.split(' ', 1)[0] - extrainfo_content += _read_until_keywords(block_end_prefix, descriptor_file, True) + # we've reached the 'router-signature', now include the pgp style block + + block_end_prefix = PGP_BLOCK_END.split(' ', 1)[0] + extrainfo_content += _read_until_keywords(block_end_prefix, descriptor_file, True) + else: + # bridge descriptors lack a well defined ending, so checking for a @type + # annotation + + extrainfo_content = _read_until_keywords('@type', descriptor_file, ignore_first = True) if extrainfo_content: if extrainfo_content[0].startswith(b'@type'): diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 54ee645..80245ff 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -144,11 +144,19 @@ def _parse_file(descriptor_file, is_bridge = False, validate = False, **kwargs): while True: annotations = _read_until_keywords('router', descriptor_file) - descriptor_content = _read_until_keywords('router-signature', descriptor_file) - # we've reached the 'router-signature', now include the pgp style block - block_end_prefix = PGP_BLOCK_END.split(' ', 1)[0] - descriptor_content += _read_until_keywords(block_end_prefix, descriptor_file, True) + if not is_bridge: + descriptor_content = _read_until_keywords('router-signature', descriptor_file) + + # we've reached the 'router-signature', now include the pgp style block + + block_end_prefix = PGP_BLOCK_END.split(' ', 1)[0] + descriptor_content += _read_until_keywords(block_end_prefix, descriptor_file, True) + else: + # bridge descriptors lack a well defined ending, so checking for a @type + # annotation + + descriptor_content = _read_until_keywords('@type', descriptor_file, ignore_first = True) if descriptor_content: if descriptor_content[0].startswith(b'@type'): diff --git a/test/unit/descriptor/data/extrainfo_bridge_descriptor_multiple b/test/unit/descriptor/data/extrainfo_bridge_descriptor_multiple new file mode 100644 index 0000000..12b1232 --- /dev/null +++ b/test/unit/descriptor/data/extrainfo_bridge_descriptor_multiple @@ -0,0 +1,62 @@ +@type bridge-extra-info 1.2 +extra-info default 909B07DB17E21D263C55794AB815BF1DB195FDD9 +published 2015-03-20 10:49:48 +router-digest 560269C81DEC146D94399FF5E95505A6DE591F3C +@type bridge-extra-info 1.2 +extra-info AndreasBaader 7F7798A3CBB0F643B1CFCE3FD4F2B7C553764498 +published 2015-03-20 10:52:01 +write-history 2015-03-20 10:37:14 (900 s) 7168,24576,89088,14336,9216,9216,215040,62464,5120,10240,4096,10240,7168,45056,79872,7317504,566272,3484672,1227776,19456,92160,9216,11264,176128,17408,58368,46080,7168,10240,15360,8192,17408,115712,8268800,5313536,4535296,4857856,4766720,2446336,4061184,17056768,12321792,9737216,4689920,41984,128000,10240,9216,75776,3697664,8046592,3249152,3329024,15947776,30720,5165056,11705344,10077184,2409472,1417216,944128,3110912,558080,14336,9216,63488,10240,70656,15360,72704,14336,6144,11264,8192,225280,40960,15360,8192,13312,7168,44032,11264,7168,94208,10240,5120,21504,38912,39936,71680,11264,5120,49152,15360,114688,17408 +read-history 2015-03-20 10:37:14 (900 s) 8192,26624,896000,26624,12288,12288,2320384,107520,4096,12288,5120,11264,6144,644096,907264,7287808,723968,3475456,1826816,17408,914432,14336,13312,2001920,54272,663552,657408,9216,17408,24576,15360,19456,966656,8250368,5293056,4518912,6098944,5287936,2457600,4047872,17041408,12282880,9706496,4666368,683008,1456128,19456,10240,1010688,3686400,8024064,3246080,5412864,15894528,31744,5157888,12541952,11269120,2410496,1417216,947200,3341312,557056,11264,9216,874496,12288,1241088,16384,935936,13312,6144,11264,11264,2270208,279552,26624,12288,21504,8192,628736,13312,10240,1213440,8192,7168,21504,626688,635904,905216,8192,8192,649216,18432,1274880,40960 +dirreq-write-history 2015-03-20 01:52:14 (900 s) 1024,0,0,0,0,0,0,0,0,0,0,0,20480,2048,0,2048,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29696,2048,5120,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,1024,4096,0,0,613376,1024,0,0,0,1024,0,0,0,0,0,0,7168,2048,0,1024,2048,0,0,21504,4096,2048,0,3072 +dirreq-read-history 2015-03-20 01:52:14 (900 s) 0,0,0,0,0,0,0,0,0,0,0,0,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4096,0,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4096,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3072,0,0,0,0 +geoip-db-digest 9EF0A1874377BFB6413ED3F9EB5504B1DB17BE13 +geoip6-db-digest 542D349827A88738A04332DAFF2516A384BCC8FF +dirreq-stats-end 2015-03-20 07:52:16 (86400 s) +dirreq-v3-ips mx=8 +dirreq-v3-reqs mx=8 +dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v3-direct-dl complete=0,timeout=0,running=0 +dirreq-v3-tunneled-dl complete=4,timeout=0,running=0 +transport obfs3 +bridge-stats-end 2015-03-20 07:52:22 (86400 s) +bridge-ips ??=8,mx=8 +bridge-ip-versions v4=8,v6=8 +bridge-ip-transports <OR>=8,obfs3=8 +router-digest A493F46D74014938951862D30A71C59E652AEBE7 +@type bridge-extra-info 1.2 +extra-info UlrikeMeinhof B4869206C1EEA4A090FE614155BD6942701F80F1 +published 2015-03-20 10:54:03 +write-history 2015-03-20 10:40:27 (14400 s) 440320,487424,483328,495616,435200,1073152 +read-history 2015-03-20 10:40:27 (14400 s) 5354496,5104640,4907008,4946944,4852736,6280192 +geoip-db-digest C1EB5237F2FBAF63381D8551157F13D12EFCCA25 +geoip6-db-digest 1F99B6B0EC78E9DB34D61AE7E0FC261D558E8E5D +dirreq-stats-end 2015-03-20 07:55:27 (86400 s) +dirreq-v3-ips +dirreq-v3-reqs +dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v3-direct-dl complete=0,timeout=0,running=0 +dirreq-v3-tunneled-dl complete=0,timeout=0,running=0 +transport obfs3 +bridge-stats-end 2015-03-20 07:55:31 (86400 s) +bridge-ips +bridge-ip-versions v4=0,v6=0 +bridge-ip-transports +router-digest 2BEA3A5A03D1125617892D5A4E69A1BFDAE07AB6 +@type bridge-extra-info 1.2 +extra-info Unnamed C18896EB6274DC8123491FAE1DD17E1769C54C4F +published 2015-03-20 10:55:41 +write-history 2015-03-20 10:52:59 (900 s) 1520640,17408,24576,19456,11264,5120,130048,25600,20480,14336,11264,100352,12288 +read-history 2015-03-20 10:52:59 (900 s) 7316480,16384,24576,23552,11264,4096,2151424,33792,23552,13312,12288,1253376,8192 +router-digest 5D531EB5BC5B4D887B6AE1CFE8B20D61E9E4C43D +@type bridge-extra-info 1.2 +extra-info default 478B4CB438302981DE9AAF246F48DBE57F69050A +published 2015-03-20 10:56:17 +write-history 2015-03-20 10:54:10 (900 s) 1387520 +read-history 2015-03-20 10:54:10 (900 s) 7402496 +router-digest 132180906EAF02DD018CBD939AFE56236B2D3218 +@type bridge-extra-info 1.2 +extra-info Unnamed 25D9D52A0350B42E69C8AB7CE945DB1CA38DA0CF +published 2015-03-20 10:59:53 +write-history 2015-03-20 10:51:53 (900 s) 1398784,70656,20480,21504,9216,7168,55296,35840,104448,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +read-history 2015-03-20 10:51:53 (900 s) 8119296,885760,26624,32768,18432,16384,1226752,60416,1311744,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +router-digest 1AA6F27BB6A55EE97FF8C22D8BC2026A437BC1EF diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index c418ff3..5cb3205 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -121,6 +121,22 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEqual({}, desc.dir_v2_responses_unknown) self.assertEqual({}, desc.dir_v2_responses_unknown) + def test_multiple_metrics_bridge_descriptors(self): + """ + Check that we can read bridge descriptors when there's multiple in a file. + """ + + descriptor_file = open(get_resource('extrainfo_bridge_descriptor_multiple'), 'rb') + desc_list = list(stem.descriptor.parse_file(descriptor_file)) + + self.assertEqual(6, len(desc_list)) + self.assertEqual('909B07DB17E21D263C55794AB815BF1DB195FDD9', desc_list[0].fingerprint) + self.assertEqual('7F7798A3CBB0F643B1CFCE3FD4F2B7C553764498', desc_list[1].fingerprint) + self.assertEqual('B4869206C1EEA4A090FE614155BD6942701F80F1', desc_list[2].fingerprint) + self.assertEqual('C18896EB6274DC8123491FAE1DD17E1769C54C4F', desc_list[3].fingerprint) + self.assertEqual('478B4CB438302981DE9AAF246F48DBE57F69050A', desc_list[4].fingerprint) + self.assertEqual('25D9D52A0350B42E69C8AB7CE945DB1CA38DA0CF', desc_list[5].fingerprint) + def test_minimal_extrainfo_descriptor(self): """ Basic sanity check that we can parse an extrainfo descriptor with minimal

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 25 Mar '15

25 Mar '15

commit 982093eb56ab5d4add21e57c8d4a166dd2fd84b3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 16:15:48 2015 +0000 Update translations for torbutton-browserproperties_completed --- pt/browser.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/browser.properties b/pt/browser.properties index 8849b67..52ef750 100644 --- a/pt/browser.properties +++ b/pt/browser.properties @@ -2,4 +2,4 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=en_US +spellchecker.dictionary=pt_PT

1 0

[translation/torbutton-browserproperties] Update translations for torbutton-browserproperties
by translation＠torproject.org 25 Mar '15

25 Mar '15

commit a9a5c3f9e175592cce5a9bd6d569de71e0fc0810 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 16:15:44 2015 +0000 Update translations for torbutton-browserproperties --- pt/browser.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/browser.properties b/pt/browser.properties index 8849b67..52ef750 100644 --- a/pt/browser.properties +++ b/pt/browser.properties @@ -2,4 +2,4 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=en_US +spellchecker.dictionary=pt_PT

1 0

[stem/master] Revert use of CONF_CHANGED events by test_reattaching_listeners
by atagar＠torproject.org 25 Mar '15

25 Mar '15

commit d537fd664203a3a6e665caa061e629416986f589 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 25 08:45:14 2015 -0700 Revert use of CONF_CHANGED events by test_reattaching_listeners Reverting part of the change for #14943 and reopening the ticket since this is causing frequent Jenkins failures... ====================================================================== FAIL: test_reattaching_listeners ---------------------------------------------------------------------- Traceback (most recent call last): File "/srv/jenkins-workspace/workspace/stem-tor-ci/test/runner.py", line 127, in wrapped return func(self, *args, **kwargs) File "/srv/jenkins-workspace/workspace/stem-tor-ci/test/integ/control/controller.py", line 273, in test_reattaching_listeners self.assertTrue(event_notice.wait(10)) AssertionError: False is not true ---------------------------------------------------------------------- Ran 37 tests in 11.423s Test passes more often that not but at this point the cure is worse than the disease, so we should revert until this can be addressed. --- test/integ/control/controller.py | 39 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 7ce3fdc..5deda2b 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -206,12 +206,13 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - controller.add_event_listener(listener, EventType.CONF_CHANGED) + controller.add_event_listener(listener, EventType.BW) - controller.set_conf('NodeFamily', random_fingerprint()) - self.assertTrue(event_notice.wait(10)) - self.assertEqual(len(event_buffer), 1) - event_notice.clear() + # Get a BW event or two. These should be emitted each second but under + # heavy system load that's not always the case. + + event_notice.wait(4) + self.assertTrue(len(event_buffer) >= 1) # disconnect and check that we stop getting events @@ -219,26 +220,21 @@ class TestController(unittest.TestCase): event_notice.clear() event_buffer = [] - # Spawn a second controller and trigger an event - - with runner.get_tor_controller() as controller2: - controller2.set_conf('NodeFamily', random_fingerprint()) - - self.assertEqual(len(event_buffer), 0) + event_notice.wait(2) + self.assertTrue(len(event_buffer) == 0) # reconnect and check that we get events again controller.connect() controller.authenticate(password = test.runner.CONTROL_PASSWORD) - controller.set_conf('NodeFamily', random_fingerprint()) - self.assertTrue(event_notice.wait(10)) - self.assertEqual(len(event_buffer), 1) - event_notice.clear() + event_notice.wait(4) + self.assertTrue(len(event_buffer) >= 1) # disconnect controller.close() + event_notice.clear() event_buffer = [] # reconnect and check that we get events again @@ -246,14 +242,13 @@ class TestController(unittest.TestCase): controller.connect() stem.connection.authenticate(controller, password = test.runner.CONTROL_PASSWORD) - controller.set_conf('NodeFamily', random_fingerprint()) - self.assertTrue(event_notice.wait(10)) - self.assertEqual(len(event_buffer), 1) - event_notice.clear() + event_notice.wait(4) + self.assertTrue(len(event_buffer) >= 1) # disconnect controller.close() + event_notice.clear() event_buffer = [] # Reconnect and check that we get events again. This is being done by @@ -269,10 +264,8 @@ class TestController(unittest.TestCase): else: controller.msg('AUTHENTICATE') - controller.set_conf('NodeFamily', random_fingerprint()) - self.assertTrue(event_notice.wait(10)) - self.assertEqual(len(event_buffer), 1) - event_notice.clear() + event_notice.wait(4) + self.assertTrue(len(event_buffer) >= 1) @require_controller def test_getinfo(self):

1 0

[stem/master] Note that bridge-extra-info 1.2 is ok
by atagar＠torproject.org 25 Mar '15

25 Mar '15

commit baab680f3bf1b000a494db25012d1bc303bea3f4 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 25 08:25:17 2015 -0700 Note that bridge-extra-info 1.2 is ok George was understandably confused since we say that we support 1.1 but the descriptors say 1.2. We only check the major version so either is fine. Collector docs for this say... 'nothing has changed as compared to version 1.1' Sounds like we shouldn't have the version at all but meh, trivial to say it's ok. --- stem/descriptor/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 85ff986..8c0df9d 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -121,7 +121,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume network-status-microdesc-consensus-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) bridge-network-status 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.BridgeNetworkStatusDocument`) bridge-server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` - bridge-extra-info 1.1 :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor` + bridge-extra-info 1.1 or 1.2 :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor` torperf 1.0 **unsupported** bridge-pool-assignment 1.0 **unsupported** tordnsel 1.0 :class:`~stem.descriptor.tordnsel.TorDNSEL`

1 0