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

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #15703: Regression tests for isolation of mediasource URI
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 2ae052be0e0cdcba4df89607002233ad3d1e6f11 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jul 2 16:28:36 2015 -0700 Bug #15703: Regression tests for isolation of mediasource URI --- dom/base/test/bug15703_page_create.html | 28 +++++++++ dom/base/test/bug15703_page_retrieve.html | 50 ++++++++++++++++ dom/base/test/mochitest.ini | 3 + dom/base/test/test_tor_bug15703.html | 92 +++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+) diff --git a/dom/base/test/bug15703_page_create.html b/dom/base/test/bug15703_page_create.html new file mode 100644 index 0000000..2325e6f --- /dev/null +++ b/dom/base/test/bug15703_page_create.html @@ -0,0 +1,28 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page mediasource URI creator for Tor Browser Bug 15703</title> + <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<script type="text/javascript;version=1.7"> + +spawnTask(function* () { + sendMessage(window.parent, "ready"); + let message = yield receiveMessage(window.parent), + mediaSource = new MediaSource(), + mediaSourceURL = URL.createObjectURL(mediaSource); + sendMessage(window.parent, mediaSourceURL); + appendLine("display", message + " -> " + mediaSourceURL); +}); + +</script> +</body> +</html> diff --git a/dom/base/test/bug15703_page_retrieve.html b/dom/base/test/bug15703_page_retrieve.html new file mode 100644 index 0000000..de3e14f --- /dev/null +++ b/dom/base/test/bug15703_page_retrieve.html @@ -0,0 +1,50 @@ + +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page mediaSource retriever for Tor Browser Bug 15703</title> + <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> +<video id="testvideo"></video> +<script type="text/javascript;version=1.7"> + +let reportResult = function(mediaSourceURL, message) { + sendMessage(window.parent, message); + appendLine("display", mediaSourceURL + " -> " + message); +}; + +spawnTask(function* () { + // Tell the parent tab we are ready to start. + sendMessage(window.parent, "ready"); + // Receive a mediaSourceURL. In a moment, we will + // use a video element to attempt to implicitly load + // the MediaSource object at this URL. + let mediaSourceURL = yield receiveMessage(window.parent); + // First create the video element. + let videoElement = document.getElementById("testvideo"); + // If we are not able to load a MediaSource object + // at mediaSourceURL, then an error event will occur. + videoElement.addEventListener("error", function (e) { + reportResult(mediaSourceURL, "setting videoElement.src failed"); + }); + // If we do find a MediaSource object at mediaSourceURL, + // then a "stalled" event will occur, because the object + // has been found, but contains no content. + videoElement.addEventListener("stalled", function (e) { + reportResult(mediaSourceURL, "retrieved"); + }); + // Now attempt to load a MediaSource object by setting + // the video element's src to mediaSourceURL. + videoElement.src = mediaSourceURL; +}); + +</script> +</body> +</html> diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index dc5dfef..133348e 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -31,6 +31,8 @@ support-files = bug15502_worker_blobify.html bug15502_worker_deblobify.js bug15502_worker_deblobify.html + bug15703_page_create.html + bug15703_page_retrieve.html bug282547.sjs bug298064-subframe.html bug313646.txt @@ -736,6 +738,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM [test_textnode_split_in_selection.html] [test_title.html] [test_tor_bug15502.html] +[test_tor_bug15703.html] [test_treewalker_nextsibling.xml] [test_viewport_scroll.html] [test_viewsource_forbidden_in_object.html] diff --git a/dom/base/test/test_tor_bug15703.html b/dom/base/test/test_tor_bug15703.html new file mode 100644 index 0000000..a0d3ae1 --- /dev/null +++ b/dom/base/test/test_tor_bug15703.html @@ -0,0 +1,92 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Test for Tor Browser Bug 15703</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<p id="display"></p> +<div id="content"></div> + +<script class="testbody" type="application/javascript;version=1.7"> +SimpleTest.waitForExplicitFinish(); + +// __setPref(key, value)__. +// Set a pref value asynchronously, returning a prmoise that resolves +// when it succeeds. +let setPref = function* (key, value) { + return new Promise(function(resolve, reject) { + SpecialPowers.pushPrefEnv({"set": [[key, value]]}, resolve); + }); +}; + +// ## Testing constants +let domain1 = "http://example.com", + domain2 = "http://example.net", + path = "/tests/dom/base/test/", + page_create = "bug15703_page_create.html", + page_retrieve = "bug15703_page_retrieve.html" + worker_create = "bug15703_worker_create.html", + worker_retrieve = "bug15703_worker_retrieve.html"; + +// __tabIO(domain, child, input)__. +// Open a tab at the given `domain` and `child` page. Post an +// `input` message to the tab. +let tabIO = function* (domain, child, input) { + tab = window.open(domain + path + "bug15502_tab.html", "_blank"); + yield receiveMessage(tab); // ready message + sendMessage(tab, "http://example.org" + path + child); + yield receiveMessage(tab); // ready message + sendMessage(tab, input); + return yield receiveMessage(tab); +}; + +// __mediaSourceTest(isolationOn, domainA, domainB, createPage, retrievePage)__. +// Run a test where we set the pref "privacy.thirdparty.isolate" to on or off, +// and then create a media source in `domainA`, using the page `createPage`, +// and then attempt to retrive a media source in `domainB`, using +// the page `retrievePage`. +let mediaSourceTest = function* (isolationOn, domainA, domainB, createPage, retrievePage) { + yield setPref("privacy.thirdparty.isolate", isolationOn ? 2 : 0); + let input = "create", + mediaSourceURL = yield tabIO(domainA, createPage, input), + result = yield tabIO(domainB, retrievePage, mediaSourceURL), + description = domainA + ":" + createPage + "->" + domainB + ":" + retrievePage + ", isolation " + (isolationOn ? "on." : "off."); + if (isolationOn && domainA !== domainB) { + ok(result !== "retrieved", description + " Deny retrieval"); + } else { + ok(result === "retrieved", description + " Allow retrieval"); + } +}; + + +// ## The main test +// Run a Task.jsm coroutine that tests various combinations of domains +// methods, and isolation states for reading and writing mediasource URLs. +spawnTask(function* () { + yield setPref("media.mediasource.whitelist", false); + for (let isolate of [false, true]) { + for (let domainB of [domain1, domain2]) { + // There doesn't appear to be a way to create a MediaSource object in a worker. + for (let create of [page_create, /* worker_create */]) { + // No way I could find to retrieve a MediaSource object in a worker. + for (let retrieve of [page_retrieve, /* worker_retrieve */]) { + yield mediaSourceTest(isolate, domain1, domainB, create, retrieve); + } + } + } + } + SimpleTest.finish(); +}); + +</script> + +</body> +</html>

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'arthur/16429+11' into tor-browser-38.1.0esr-5.0-1
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 2d817309e07d1e5d7eb7c6e2546c0e6793c53739 Merge: 5ba1b34 2ae052b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 28 01:37:07 2015 -0700 Merge remote-tracking branch 'arthur/16429+11' into tor-browser-38.1.0esr-5.0-1 .../pdfjs/content/PdfStreamConverter.jsm | 7 +- .../extensions/pdfjs/content/build/pdf.worker.js | 9 +- dom/base/ThirdPartyUtil.cpp | 30 ++- dom/base/ThirdPartyUtil.h | 12 + dom/base/URL.cpp | 32 ++- dom/base/moz.build | 1 + dom/base/nsDocument.cpp | 17 +- dom/base/nsHostObjectProtocolHandler.cpp | 125 +++++----- dom/base/nsHostObjectProtocolHandler.h | 15 +- dom/base/test/bug15502_page_blobify.html | 3 +- dom/base/test/bug15502_page_deblobify.html | 3 +- dom/base/test/bug15502_tab.html | 5 +- dom/base/test/bug15502_utils.js | 15 +- dom/base/test/bug15502_worker_blobify.html | 3 +- dom/base/test/bug15502_worker_deblobify.html | 3 +- dom/base/test/bug15703_page_create.html | 28 +++ dom/base/test/bug15703_page_retrieve.html | 50 ++++ dom/base/test/mochitest.ini | 3 + dom/base/test/test_tor_bug15502.html | 33 ++- dom/base/test/test_tor_bug15703.html | 92 ++++++++ dom/fetch/Fetch.cpp | 17 +- dom/fetch/FetchDriver.cpp | 8 +- dom/fetch/FetchDriver.h | 5 +- dom/html/HTMLMediaElement.cpp | 17 +- dom/media/MediaResource.cpp | 6 +- dom/workers/URL.cpp | 28 ++- dom/workers/WorkerPrivate.cpp | 22 +- netwerk/base/mozIThirdPartyUtil.idl | 14 -- testing/mochitest/chrome/chrome.ini | 1 + testing/mochitest/chrome/test_sanitySpawnTask.xul | 70 ++++++ testing/mochitest/jar.mn | 1 + .../mochitest/tests/Harness_sanity/mochitest.ini | 2 +- .../tests/Harness_sanity/test_spawn_task.html | 73 ++++++ .../mochitest/tests/SimpleTest/LICENSE_SpawnTask | 24 ++ testing/mochitest/tests/SimpleTest/SpawnTask.js | 244 ++++++++++++++++++++ testing/mochitest/tests/SimpleTest/moz.build | 1 + 36 files changed, 848 insertions(+), 171 deletions(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug #15502, Part 2: Regression tests for blob URL isolation
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 4ef8f72964d1608a9ded427137d66547f78d71b8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jul 2 12:26:40 2015 -0700 fixup! Bug #15502, Part 2: Regression tests for blob URL isolation --- dom/base/test/test_tor_bug15502.html | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dom/base/test/test_tor_bug15502.html b/dom/base/test/test_tor_bug15502.html index 18b8459..05173d9 100644 --- a/dom/base/test/test_tor_bug15502.html +++ b/dom/base/test/test_tor_bug15502.html @@ -59,20 +59,10 @@ let blobTest = function* (isolationOn, domainA, domainB, blobPage, deblobPage) { blobURL = yield tabIO(domainA, blobPage, input), result = yield tabIO(domainB, deblobPage, blobURL), description = domainA + ":" + blobPage + "->" + domainB + ":" + deblobPage + ", isolation " + (isolationOn ? "on." : "off."); - if (blobPage === worker_blob) { - // Remove this case when we write a patch that properly isolates web worker blob URLs - // by first party domain. - ok(blobURL.contains("Permission to call 'URL.createObjectURL' denied."), description + " Deny blob URL creation in web worker"); - } else if (deblobPage === worker_deblob && isolationOn) { - // Remove this case when we write a patch that properly isolates web worker blob URLs - // by first party domain. - ok(result.contains("Access to restricted URI denied"), description + " Isolated blobs not available to web workers"); + if (isolationOn && domainA !== domainB) { + ok(input !== result, description + " Deny retrieval"); } else { - if (isolationOn && domainA !== domainB) { - ok(input !== result, description + " Deny retrieval"); - } else { - ok(input === result, description + " Allow retrieval"); - } + ok(input === result, description + " Allow retrieval"); } };

1 0

[torbutton/master] Bug 16268: non-en-US Tor Browser has Firefox branding in about box.
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit d7ff1cc7c2b785a2e44e2a568ae0d66a890f225b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jul 27 13:40:29 2015 -0400 Bug 16268: non-en-US Tor Browser has Firefox branding in about box. Import aboutDialog.dtd and aboutTor.properties from Transifex. Improved import-translations.sh to check that all .dtd and .properties files are imported. Work around a Transifex issue that caused some entities to be encoded twice. --- trans_tools/import-translations.sh | 88 ++++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 28 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index c29ed4c..28816ff 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync @@ -11,6 +11,48 @@ BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru tr vi zh-CN" # and translations are available. BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv" +LOCALE_DIR=../src/chrome/locale + +# FILEMAP is an array of "localeFile:translationBranch" strings. +FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" + "aboutTor.dtd:abouttor-homepage" + "aboutTor.properties:torbutton-abouttorproperties" + "brand.dtd:torbutton-branddtd" + "brand.properties:torbutton-brandproperties" + "browser.properties:torbutton-browserproperties" + "torbutton.dtd:torbutton-torbuttondtd" + "torbutton.properties:torbutton-torbuttonproperties" + ) + +# Verify that the FILEMAP contains an entry for each Torbutton file. +FILES_ARE_MISSING=0 +for DEST_PATH in $LOCALE_DIR/en/*.dtd $LOCALE_DIR/en/*.properties; +do + IS_FILE_IN_MAP=0 + DEST_FILE=${DEST_PATH##*/} + for KEYVAL in "${FILEMAP[@]}"; + do + FILE="${KEYVAL%%:*}" + if [ $FILE = $DEST_FILE ]; + then + IS_FILE_IN_MAP=1 + break; + fi + done + + if [ $IS_FILE_IN_MAP -eq 0 ]; + then + echo "Please add $DEST_FILE to FILEMAP." 1>&2 + FILES_ARE_MISSING=1 + fi +done + +if [ $FILES_ARE_MISSING -ne 0 ]; +then + exit 1 +fi + +# Clone or update our translation repo. if [ -d translation ]; then cd translation @@ -20,32 +62,22 @@ else git clone https://git.torproject.org/translation.git fi +# Update each translated file for each locale. +echo "Locales: $BUNDLE_LOCALES" cd translation -for i in $BUNDLE_LOCALES -do - UL="`echo $i|tr - _`" - mkdir -p ../../src/chrome/locale/$i/ - git checkout abouttor-homepage - git merge origin/abouttor-homepage - cp $UL/aboutTor.dtd ../../src/chrome/locale/$i/ - - git checkout torbutton-torbuttondtd - git merge origin/torbutton-torbuttondtd - cp $UL/torbutton.dtd ../../src/chrome/locale/$i/ - - git checkout torbutton-branddtd - git merge origin/torbutton-branddtd - cp $UL/brand.dtd ../../src/chrome/locale/$i/ - - git checkout torbutton-torbuttonproperties - git merge origin/torbutton-torbuttonproperties - cp $UL/torbutton.properties ../../src/chrome/locale/$i/ - - git checkout torbutton-browserproperties - git merge origin/torbutton-browserproperties - cp $UL/browser.properties ../../src/chrome/locale/$i/ - - git checkout torbutton-brandproperties - git merge origin/torbutton-brandproperties - cp $UL/brand.properties ../../src/chrome/locale/$i/ +for KEYVAL in "${FILEMAP[@]}"; do + FILE="${KEYVAL%%:*}" + BRANCH="${KEYVAL##*:}" + echo "Updating ${FILE}..." + git checkout -q "$BRANCH" + git merge -q origin/"$BRANCH" + for i in $BUNDLE_LOCALES; + do + UL="`echo $i|tr - _`" + mkdir -p ../$LOCALE_DIR/$i/ +# Use sed to work around a Transifex "double entity" issue. + sed -e 's/\&brandShortName;/\&brandShortName;/g' \ + -e 's/\&vendorShortName;/\&vendorShortName;/g' \ + $UL/"$FILE" > ../$LOCALE_DIR/$i/"$FILE" + done done

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'brade/bug16236-01' into tor-browser-38.1.0esr-5.0-1
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 5ba1b3465b136c061afca8fdcfd38ccf77b02d88 Merge: 41a0771 b7a65a6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 27 08:57:50 2015 -0700 Merge remote-tracking branch 'brade/bug16236-01' into tor-browser-38.1.0esr-5.0-1 toolkit/mozapps/update/updater/updater.cpp | 9 ++++++++- toolkit/xre/nsUpdateDriver.cpp | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug 16236: Windows updater: avoid writing to the registry.
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit b7a65a6dcfc1963fef42b4a0d4b5013dbc8a36ad Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 22 15:58:52 2015 -0400 Bug 16236: Windows updater: avoid writing to the registry. Mozilla moves "in use" files that cannot be deleted during an update to a "tobedeleted" directory and then makes a call to MoveFileEx(..., MOVEFILE_DELAY_UNTIL_REBOOT) to request that the file be deleted later. To avoid writing to the Windows Registry, we simply try to remove the "tobedeleted" directory and its contents during browser startup. --- toolkit/mozapps/update/updater/updater.cpp | 9 ++++++++- toolkit/xre/nsUpdateDriver.cpp | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index acb610c..6e55fe2 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -866,7 +866,7 @@ static int rename_file(const NS_tchar *spath, const NS_tchar *dpath, return OK; } -#ifdef XP_WIN +#if defined(XP_WIN) && !defined(TOR_BROWSER_UPDATE) // Remove the directory pointed to by path and all of its files and // sub-directories. If a file is in use move it to the tobedeleted directory // and attempt to schedule removal of the file on reboot @@ -1005,6 +1005,8 @@ static int backup_discard(const NS_tchar *path) backup, path)); return WRITE_ERROR; } + +#if !defined(TOR_BROWSER_UPDATE) // The MoveFileEx call to remove the file on OS reboot will fail if the // process doesn't have write access to the HKEY_LOCAL_MACHINE registry key // but this is ok since the installer / uninstaller will delete the @@ -1017,6 +1019,7 @@ static int backup_discard(const NS_tchar *path) LOG(("backup_discard: failed to schedule OS reboot removal of " \ "file: " LOG_S, path)); } +#endif } #else if (rv) @@ -2280,8 +2283,10 @@ ProcessReplaceRequest() if (NS_taccess(deleteDir, F_OK)) { NS_tmkdir(deleteDir, 0755); } +#if !defined(TOR_BROWSER_UPDATE) remove_recursive_on_reboot(tmpDir, deleteDir); #endif +#endif } #ifdef XP_MACOSX @@ -3360,6 +3365,7 @@ int NS_main(int argc, NS_tchar **argv) if (!sStagedUpdate && !sReplaceRequest && _wrmdir(DELETE_DIR)) { LOG(("NS_main: unable to remove directory: " LOG_S ", err: %d", DELETE_DIR, errno)); +#if !defined(TOR_BROWSER_UPDATE) // The directory probably couldn't be removed due to it containing files // that are in use and will be removed on OS reboot. The call to remove the // directory on OS reboot is done after the calls to remove the files so the @@ -3376,6 +3382,7 @@ int NS_main(int argc, NS_tchar **argv) LOG(("NS_main: failed to schedule OS reboot removal of " \ "directory: " LOG_S, DELETE_DIR)); } +#endif } #endif /* XP_WIN */ diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index ef4c5fb..085f439 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -1111,6 +1111,20 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir, bool restart, bool isOSUpdate, nsIFile *osApplyToDir, ProcessType *pid) { +#if defined(XP_WIN) && defined(TOR_BROWSER_UPDATE) + // Try to remove the "tobedeleted" directory which, if present, contains + // files that could not be removed during a previous update (e.g., DLLs + // that were in use and therefore locked by Windows). + nsCOMPtr<nsIFile> deleteDir; + nsresult winrv = appDir->Clone(getter_AddRefs(deleteDir)); + if (NS_SUCCEEDED(winrv)) { + winrv = deleteDir->AppendNative(NS_LITERAL_CSTRING("tobedeleted")); + if (NS_SUCCEEDED(winrv)) { + winrv = deleteDir->Remove(true); + } + } +#endif + nsresult rv; nsCOMPtr<nsIFile> updatesDir;

1 0

[torbutton/master] Bug 16639: Check for Updates menu item can cause update failure.
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 84497608ae13239b67d2b656647c64a70badd72c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 23 15:30:51 2015 -0400 Bug 16639: Check for Updates menu item can cause update failure. Check the state of the active update (if any) and open the update prompt in the correct mode. --- src/chrome/content/torbutton.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6539ea9..1d81960 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -893,9 +893,23 @@ function torbutton_notify_if_update_needed() { } function torbutton_check_for_update() { + // Open the update prompt in the correct mode. The update state + // checks used here were adapted from isPending() and isApplied() in + // Mozilla's browser/base/content/aboutDialog.js code. + let updateMgr = Cc["@mozilla.org/updates/update-manager;1"] + .getService(Ci.nsIUpdateManager); + let update = updateMgr.activeUpdate; + let updateState = (update) ? update.state : undefined; + let pendingStates = [ "pending", "pending-service", + "applied", "applied-service" ]; + let isPending = (updateState && (pendingStates.indexOf(updateState) >= 0)); + let prompter = Cc["@mozilla.org/updates/update-prompt;1"] .createInstance(Ci.nsIUpdatePrompt); - prompter.checkForUpdates(); + if (isPending) + prompter.showUpdateDownloaded(update, false); + else + prompter.checkForUpdates(); } // Pass undefined for a parameter to have this function determine it.

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug 16528: Prevent indexedDB Modernizr breakage (e10s highrisk).
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 0d808cd9cf4c7efbd1391c69fae63cf40822389e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 13 13:43:18 2015 -0700 Bug 16528: Prevent indexedDB Modernizr breakage (e10s highrisk). This change should make the indexedDB failure mode for pref checks equivalent to the private browsing failure mode. Sites that use Modernizr are accustomed to the failure modes for Private Browsing usage of IndexedDB, but not for when the pref is disabled. This patch may cause serious issues with e10s in the future. We'll need to keep an eye on it for FF45. --- dom/indexedDB/ActorsParent.cpp | 1 + dom/indexedDB/IDBFactory.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp index e32f9a4..ed5d8b3 100644 --- a/dom/indexedDB/ActorsParent.cpp +++ b/dom/indexedDB/ActorsParent.cpp @@ -10756,6 +10756,7 @@ FactoryOp::CheckPermission(ContentParent* aContentParent, if (aContentParent) { // The DOM in the other process should have kept us from receiving any // indexedDB messages so assume that the child is misbehaving. + // XXX: Does this happen with e10s due to Bug #16528? aContentParent->KillHard("IndexedDB CheckPermission 1"); } return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index 2ad3ee2..8acdf0f 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -132,11 +132,13 @@ IDBFactory::CreateForWindow(nsPIDOMWindow* aWindow, nsCOMPtr<nsIPrincipal> principal; nsresult rv = AllowedForWindowInternal(aWindow, getter_AddRefs(principal)); + // XXX: Check Removed due to Bug #16528 + /* if (!(NS_SUCCEEDED(rv) && nsContentUtils::IsSystemPrincipal(principal)) && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; - } + } */ if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { NS_WARNING("IndexedDB is not permitted in a third-party window."); @@ -265,11 +267,13 @@ IDBFactory::CreateForMainThreadJSInternal( MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(aPrincipalInfo); + /* XXX: Check Removed to due #16528 if (aPrincipalInfo->type() != PrincipalInfo::TSystemPrincipalInfo && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } + */ IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate(); if (NS_WARN_IF(!mgr)) {

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 41a07713072501dc23ce48f74deed464e232d07f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 27 08:49:02 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16632: Turn on the background updater and be more annoying when updates are ready. --- browser/app/profile/000-tor-browser.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index aee7a83..8188855 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -4,14 +4,17 @@ // Please maintain unit tests at ./tbb-tests/browser_tor_TB4.js -// Disable browser automatic updates and associated homepage notifications -pref("app.update.auto", false); +// 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", ""); +// Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog +pref("app.update.promptWaitTime", 3600); +pref("app.update.badge", true); + // Disable "Slow startup" warnings and associated disk history // (bug #13346) pref("browser.slowStartup.notificationDisabled", true);

1 0

[tor-browser-bundle/master] Bug 16674: Allow trailing '.' in FQDNs
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 3ad5030cfbdf3686defc63f4896fdd2e325ed742 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 27 08:07:57 2015 -0700 Bug 16674: Allow trailing '.' in FQDNs Backport of Tor patch. --- gitian/descriptors/linux/gitian-tor.yml | 2 + gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug16674.patch | 74 +++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index e62a1f0..bfd0e18 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -23,6 +23,7 @@ files: - "bug8405.patch" - "bug15482.patch" - "bug16430.patch" +- "bug16674.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -85,6 +86,7 @@ script: | else git am ~/build/bug15482.patch git am ~/build/bug16430.patch + git am ~/build/bug16674.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index d305ff7..c755851 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -19,6 +19,7 @@ files: - "bug8405.patch" - "bug15482.patch" - "bug16430.patch" +- "bug16674.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -63,6 +64,7 @@ script: | else git am ~/build/bug15482.patch git am ~/build/bug16430.patch + git am ~/build/bug16674.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 22fda90..a6be6b4 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -19,6 +19,7 @@ files: - "bug8405.patch" - "bug15482.patch" - "bug16430.patch" +- "bug16674.patch" - "binutils.tar.bz2" - "dzip.sh" - "mingw-w64-win32-utils.zip" @@ -63,6 +64,7 @@ script: | else git am ~/build/bug15482.patch git am ~/build/bug16430.patch + git am ~/build/bug16674.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug16674.patch b/gitian/patches/bug16674.patch new file mode 100644 index 0000000..9497684 --- /dev/null +++ b/gitian/patches/bug16674.patch @@ -0,0 +1,74 @@ +From da6aa7bfa5014b980a93b38024d16b32720dc67a Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Mon, 27 Jul 2015 12:58:40 +0000 +Subject: [PATCH] Allow a single trailing `.` when validating FQDNs from SOCKS. + +URI syntax (and DNS syntax) allows for a single trailing `.` to +explicitly distinguish between a relative and absolute +(fully-qualified) domain name. While this is redundant in that RFC 1928 +DOMAINNAME addresses are *always* fully-qualified, certain clients +blindly pass the trailing `.` along in the request. + +Fixes bug 16674; bugfix on 0.2.6.2-alpha. +--- + changes/bug16674 | 5 +++++ + src/common/util.c | 6 ++++++ + src/test/test_util.c | 12 ++++++++++++ + 3 files changed, 23 insertions(+) + create mode 100644 changes/bug16674 + +diff --git a/changes/bug16674 b/changes/bug16674 +new file mode 100644 +index 0000000..de55523 +--- /dev/null ++++ b/changes/bug16674 +@@ -0,0 +1,5 @@ ++ o Minor features (client): ++ - Relax the validation done to hostnames in SOCKS5 requests, and allow ++ a single trailing '.' to cope with clients that pass FQDNs using that ++ syntax to explicitly indicate that the domain name is ++ fully-qualified. Fixes bug 16674; bugfix on 0.2.6.2-alpha. +diff --git a/src/common/util.c b/src/common/util.c +index 618e6a1..1aac4fc 100644 +--- a/src/common/util.c ++++ b/src/common/util.c +@@ -1056,6 +1056,12 @@ string_is_valid_hostname(const char *string) + break; + } + ++ /* Allow a single terminating '.' used rarely to indicate domains ++ * are FQDNs rather than relative. */ ++ if ((c_sl_idx > 0) && (c_sl_idx + 1 == c_sl_len) && !*c) { ++ continue; ++ } ++ + do { + if ((*c >= 'a' && *c <= 'z') || + (*c >= 'A' && *c <= 'Z') || +diff --git a/src/test/test_util.c b/src/test/test_util.c +index 0f64c26..2bffb17 100644 +--- a/src/test/test_util.c ++++ b/src/test/test_util.c +@@ -4285,7 +4285,19 @@ test_util_hostname_validation(void *arg) + // comply with a ~30 year old standard. + tt_assert(string_is_valid_hostname("core3_euw1.fabrik.nytimes.com")); + ++ // Firefox passes FQDNs with trailing '.'s directly to the SOCKS proxy, ++ // which is redundant since the spec states DOMAINNAME addresses are fully ++ // qualified. While unusual, this should be tollerated. ++ tt_assert(string_is_valid_hostname("core9_euw1.fabrik.nytimes.com.")); ++ tt_assert(!string_is_valid_hostname("..washingtonpost.is.better.com")); ++ tt_assert(!string_is_valid_hostname("so.is..ft.com")); ++ tt_assert(!string_is_valid_hostname("...")); ++ + // XXX: do we allow single-label DNS names? ++ // We shouldn't for SOCKS (spec says "contains a fully-qualified domain name" ++ // but only test pathologically malformed traling '.' cases for now. ++ tt_assert(!string_is_valid_hostname(".")); ++ tt_assert(!string_is_valid_hostname("..")); + + done: + return; +-- +1.9.1 +

1 0