- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug 14716: HTTP Basic Authentication prompt only displayed once
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit f0fe46bcec5946e94fd66792983b1f081913a74f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Apr 17 16:31:28 2015 -0400 Bug 14716: HTTP Basic Authentication prompt only displayed once Modify the login manager implementation to handle the situation where storage is not available. --- toolkit/components/passwordmgr/nsLoginManager.js | 57 +++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js index a4cbdb0..19024fd 100644 --- a/toolkit/components/passwordmgr/nsLoginManager.js +++ b/toolkit/components/passwordmgr/nsLoginManager.js @@ -243,6 +243,10 @@ LoginManager.prototype = { if (logins.some(function(l) login.matches(l, true))) throw "This login already exists."; + if (!this._storage) { + throw "No storage to add login"; + } + log("Adding login"); return this._storage.addLogin(login); }, @@ -255,6 +259,12 @@ LoginManager.prototype = { */ removeLogin : function (login) { log("Removing login"); + + if (!this._storage) { + log("No storage to remove login"); + return null; + } + return this._storage.removeLogin(login); }, @@ -266,6 +276,12 @@ LoginManager.prototype = { */ modifyLogin : function (oldLogin, newLogin) { log("Modifying login"); + + if (!this._storage) { + log("No storage to modify login"); + return null; + } + return this._storage.modifyLogin(oldLogin, newLogin); }, @@ -281,6 +297,12 @@ LoginManager.prototype = { */ getAllLogins : function (count) { log("Getting a list of all logins"); + + if (!this._storage) { + log("No storage to get all logins"); + return null; + } + return this._storage.getAllLogins(count); }, @@ -292,7 +314,10 @@ LoginManager.prototype = { */ removeAllLogins : function () { log("Removing all logins"); - this._storage.removeAllLogins(); + if (!this._storage) + log("No storage to remove all logins"); + else + this._storage.removeAllLogins(); }, /* @@ -307,6 +332,12 @@ LoginManager.prototype = { */ getAllDisabledHosts : function (count) { log("Getting a list of all disabled hosts"); + + if (!this._storage) { + log("No storage to get all disabled hosts"); + return null; + } + return this._storage.getAllDisabledHosts(count); }, @@ -320,6 +351,11 @@ LoginManager.prototype = { log("Searching for logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); + if (!this._storage) { + log("No storage to find logins"); + return null; + } + return this._storage.findLogins(count, hostname, formSubmitURL, httpRealm); }, @@ -336,6 +372,11 @@ LoginManager.prototype = { searchLogins : function(count, matchData) { log("Searching for logins"); + if (!this._storage) { + log("No storage to search logins"); + return null; + } + return this._storage.searchLogins(count, matchData); }, @@ -350,6 +391,9 @@ LoginManager.prototype = { log("Counting logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); + if (!this._storage) + return 0; + return this._storage.countLogins(hostname, formSubmitURL, httpRealm); }, @@ -358,6 +402,9 @@ LoginManager.prototype = { * uiBusy */ get uiBusy() { + if (!this._storage) + return false; + return this._storage.uiBusy; }, @@ -366,6 +413,9 @@ LoginManager.prototype = { * isLoggedIn */ get isLoggedIn() { + if (!this._storage) + return false; + return this._storage.isLoggedIn; }, @@ -377,7 +427,7 @@ LoginManager.prototype = { */ getLoginSavingEnabled : function (host) { log("Checking if logins to", host, "can be saved."); - if (!this._remember) + if (!this._remember || !this._storage) return false; return this._storage.getLoginSavingEnabled(host); @@ -394,6 +444,9 @@ LoginManager.prototype = { if (hostname.indexOf("\0") != -1) throw "Invalid hostname"; + if (!this._storage) + throw "No storage to set login saving enabled"; + log("Login saving for", hostname, "now enabled?", enabled); return this._storage.setLoginSavingEnabled(hostname, enabled); },

1 0

[torbutton/master] Bug #15502: Wipe blob URIs on New Identity
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 2568365dfa0ce8ebc2f5f430b4c752ca57b2fc97 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Apr 13 10:41:44 2015 -0700 Bug #15502: Wipe blob URIs on New Identity --- src/chrome/content/torbutton.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b4b3ab5..2fdfd1c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1884,6 +1884,12 @@ function torbutton_do_new_identity() { torbutton_log(3, "New identity successful"); + // Run garbage collection and cycle collection after window is gone. + // This ensures that blob URIs are forgotten. + window.addEventListener("unload", function (event) { + m_tb_domWindowUtils.garbageCollect(); + }); + // Close the current window for added safety window.close(); }

1 0

[torbutton/master] Bug #15502: Ensure garbage collection runs immediately and completely.
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit accb4b887b4427221358fc8c17bbbdf85e77467c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 15 21:34:07 2015 -0700 Bug #15502: Ensure garbage collection runs immediately and completely. --- src/chrome/content/torbutton.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2fdfd1c..7d229dd 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1887,7 +1887,34 @@ function torbutton_do_new_identity() { // Run garbage collection and cycle collection after window is gone. // This ensures that blob URIs are forgotten. window.addEventListener("unload", function (event) { + torbutton_log(3, "Initiating New Identity GC pass"); + // Clear out potential pending sInterSliceGCTimer: + m_tb_domWindowUtils.runNextCollectorTimer(); + + // Clear out potential pending sICCTimer: + m_tb_domWindowUtils.runNextCollectorTimer(); + + // Schedule a garbage collection in 4000-1000ms... + m_tb_domWindowUtils.garbageCollect(); + + // To ensure the GC runs immediately instead of 4-10s from now, we need + // to poke it at least 11 times. + // We need 5 pokes for GC, 1 poke for the interSliceGC, and 5 pokes for CC. + // See nsJSContext::RunNextCollectorTimer() in + // https://mxr.mozilla.org/mozilla-central/source/dom/base/nsJSEnvironment.cpp…. + // XXX: We might want to make our own method for immediate full GC... + for (let poke = 0; poke < 11; poke++) { + m_tb_domWindowUtils.runNextCollectorTimer(); + } + + // And now, since the GC probably actually ran *after* the CC last time, + // run the whole thing again. m_tb_domWindowUtils.garbageCollect(); + for (let poke = 0; poke < 11; poke++) { + m_tb_domWindowUtils.runNextCollectorTimer(); + } + + torbutton_log(3, "Completed New Identity GC pass"); }); // Close the current window for added safety

1 0

[torbutton/master] Add changelog and bump version for 1.9.2.0.
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 60b1537295374c64594564a00d17bcc42dc76985 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 20 17:26:45 2015 -0700 Add changelog and bump version for 1.9.2.0. --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e140ff5..e50f5b6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.2.0: + * Bug 15562: Bind SharedWorkers to thirdparty pref + * Bug 15533: Restore default security level when restoring defaults + * Bug 15510: Close Tor Circuit UI control port connections on New Identity + * Bug 15472: Make node text black in circuit status UI. + * Bug 15502: Wipe blob URIs on New Identity + 1.9.1.0: * Bug 9387: "Security Slider 1.0" * Include descriptions and tooltip hints for security levels diff --git a/src/install.rdf b/src/install.rdf index 94245a0..6af4e9b 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.1.0</em:version> + <em:version>1.9.2.0</em:version> <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

[tor-browser-bundle/master] Revert "Bug 15670: add support for the no_update_for option in config.yml"
by gk＠torproject.org 20 Apr '15

20 Apr '15

commit 6fddec33ed9d3baf343f3848bc3d85553de6b03b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 20 08:42:39 2015 +0000 Revert "Bug 15670: add support for the no_update_for option in config.yml" This reverts commit 7d7faa30b4443f0cc76474738a36fd3f45e875f4. --- tools/update-responses/update_responses | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 6c497ef..07efc7c 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -283,10 +283,6 @@ sub write_htaccess { my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; - my $noup_for = $config->{no_update_for}{$channel}; - for my $noup_ver (ref $noup_for eq 'ARRAY' ? @$noup_for : ()) { - $htaccess .= "RewriteRule ^[^\/]+/$noup_ver/ no-update.xml $flags\n"; - } foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) {

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'mikeperry/bug15672'
by gk＠torproject.org 20 Apr '15

20 Apr '15

commit 44e59e8d6e91bab002d93a978b8a4e36fbb5b9fb Merge: 33f867c c9266da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 20 08:41:44 2015 +0000 Merge remote-tracking branch 'mikeperry/bug15672' RelativeLink/start-tor-browser | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-)

1 0

[tor-browser-bundle/master] Bug #15672: Provide desktop app registration+unregistration for Linux
by gk＠torproject.org 20 Apr '15

20 Apr '15

commit c9266daa8ce6501e6f24446dc0da05caf7fa955d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 13 11:27:29 2015 -0700 Bug #15672: Provide desktop app registration+unregistration for Linux --- RelativeLink/start-tor-browser | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index aac5a6e..098f506 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -100,11 +100,18 @@ fi debug=0 show_usage=0 +register_desktop_app=0 # !!! We may have more than one argument, changed -eq to -ge in if & elif clauses below if [ "$#" -ge 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1 shift # pop the debug argument printf "\nDebug enabled.\n\n" +elif [ "$#" -ge 1 -a $ "x$1" = "x--register-app" -o "x$1" = "x-register-app" $ ]; then + register_desktop_app=1 + shift # pop the register arg +elif [ "$#" -ge 1 -a $ "x$1" = "x--unregister-app" -o "x$1" = "x-unregister-app" $ ]; then + register_desktop_app=-1 + shift # pop the register arg elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then show_usage=1 else @@ -160,6 +167,13 @@ fi mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" +# If ${PWD} results in a zero length string, we can try something else... +if [ ! "${PWD}" ]; then + # "hacking around some braindamage" + PWD="`pwd`" + surveysays="This system has a messed up shell.\n" +fi + # This is a fix for an ibus issue on some Linux systems. See #9353 for more # details. The symlink needs to be created before we change HOME. if [ ! -d ".config/ibus" ]; then @@ -167,23 +181,34 @@ if [ ! -d ".config/ibus" ]; then ln -nsf ~/.config/ibus/bus .config/ibus fi -# If ${PWD} results in a zero length HOME, we can try something else... -if [ ! "${PWD}" ]; then - # "hacking around some braindamage" - HOME="`pwd`" - export HOME - surveysays="This system has a messed up shell.\n" -else - HOME="${PWD}" - export HOME -fi - # Fix up .desktop Icon and Exec Paths, and update the .desktop file from the # canonical version if it was changed by the updater. cp start-tor-browser.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop -sed -i -e "s,^Icon=.*,Icon=$HOME/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop -sed -i -e "s,^Exec=.*,Exec=sh -c '\"$HOME/start-tor-browser\" || ([ ! -x \"$HOME/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser)' dummy %k,g" ../start-tor-browser.desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop +sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser)' dummy %k,g" ../start-tor-browser.desktop + +if [ "$register_desktop_app" -eq 1 ]; then + mkdir -p "$HOME/.local/share/applications/" + cp ../start-tor-browser.desktop "$HOME/.local/share/applications/" + update-desktop-database "$HOME/.local/share/applications/" + printf "Tor Browser has been registered as a desktop app for this user in ~/.local/share/applications/\n" + exit 0 +fi + +if [ "$register_desktop_app" -eq -1 ]; then + if [ -e "$HOME/.local/share/applications/start-tor-browser.desktop" ]; then + rm -f "$HOME/.local/share/applications/start-tor-browser.desktop" + update-desktop-database "$HOME/.local/share/applications/" + printf "Tor Browser has been removed as a user desktop app (from ~/.local/share/applications/)\n" + else + printf "Tor Browser does not appear to be a desktop app (not present in ~/.local/share/applications/)\n" + fi + exit 0 +fi + +HOME="${PWD}" +export HOME SYSARCHITECTURE=$(getconf LONG_BIT) TORARCHITECTURE=$(expr "$(file TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') @@ -279,7 +304,9 @@ if [ "$show_usage" -eq 1 ]; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ -profile TorBrowser/Data/Browser/profile.default "${@}" 2>/dev/null printf "\nTor Browser Script Options\n" - printf " --debug Display Tor and Firefox output and record in tor-browser-debug.log\n" + printf " --debug Display Tor and Firefox output and record in tor-browser-debug.log\n" + printf " --register-app Register Tor Browser as a desktop app for this user\n" + printf " --unregister-app Unregister Tor Browser as a desktop app for this user\n" elif [ "$debug" -ne 1 ] ; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ -profile TorBrowser/Data/Browser/profile.default "${@}" > /dev/null 2>&1 </dev/null &

1 0

[tor-launcher/master] Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked.
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit 81fd61c79e77e8dcbcfa42559a727ac384583f03 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 11:49:00 2015 -0400 Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked. Fix a related problem where the progress dialog immediately closed itself if an error had previously been reported. Send SETCONF DisableNetwork=0 instead of SETCONF DisableNetwork (this makes it easier to interpret debug logs). --- src/chrome/content/progress.js | 29 ++++++++++++++++++++++++++++- src/components/tl-process.js | 1 + src/components/tl-protocol.js | 4 +++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 8208398..b44dca5 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -15,6 +15,9 @@ const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", + "resource://torlauncher/modules/tl-logger.jsm"); + var gObsSvc; var gOpenerCallbackFunc; // Set when opened from network settings. @@ -110,7 +113,7 @@ function onCancel() if (gOpenerCallbackFunc) { - // TODO: stop the bootstrapping process? + stopTorBootstrap(); gOpenerCallbackFunc(false); } else try @@ -126,11 +129,35 @@ function onCancel() function onOpenSettings() { + stopTorBootstrap(); cleanup(); window.close(); } +function stopTorBootstrap() +{ + // Tell tor to disable use of the network; this should stop the bootstrap + // process. + const kErrorPrefix = "Setting DisableNetwork=1 failed: "; + try + { + var svc = Cc["@torproject.org/torlauncher-protocol-service;1"] + .getService(Ci.nsISupports); + svc = svc.wrappedJSObject; + var settings = {}; + settings["DisableNetwork"] = true; + var errObj = {}; + if (!svc.TorSetConfWithReply(settings, errObj)) + TorLauncherLogger.log(5, kErrorPrefix + errObj.details); + } + catch(e) + { + TorLauncherLogger.log(5, kErrorPrefix + e); + } +} + + var gObserver = { // nsIObserver implementation. observe: function(aSubject, aTopic, aParam) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index ef2b12c..80cd7ea 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -275,6 +275,7 @@ TorProcessService.prototype = TorClearBootstrapError: function() { + this.mBootstrapErrorOccurred = false; this.mLastTorWarningPhase = null; this.mLastTorWarningReason = null; }, diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 559bb37..fdc2394 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -206,6 +206,8 @@ TorProtocolService.prototype = // aSettingsObj should be a JavaScript object with keys (property values) // that correspond to tor config. keys. The value associated with each // key should be a simple string, a string array, or a Boolean value. + // If an associated value is undefined or null, a key with no value is + // passed in the SETCONF command. // If a fatal error occurs, null is returned. Otherwise, a reply object is // returned. TorSetConf: function(aSettingsObj) @@ -221,7 +223,7 @@ TorProtocolService.prototype = else cmdArgs += ' ' + key; var val = aSettingsObj[key]; - if (val) + if ((val !== undefined) && (val !== null)) { var valType = (typeof val); if ("boolean" == valType)

1 0

[tor-launcher/master] Merge remote-tracking branch 'brade/bug11879-02'
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit 2d7e66fa39cf3e9da4242e17171ff02cf14bcf9a Merge: fd61cb0 81fd61c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 16 18:57:54 2015 -0700 Merge remote-tracking branch 'brade/bug11879-02' src/chrome/content/progress.js | 29 ++++++++++++++++++++++++++++- src/components/tl-process.js | 1 + src/components/tl-protocol.js | 4 +++- 3 files changed, 32 insertions(+), 2 deletions(-)

1 0

[tor-launcher/master] Bug 15704: Do not enable network if wizard is opened.
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit fd61cb0e01d9dfb8904be00019d0546330a91b06 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 12:24:27 2015 -0400 Bug 15704: Do not enable network if wizard is opened. If default bridges were configured and the network settings wizard was opened during a subsequent launch of Tor Browser (e.g., after a failed bootstrap), Tor Launcher was incorrectly setting DisableNetwork=0. --- src/components/tl-process.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index ef2b12c..9265052 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -559,12 +559,17 @@ TorProcessService.prototype = var errObj = {}; var didSucceed = this.mProtocolSvc.TorSetConfWithReply(settings, errObj); - settings = {}; - settings["DisableNetwork"] = false; - if (!this.mProtocolSvc.TorSetConfWithReply(settings, - (didSucceed) ? errObj : null)) + // If the network settings wizard was not opened at startup, enable the + // network so that bootstrapping will proceed with the default bridges. + if (!TorLauncherUtil.shouldShowNetworkSettings) { - didSucceed = false; + settings = {}; + settings["DisableNetwork"] = false; + if (!this.mProtocolSvc.TorSetConfWithReply(settings, + (didSucceed) ? errObj : null)) + { + didSucceed = false; + } } if (didSucceed)

1 0