- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-5.0] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit badf55cb0fdda5c3c893f01f996a29a4e105d3d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index d238d3a..a371403 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -421,7 +421,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/master] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 7097c9651a556a314a8265226e2e2c111934a7b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bb285fd..b1b3331 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -331,6 +331,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0

[tor-browser-bundle/master] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 199808ddbe8e9f640bc8cef57e6f09f2f3070d95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 4f6286d..bb285fd 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -423,7 +423,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/maint-5.0] Update Tor Browser key
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit ce86c32d1160983b08775cd154f22dbb3d303947 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 07:28:33 2015 +0000 Update Tor Browser key --- gitian/gpg/torbrowser.gpg | Bin 6015 -> 18844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index 7267d4d..dc44e33 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ

1 0

[tor-browser-bundle/maint-5.0] Bug 16948: Download PyCrypto from pypi.python.org
by gk＠torproject.org 03 Sep '15

03 Sep '15

1 0

[tor-browser-bundle/master] Bug 16948: Download PyCrypto from pypi.python.org
by gk＠torproject.org 03 Sep '15

03 Sep '15

1 0

[tor-browser-bundle/master] Update Tor Browser key
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit b5533d49b8dbc8b24ffddae56623bb38e380875f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 07:12:38 2015 +0000 Update Tor Browser key --- gitian/gpg/torbrowser.gpg | Bin 6015 -> 18844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index 7267d4d..dc44e33 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ

1 0

[tor-browser-bundle/maint-5.0] Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit bc17a40f050335b9dbfaff73ac0233e48ead546e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:50:47 2015 +0200 Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR --- gitian/get-tb-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index bc3181c..07c5962 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -44,7 +44,7 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { next unless $tags{$commit}; print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", - substr($commit, 0, 12), "\n"; + substr($current_commit, 0, 12), "\n"; print "TORBROWSER_SYMLINK_VERSION=0\n"; exit 0; }

1 0

[tor-browser-bundle/master] Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit e594dfac1fdb2bf32a51a0020e59fa1a9826f6ba Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:50:47 2015 +0200 Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR --- gitian/get-tb-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index bc3181c..07c5962 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -44,7 +44,7 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { next unless $tags{$commit}; print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", - substr($commit, 0, 12), "\n"; + substr($current_commit, 0, 12), "\n"; print "TORBROWSER_SYMLINK_VERSION=0\n"; exit 0; }

1 0

[tor-browser-bundle/maint-5.0] Bug 16956: Make explicit error when no version tag is found
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit 5a8177f0164a3f19fe11a970b4b61dea04c334a2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:33:46 2015 +0200 Bug 16956: Make explicit error when no version tag is found --- gitian/get-tb-version | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index 9a4a102..bc3181c 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -49,5 +49,6 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { exit 0; } -print STDERR "Could not find TORBROWSER version from tags\n"; +print STDERR "Could not find TORBROWSER version from tags. Does your git repo have tags?\n"; +print "exit 1\n"; exit 1;

1 0

[tor-browser-bundle/master] Bug 16956: Make explicit error when no version tag is found
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit 4a83432493057ad9cb60416b1fc121b51cbff238 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:33:46 2015 +0200 Bug 16956: Make explicit error when no version tag is found --- gitian/get-tb-version | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index 9a4a102..bc3181c 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -49,5 +49,6 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { exit 0; } -print STDERR "Could not find TORBROWSER version from tags\n"; +print STDERR "Could not find TORBROWSER version from tags. Does your git repo have tags?\n"; +print "exit 1\n"; exit 1;

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! Bug 12827: Create preference to disable SVG.
by gk＠torproject.org 01 Sep '15

01 Sep '15

commit 191176cf015236f75da321b2ca0e8ddcd6881a55 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 21 14:59:51 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. Allow SVG on about:preferences and other about: pages. Fixes #16775. --- layout/svg/moz.build | 2 ++ layout/svg/nsSVGUtils.cpp | 88 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 84 insertions(+), 6 deletions(-) diff --git a/layout/svg/moz.build b/layout/svg/moz.build index df2c209..7685cf5 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -54,6 +54,8 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: FAIL_ON_WARNINGS = True +#DEFINES['DEBUG_SVG_ENABLE'] = True + FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../../widget', diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index c2b6608..5a66b8c 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -66,8 +66,12 @@ static bool sSVGDisplayListHitTestingEnabled; static bool sSVGDisplayListPaintingEnabled; static bool sSVGNewGetBBoxEnabled; +static bool IsWhitelisted(nsIURI *aURI); + // Determine if SVG should be enabled for aDoc. The svg.in-content.enabled -// preference is checked as well as whether aDoc is a content or chrome doc. +// preference is checked, then we check whether aDoc is a chrome doc, and +// finally as a fallback we check whether the top-level document is +// whitelisted (e.g., about:preferences). // If aDoc is NULL, the pref. value is returned. // Once we determine whether SVG is allowed for a given document, we record // that fact inside the document. This is necessary to avoid crashes due @@ -92,8 +96,9 @@ NS_SVGEnabled(nsIDocument *aDoc) } // Determine if SVG should be enabled for aChannel. The svg.in-content.enabled -// preference is checked as well as whether the load context associated with -// aChannel is content or chrome. +// preference is checked, then we check whether the load context associated +// with aChannel is a chrome doc, and finally as a fallback we check whether +// the top-level document is whitelisted (e.g., about:preferences). // If aChannel is NULL, the pref. value is returned. bool NS_SVGEnabledForChannel(nsIChannel *aChannel) @@ -104,13 +109,84 @@ NS_SVGEnabledForChannel(nsIChannel *aChannel) if (!aChannel) return false; - bool isContent = true; +#ifdef DEBUG_SVG_ENABLE + nsAutoCString topDocSpec; // Set if approved via a whitelisted top doc. +#endif + + bool isSVGAllowed = false; nsCOMPtr<nsILoadContext> ctx; NS_QueryNotificationCallbacks(aChannel, ctx); - if (ctx) + if (ctx) { + bool isContent = true; ctx->GetIsContent(&isContent); + if (!isContent) { + isSVGAllowed = true; + } else { + // Disallowed. As a fallback, check for whitelisted URLs. + uint32_t loadFlags = 0; + aChannel->GetLoadFlags(&loadFlags); + if (loadFlags & nsIChannel::LOAD_INITIAL_DOCUMENT_URI) { + // This is the top-level load; just check the channel's URL. + nsCOMPtr<nsIURI> uri; + aChannel->GetOriginalURI(getter_AddRefs(uri)); + isSVGAllowed = IsWhitelisted(uri); +#ifdef DEBUG_SVG_ENABLE + if (isSVGAllowed) + uri->GetSpec(topDocSpec); +#endif + } else { + // Obtain the top window's document and check it's URL. + nsCOMPtr<nsIDOMWindow> topWin; + ctx->GetTopWindow(getter_AddRefs(topWin)); + if (topWin) { + nsCOMPtr<nsIDOMDocument> topDOMDoc; + topWin->GetDocument(getter_AddRefs(topDOMDoc)); + nsCOMPtr<nsIDocument> topDoc = do_QueryInterface(topDOMDoc); + if (topDoc) { + nsIURI *topDocURI = topDoc->GetDocumentURI(); + isSVGAllowed = IsWhitelisted(topDocURI); +#ifdef DEBUG_SVG_ENABLE + if (isSVGAllowed) + topDocURI->GetSpec(topDocSpec); +#endif + } + } + } + } + } + +#ifdef DEBUG_SVG_ENABLE + nsAutoCString spec; + nsCOMPtr<nsIURI> uri; + aChannel->GetOriginalURI(getter_AddRefs(uri)); + if (uri) + uri->GetSpec(spec); + + if (topDocSpec.IsEmpty()) { + printf("NS_SVGEnabledForChannel for %s: %s\n", spec.get(), + isSVGAllowed ? "YES" : "NO"); + } else { + printf("NS_SVGEnabledForChannel for %s: %s (via whitelisted top doc %s)\n", + spec.get(), isSVGAllowed ? "YES" : "NO", topDocSpec.get()); + } +#endif + + return isSVGAllowed; +} + +// Always allow SVG for about: URLs so that about:preferences and other +// built-in browser pages function correctly. Exclude about:blank because +// iframes initially contain about:blank documents, and since we cache the +// SVG status we must avoid enabling SVG in that case. +static bool +IsWhitelisted(nsIURI *aURI) +{ + if (!aURI) + return false; - return !isContent; + nsAutoCString scheme; + aURI->GetScheme(scheme); + return scheme.EqualsLiteral("about") && !NS_IsAboutBlank(aURI); } bool

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug 12827: Create preference to disable SVG.
by gk＠torproject.org 01 Sep '15

01 Sep '15

commit d8419037dbb3d36115702cc19de9380c6d9c0f10 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 21 14:59:51 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. Allow SVG on about:preferences and other about: pages. Fixes #16775. --- layout/svg/moz.build | 2 ++ layout/svg/nsSVGUtils.cpp | 88 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 84 insertions(+), 6 deletions(-) diff --git a/layout/svg/moz.build b/layout/svg/moz.build index df2c209..7685cf5 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -54,6 +54,8 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: FAIL_ON_WARNINGS = True +#DEFINES['DEBUG_SVG_ENABLE'] = True + FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../../widget', diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index c2b6608..5a66b8c 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -66,8 +66,12 @@ static bool sSVGDisplayListHitTestingEnabled; static bool sSVGDisplayListPaintingEnabled; static bool sSVGNewGetBBoxEnabled; +static bool IsWhitelisted(nsIURI *aURI); + // Determine if SVG should be enabled for aDoc. The svg.in-content.enabled -// preference is checked as well as whether aDoc is a content or chrome doc. +// preference is checked, then we check whether aDoc is a chrome doc, and +// finally as a fallback we check whether the top-level document is +// whitelisted (e.g., about:preferences). // If aDoc is NULL, the pref. value is returned. // Once we determine whether SVG is allowed for a given document, we record // that fact inside the document. This is necessary to avoid crashes due @@ -92,8 +96,9 @@ NS_SVGEnabled(nsIDocument *aDoc) } // Determine if SVG should be enabled for aChannel. The svg.in-content.enabled -// preference is checked as well as whether the load context associated with -// aChannel is content or chrome. +// preference is checked, then we check whether the load context associated +// with aChannel is a chrome doc, and finally as a fallback we check whether +// the top-level document is whitelisted (e.g., about:preferences). // If aChannel is NULL, the pref. value is returned. bool NS_SVGEnabledForChannel(nsIChannel *aChannel) @@ -104,13 +109,84 @@ NS_SVGEnabledForChannel(nsIChannel *aChannel) if (!aChannel) return false; - bool isContent = true; +#ifdef DEBUG_SVG_ENABLE + nsAutoCString topDocSpec; // Set if approved via a whitelisted top doc. +#endif + + bool isSVGAllowed = false; nsCOMPtr<nsILoadContext> ctx; NS_QueryNotificationCallbacks(aChannel, ctx); - if (ctx) + if (ctx) { + bool isContent = true; ctx->GetIsContent(&isContent); + if (!isContent) { + isSVGAllowed = true; + } else { + // Disallowed. As a fallback, check for whitelisted URLs. + uint32_t loadFlags = 0; + aChannel->GetLoadFlags(&loadFlags); + if (loadFlags & nsIChannel::LOAD_INITIAL_DOCUMENT_URI) { + // This is the top-level load; just check the channel's URL. + nsCOMPtr<nsIURI> uri; + aChannel->GetOriginalURI(getter_AddRefs(uri)); + isSVGAllowed = IsWhitelisted(uri); +#ifdef DEBUG_SVG_ENABLE + if (isSVGAllowed) + uri->GetSpec(topDocSpec); +#endif + } else { + // Obtain the top window's document and check it's URL. + nsCOMPtr<nsIDOMWindow> topWin; + ctx->GetTopWindow(getter_AddRefs(topWin)); + if (topWin) { + nsCOMPtr<nsIDOMDocument> topDOMDoc; + topWin->GetDocument(getter_AddRefs(topDOMDoc)); + nsCOMPtr<nsIDocument> topDoc = do_QueryInterface(topDOMDoc); + if (topDoc) { + nsIURI *topDocURI = topDoc->GetDocumentURI(); + isSVGAllowed = IsWhitelisted(topDocURI); +#ifdef DEBUG_SVG_ENABLE + if (isSVGAllowed) + topDocURI->GetSpec(topDocSpec); +#endif + } + } + } + } + } + +#ifdef DEBUG_SVG_ENABLE + nsAutoCString spec; + nsCOMPtr<nsIURI> uri; + aChannel->GetOriginalURI(getter_AddRefs(uri)); + if (uri) + uri->GetSpec(spec); + + if (topDocSpec.IsEmpty()) { + printf("NS_SVGEnabledForChannel for %s: %s\n", spec.get(), + isSVGAllowed ? "YES" : "NO"); + } else { + printf("NS_SVGEnabledForChannel for %s: %s (via whitelisted top doc %s)\n", + spec.get(), isSVGAllowed ? "YES" : "NO", topDocSpec.get()); + } +#endif + + return isSVGAllowed; +} + +// Always allow SVG for about: URLs so that about:preferences and other +// built-in browser pages function correctly. Exclude about:blank because +// iframes initially contain about:blank documents, and since we cache the +// SVG status we must avoid enabling SVG in that case. +static bool +IsWhitelisted(nsIURI *aURI) +{ + if (!aURI) + return false; - return !isContent; + nsAutoCString scheme; + aURI->GetScheme(scheme); + return scheme.EqualsLiteral("about") && !NS_IsAboutBlank(aURI); } bool

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 01 Sep '15

01 Sep '15

commit 8882fd2ca86bc843060556b8126de75046a35f8f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 25 11:03:21 2015 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Fixes #13512: After update, load a static tab with change notes. To use this feature, include the following attributes within the <update> element of each XML update manifest: actions="showURL" openURL="https://..." Within the URL, %OLD_VERSION% will be replaced with the previous Gecko version (e.g., 38.2.0) and %OLD_TOR_BROWSER_VERSION% will be replaced with the previous Tor Browser version (e.g., 5.5a1). Note that the "Update Installed" window that previously was displayed after an update is no longer opened. --- browser/app/profile/000-tor-browser.js | 9 ++++- browser/app/profile/firefox.js | 2 +- browser/components/nsBrowserContentHandler.js | 50 ++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 5918a3e..b32728b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -7,9 +7,14 @@ // Disable initial homepage notifications pref("browser.search.update", false); pref("browser.rights.3.shown", true); -pref("browser.startup.homepage_override.mstone", "ignore"); pref("startup.homepage_welcome_url", ""); -pref("startup.homepage_override_url", ""); + +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags/tor-browser"); // Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog pref("app.update.promptWaitTime", 3600); diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 53fd8d2..7d9677a 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -190,7 +190,7 @@ pref("app.update.idletime", 60); // upgrade start page instead! Other apps may wish to show this UI, and supply // a whatsNewURL field in their brand.properties that contains a link to a page // which tells users what's new in this new update. -pref("app.update.showInstalledUI", true); +pref("app.update.showInstalledUI", false); // 0 = suppress prompting for incompatibilities if there are updates available // to newer versions of installed addons that resolve them. diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js index 9ae384e..a3465a0 100644 --- a/browser/components/nsBrowserContentHandler.js +++ b/browser/components/nsBrowserContentHandler.js @@ -43,6 +43,10 @@ const NS_ERROR_ABORT = Components.results.NS_ERROR_ABORT; const URI_INHERITS_SECURITY_CONTEXT = Components.interfaces.nsIHttpProtocolHandler .URI_INHERITS_SECURITY_CONTEXT; +#ifdef TOR_BROWSER_VERSION +const kTBSavedVersionPref = "browser.startup.homepage_override.torbrowser.version"; +#endif + function shouldLoadURI(aURI) { if (aURI && !aURI.schemeIs("chrome")) return true; @@ -94,7 +98,8 @@ const OVERRIDE_NEW_BUILD_ID = 3; * Returns: * OVERRIDE_NEW_PROFILE if this is the first run with a new profile. * OVERRIDE_NEW_MSTONE if this is the first run with a build with a different - * Gecko milestone (i.e. right after an upgrade). + * Gecko milestone or Tor Browser version (i.e. right + * after an upgrade). * OVERRIDE_NEW_BUILD_ID if this is the first run with a new build ID of the * same Gecko milestone (i.e. after a nightly upgrade). * OVERRIDE_NONE otherwise. @@ -110,6 +115,15 @@ function needHomepageOverride(prefb) { var mstone = Services.appinfo.platformVersion; +#ifdef TOR_BROWSER_VERSION +#expand const TOR_BROWSER_VERSION = __TOR_BROWSER_VERSION__; + + var savedTBVersion = null; + try { + savedTBVersion = prefb.getCharPref(kTBSavedVersionPref); + } catch (e) {} +#endif + var savedBuildID = null; try { savedBuildID = prefb.getCharPref("browser.startup.homepage_override.buildID"); @@ -127,9 +141,30 @@ function needHomepageOverride(prefb) { prefb.setCharPref("browser.startup.homepage_override.mstone", mstone); prefb.setCharPref("browser.startup.homepage_override.buildID", buildID); +#ifdef TOR_BROWSER_VERSION + prefb.setCharPref(kTBSavedVersionPref, TOR_BROWSER_VERSION); + + // After an upgrade from an older release of Tor Browser (<= 5.5a1), the + // savedmstone will be undefined because those releases included the + // value "ignore" for the browser.startup.homepage_override.mstone pref. + // To correctly detect an upgrade vs. a new profile, we check for the + // presence of the "app.update.postupdate" pref. + var updated = prefb.prefHasUserValue("app.update.postupdate"); + return (savedmstone || updated) ? OVERRIDE_NEW_MSTONE + : OVERRIDE_NEW_PROFILE; +#else return (savedmstone ? OVERRIDE_NEW_MSTONE : OVERRIDE_NEW_PROFILE); +#endif } +#ifdef TOR_BROWSER_VERSION + if (TOR_BROWSER_VERSION != savedTBVersion) { + prefb.setCharPref("browser.startup.homepage_override.buildID", buildID); + prefb.setCharPref(kTBSavedVersionPref, TOR_BROWSER_VERSION); + return OVERRIDE_NEW_MSTONE; + } +#endif + if (buildID != savedBuildID) { prefb.setCharPref("browser.startup.homepage_override.buildID", buildID); return OVERRIDE_NEW_BUILD_ID; @@ -572,6 +607,15 @@ nsBrowserContentHandler.prototype = { try { old_mstone = Services.prefs.getCharPref("browser.startup.homepage_override.mstone"); } catch (ex) {} + +#ifdef TOR_BROWSER_VERSION + // We do the same for the Tor Browser version. + var old_tbversion = null; + try { + old_tbversion = prefb.getCharPref(kTBSavedVersionPref); + } catch (e) {} +#endif + let override = needHomepageOverride(prefb); if (override != OVERRIDE_NONE) { switch (override) { @@ -594,6 +638,10 @@ nsBrowserContentHandler.prototype = { overridePage = getPostUpdateOverridePage(overridePage); overridePage = overridePage.replace("%OLD_VERSION%", old_mstone); +#ifdef TOR_BROWSER_VERSION + overridePage = overridePage.replace("%OLD_TOR_BROWSER_VERSION%", + old_tbversion); +#endif break; } }

1 0

[tor-browser-bundle/master] Point detailsURL to our blog
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit fb4e9c0b57e7c8fb67e9924443400af8ad7d0c09 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 31 11:20:39 2015 +0000 Point detailsURL to our blog This is a follow-up to bug 13512 which should help reminding us to bump the version in the detailsURL when the next release is due. --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 761a987..fc44ddf 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -25,7 +25,7 @@ versions: detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… 5.5a2: platformVersion: 38.2.1 - detailsURL: https://www.torproject.org/projects/torbrowser.html.en + detailsURL: https://blog.torproject.org/blog/tor-browser-55a2-released download_url: https://www.torproject.org/dist/torbrowser/5.5a2 incremental_from: - 5.5a1

1 0

[tor-browser-bundle/master] Bug 13512: update_responses - add the actions and openURL attributes
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 276687123cd14f6889c7506016d1d233a3e74628 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 15:54:36 2015 +0200 Bug 13512: update_responses - add the actions and openURL attributes --- tools/update-responses/update_responses | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index d238d3a..4f6286d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -226,6 +226,8 @@ sub get_response { platformVersion => get_config($config, $version, $os, 'platformVersion'), buildID => '20000101000000', detailsURL => get_config($config, $version, $os, 'detailsURL'), + actions => 'showURL', + openURL => get_config($config, $version, $os, 'detailsURL'), defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), ); foreach my $patch (@patches) {

1 0

[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] 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] 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! 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] 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