April 2017 - tor-commits - lists.torproject.org

[webwml/staging] Merge branch 'staging'
by hiro＠torproject.org 04 Apr '17

04 Apr '17

commit 75a21b72db5519bf572a5e4a1a7a8a3e05866aea Merge: 371a8cf d4e1a35 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Mar 19 18:37:14 2017 +0100 Merge branch 'staging' * staging: Do not use onchange=<inline script>, instead add listeners in init Move Debian sources.list generator JS into its own file (re: #21769) docs/debian-selector.js | 163 +++++++++++++++++++++++++++++++++++++++++++++ docs/en/debian.wml | 174 ++---------------------------------------------- include/head.wmi | 1 + 3 files changed, 170 insertions(+), 168 deletions(-)

1 0

[torbutton/master] Bug 21201: Mark Torbutton as multiprocess compatible
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 7c8c20ff3b4f6747d57c259407a55194ffb62374 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 4 10:08:06 2017 +0000 Bug 21201: Mark Torbutton as multiprocess compatible --- src/install.rdf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/install.rdf b/src/install.rdf index 3077598..5a698b3 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,6 +7,7 @@ <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> <em:version>1.9.7.1</em:version> + <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug 21745: Fix handling of catch-all circuit
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 1324e306018779166674e9bc6101ddb9e2bbc68b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Mar 17 12:16:36 2017 -0700 Bug 21745: Fix handling of catch-all circuit --- src/components/domain-isolator.js | 44 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a537429..e43ee58 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -6,7 +6,7 @@ // call earlier functions). The code file can be processed // with docco.js to provide clear documentation. -/* jshint moz: true */ +/* jshint esversion: 6 */ /* global Components, console, XPCOMUtils */ // ### Abbreviations @@ -91,19 +91,19 @@ tor.nonce = function() { // Convert the tag to a hex string. let tagStr = ""; - for (var i = 0; i < tag.length; i++) { + for (let i = 0; i < tag.length; i++) { tagStr += (tag[i] >>> 4).toString(16); tagStr += (tag[i] & 0x0F).toString(16); } return tagStr; -} +}; tor.newCircuitForDomain = function(domain) { // Re-generate the nonce for the domain. tor.noncesForDomains[domain] = tor.nonce(); logger.eclog(3, "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain]); -} +}; // __tor.clearIsolation()_. // Clear the isolation state cache, forcing new circuits to be used for all @@ -115,7 +115,7 @@ tor.clearIsolation = function () { // Force a rotation on the next catch-all circuit use by setting the creation // time to the epoch. tor.unknownDirtySince = 0; -} +}; // __tor.isolateCircuitsByDomain()__. // For every HTTPChannel, replaces the default SOCKS proxy with one that authenticates @@ -124,29 +124,27 @@ tor.clearIsolation = function () { // combination. tor.isolateCircuitsByDomain = function () { mozilla.registerProxyChannelFilter(function (aChannel, aProxy) { - if (!tor.isolationEnabled) + if (!tor.isolationEnabled) { return aProxy; - + } try { - let channel = aChannel.QueryInterface(Ci.nsIChannel); - firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain, + let channel = aChannel.QueryInterface(Ci.nsIChannel), proxy = aProxy.QueryInterface(Ci.nsIProxyInfo), - replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); - logger.eclog(3, "tor SOCKS: " + channel.URI.spec + " via " + - 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--"); - tor.unknownDirtySince = Date.now(); + firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain; + if (firstPartyDomain === "") { + firstPartyDomain = "--unknown--"; + 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); + let replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); + logger.eclog(3, `tor SOCKS: ${channel.URI.spec} via + ${replacementProxy.username}:${replacementProxy.password}`); return replacementProxy; + } catch (e) { + logger.eclog(4, `tor domain isolator error: ${e.message}`); } }, 0); };

1 0

[torbutton/master] Bug 21747: 'New Tor Circuit for this Site' in ESR52
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit cfa9229fddb79067ebd3a0a6d8d0a10ab1bffc02 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Mar 17 13:08:16 2017 -0700 Bug 21747: 'New Tor Circuit for this Site' in ESR52 Also, make sure we renew catchall "--unknown--" domain if user chooses "New Tor Circuit" for about:addons, for example. --- src/chrome/content/torbutton.js | 7 ++----- src/components/domain-isolator.js | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 970d2d0..9af7c57 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1014,11 +1014,8 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New IP Address function torbutton_new_circuit() { - let thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] - .getService(Ci.mozIThirdPartyUtil); - - let firstPartyDomain = thirdPartyUtil - .getFirstPartyHostForIsolation(gBrowser.currentURI); + let firstPartyDomain = gBrowser.contentPrincipal.originAttributes + .firstPartyDomain; let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index e43ee58..a52cccc 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -101,6 +101,9 @@ tor.nonce = function() { tor.newCircuitForDomain = function(domain) { // Re-generate the nonce for the domain. + if (domain === "") { + domain = "--unknown--"; + } tor.noncesForDomains[domain] = tor.nonce(); logger.eclog(3, "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain]); };

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 04 Apr '17

04 Apr '17

commit f63cd9cbd6d32a9b285508d4927f552615c15a66 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 4 09:49:20 2017 +0000 Update translations for tails-greeter-2_completed --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index c9cecef..bacfa9b 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -228,7 +228,7 @@ msgstr "直接(預設)" #: ../data/greeter.ui.h:51 msgid "_Windows Camouflage" -msgstr "視窗系統偽裝" +msgstr "微軟 Windows 系統偽裝" #: ../tailsgreeter/gui.py:388 msgid "Bridge & Proxy"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 04 Apr '17

04 Apr '17

commit 2dc9e1d981e925e516212e0f88ce6c3adefffd7a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 4 09:49:11 2017 +0000 Update translations for tails-greeter-2 --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index c9cecef..bacfa9b 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -228,7 +228,7 @@ msgstr "直接(預設)" #: ../data/greeter.ui.h:51 msgid "_Windows Camouflage" -msgstr "視窗系統偽裝" +msgstr "微軟 Windows 系統偽裝" #: ../tailsgreeter/gui.py:388 msgid "Bridge & Proxy"

1 0

[torbutton/master] Bug 21547: Fix circuit display under e10s
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 45184e903fd682f6eef5a44b6fa44df86a0dbc9f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Mar 5 23:50:15 2017 -0800 Bug 21547: Fix circuit display under e10s --- src/chrome/content/tor-circuit-display.js | 70 +++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 14e5e8e..b5c24f8 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -26,7 +26,7 @@ let createTorCircuitDisplay = (function () { "use strict"; // Mozilla utilities -const Cu = Components.utils; +const { Cu : utils , Ci : interfaces } = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); @@ -34,7 +34,7 @@ Cu.import("resource://gre/modules/Task.jsm"); let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); // Utility functions -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -47,7 +47,10 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] let credentialsToNodeDataMap = {}, // A mutable map that reports `true` for IDs of "mature" circuits // (those that have conveyed a stream). - knownCircuitIDs = {}; + knownCircuitIDs = {}, + // A mutable map that records the SOCKS credentials for the + // latest channels for each browser. + browserToCredentialsMap = new Map(); // __trimQuotes(s)__. // Removes quotation marks around a quoted string. @@ -154,6 +157,42 @@ let collectIsolationData = function (aController, updateUI) { }).then(null, Cu.reportError)); }; +// __browserForChannel(channel)__. +// Returns the browser that loaded a given channel. +let browserForChannel = function (channel) { + if (!channel) return null; + let chan = channel.QueryInterface(Ci.nsIChannel); + let callbacks = chan.notificationCallbacks; + if (!callbacks) return null; + let loadContext; + try { + loadContext = callbacks.getInterface(Ci.nsILoadContext); + } catch (e) { + // Ignore + return null; + } + if (!loadContext) return null; + return loadContext.topFrameElement; +}; + +// __collectBrowserCredentials()__. +// Starts observing http channels. Each channel's proxyInfo +// username and password is recorded for the channel's browser. +let collectBrowserCredentials = function () { + return observe("http-on-modify-request", chan => { + try { + let proxyInfo = chan.QueryInterface(Ci.nsIProxiedChannel).proxyInfo; + let browser = browserForChannel(chan); + if (browser && proxyInfo) { + browserToCredentialsMap.set(browser, [proxyInfo.username, + proxyInfo.password]); + } + } catch (e) { + logger.eclog(3, `Error collecting browser credentials: ${e.message}, ${chan.URI.spec}`); + } + }); +}; + // ## User interface // __torbuttonBundle__. @@ -221,24 +260,6 @@ let nodeLines = function (nodeData) { return result; }; -// __getSOCKSCredentials(browser)__. -// Reads the SOCKS credentials for the corresponding browser object. -let getSOCKSCredentialsForBrowser = function (browser) { - if (browser === null) return null; - let docShell = browser.docShell; - if (docShell === null) return null; - let channel = docShell.currentDocumentChannel; - if (channel === null) return null; - if (channel instanceof Ci.nsIMultiPartChannel) { - channel = channel.baseChannel; - } - if (channel === null) return null; - if (!(channel instanceof Ci.nsIProxiedChannel)) return null; - let proxyInfo = channel.proxyInfo; - if (proxyInfo === null) return null; - return [proxyInfo.username, proxyInfo.password]; -}; - // __onionSiteRelayLine__. // When we have an onion site, we simply show the word '(relay)'. let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; @@ -249,7 +270,7 @@ let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; let updateCircuitDisplay = function () { let selectedBrowser = gBrowser.selectedBrowser; if (selectedBrowser) { - let credentials = getSOCKSCredentialsForBrowser(selectedBrowser), + let credentials = browserToCredentialsMap.get(selectedBrowser), nodeData = null; if (credentials) { let [SOCKS_username, SOCKS_password] = credentials; @@ -319,12 +340,16 @@ let syncDisplayWithSelectedTab = (function() { let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, + stopCollectingBrowserCredentials = null, stop = function() { syncDisplayWithSelectedTab(false); if (myController) { if (stopCollectingIsolationData) { stopCollectingIsolationData(); } + if (stopCollectingBrowserCredentials) { + stopCollectingBrowserCredentials(); + } myController = null; } }, @@ -340,6 +365,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { }); syncDisplayWithSelectedTab(true); stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); + stopCollectingBrowserCredentials = collectBrowserCredentials(); } }; try {

1 0

[torbutton/master] Bug 21268: e10s compatibility for New Identity.
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 7c712a4ecbd1951503532c0e1f323ab6f0eaa4b3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 8 11:37:06 2017 -0500 Bug 21268: e10s compatibility for New Identity. Ignore "not available" errors from appCacheStorage.asyncEvictStorage() since these can occur if the cache has not been used yet. Change torbutton_close_tabs_on_new_identity() to use browser.removeTab() instead of browser.contentWindow.close() since we cannot directly access the contentWindow when multi-process mode is enabled. Fix indentation and modernize the torbutton_close_tabs_on_new_identity() code. --- src/chrome/content/torbutton.js | 92 ++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 43 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index abf533f..970d2d0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1219,7 +1219,12 @@ function torbutton_do_new_identity() { // then we are using the new cache (cache2) which operates synchronously. // If we are using the old cache, then the tor-browser.git patch for // #5715 also makes this synchronous. So we pass a null callback. - appCacheStorage.asyncEvictStorage(null); + try { + appCacheStorage.asyncEvictStorage(null); + } catch (err if err.name == 'NS_ERROR_NOT_AVAILABLE') { + // We ignore "not available" errors because they occur if a cache + // has not been used, e.g., if no browsing has been done. + } } } catch(e) { torbutton_log(5, "Exception on cache clearing: "+e); @@ -1758,56 +1763,57 @@ function torbutton_update_thirdparty_prefs() { m_tb_prefs.savePrefFile(null); } +// This function closes all XUL browser windows except this one. For this +// window, it closes all existing tabs and creates one about:blank tab. function torbutton_close_tabs_on_new_identity() { - var close_newnym = m_tb_prefs.getBoolPref("extensions.torbutton.close_newnym"); - if (!close_newnym) { - torbutton_log(3, "Not closing tabs"); - return; - } - - // TODO: muck around with browser.tabs.warnOnClose.. maybe.. - torbutton_log(3, "Closing tabs..."); - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var enumerator = wm.getEnumerator("navigator:browser"); - var closeWins = new Array(); - while(enumerator.hasMoreElements()) { - var win = enumerator.getNext(); - var browser = win.getBrowser(); - if(!browser) { - torbutton_log(5, "No browser for possible closed window"); - continue; - } - var tabs = browser.browsers.length; - - torbutton_log(3, "Length: "+browser.browsers.length); + if (!m_tb_prefs.getBoolPref("extensions.torbutton.close_newnym")) { + torbutton_log(3, "Not closing tabs"); + return; + } - var remove = new Array(); - for(var i = 0; i < tabs; i++) { - remove.push(browser.browsers[i]); - } + // TODO: muck around with browser.tabs.warnOnClose.. maybe.. + torbutton_log(3, "Closing tabs..."); + let wm = Cc["@mozilla.org/appshell/window-mediator;1"] + .getService(Ci.nsIWindowMediator); + let enumerator = wm.getEnumerator("navigator:browser"); + let windowsToClose = new Array(); + while (enumerator.hasMoreElements()) { + let win = enumerator.getNext(); + let browser = win.getBrowser(); + if (!browser) { + torbutton_log(5, "No browser for possible closed window"); + continue; + } - if(browser.browsers.length == remove.length) { - // It is a bad idea to alter the window list while - // iterating over it. - browser.addTab("about:blank"); - if(win != window) { - closeWins.push(win); - } - } + let tabCount = browser.browsers.length; + torbutton_log(3, "Tab count for window: " + tabCount); + let tabsToRemove = new Array(); + for (let i = 0; i < tabCount; i++) { + let tab = browser.getTabForBrowser(browser.browsers[i]); + if (!tab) { + torbutton_log(5, "No tab for browser"); + } else { + tabsToRemove.push(tab); + } + } - for(var i = 0; i < remove.length; i++) { - remove[i].contentWindow.close(); - } + if (win == window) { + browser.addTab("about:blank"); + } else { + // It is a bad idea to alter the window list while iterating + // over it, so add this window to an array and close it later. + windowsToClose.push(win); } - torbutton_log(2, "Closing windows..."); + // Close each tab except the new blank one that we created. + tabsToRemove.forEach(aTab => browser.removeTab(aTab)); + } - for(var i = 0; i < closeWins.length; ++i) { - closeWins[i].close(); - } + // Close all XUL windows except this one. + torbutton_log(2, "Closing windows..."); + windowsToClose.forEach(aWin => aWin.close()); - torbutton_log(3, "Closed all tabs"); + torbutton_log(3, "Closed all tabs"); } // Bug 1506 P2: This code is only important for disabling

1 0

[torbutton/master] fixup! Bug 21267: Remove 14429 implementation for now
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit eadfd9622fc7a15aad5200e11a35a4f558ae5743 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 4 08:59:06 2017 +0000 fixup! Bug 21267: Remove 14429 implementation for now --- src/defaults/preferences/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 68772a5..f61cb89 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -25,7 +25,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_warnings_remaining", 0); +pref("extensions.torbutton.maximize_warnings_remaining", 3); // Security prefs: pref("extensions.torbutton.cookie_protections",true);

1 0

[torbutton/master] Bug 21201.1: Use new svg.disabled pref
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 1b7ce9f53f6a27e8684fdcda0b3be086a914d054 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jan 11 09:21:26 2017 -0800 Bug 21201.1: Use new svg.disabled pref --- src/modules/security-prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index 4a39ca8..f508b87 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -29,7 +29,7 @@ const kSecuritySettings = { "noscript.global" : [, false, false, false, true ], "noscript.globalHttpsWhitelist" : [, false, true, true, false], "noscript.forbidFonts" : [, true, false, false, false], - "svg.in-content.enabled" : [, false, true, true, true ], + "svg.disabled" : [, true, false, false, false], }; // The Security Settings prefs in question.

1 0