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

[tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! Regression tests for Bug 15564: Isolate SharedWorker by first party domain
by gk＠torproject.org 12 Dec '15

12 Dec '15

commit 69f1279b009afc2625bb6d5038fc1fd90cf56b14 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 12 20:33:08 2015 +0000 fixup! Regression tests for Bug 15564: Isolate SharedWorker by first party domain --- dom/base/test/test_tor_bug15564.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dom/base/test/test_tor_bug15564.html b/dom/base/test/test_tor_bug15564.html index 3609616..b8f7544 100644 --- a/dom/base/test/test_tor_bug15564.html +++ b/dom/base/test/test_tor_bug15564.html @@ -38,7 +38,7 @@ let domain1 = "http://example.com", // parent page should then open a `child` iframe. Post an // `input` message to the child. Returns [tab, response]. let tabIO = function* (domain, child, input) { - // Open a new tab with a parent page at the given (first party) domain. + // Open a new tab with a parent page at the given (first-party) domain. tab = window.open(domain + path + "bug15502_tab.html", "_blank"); // Wait for the parent page to report that it has completed loading. yield receiveMessage(tab); // ready message @@ -64,15 +64,15 @@ let tabIO = function* (domain, child, input) { // __sharedWorkerTest(isolationOn, domainA, domainB, childPage)__. // Run a test where we set the pref "privacy.thirdparty.isolate" to on or off, -// and then create a shared worker under first party `domainA`, using the page `child_page`, -// and then a matching SharedWorker under first party `domainB`, and see if they match. +// and then create a SharedWorker under first-party `domainA`, using the page `child_page`, +// and then a matching SharedWorker under first-party `domainB`, and see if they match. let sharedWorkerTest = function* (isolationOn, domainA, domainB, child_page) { // Set the pref to reflect whether we want isolation on or off. // 2 means always on; 0 means always off. yield setPref("privacy.thirdparty.isolate", isolationOn ? 2 : 0); - // Open two tabs with parent pages embedding child iframes. The parent (first party) + // Open two tabs with parent pages embedding child iframes. The parent (first-party) // domains are set to domainA and domainB (which may be the same or different). - // The child page always has origin example.org, but gets its first party domain + // The child page always has origin example.org, but gets its first-party domain // from the parent page. Report results: are child pages able to share information? let input = isolationOn + "|" + domainA + "|" + domainB, [tabA, firstResult] = yield tabIO(domainA, child_page, input), @@ -83,11 +83,11 @@ let sharedWorkerTest = function* (isolationOn, domainA, domainB, child_page) { // If the child pages both report the same random number, then they have shared // that number via a SharedWorker. Otherwise sharing was denied. if (isolationOn && domainA !== domainB) { - // The isolation pref is enabled and first party domains of the two child pages + // The isolation pref is enabled and first-party domains of the two child pages // are different, so sharing should have been prevented. ok(firstResult !== secondResult, description + " Deny sharing SharedWorker"); } else { - // The isolation pref is disable, or the first party domain is the same for + // The isolation pref is disabled, or the first-party domain is the same for // both child pages, so the secret data should have been shared. ok(firstResult === secondResult, description + " Allow sharing SharedWorker"); } @@ -103,8 +103,8 @@ spawnTask(function* () { let domainA = domain1; for (let isolate of [false, true]) { for (let domainB of [domain1, domain2]) { - // For the given isolation state, and a pair of first party domains - // (which may or not be different), test if secret data can be + // For the given isolation state, and a pair of first-party domains + // (which may or may not be different), test if secret data can be // shared via a SharedWorker, and if that matches the intended behavior. // Here domainA is always domain1, and domainB is either // domain1 or domain2.

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 12 Dec '15

12 Dec '15

commit f5f40cedc6d47e995b5530b1f436e4c578ae693b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Sep 22 14:59:35 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Allow SharedWorkers to be used --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c7039a0..bf33260 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -130,7 +130,6 @@ pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in cas pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in case pref("privacy.thirdparty.isolate", 2); // Always enforce third party isolation -pref("dom.workers.sharedWorkers.enabled", false); // See https://bugs.torproject.org/15562 pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Regression tests for Bug 15564: Isolate SharedWorker by first party domain
by gk＠torproject.org 12 Dec '15

12 Dec '15

commit 2c8a18f3f6ccd1a1db86b74b7bfca715890c1ed4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 8 16:13:59 2015 -0700 Regression tests for Bug 15564: Isolate SharedWorker by first party domain --- dom/base/test/bug15564_child_page.html | 29 ++++++++ dom/base/test/bug15564_sharedworker.js | 7 ++ dom/base/test/mochitest.ini | 3 + dom/base/test/test_tor_bug15564.html | 120 ++++++++++++++++++++++++++++++++ 4 files changed, 159 insertions(+) diff --git a/dom/base/test/bug15564_child_page.html b/dom/base/test/bug15564_child_page.html new file mode 100644 index 0000000..e84024e --- /dev/null +++ b/dom/base/test/bug15564_child_page.html @@ -0,0 +1,29 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page SharedWorker creator for Tor Browser Bug 15564</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), + worker = new SharedWorker("bug15564_sharedworker.js", message); + worker.port.onmessage = function (e) { + document.getElementById("display").innerHTML = e.data; + sendMessage(window.parent, e.data); + } +}); + +</script> +</body> +</html> diff --git a/dom/base/test/bug15564_sharedworker.js b/dom/base/test/bug15564_sharedworker.js new file mode 100644 index 0000000..56cbc2c --- /dev/null +++ b/dom/base/test/bug15564_sharedworker.js @@ -0,0 +1,7 @@ +self.randomValue = Math.random(); + +onconnect = function (e) { + var port = e.ports[0]; + port.postMessage(self.randomValue); + port.start(); +}; diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index 6a8c334..e8812fb 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -33,6 +33,8 @@ support-files = bug15502_worker_deblobify.html bug15703_page_create.html bug15703_page_retrieve.html + bug15564_child_page.html + bug15564_sharedworker.js bug282547.sjs bug298064-subframe.html bug313646.txt @@ -738,6 +740,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM [test_textnode_split_in_selection.html] [test_title.html] [test_tor_bug15502.html] +[test_tor_bug15564.html] [test_tor_bug15703.html] [test_tor_bug17207.html] [test_treewalker_nextsibling.xml] diff --git a/dom/base/test/test_tor_bug15564.html b/dom/base/test/test_tor_bug15564.html new file mode 100644 index 0000000..3609616 --- /dev/null +++ b/dom/base/test/test_tor_bug15564.html @@ -0,0 +1,120 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Test for Tor Browser Bug 15564</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 promise 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/", + child_page = "bug15564_child_page.html"; + +// __tabIO(domain, child, input)__. +// Open a parent page at the given `domain`, in a new tab. The +// parent page should then open a `child` iframe. Post an +// `input` message to the child. Returns [tab, response]. +let tabIO = function* (domain, child, input) { + // Open a new tab with a parent page at the given (first party) domain. + tab = window.open(domain + path + "bug15502_tab.html", "_blank"); + // Wait for the parent page to report that it has completed loading. + yield receiveMessage(tab); // ready message + // Send a message to the parent page, with a URL for the child page. + // The first-party page will load the child page in an iframe. + // (Note that every child page always has the same origin, example.org, + // but its first-party domain is inherited from the parent page.) + sendMessage(tab, "http://example.org" + path + child); + // Wait for the child page to report that it has finished loading, + // in a message forwarded by the parent page. + yield receiveMessage(tab); // ready message + // Send the input message to the tab's parent page, which will forward + // the message to the child page. + sendMessage(tab, input); + // The child page will attempt to read a secret random number via a + // SharedWorker. If it is unable to find such a number, it + // generates a new random number, posts it to the SharedWorker, + // and also posts it back to us. + // Wait for a message containing the number from the child page, + // forwarded by the parent page. Return the tab and the response. + return [tab, yield receiveMessage(tab)]; +}; + +// __sharedWorkerTest(isolationOn, domainA, domainB, childPage)__. +// Run a test where we set the pref "privacy.thirdparty.isolate" to on or off, +// and then create a shared worker under first party `domainA`, using the page `child_page`, +// and then a matching SharedWorker under first party `domainB`, and see if they match. +let sharedWorkerTest = function* (isolationOn, domainA, domainB, child_page) { + // Set the pref to reflect whether we want isolation on or off. + // 2 means always on; 0 means always off. + yield setPref("privacy.thirdparty.isolate", isolationOn ? 2 : 0); + // Open two tabs with parent pages embedding child iframes. The parent (first party) + // domains are set to domainA and domainB (which may be the same or different). + // The child page always has origin example.org, but gets its first party domain + // from the parent page. Report results: are child pages able to share information? + let input = isolationOn + "|" + domainA + "|" + domainB, + [tabA, firstResult] = yield tabIO(domainA, child_page, input), + [tabB, secondResult] = yield tabIO(domainB, child_page, input), + description = domainA + ":" + child_page + "->" + + domainB + ":" + child_page + + ", isolation " + (isolationOn ? "on." : "off."); + // If the child pages both report the same random number, then they have shared + // that number via a SharedWorker. Otherwise sharing was denied. + if (isolationOn && domainA !== domainB) { + // The isolation pref is enabled and first party domains of the two child pages + // are different, so sharing should have been prevented. + ok(firstResult !== secondResult, description + " Deny sharing SharedWorker"); + } else { + // The isolation pref is disable, or the first party domain is the same for + // both child pages, so the secret data should have been shared. + ok(firstResult === secondResult, description + " Allow sharing SharedWorker"); + } + // Clean up tabs now that this test has finished. + tabA.close(); + tabB.close(); +}; + +// ## The main test +// Run a coroutine that tests various combinations of domains +// methods, and isolation states for sharing (or not sharing) SharedWorkers. +spawnTask(function* () { + let domainA = domain1; + for (let isolate of [false, true]) { + for (let domainB of [domain1, domain2]) { + // For the given isolation state, and a pair of first party domains + // (which may or not be different), test if secret data can be + // shared via a SharedWorker, and if that matches the intended behavior. + // Here domainA is always domain1, and domainB is either + // domain1 or domain2. + yield sharedWorkerTest(isolate, domainA, domainB, child_page); + } + } + SimpleTest.finish(); +}); + +</script> + +</body> +</html>

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 12 Dec '15

12 Dec '15

commit 7cda561f125169f05a539be1b5afd88522d4fc46 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Dec 11 13:36:48 2015 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index ffb0a63..c7039a0 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -271,7 +271,7 @@ pref("browser.download.panel.shown", true); #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi");

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 12 Dec '15

12 Dec '15

commit 2c2d625aef55b9bd1ed1b1ec459e4f1a8b11eadb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Dec 11 13:35:27 2015 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index ed0d3ce..ffb0a63 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -284,7 +284,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, 微软雅黑, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[torbutton/master] Bug 17792: Auto-adjust font size for donation banner l10n
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 2faa79edfc674786a062a22a93f95734cdcacf15 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Dec 10 15:59:38 2015 -0800 Bug 17792: Auto-adjust font size for donation banner l10n --- src/chrome/content/aboutTor/aboutTor.xhtml | 66 +++++++++++++++++++++++++--- src/chrome/skin/aboutTor.css | 15 +++++-- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index a95ae6f..d591adc 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -169,18 +169,63 @@ window.addEventListener("pageshow", function() { // Donation banner constants let gBannerAlternates = ["lp", "cd", "rd"], - gBannerSuffixes = ["quote", "who", "speciality"], - populateBannerText = (suffix, alternate) => - document.getElementById("donation-banner-" + suffix).innerHTML - = gStringBundle.GetStringFromName("aboutTor.donationBanner." + - alternate + "." + suffix); + gBannerSuffixes = ["quote", "who", "speciality"]; + +// Change the font size of text in element by ratio. +let scaleFontBy = function (element, ratio) { + let style = window.getComputedStyle(element), + originalFontSize = parseFloat(style.fontSize), + targetFontSize = originalFontSize * ratio; + element.style.fontSize = targetFontSize + "px"; +}; + +// Shrink the font size if the text in the given element is overflowing. +let fitTextInElement = function(element) { + let style = window.getComputedStyle(element); + if (style.whiteSpace === "nowrap") { + // Look for horizontal overflow. + let elementWidth = element.getBoundingClientRect().width, + paddingWidth = parseFloat(style.paddingLeft) + + parseFloat(style.paddingRight), + targetWidth = elementWidth - paddingWidth, + textWidth = element.scrollWidth; + // Compute the appropriate font size to make the text fit. + let ratio = targetWidth / textWidth; + scaleFontBy(element, ratio); + } else { + // Look for vertical overflow. + let elementHeight = element.getBoundingClientRect().height, + paddingHeight = parseFloat(style.paddingTop) + + parseFloat(style.paddingBottom), + targetHeight = elementHeight - paddingHeight; + // Wrapping causes somewhat difficult-to-predict overflow. + // So shrink slightly and repeat. + let ratio = 0; + for (let i = 0; i < 100 && ratio < 1; ++i) { + let textHeight = element.scrollHeight; + ratio = targetHeight < textHeight ? 0.99 : 1; + if (ratio < 1) { + scaleFontBy(element, ratio); + } + } + } +}; + +// Put text of the appropriate locale into donation banner elements. +let populateBannerText = function (suffix, alternate) { + let text = gStringBundle.GetStringFromName("aboutTor.donationBanner." + + alternate + "." + suffix), + div = document.getElementById("donation-banner-" + suffix); + div.innerHTML = text; +}; // This function takes care of the donation banner. function setupDonationBanner() { try { - // Only show banner for US English + // Only show banner for locales for which we have translations. let browserLocale = Services.prefs.getCharPref("general.useragent.locale"); - if (browserLocale !== "en-US") { + if (!["en", "de", "fa", "fr", "nl", "ru", "sv", "tr", "zh"] + .some(code => browserLocale.startsWith(code))) { return; } // Only show banner until 2016 Jan 25. @@ -218,6 +263,13 @@ function setupDonationBanner() { } // Now we can show the banner. document.getElementById("donation-banner").style.display = "block"; + for (let id of ["donation-banner-quote", + "donate-button", + "donation-banner-who", + "donation-banner-speciality", + "donation-banner-plea"]) { + fitTextInElement(document.getElementById(id)); + } } ]]> </script> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 806fec5..549256f 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -331,6 +331,7 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { left: 245px; position: absolute; top: 23px; + text-align: start; width: 420px; } @@ -338,7 +339,7 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { color: darkgreen; font-family: serif; font-size: 18px; - text-align: start; + max-height: 64px; white-space: normal; } @@ -351,11 +352,13 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { #donation-banner-who { font-size: 19px; font-style: bold; + width: 420px; } #donation-banner-speciality { font-size: 13px; text-transform: uppercase; + width: 420px; } #donation-banner-plea { @@ -364,9 +367,13 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { font-size: 20px; color: darkgreen; left: 250px; - padding: 10px; + line-height: 42px; + height: 42px; + padding: 0px 5px 0px 5px; position: absolute; + text-align: center; top: 144px; + width: 200px; } #donate-button { @@ -375,8 +382,10 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { color: white; font-family: sans-serif; font-size: 20px; + height: 42px; left: 490px; - padding: 10px; + line-height: 42px; + padding: 0px 5px 0px 5px; position: absolute; text-align: center; top: 144px;

1 0

[torbutton/master] Release preparations
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit c59561543e708a44f514b624d9578338da5e317d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 11 20:19:31 2015 +0000 Release preparations --- src/CHANGELOG | 10 ++++++++++ src/chrome/locale/ru/aboutTor.dtd | 2 +- src/chrome/locale/ru/torbutton.properties | 2 +- src/install.rdf | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 91ece83..2d8647f 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,13 @@ +1.9.4.2 + * Bug 16940: After update, load local change notes + * Bug 16990: Avoid matching '250 ' to the end of node name + * Bug 17108: Polish about:tor appearance + * Bug 17565: Tor fundraising campaign donation banner + * Bug 17568: Clean up tor-control-port.js + * Bug 17770: Fix alignments on donation banner + * Bug 17792: Include donation banner in some non en-US Tor Browsers + * Translation updates + 1.9.4.1 * Bug 9623: Spoof Referer when leaving a .onion domain * Bug 16620: Move window.name handling into a Firefox patch diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index bb5a49b..ac71c5b 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "О проекте Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот обозреватель устарел."> +<!ENTITY aboutTor.outOfDateTorOn.label "ВНИМАНИЕ: этот браузер устарел."> <!ENTITY aboutTor.outOfDateTorOff.label "КРОМЕ ТОГО, данный браузер устарел."> <!ENTITY aboutTor.outOfDate2.label "Нажмите на "луковицу"и затем выберите "Проверить обновления браузера Tor""> diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 62af84b..00c3dd0 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Этот браузер torbutton.circuit_display.relay = узел torbutton.circuit_display.tor_bridge = Ретранслятор torbutton.circuit_display.unknown_country = Неизвестная страна -torbutton.content_sizer.margin_tooltip = Tor Browser добавляет этот отступ, чтобы ширина и высота окна были менее узнаваемыми, и это усложняет возможность отследить Вас в сети. +torbutton.content_sizer.margin_tooltip = Tor Browser добавляет этот отступ, чтобы ширина и высота окна были менее узнаваемыми, это усложняет возможность отследить Вас в сети. torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor torbutton.panel.plugins.disabled = Нажмите, чтобы включить плагины diff --git a/src/install.rdf b/src/install.rdf index 267870c..cbf74d0 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.4.1</em:version> + <em:version>1.9.4.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Changelog update, versions bumps
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 0fc577ffdb3df55742a7aaae8840720b856e21e5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 11 14:26:07 2015 +0000 Changelog update, versions bumps --- Bundle-Data/Docs/ChangeLog.txt | 43 ++++++++++++++++++++++++++++++++----- gitian/versions.alpha | 18 ++++++++-------- tools/update-responses/config.yml | 12 +++++------ 3 files changed, 53 insertions(+), 20 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ef1a6be..335417f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 5.5a5 -- December 15 2015 + * All Platforms + * Update Firefox to 38.5.0esr + * Update Tor to 0.2.7.6 + * Update OpenSSL to 1.0.1q + * Update NoScript to 2.7 + * Update Torbutton to 1.9.4.2 + * Bug 16940: After update, load local change notes + * Bug 16990: Avoid matching '250 ' to the end of node name + * Bug 17565: Tor fundraising campaign donation banner + * Bug 17770: Fix alignments on donation banner + * Bug 17792: Include donation banner in some non en-US Tor Browsers + * Bug 17108: Polish about:tor appearance + * Bug 17568: Clean up tor-control-port.js + * Translation updates + * Update Tor Launcher to 0.2.8.1 + * Bug 17344: enumerate available language packs for language prompt + * Code clean-up + * Translation updates + * Bug 9659: Avoid loop due to optimistic data socks code (fix of #3875) + * Bug 16940: After update, load local change notes + * Bug 17759: Apply whitelist to local fonts in @font-face (fix of #13313) + * Bug 17747: Add ndnop3 as new default obfs4 bridge + * Bug 17009: Shift and Alt keys leak physical keyboard layout (fix of #15646) + * Bug 17369: Disable RC4 fallback + * Bug 17442: Remove custom updater certificate pinning + * Bug 16863: Avoid confusing error when loop.enabled is false + * Bug 17502: Add a preference for hiding "Open with" on download dialog + * Bug 17446: Prevent canvas extraction by third parties (fixup of #6253) + * Bug 16441: Suppress "Reset Tor Browser" prompt + * Windows + * Bug 13819: Ship expert bundles with console + Tor Browser 5.5a4 -- November 3 2015 * All Platforms * Update Firefox to 38.4.0esr @@ -889,7 +922,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms * Update OpenSSL to 1.0.1g * Bug 9010: Add Turkish language support. - * Bug 9387 testing: Disable JS JIT, type inference, asmjs, and ion. + * Bug 9387 testing: Disable JS JIT, type inference, asmjs, and ion. * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 * Update Torbutton to 1.6.8.1 @@ -948,7 +981,7 @@ Tor Browser Bundle 3.6-beta-1 -- Mar 17 2014 * Bug 5018: Don't launch Pluggable Transport helpers if not in use * Bug 9229: Eliminate 60 second stall during bootstrap with some PTs * Bug 11069: Detect and report Pluggable Transport bootstrap failures - * Bug 11156: Prevent spurious warning about missing pluggable transports + * Bug 11156: Prevent spurious warning about missing pluggable transports * Bug 10237: Disable the media cache to prevent disk leaks for videos * Bug 10703: Force the default charset to avoid locale fingerprinting * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) @@ -1039,7 +1072,7 @@ Tor Browser Bundle 3.0rc1 -- Nov 21 2013 * All Platforms: * Update Firefox to 17.0.11esr * Update Tor to 0.2.4.18-rc - * Remove unsupported PDF.JS addon from the bundle + * Remove unsupported PDF.JS addon from the bundle * Bug #7277: TBB's Tor client will now omit its timestamp in the TLS handshake. * Update Torbutton to 1.6.4.1 * Bug #10002: Make the TBB3.0 blog tag our update download URL for now @@ -1060,7 +1093,7 @@ Tor Browser Bundle 3.0beta1 -- Oct 31 2013 * Bug #9173: Patch Tor Browser to auto-detect profile directory if launched without the wrapper script. * Bug #9012: Hide Tor Browser infobar for missing plugins. - * Bug #8364: Change the default entry page for the addons tab to the + * Bug #8364: Change the default entry page for the addons tab to the installed addons page. * Bug #9867: Make flash objects really be click-to-play if flash is enabled. * Bug #8292: Make getFirstPartyURI log+handle errors internally to simplify @@ -1090,7 +1123,7 @@ Tor Browser Bundle 3.0alpha4 -- Sep 24 2013 * Update Tor to 0.2.4.17-rc * Update NoScript to 2.6.7.1 * Update Tor-Launcher to 0.2.2-alpha - * Bug #9675: Provide feedback mechanism for clock-skew and other early + * Bug #9675: Provide feedback mechanism for clock-skew and other early startup issues * Bug #9445: Allow user to enter bridges with or without 'bridge' keyword * Bug #9593: Use UTF16 for Tor process launch to handle unicode paths. diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 81818e8..ae70b91 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,14 +7,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.4.0esr +FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 -TOR_TAG=tor-0.2.7.4-rc -TORLAUNCHER_TAG=0.2.7.7 -TORBUTTON_TAG=1.9.4.1 +TOR_TAG=tor-0.2.7.6 +TORLAUNCHER_TAG=0.2.8.1 +TORBUTTON_TAG=1.9.4.2 HTTPSE_TAG=5.1.1 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -39,10 +39,10 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux -OPENSSL_VER=1.0.1p +OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5 @@ -62,7 +62,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.39-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.7-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -87,13 +87,13 @@ NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 +OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=dd904c6a12a8b1f6b1da48d51e4df903d7f9211ba5b3f32d7272f413a3bf548a +NOSCRIPT_HASH=ab84fd85addd6c15f2ce1e81c58ac9f09b228f9e56703f4d938447b8a2b752ea MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index acfa5db..ddd5b1e 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.5a4 + alpha: 5.5a5 release: 5.0 versions: 5.0: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.5a4: - platformVersion: 38.4.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55a4-released - download_url: https://www.torproject.org/dist/torbrowser/5.5a4 + 5.5a5: + platformVersion: 38.5.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-55a5-released + download_url: https://www.torproject.org/dist/torbrowser/5.5a5 incremental_from: - - 5.5a3 + - 5.5a4 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-5.0] Changelog update
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 45e9e5e26b172c3bfebdf541505b5d1bc6bf9ebb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 11 13:48:20 2015 +0000 Changelog update --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 89e56e7..222f31c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -17,6 +17,7 @@ Tor Browser 5.0.5 -- December 15 2015 * Bug 17502: Add a preference for hiding "Open with" on download dialog * Bug 17446: Prevent canvas extraction by third parties (fixup of #6253) * Bug 16441: Suppress "Reset Tor Browser" prompt + * Bug 17747: Add ndnop3 as new default obfs4 bridge Tor Browser 5.0.4 -- November 3 2015 * All Platforms

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 099454f2b3ccb7172b0f76874ceafe1ddbaab9f5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 11 13:24:58 2015 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 48a9471..4a9944b 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.8</em:version> + <em:version>0.2.8.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0