tbb-commits April 2017

tbb-commits@lists.torproject.org

2 participants
143 discussions

[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.2: Isolate by firstPartyDomain from OriginAttributes
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 7fffae283aaf12d745b64a95a57ee4d8c9d05457 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Jan 22 22:03:34 2017 -0800 Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes --- src/components/domain-isolator.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index dbdca1b..a537429 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -29,11 +29,6 @@ let mozilla = {}; mozilla.protocolProxyService = Cc["@mozilla.org/network/protocol-proxy-service;1"] .getService(Ci.nsIProtocolProxyService); -// __mozilla.thirdPartyUtil__. -// Mozilla's Thirdy Party Utilities, for figuring out first party domain. -mozilla.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] - .getService(Ci.mozIThirdPartyUtil); - // __mozilla.registerProxyChannelFilter(filterFunction, positionIndex)__. // Registers a proxy channel filter with the Mozilla Protocol Proxy Service, // which will help to decide the proxy to be used for a given channel. @@ -133,11 +128,8 @@ tor.isolateCircuitsByDomain = function () { return aProxy; try { - let channel = aChannel.QueryInterface(Ci.nsIChannel), - firstPartyURI = mozilla.thirdPartyUtil.getFirstPartyURIFromChannel(channel, true) - .QueryInterface(Ci.nsIURI), - firstPartyDomain = mozilla.thirdPartyUtil - .getFirstPartyHostForIsolation(firstPartyURI), + let channel = aChannel.QueryInterface(Ci.nsIChannel); + firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain, proxy = aProxy.QueryInterface(Ci.nsIProxyInfo), replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); logger.eclog(3, "tor SOCKS: " + channel.URI.spec + " via " +

1 0

[torbutton/master] Bug 21201: Avoid accessing contentWindow inside torbutton_resizelistener.
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 0f9c8fc79b9e0c3411c2aedf18ad24b4596172a0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 9 11:37:20 2017 -0500 Bug 21201: Avoid accessing contentWindow inside torbutton_resizelistener. Also, use Cc, Ci, and Cr inside torbutton_resizelistener. --- src/chrome/content/torbutton.js | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 44f01f9..f521a6c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2204,26 +2204,16 @@ var torbutton_resizelistener = { QueryInterface: function(aIID) { - if (aIID.equals(Components.interfaces.nsIWebProgressListener) || - aIID.equals(Components.interfaces.nsISupportsWeakReference) || - aIID.equals(Components.interfaces.nsISupports)) + if (aIID.equals(Ci.nsIWebProgressListener) || + aIID.equals(Ci.nsISupportsWeakReference) || + aIID.equals(Ci.nsISupports)) return this; - throw Components.results.NS_NOINTERFACE; + throw Cr.NS_NOINTERFACE; }, onLocationChange: function(aProgress, aRequest, aURI) {}, onStateChange: function(aProgress, aRequest, aFlag, aStatus) { - if (aFlag & Components.interfaces.nsIWebProgressListener.STATE_STOP) { - var progress = - Components.classes["@mozilla.org/docloaderservice;1"]. - getService(Components.interfaces.nsIWebProgress); - var win = getBrowser().contentWindow; - if (!win || typeof(win) == "undefined") { - torbutton_log(5, "No initial browser content window?"); - progress.removeProgressListener(this); - return; - } - + if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { m_tb_resize_handler = function() { if (window.windowState === 1) { if (m_tb_prefs. @@ -2301,6 +2291,8 @@ var torbutton_resizelistener = // event got fired. Thus, we have the rather klunky setTimeout() call. window.addEventListener("sizemodechange", m_tb_resize_handler, false); + let progress = Cc["@mozilla.org/docloaderservice;1"] + .getService(Ci.nsIWebProgress); progress.removeProgressListener(this); } }, // onStateChange

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits April 2017