- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bump nightly tor-browser branch
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 3149bcc9b8671ed5b513b24f06a708fe14082234 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 31 11:06:04 2015 +0000 Bump nightly tor-browser branch --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8d7469e..1308302 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.2.0esr +FIREFOX_VERSION=38.2.1esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

1 0

[tor-browser-bundle/master] Revert "Revert "Bug 12240: Building OpenSSL reproducibly with LXC""
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit a640b2e3c2d58f89880350bdee883f7f1d2f90be Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 31 11:03:11 2015 +0000 Revert "Revert "Bug 12240: Building OpenSSL reproducibly with LXC"" This reverts commit b566f9f13978874e3d27428e56d44aec19421780. We are back on track and this fix should make it into the next alpha. It solves bug 12240. --- gitian/descriptors/mac/gitian-utils.yml | 20 +++++++++++++++++++- gitian/mkbundle-mac.sh | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index c47767e..d457fef 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -16,6 +16,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -24,6 +26,7 @@ files: - "gmp.tar.bz2" - "versions" - "dzip.sh" +- "libfaketime.patch" script: | INSTDIR="$HOME/install" source versions @@ -44,8 +47,17 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc cp *utils.zip $OUTDIR/ else - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Building libfaketime. + cd faketime + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" + git am ~/build/libfaketime.patch + make + DESTDIR="$INSTDIR/faketime" make install + export FAKETIME_SKIP_CMDS="make" export FAKETIME=$REFERENCE_DATETIME + cd .. sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz @@ -65,6 +77,7 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make $MAKEOPTS make install cd .. @@ -84,10 +97,15 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make make install cd .. diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index cf54e19..4e458bd 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -114,7 +114,7 @@ then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 0febd3270179aa6e9ec7255181612764d074f5f6 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 6fec465fa4e2feea64526850387c91f7f67c2446 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..20e2f3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 85ae5da40c3b969157243e62f8f5b35829577717 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 19 13:51:11 2015 -0400 fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once Account for ESR38 login manager changes: skip storage initialization if security.nocertdb = true and set _storage to null upon failure. Fixes #16842. --- toolkit/components/passwordmgr/nsLoginManager.js | 104 +++++++++++++--------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js index f2b77ac..9648f8f 100644 --- a/toolkit/components/passwordmgr/nsLoginManager.js +++ b/toolkit/components/passwordmgr/nsLoginManager.js @@ -153,9 +153,25 @@ LoginManager.prototype = { log("No alternate nsILoginManagerStorage registered"); } - this._storage = Cc[contractID]. - createInstance(Ci.nsILoginManagerStorage); - this.initializationPromise = this._storage.initialize(); + // If the security.nocertdb pref. is true, we skip initialization of + // login manager storage since we know it will fail. In this case we + // pretend that initialization succeeded in order to avoid a cascade of + // initialization errors. + if (Services.prefs.getBoolPref("security.nocertdb")) { + this._storage = null; + this.initializationPromise = Promise.resolve(); + } else { + this._storage = Cc[contractID]. + createInstance(Ci.nsILoginManagerStorage); + try { + this.initializationPromise = this._storage.initialize(); + } catch (e) { + // If storage is not available, set _storage to null so that we can + // cleanly check for a lack of storage elsewhere in this file. + this._storage = null; + this.initializationPromise = Promise.reject(e); + } + } }, @@ -196,7 +212,8 @@ LoginManager.prototype = { this._pwmgr = null; } else if (topic == "passwordmgr-storage-replace") { Task.spawn(function () { - yield this._pwmgr._storage.terminate(); + if (this._pwmgr._storage) + yield this._pwmgr._storage.terminate(); this._pwmgr._initStorage(); yield this._pwmgr.initializationPromise; Services.obs.notifyObservers(null, @@ -331,9 +348,8 @@ 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"; - } + if (!this._storage) + throw "No storage to add login"; log("Adding login"); return this._storage.addLogin(login); @@ -348,10 +364,10 @@ LoginManager.prototype = { removeLogin : function (login) { log("Removing login"); - if (!this._storage) { - log("No storage to remove login"); - return null; - } + if (!this._storage) { + log("No storage to remove login"); + return null; + } return this._storage.removeLogin(login); }, @@ -365,10 +381,10 @@ LoginManager.prototype = { modifyLogin : function (oldLogin, newLogin) { log("Modifying login"); - if (!this._storage) { - log("No storage to modify login"); - return null; - } + if (!this._storage) { + log("No storage to modify login"); + return null; + } return this._storage.modifyLogin(oldLogin, newLogin); }, @@ -386,10 +402,10 @@ LoginManager.prototype = { getAllLogins : function (count) { log("Getting a list of all logins"); - if (!this._storage) { - log("No storage to get all logins"); - return null; - } + if (!this._storage) { + log("No storage to get all logins"); + return null; + } return this._storage.getAllLogins(count); }, @@ -402,10 +418,10 @@ LoginManager.prototype = { */ removeAllLogins : function () { log("Removing all logins"); - if (!this._storage) - log("No storage to remove all logins"); - else - this._storage.removeAllLogins(); + if (!this._storage) + log("No storage to remove all logins"); + else + this._storage.removeAllLogins(); }, /* @@ -421,10 +437,10 @@ 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; - } + if (!this._storage) { + log("No storage to get all disabled hosts"); + return null; + } return this._storage.getAllDisabledHosts(count); }, @@ -439,10 +455,10 @@ LoginManager.prototype = { log("Searching for logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) { - log("No storage to find logins"); - return null; - } + if (!this._storage) { + log("No storage to find logins"); + return null; + } return this._storage.findLogins(count, hostname, formSubmitURL, httpRealm); @@ -460,10 +476,10 @@ LoginManager.prototype = { searchLogins : function(count, matchData) { log("Searching for logins"); - if (!this._storage) { - log("No storage to search logins"); - return null; - } + if (!this._storage) { + log("No storage to search logins"); + return null; + } return this._storage.searchLogins(count, matchData); }, @@ -479,8 +495,8 @@ LoginManager.prototype = { log("Counting logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) - return 0; + if (!this._storage) + return 0; return this._storage.countLogins(hostname, formSubmitURL, httpRealm); }, @@ -490,8 +506,8 @@ LoginManager.prototype = { * uiBusy */ get uiBusy() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.uiBusy; }, @@ -501,8 +517,8 @@ LoginManager.prototype = { * isLoggedIn */ get isLoggedIn() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.isLoggedIn; }, @@ -515,7 +531,7 @@ LoginManager.prototype = { */ getLoginSavingEnabled : function (host) { log("Checking if logins to", host, "can be saved."); - if (!this._remember || !this._storage) + if (!this._remember || !this._storage) return false; return this._storage.getLoginSavingEnabled(host); @@ -532,8 +548,8 @@ LoginManager.prototype = { if (hostname.indexOf("\0") != -1) throw "Invalid hostname"; - if (!this._storage) - throw "No storage to set login saving enabled"; + 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

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit e1d7a8fe862d1e1c8f2707b6dc8d27cb65e7b4a2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 11:27:22 2015 -0400 fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party Resurrect a workaround that allows pdf.js to save files. Fixes #16781. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f2ac778..24c2de1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,6 +250,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -257,7 +263,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit d97c1f91bd955e6d7aa9bcb086fceb3d1edbcdf2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 11:27:22 2015 -0400 fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party Resurrect a workaround that allows pdf.js to save files. Fixes #16781. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f2ac778..24c2de1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,6 +250,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -257,7 +263,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 641feb2e095bfb8bdcea91851c7be9e0c1329a26 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 5ae8e3145026ed9ba40d33105a0478ff58089137 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index f21a564..5918a3e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 313e32cf752756d9c64e05058342cdda84d550e7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 19 13:51:11 2015 -0400 fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once Account for ESR38 login manager changes: skip storage initialization if security.nocertdb = true and set _storage to null upon failure. Fixes #16842. --- toolkit/components/passwordmgr/nsLoginManager.js | 104 +++++++++++++--------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js index f2b77ac..9648f8f 100644 --- a/toolkit/components/passwordmgr/nsLoginManager.js +++ b/toolkit/components/passwordmgr/nsLoginManager.js @@ -153,9 +153,25 @@ LoginManager.prototype = { log("No alternate nsILoginManagerStorage registered"); } - this._storage = Cc[contractID]. - createInstance(Ci.nsILoginManagerStorage); - this.initializationPromise = this._storage.initialize(); + // If the security.nocertdb pref. is true, we skip initialization of + // login manager storage since we know it will fail. In this case we + // pretend that initialization succeeded in order to avoid a cascade of + // initialization errors. + if (Services.prefs.getBoolPref("security.nocertdb")) { + this._storage = null; + this.initializationPromise = Promise.resolve(); + } else { + this._storage = Cc[contractID]. + createInstance(Ci.nsILoginManagerStorage); + try { + this.initializationPromise = this._storage.initialize(); + } catch (e) { + // If storage is not available, set _storage to null so that we can + // cleanly check for a lack of storage elsewhere in this file. + this._storage = null; + this.initializationPromise = Promise.reject(e); + } + } }, @@ -196,7 +212,8 @@ LoginManager.prototype = { this._pwmgr = null; } else if (topic == "passwordmgr-storage-replace") { Task.spawn(function () { - yield this._pwmgr._storage.terminate(); + if (this._pwmgr._storage) + yield this._pwmgr._storage.terminate(); this._pwmgr._initStorage(); yield this._pwmgr.initializationPromise; Services.obs.notifyObservers(null, @@ -331,9 +348,8 @@ 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"; - } + if (!this._storage) + throw "No storage to add login"; log("Adding login"); return this._storage.addLogin(login); @@ -348,10 +364,10 @@ LoginManager.prototype = { removeLogin : function (login) { log("Removing login"); - if (!this._storage) { - log("No storage to remove login"); - return null; - } + if (!this._storage) { + log("No storage to remove login"); + return null; + } return this._storage.removeLogin(login); }, @@ -365,10 +381,10 @@ LoginManager.prototype = { modifyLogin : function (oldLogin, newLogin) { log("Modifying login"); - if (!this._storage) { - log("No storage to modify login"); - return null; - } + if (!this._storage) { + log("No storage to modify login"); + return null; + } return this._storage.modifyLogin(oldLogin, newLogin); }, @@ -386,10 +402,10 @@ LoginManager.prototype = { getAllLogins : function (count) { log("Getting a list of all logins"); - if (!this._storage) { - log("No storage to get all logins"); - return null; - } + if (!this._storage) { + log("No storage to get all logins"); + return null; + } return this._storage.getAllLogins(count); }, @@ -402,10 +418,10 @@ LoginManager.prototype = { */ removeAllLogins : function () { log("Removing all logins"); - if (!this._storage) - log("No storage to remove all logins"); - else - this._storage.removeAllLogins(); + if (!this._storage) + log("No storage to remove all logins"); + else + this._storage.removeAllLogins(); }, /* @@ -421,10 +437,10 @@ 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; - } + if (!this._storage) { + log("No storage to get all disabled hosts"); + return null; + } return this._storage.getAllDisabledHosts(count); }, @@ -439,10 +455,10 @@ LoginManager.prototype = { log("Searching for logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) { - log("No storage to find logins"); - return null; - } + if (!this._storage) { + log("No storage to find logins"); + return null; + } return this._storage.findLogins(count, hostname, formSubmitURL, httpRealm); @@ -460,10 +476,10 @@ LoginManager.prototype = { searchLogins : function(count, matchData) { log("Searching for logins"); - if (!this._storage) { - log("No storage to search logins"); - return null; - } + if (!this._storage) { + log("No storage to search logins"); + return null; + } return this._storage.searchLogins(count, matchData); }, @@ -479,8 +495,8 @@ LoginManager.prototype = { log("Counting logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) - return 0; + if (!this._storage) + return 0; return this._storage.countLogins(hostname, formSubmitURL, httpRealm); }, @@ -490,8 +506,8 @@ LoginManager.prototype = { * uiBusy */ get uiBusy() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.uiBusy; }, @@ -501,8 +517,8 @@ LoginManager.prototype = { * isLoggedIn */ get isLoggedIn() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.isLoggedIn; }, @@ -515,7 +531,7 @@ LoginManager.prototype = { */ getLoginSavingEnabled : function (host) { log("Checking if logins to", host, "can be saved."); - if (!this._remember || !this._storage) + if (!this._remember || !this._storage) return false; return this._storage.getLoginSavingEnabled(host); @@ -532,8 +548,8 @@ LoginManager.prototype = { if (hostname.indexOf("\0") != -1) throw "Invalid hostname"; - if (!this._storage) - throw "No storage to set login saving enabled"; + 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