February 2015 - tbb-commits - lists.torproject.org

[torbutton/master] Bug 13900: Remove SafeCache code.
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit 2d94a9de3e8b7c3e611bfe18db1f2316a8b88a70 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 4 11:01:37 2015 -0500 Bug 13900: Remove SafeCache code. The SafeCache functionality that we need has been reimplemented in C++ inside Tor Browser. --- src/chrome/content/stanford-safecache.js | 448 ------------------------------ src/chrome/content/torbutton.js | 7 - src/chrome/content/torbutton.xul | 3 - src/defaults/preferences/preferences.js | 3 - 4 files changed, 461 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js deleted file mode 100644 index 0ef52ad..0000000 --- a/src/chrome/content/stanford-safecache.js +++ /dev/null @@ -1,448 +0,0 @@ -// Bug 1506 P3: This file provides important cache isolation properties, -// but it is not very useful without a patched Firefox to go with it. -// It could probably also use some refactoring into an XPCOM component. -// It is currently registered from torbutton.js's "main window" observers, -// which is not the right place. - -/* - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Stanford University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// Dual-keyed cache/cookie same-origin policy -// Ensures that cache and cookies set in HTTP headers cannot be used for -// non-cooperative or semi-cooperative tracking. -// -// Author: Edward Pastuszenski -// -// Based on Stanford SafeCache -// Author: Collin Jackson -// Other contributors: Andrew Bortz, John Mitchell, Dan Boneh -// - -////////////////////////////////////////////////////////////////////////////// -// Constants - -const kSSC_ENABLED_PREF = "extensions.torbutton.safecache"; -const kSSC_SC_ENABLED_PREF = "extensions.torbutton.dual_key_cookies"; -const kSSC_TORBUTTON_PREF = "extensions.torbutton.tor_enabled"; -const kSSC_COOKIE_JS_PREF = "extensions.torbutton.cookie_js_allow"; - -//////////////////////////////////////////////////////////////////////////// -// Debug stuff - -/** - * Dump information to the console? - */ -var SSC_debug = true; - -/** - * Sends data to the console if we're in debug mode - * @param msg The string containing the message to display - */ -function SSC_dump(msg) { - if (SSC_debug) - torbutton_log(3, "SSC: " + msg); -} - -//////////////////////////////////////////////////////////////////////////// -// "Major" objects/classes - -/** - * SafeCache HTTP Request Listener - * Watches for the authentication requests and presents password dialog - */ - -function SSC_RequestListener(controller) { - this.controller = controller; - this.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"]. - getService(Ci.mozIThirdPartyUtil); - this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"]. - getService(Ci.nsICookiePermission); -} - -SSC_RequestListener.prototype = -{ - controller: null, // The SSC_Controller that created this - - observe: function(subject, topic, data) { - try { - if(this.controller.getEnabled() == 2) return; - if(this.controller.getEnabled() == 1 - && !this.controller.getTorButton()) return; - if (topic == 'http-on-modify-request') { - subject.QueryInterface(Components.interfaces.nsIHttpChannel); - subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - subject.QueryInterface(Components.interfaces.nsICachingChannel); - subject.QueryInterface(Components.interfaces.nsIChannel); - this.onModifyRequest(subject); - } else if (topic == 'http-on-examine-response') { - subject.QueryInterface(Components.interfaces.nsIHttpChannel); - subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - subject.QueryInterface(Components.interfaces.nsICachingChannel); - subject.QueryInterface(Components.interfaces.nsIChannel); - this.onExamineResponse(subject); - } - } catch(e) {try {torbutton_log(4, "SSC: "+e);} catch(ex) {}} - }, - - bypassCache: function(channel) { - channel.loadFlags |= channel.LOAD_BYPASS_CACHE; - // INHIBIT_PERSISTENT_CACHING instead? - channel.cacheKey = this.newCacheKey(0); - SSC_dump("Bypassed cache for " + channel.URI.spec); - }, - - setCacheKey: function(channel, str) { - try { - channel.cacheDomain = str; - SSC_dump("Set cacheDomain to "+str+" for "+channel.URI.spec); - } catch(e) { - var oldData = this.readCacheKey(channel); - var newKey = this.newCacheKey(this.getHash(str) + oldData); - channel.cacheKey = newKey; - SSC_dump("Set cache key to hash(" + str + ") = " + - newKey.data + " for " + channel.URI.spec); - } - }, - - onModifyRequest: function(channel) { - var parent_host = null; - var parent_spec = null; - if (channel.notificationCallbacks || - channel.loadGroup && channel.loadGroup.notificationCallbacks) { - var callbacks = null; - if (channel.notificationCallbacks) { - callbacks = channel.notificationCallbacks; - } else { - callbacks = channel.loadGroup.notificationCallbacks; - } - try { - var wind = callbacks.QueryInterface( - Components.interfaces.nsIInterfaceRequestor).getInterface( - Components.interfaces.nsIDOMWindow); - parent_host = wind.window.top.location.hostname; - parent_spec = wind.window.top.location.href; - } catch(e) { - } - SSC_dump("Parent "+parent_host+" for "+ channel.URI.spec); - } - - if (channel.documentURI && channel.documentURI == channel.URI) { - parent_host = null; // first party interaction - parent_spec = null; - } else if(!parent_host) { - // Questionable first party interaction.. - try { - var anuri = null; - try { - anuri = this.thirdPartyUtil.getFirstPartyURIFromChannel(channel, false); - } catch (e) { - torbutton_safelog(2, "FirstParty API failed to get parent: "+e+" ", channel.URI.spec); - // We are not using the TBB based on ESR 24. Falling back to the old - // method. - anuri = this.cookie_permissions.getOriginatingURI(channel); - } - parent_host = anuri.host; - parent_spec = anuri.spec; - } catch(e) { - // XXX: This can still fail for OCSP and other windowless requests.. - torbutton_safelog(3, "Cookie API failed to get parent: "+e+" ",channel.URI.spec); - if (!channel.referrer) { - torbutton_safelog(3, "SSC: No cache isolation parent for ", channel.URI.spec); - } else { - parent_host = channel.referrer.host; - parent_spec = channel.referrer.spec; - } - } - } - - // Same-origin policy - var referrer; - if (parent_host && parent_host != channel.URI.host) { - SSC_dump("Segmenting " + channel.URI.spec + - " content loaded by " + parent_host); - this.setCacheKey(channel, parent_host); - referrer = parent_host; - try { - // Disable 3rd party http auth, but exempt the browser (for favicon loads) - // FIXME: Hrmm, this is just going to disable auth for 3rd party domains. - // It would be better if we could isolate the auth, but still - // allow it to be transmitted.. But I guess, who still uses http auth anyways? - if (channel.getRequestHeader("Authorization") !== null) { - if (parent_spec == "chrome://browser/content/browser.xul") { - torbutton_log(3, "Allowing auth for browser load of "+channel.URI.spec); - } else { - torbutton_safelog(4, "Removing 3rd party HTTP auth for url ", - channel.URI.spec+", parent: "+parent_spec); - channel.setRequestHeader("Authorization", null, false); - channel.setRequestHeader("Pragma", null, false); - channel.setRequestHeader("Cache-Control", null, false); - } - } - } catch (e) {} - } else { - referrer = channel.URI.host; - if(!this.readCacheKey(channel)) { - this.setCacheKey(channel, channel.URI.host); - } else { - SSC_dump("Existing cache key detected; leaving it unchanged."); - } - } - - if (this.controller.getBlockThirdPartyCache()) { - if(parent_host && parent_host != channel.URI.host) { - //SSC_dump("Third party cache blocked for " + channel.URI.spec + - //" content loaded by " + parent_host); - this.bypassCache(channel); - } - } - - var cookie = null; - if (this.controller.getSafeCookieEnabled()) { - try{ - cookie = channel.getRequestHeader("Cookie"); - //SSC_dump("Cookie: " + cookie); - } catch(e) {cookie = null;} - } - - if(cookie) { - //Strip the secondary key from every referrer-matched cookie - var newHeader = ""; - var i = 0; - var lastStart = 0; - //State 0: no information on next cookie - //State 1: cookie will be sent. - //State 2: cookie will not be sent. - var state = 0; - while (i < cookie.length) { - //Dual-keyed cookie - if(state == 0 && cookie.charAt(i) == '|'){ - //If referrers match, strip key and send cookie - var cookieReferrer = cookie.toString().substr(lastStart, i - lastStart); - if (referrer == cookieReferrer){ - lastStart = i+1; - state = 1; - } else { - state = 2; - } - } - //Single-keyed cookie that was set via scripting. - if (state == 0 && cookie.charAt(i) == '='){ - if(this.controller.getCookieJS()) state = 1; - else { - if (referrer == channel.getRequestHeader("Host")) state = 1; - else state = 2; - } - } - //End of a cookie - if (cookie.charAt(i) == ';') { - var thisCookie = cookie.toString().substr(lastStart, i - lastStart + 2); - if (state == 1){ - newHeader += thisCookie; - } - if (state == 2){ - SSC_dump("Declining to send " + thisCookie + - " for request by embedded domain " + channel.URI.host + - + " " + channel.getRequestHeader("Host") + - " on embedding page " + referrer); - } - lastStart = i+2; - state = 0; - } - //End of the string - if (i == cookie.length - 1){ - thisCookie = cookie.toString().substr(lastStart, i - lastStart + 1); - if (state == 1){ - newHeader += thisCookie; - } - if (state == 2){ - SSC_dump("Declining to send " + thisCookie + - " for request by embedded domain " + channel.URI.host + - + " " + channel.getRequestHeader("Host") + - " on embedding page " + referrer); - } - lastStart = i+1; - } - i++; - } - channel.setRequestHeader("Cookie", newHeader, false); - } - - }, - - onExamineResponse: function(channel) { - var setCookie; - try{ - setCookie = channel.getResponseHeader("Set-Cookie"); - } catch(e) {setCookie = null;} - - if(setCookie) { - var parent = null; - // XXX: need to use loadGroup here if null.. - if (channel.notificationCallbacks) { - var wind = channel.notificationCallbacks.QueryInterface( - Components.interfaces.nsIInterfaceRequestor).getInterface( - Components.interfaces.nsIDOMWindow); - parent = wind.window.top.location; - } - - if (channel.documentURI && channel.documentURI == channel.URI) { - parent = null; // first party interaction - } - - var referrer; - // Same-origin policy - if (parent && parent.hostname != channel.URI.host) { - //SSC_dump("Segmenting " + channel.URI.host + - //" content loaded by " + parent.host); - referrer = parent.hostname; - } else { - referrer = channel.URI.host; - } - //Dual-key each cookie set in the header - var newHeader = ""; - var i = 0; - var lastStart = 0; - //Some messy code that prevents multiple embedding-domain keys - //from being concatenated to cookie names. - var passedname = false; - var namebar = false; - while (i < setCookie.length) { - if (setCookie.charAt(i) == '=') passedname = true; - else if (setCookie.charAt(i) == '|' && passedname == false) - namebar = true; - if (i == setCookie.length - 1 || setCookie.charAt(i) == '\n'){ - if(!namebar){ - newHeader += referrer + "|" + - setCookie.toString().substr(lastStart, i - lastStart + 1); - } - lastStart = i+1; - passedname = false; - namebar = false; - } - i++; - } - //SSC_dump("MODIFIED Set-Cookie: " + newHeader); - channel.setResponseHeader("Set-Cookie", newHeader, false); - } - }, - - // Read the integer data contained in a cache key - readCacheKey: function(channel) { - try { - return channel.cacheDomain; - } catch(e) { - channel.cacheKey.QueryInterface(Components.interfaces.nsISupportsPRUint32); - return channel.cacheKey.data; - } - }, - - // Construct a new cache key with some integer data - newCacheKey: function(data) { - var cacheKey = - Components.classes["@mozilla.org/supports-PRUint32;1"] - .createInstance(Components.interfaces.nsISupportsPRUint32); - cacheKey.data = data; - return cacheKey; - }, - - strMD5: function(str) { - var converter = - Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]. - createInstance(Components.interfaces.nsIScriptableUnicodeConverter); - - // nsIURI.host is UTF-8 - converter.charset = "UTF-8"; - // result.value will contain the array length - var result = {}; - // data is an array of bytes - var data = converter.convertToByteArray(str, result); - var ch = Components.classes["@mozilla.org/security/hash;1"] - .createInstance(Components.interfaces.nsICryptoHash); - ch.init(ch.MD5); - ch.update(data, data.length); - return ch.finish(false); - }, - - // Get an integer hash of a string - getHash: function(str) { - var hash = this.strMD5(str); - var intHash = 0; - for(var i = 0; i < hash.length && i < 8; i++) - intHash += hash.charCodeAt(i) << (i << 3); - return intHash; - }, -} - -/** - * Master control object. Adds and removes the RequestListener - */ -function SSC_Controller() { - this.prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - this.addListener(new SSC_RequestListener(this)); -} - -SSC_Controller.prototype = { - - getEnabled: function() { - return (this.prefs.getIntPref(kSSC_ENABLED_PREF)); - }, - - getSafeCookieEnabled: function() { - return (this.prefs.getBoolPref(kSSC_SC_ENABLED_PREF)); - }, - - getBlockThirdPartyCache: function() { - // Meh, no pref for now. Always allow. - return false; - }, - - getTorButton: function() { - return (this.prefs.getBoolPref(kSSC_TORBUTTON_PREF)); - }, - - getCookieJS: function() { - return (this.prefs.getBoolPref(kSSC_COOKIE_JS_PREF)); - }, - - addListener: function(listener) { - this.listener = listener; - var observerService = - Components.classes["@mozilla.org/observer-service;1"] - .getService(Components.interfaces.nsIObserverService); - observerService.addObserver(listener, "http-on-modify-request", false); - // XXX: We need an observer to add this listener when the pref gets set - if (this.getSafeCookieEnabled()) { - observerService.addObserver(listener, "http-on-examine-response", false); - } - }, - - removeListener: function() { - var observerService = - Components.classes["@mozilla.org/observer-service;1"] - .getService(Components.interfaces.nsIObserverService); - observerService.removeObserver(this.listener, "http-on-modify-request"); - if (this.getSafeCookieEnabled()) { - observerService.removeObserver(this.listener, "http-on-examine-response"); - } - }, -} - -//////////////////////////////////////////////////////////////////////////// -// Global stuff -// "What script would be complete without a couple of globals?" --Fritz - -var SSC_controller; - -function SSC_startup() { - if(!SSC_controller) SSC_controller = new SSC_Controller(); - SSC_dump("Loaded controller"); -} diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2fa7189..01591cc 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2865,10 +2865,6 @@ function torbutton_do_main_window_startup() //torbutton_wrap_search_service(); torbutton_unique_pref_observer.register(); - - // Bug 1506: This is probably the most important observer in this function - // XXX: We should fold this into our code/move it to its own component - SSC_startup(); } // Bug 1506 P4: Most of this function is now useless, save @@ -3134,9 +3130,6 @@ function torbutton_close_window(event) { progress.removeProgressListener(torbutton_weblistener); torbutton_unique_pref_observer.unregister(); - // XXX: We should fold this into our code.. - SSC_controller.removeListener(); - if(m_tb_is_main_window) { // main window not reset above // This happens on Mac OS because they allow firefox // to still persist without a navigator window diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index 00dc6f0..5da3439 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -7,9 +7,6 @@ <overlay id="torbutton-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> -  - <script src="chrome://torbutton/content/stanford-safecache.js" /> - <script type="application/x-javascript" src="chrome://torbutton/content/torbutton_util.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/tor-circuit-display.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" /> diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index c6fb8e4..6dde983 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -219,9 +219,6 @@ pref("extensions.torbutton.buildID_override","0"); pref("extensions.torbutton.useragent_vendor", ""); pref("extensions.torbutton.useragent_vendorSub",""); -pref("extensions.torbutton.safecache",1); // 0=always, 1=during tor, 2=never -pref("extensions.torbutton.dual_key_cookies",false); -pref("extensions.torbutton.cookie_js_allow", true); pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true);

1 0

[torbutton/master] Bug 11175: Remove "About Torbutton" from onion menu.
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit 98c9a821aaa392519f78946ba0577d5565c430cb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 9 14:56:07 2015 -0800 Bug 11175: Remove "About Torbutton" from onion menu. Patch originally by Saint, but in this version we keep the actual dialog in case we want to move it somewhere else later. --- src/chrome/content/popup.xul | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index e61dcfe..f4ad7d2 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -28,11 +28,6 @@ accesskey="&torbutton.context_menu.preferences.key;" insertafter="context-stop" oncommand="torbutton_open_prefs_dialog()"/> - <menuitem id="torbutton-about" - label="&torbutton.context_menu.about;" - accesskey="&torbutton.context_menu.about.key;" - insertafter="context-stop" - oncommand="window.open('chrome://torbutton/content/about.xul', '', 'chrome,centerscreen');"/> <menuitem id="torbutton-networksettings" label="&torbutton.context_menu.networksettings;" accesskey="&torbutton.context_menu.networksettings.key;"

1 0

[torbutton/master] Bug 14632: Disable Cookie Manager until we get it working.
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit 3b8c21044edea186da1e7039f4c4151fde3a0cd8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 9 15:04:48 2015 -0800 Bug 14632: Disable Cookie Manager until we get it working. Also update the string so it is more clear that it is a secondary dialog, once we do get it working again. --- src/chrome/content/popup.xul | 3 ++- src/chrome/content/torbutton.js | 4 ++++ src/chrome/locale/en/torbutton.dtd | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index f4ad7d2..9a77c54 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -21,7 +21,8 @@ <menuitem id="torbutton-cookie-protector" label="&torbutton.context_menu.cookieProtections;" accesskey="&torbutton.context_menu.cookieProtections.key;" - insertafter="context-stop" + insertafter="context-stop" + hidden="true" oncommand="torbutton_open_cookie_dialog()"/> <menuitem id="torbutton-preferences" label="&torbutton.context_menu.preferences;" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 01591cc..bdb3b2d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2061,6 +2061,10 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setIntPref("browser.download.manager.retention", 2); } + // XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR + // See https://trac.torproject.org/projects/tor/ticket/10353 for more info. + document.getElementById("torbutton-cookie-protector").hidden = mode; + // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefService); diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 7a4284f..ea37d19 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -34,7 +34,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> <!ENTITY torbutton.context_menu.copyTor.key "p">

1 0

[torbutton/master] Bug 14630: Hide Torbutton's proxy settings tab.
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit bf942275f1b46b3a2ab52b68963199dd976b7c98 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 9 15:59:47 2015 -0800 Bug 14630: Hide Torbutton's proxy settings tab. We only hide this for now in case we want to bring it back as a secondary tab after everyone cries about it. It also simplifies the code changes to simply hide it. Also clean up the associated Torbutton menu and strings for clarity. --- src/chrome/content/popup.xul | 1 + src/chrome/content/preferences.xul | 10 +++++----- src/chrome/locale/en/torbutton.dtd | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 9a77c54..4117632 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -18,6 +18,7 @@ accesskey="&torbutton.context_menu.new_identity_key;" insertafter="context-stop" oncommand="torbutton_new_identity()"/> + <menuseparator/> <menuitem id="torbutton-cookie-protector" label="&torbutton.context_menu.cookieProtections;" accesskey="&torbutton.context_menu.cookieProtections.key;" diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 57b013a..f4fcb4d 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -6,7 +6,7 @@ <dialog id="torbutton-prefs" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" - title="&torbutton.prefs.title;" + title="&torbutton.prefs.privacy_security_settings;" buttons="accept,cancel,extra1" buttonlabelextra1="&torbutton.prefs.restore_defaults;" ondialogextra1="torbutton_prefs_reset_defaults();" @@ -18,11 +18,11 @@ <script type="application/x-javascript" src="preferences.js"/> <tabbox> <tabs> - <tab label="&torbutton.prefs.tor_settings;"/> - <tab label="&torbutton.prefs.privacy_security_settings;"/> + <tab hidden="true" label="&torbutton.prefs.privacy_security_settings;"/> + <tab hidden="true" label="&torbutton.prefs.tor_settings;"/> </tabs> <tabpanels> - <tabpanel> + <tabpanel hidden="true"> <vbox> <radiogroup id="torbutton_settingsMethod"> <radio value="recommended" id="torbutton_useRecommendedSettings" @@ -138,7 +138,7 @@ </hbox> </vbox> </tabpanel> - <tabpanel> + <tabpanel hidden="false"> <vbox> <groupbox> <caption label="&torbutton.prefs.priv_caption;"/> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index ea37d19..1b90d63 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -26,11 +26,11 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> +<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "About Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U">

1 0

[torbutton/master] Bug 8400: Prompt for restart if disk records are enabled/disabled.
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit 1e5da0646b288f3621588af08aa81efca09063fa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 9 18:39:53 2015 -0800 Bug 8400: Prompt for restart if disk records are enabled/disabled. The private browsing pref doesn't actually take effect until restart.. --- src/chrome/content/preferences.js | 43 ++++++++++++++++++++++++++++++++++++ src/chrome/content/preferences.xul | 3 ++- src/chrome/content/torbutton.js | 1 + 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1151176..eaaa059 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -6,6 +6,7 @@ // torbutton_prefs_save() -- on dialog save var tor_enabled = false; +const Cc = Components.classes, Ci = Components.interfaces; function torbutton_prefs_set_field_attributes(doc) { @@ -473,3 +474,45 @@ function torbutton_toggle_slider(doc, pos) { sec_custom.checked = false; } } + +function torbutton_prefs_check_disk() { + let o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); + let old_mode = o_torprefs.getBoolPref('block_disk'); + let mode = document.getElementById('torbutton_blockDisk').checked; + + if (mode === old_mode) { + // Either revert, or uncheck. + return; + } + + let sb = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService); + let bundle = sb.createBundle("chrome://browser/locale/preferences/preferences.properties"); + let brandName = sb.createBundle("chrome://branding/locale/brand.properties").GetStringFromName("brandShortName"); + + let msg = bundle.formatStringFromName(mode ? + "featureEnableRequiresRestart" : "featureDisableRequiresRestart", + [brandName], 1); + let title = bundle.formatStringFromName("shouldRestartTitle", [brandName], 1); + let prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService); + let shouldProceed = prompts.confirm(window, title, msg) + if (shouldProceed) { + let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"] + .createInstance(Ci.nsISupportsPRBool); + let obsSvc = Cc["@mozilla.org/observer-service;1"] + .getService(Ci.nsIObserverService); + obsSvc.notifyObservers(cancelQuit, "quit-application-requested", + "restart"); + shouldProceed = !cancelQuit.data; + + if (shouldProceed) { + document.documentElement.acceptDialog(); + let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"] + .getService(Ci.nsIAppStartup); + appStartup.quit(Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart); + return; + } + } + + document.getElementById('torbutton_blockDisk').checked = old_mode; +} diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index f4fcb4d..0a90f0f 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -143,7 +143,8 @@ <groupbox> <caption label="&torbutton.prefs.priv_caption;"/> <checkbox id="torbutton_blockDisk" - label="&torbutton.prefs.block_disk;"/> + label="&torbutton.prefs.block_disk;" + oncommand="torbutton_prefs_check_disk();"/> <checkbox id="torbutton_blockPlugins" label="&torbutton.prefs.block_plugins;"/> <checkbox id="torbutton_restrictThirdParty" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bdb3b2d..4fa3d63 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2042,6 +2042,7 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setBoolPref("browser.privatebrowsing.autostart", mode); m_tb_prefs.setBoolPref("browser.cache.disk.enable", !mode); + m_tb_prefs.setBoolPref("places.history.enabled", !mode); m_tb_prefs.setBoolPref("security.nocertdb", mode);

1 0

[torbutton/master] Bug 9906: Warn users before closing all windows and performing new identity.
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit 2310af87aafc831db955c06616e282d3def99e21 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 15:07:38 2015 -0800 Bug 9906: Warn users before closing all windows and performing new identity. --- src/chrome/content/torbutton.js | 28 +++++++++++++++++++++++++++- src/chrome/locale/en/torbutton.properties | 1 + src/defaults/preferences/preferences.js | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4fa3d63..cd534a7 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1558,7 +1558,33 @@ function torbutton_new_identity() { // Make sure that we can only click once on New Identiy to avoid race // conditions leading to failures (see bug 11783 for an example). document.getElementById("torbutton-new-identity").disabled = true; - torbutton_do_new_identity(); + + let shouldConfirm = m_tb_prefs.getBoolPref("extensions.torbutton.confirm_newnym"); + + if (shouldConfirm) { + let prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] + .getService(Ci.nsIPromptService); + + // Display two buttons, both with string titles. + let flags = prompts.STD_YES_NO_BUTTONS; + + let message = torbutton_get_property_string("torbutton.popup.confirm_newnym"); + let askAgainText = torbutton_get_property_string("torbutton.popup.never_ask_again"); + let askAgain = {value: false}; + + let confirmed = (prompts.confirmEx(null, "", message, flags, null, null, null, + askAgainText, askAgain) == 0); + + m_tb_prefs.setBoolPref("extensions.torbutton.confirm_newnym", !askAgain.value); + + if (confirmed) { + torbutton_do_new_identity(); + } else { + document.getElementById("torbutton-new-identity").disabled = false; + } + } else { + torbutton_do_new_identity(); + } } catch(e) { // If something went wrong make sure we have the New Identity button // enabled (again). diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index c3e85a3..505f31b 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -51,6 +51,7 @@ torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n torbutton.popup.never_ask_again = Never ask me again +torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n # 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? diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 6dde983..3584581 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -221,6 +221,7 @@ pref("extensions.torbutton.useragent_vendorSub",""); pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); +pref("extensions.torbutton.confirm_newnym", true); // Browser home page, and spell checker dictionary: pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties");

1 0

[torbutton/master] Bug 9442: Add New Circuit button
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit 0020d0dda4af8ef64919d27de5f4b2d0f259f395 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 16:25:02 2015 -0800 Bug 9442: Add New Circuit button This adds a button to utilize the domain isolation to get a new circuit for the current tab only. --- src/chrome/content/popup.xul | 5 +++++ src/chrome/content/torbutton.js | 16 ++++++++++++++++ src/chrome/locale/en/torbutton.dtd | 2 ++ src/components/domain-isolator.js | 20 +++++++++++++++++--- 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 4117632..e0c1f74 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -18,6 +18,11 @@ accesskey="&torbutton.context_menu.new_identity_key;" insertafter="context-stop" oncommand="torbutton_new_identity()"/> + <menuitem id="torbutton-new-circuit" + label="&torbutton.context_menu.new_circuit;" + accesskey="&torbutton.context_menu.new_circuit_key;" + insertafter="context-stop" + oncommand="torbutton_new_circuit()"/> <menuseparator/> <menuitem id="torbutton-cookie-protector" label="&torbutton.context_menu.cookieProtections;" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index cd534a7..8ae1d5d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1552,6 +1552,22 @@ 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 domainIsolator = Cc["@torproject.org/domain-isolator;1"] + .getService(Ci.nsISupports).wrappedJSObject; + + domainIsolator.newCircuitForDomain(firstPartyDomain); + + gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE); +} + // Bug 1506 P4: Needed for New Identity. function torbutton_new_identity() { try { diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 1b90d63..15ae1e6 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -24,6 +24,8 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index e8e6bfa..6e6201e 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -108,8 +108,10 @@ const kMODULE_CID = Components.ID("e33fd6d4-270f-475f-a96f-ff3140279f68"); // Import XPCOMUtils object. Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -// DomainIsolator object. Constructor does nothing. -function DomainIsolator() { } +// DomainIsolator object. +function DomainIsolator() { + this.wrappedJSObject = this; +} // Firefox component requirements DomainIsolator.prototype = { QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), @@ -121,7 +123,19 @@ DomainIsolator.prototype = { logger.eclog(3, "domain isolator: set up isolating circuits by domain"); tor.isolateCircuitsByDomain(); } - } + }, + newCircuitForDomain: function (domain) { + // Check if we already have a nonce. If not, create + // one for this domain. + if (!tor.noncesForDomains.hasOwnProperty(domain)) { + tor.noncesForDomains[domain] = 0; + } else { + tor.noncesForDomains[domain] += 1; + } + logger.eclog(3, "New domain isolation count " +tor.noncesForDomains[domain] + " for " + domain); + }, + + wrappedJSObject: null }; // Assign factory to global object.

1 0

[torbutton/master] Bug #14866: Show correct circuit when more than one exists for a given domain
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit b862e0c70af24fb18da276bcda1b22ea39896093 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Feb 11 22:10:31 2015 -0800 Bug #14866: Show correct circuit when more than one exists for a given domain --- src/chrome/content/tor-circuit-display.js | 56 ++++++++++++++++++----------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index d0977f1..35a7dfc 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -36,12 +36,13 @@ let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; -// ## Circuit/stream domain and node monitoring +// ## Circuit/stream credentials and node monitoring -// A mutable map that stores the current nodes for each domain. -let domainToNodeDataMap = {}, +// A mutable map that stores the current nodes for each +// SOCKS username/password pair. +let credentialsToNodeDataMap = {}, // A mutable map that reports `true` for IDs of "mature" circuits - // (those that have conveyed a stream).. + // (those that have conveyed a stream). knownCircuitIDs = {}, // A map from bridge fingerprint to its IP address. bridgeIDtoIPmap = new Map(); @@ -130,7 +131,7 @@ let getCircuitStatusByID = function* (aController, circuitID) { // Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then // we assume isolation settings (SOCKS username+password) are now fixed for the // corresponding circuit. Whenever the first stream on a new circuit is seen, -// looks up u+p and records the node data in the domainToNodeDataMap. +// looks up u+p and records the node data in the credentialsToNodeDataMap. let collectIsolationData = function (aController) { aController.watchEvent( "STREAM", @@ -140,10 +141,11 @@ let collectIsolationData = function (aController) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs[streamEvent.CircuitID] = true; let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), - domain = trimQuotes(circuitStatus.SOCKS_USERNAME); - if (domain) { + credentials = trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + + trimQuotes(circuitStatus.SOCKS_PASSWORD); + if (credentials) { let nodeData = yield nodeDataForCircuit(aController, circuitStatus); - domainToNodeDataMap[domain] = nodeData; + credentialsToNodeDataMap[credentials] = nodeData; } } }).then(null, Cu.reportError)); @@ -204,24 +206,38 @@ 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; + try { + channel.QueryInterface(Ci.nsIProxiedChannel); + } catch (e) { + return null; + } + let proxyInfo = channel.proxyInfo; + if (proxyInfo === null) return null; + return proxyInfo.username + ":" + proxyInfo.password; +}; + // __updateCircuitDisplay()__. // Updates the Tor circuit display SVG, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { let selectedBrowser = gBrowser.selectedBrowser; if (selectedBrowser) { - let URI = selectedBrowser.currentURI, - domain = null, - nodeData = null; - // Try to get a domain for this URI. Otherwise it remains null. - try { - domain = URI.host; - } catch (e) { } - if (domain) { - // Check if we have anything to show for this domain. - nodeData = domainToNodeDataMap[domain]; + let credentials = getSOCKSCredentialsForBrowser(selectedBrowser), + nodeData = null; + if (credentials) { + // Check if we have anything to show for these credentials. + nodeData = credentialsToNodeDataMap[credentials]; if (nodeData) { // Update the displayed domain. + let domain = credentials.split(":")[0]; document.querySelector("svg#tor-circuit text#domain").innerHTML = "(" + domain + "):"; // Update the displayed information for the relay nodes. let diagramNodes = document.querySelectorAll("svg#tor-circuit text.node-text"), @@ -232,8 +248,8 @@ let updateCircuitDisplay = function () { } } } - // Only show the Tor circuit if we have a domain and node data. - showCircuitDisplay(domain && nodeData); + // Only show the Tor circuit if we have credentials and node data. + showCircuitDisplay(credentials && nodeData); } };

1 0

[torbutton/master] Bug 10280: Strings and pref for preventing plugin initialization.
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit 433fa8b779a4e7b9e5ec3cf09cb49979d5fcc038 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 12 16:22:47 2015 -0800 Bug 10280: Strings and pref for preventing plugin initialization. --- src/chrome/content/torbutton.js | 2 ++ src/chrome/locale/en/brand.dtd | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8ae1d5d..69891c8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2062,6 +2062,8 @@ function torbutton_tor_check_ok() // toggles plugins: true for disabled, false for enabled function torbutton_toggle_plugins(disable_plugins) { if (m_tb_tbb) { + m_tb_prefs.setBoolPref("plugin.disable", disable_plugins); + var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); var P=PH.getPluginTags({}); for(var i=0; i<P.length; i++) { diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en/brand.dtd index 59f665e..cc65346 100644 --- a/src/chrome/locale/en/brand.dtd +++ b/src/chrome/locale/en/brand.dtd @@ -6,3 +6,9 @@ <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> + + +<!ENTITY plugins.installed.find "Click to load installed system plugins"> +<!ENTITY plugins.installed.enable "Enable plugins"> +<!ENTITY plugins.installed.disable "Disable plugins"> +<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit 981c39e35f07cfa6a4bf934ba463f78d4ab796ce Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Feb 11 19:11:16 2015 -0800 fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. This fixes proxy username/password problem reported in #9442. --- netwerk/base/src/nsProxyInfo.h | 2 ++ netwerk/protocol/http/nsHttpConnectionInfo.cpp | 5 +++++ netwerk/protocol/http/nsHttpConnectionInfo.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/netwerk/base/src/nsProxyInfo.h b/netwerk/base/src/nsProxyInfo.h index 5432d95..6559db5 100644 --- a/netwerk/base/src/nsProxyInfo.h +++ b/netwerk/base/src/nsProxyInfo.h @@ -35,6 +35,8 @@ public: int32_t Port() { return mPort; } const char *Type() { return mType; } uint32_t Flags() { return mFlags; } + const nsCString &Username() { return mUsername; } + const nsCString &Password() { return mPassword; } bool IsDirect(); bool IsHTTP(); diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.cpp b/netwerk/protocol/http/nsHttpConnectionInfo.cpp index 1c1c517..2ef09b6 100644 --- a/netwerk/protocol/http/nsHttpConnectionInfo.cpp +++ b/netwerk/protocol/http/nsHttpConnectionInfo.cpp @@ -107,6 +107,11 @@ nsHttpConnectionInfo::SetOriginServer(const nsACString &host, int32_t port) mHashKey.Append(':'); mHashKey.AppendInt(ProxyPort()); mHashKey.Append(')'); + mHashKey.Append('['); + mHashKey.Append(ProxyUsername()); + mHashKey.Append(':'); + mHashKey.Append(ProxyPassword()); + mHashKey.Append(']'); } } diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.h b/netwerk/protocol/http/nsHttpConnectionInfo.h index 4f7034d..c2b345a 100644 --- a/netwerk/protocol/http/nsHttpConnectionInfo.h +++ b/netwerk/protocol/http/nsHttpConnectionInfo.h @@ -48,6 +48,8 @@ public: const char *ProxyHost() const { return mProxyInfo ? mProxyInfo->Host().get() : nullptr; } int32_t ProxyPort() const { return mProxyInfo ? mProxyInfo->Port() : -1; } const char *ProxyType() const { return mProxyInfo ? mProxyInfo->Type() : nullptr; } + const char *ProxyUsername() const { return mProxyInfo ? mProxyInfo->Username().get() : nullptr; } + const char *ProxyPassword() const { return mProxyInfo ? mProxyInfo->Password().get() : nullptr; } // Compare this connection info to another... // Two connections are 'equal' if they end up talking the same

1 0