- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 2cc266366b66aa1052b5bb288db78ad466023a2f Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 20:49:51 2020 +0100 fixup! Bug 12620: TorBrowser regression tests --- run-tbb-tests | 10 +++++++--- tbb-tests-ignore.txt | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/run-tbb-tests b/run-tbb-tests index 5e266f9ba4cd..b12e62d942c9 100755 --- a/run-tbb-tests +++ b/run-tbb-tests @@ -18,8 +18,8 @@ then echo "Using tests list from file tbb-tests-list.txt" tests=($(cat tbb-tests-list.txt)) else - ffxbld_commit=$(git log -500 --format='%an %H' | grep '^ffxbld ' \ - | head -1 | cut -d ' ' -f 2) + ffxbld_commit=$(git log -500 --format='oneline' | grep "TB3: Tor Browser's official .mozconfigs." \ + | head -1 | cut -d ' ' -f 1) tests=($(git diff --name-status "$ffxbld_commit" HEAD | \ grep -e '^[AM].*/test_[^/]\+\.$html\|xul$$' \ @@ -51,7 +51,11 @@ fi rm -f tbb-tests.log echo $'\n''Starting tests' -./mach mochitest --log-tbpl tbb-tests.log --setpref security.nocertdb=false \ +./mach mochitest --log-tbpl tbb-tests.log \ + --setpref network.file.path_blacklist='' \ + --setpref extensions.torbutton.use_nontor_proxy=true \ + --setpref browser.privatebrowsing.autostart=false \ + --setpref security.nocertdb=false \ "${tests[@]}" echo "*************************" diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt new file mode 100644 index 000000000000..f965010a7cd4 --- /dev/null +++ b/tbb-tests-ignore.txt @@ -0,0 +1,14 @@ +browser/extensions/onboarding/test/browser/browser_onboarding_accessibility.js +browser/extensions/onboarding/test/browser/browser_onboarding_keyboard.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_2.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_3.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_4.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_5.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_click_auto_complete_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_select_default_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_skip_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_tours.js +browser/extensions/onboarding/test/browser/browser_onboarding_tourset.js +browser/extensions/onboarding/test/browser/browser_onboarding_uitour.js +

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 32658: Create a new MAR signing key
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit af86953812484a744c8dbe2d6b7a19b3ebbc668d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 8 07:57:34 2021 +0000 fixup! Bug 32658: Create a new MAR signing key Closes #40274. --- .../update/updater/nightly_aurora_level3_primary.der | Bin 1245 -> 1245 bytes .../updater/nightly_aurora_level3_secondary.der | Bin 1245 -> 1245 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der index a3a3077cc574..d579cf801e1a 100644 Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der and b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der differ diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der index d579cf801e1a..7cbfa77d06e7 100644 Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der and b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der differ

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 16620: Clear window.name when no referrer sent
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 7d9caa0c9885ccad847adc065c0bcdb2e418df8d Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Apr 3 21:23:10 2020 +0200 fixup! Bug 16620: Clear window.name when no referrer sent --- docshell/test/mochitest/test_tor_bug16620.html | 5 ++--- docshell/test/mochitest/tor_bug16620.html | 2 +- docshell/test/mochitest/tor_bug16620_form.html | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docshell/test/mochitest/test_tor_bug16620.html b/docshell/test/mochitest/test_tor_bug16620.html index f60a06711c17..46fff5a04711 100644 --- a/docshell/test/mochitest/test_tor_bug16620.html +++ b/docshell/test/mochitest/test_tor_bug16620.html @@ -13,8 +13,7 @@ </head> <body> <a target="_blank" href="https://trac.torproject.org/projects/tor/ticket/16620">Tor Bug 16620</a> -<script type="application/javascript;version=1.7"> - +<script> // ## Test constants const kTestPath = "/tests/docshell/test/mochitest/"; const kLinkFile = "tor_bug16620.html"; @@ -156,7 +155,7 @@ window.addEventListener("message", function(aEvent) { noReferrerOnLink: noReferrerOnLink, noReferrerInMetaTag: noReferrerInMetaTag, resetInUnload: resetInUnload }, - aEvent.origin); + "*"); } else if ("secondDocLoaded" == state) { // Process response from step two of the link-based tests. if (curTest.expectIsolation) { diff --git a/docshell/test/mochitest/tor_bug16620.html b/docshell/test/mochitest/tor_bug16620.html index a8e90502f1d1..26b8e406bbff 100644 --- a/docshell/test/mochitest/tor_bug16620.html +++ b/docshell/test/mochitest/tor_bug16620.html @@ -11,7 +11,7 @@ <body> <a id="link" href="">secondDoc</a> -<script type="application/javascript;version=1.7"> +<script> // Extract test state from our query string, defaulting to // "secondDocLoaded" to support use of this HTML content within // a data URI (where query strings are not supported). diff --git a/docshell/test/mochitest/tor_bug16620_form.html b/docshell/test/mochitest/tor_bug16620_form.html index 3b6e6c72cfc9..279f62e63fab 100644 --- a/docshell/test/mochitest/tor_bug16620_form.html +++ b/docshell/test/mochitest/tor_bug16620_form.html @@ -12,7 +12,7 @@ </head> <body> -<script type="application/javascript;version=1.7"> +<script> document.addEventListener("DOMContentLoaded", function () { addPostTarget(); }, false);

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 0b8a7fa9ab300d4790584a2492f652f8a5c0abb2 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jan 8 21:03:51 2021 +0100 fixup! Bug 12620: TorBrowser regression tests --- tbb-tests/browser_tor_TB4.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js index f08d086e3815..8bb12f360e5e 100644 --- a/tbb-tests/browser_tor_TB4.js +++ b/tbb-tests/browser_tor_TB4.js @@ -1,9 +1,7 @@ // # Test for TB4: Tor Browser's Firefox preference overrides -// Simple regression tests to check the value of each pref and -// decides if it is set as expected. - -// TODO: Write unit tests to check that each pref setting here -// causes the browser to have the desired behavior (a big task). +// This is a minimal test to check whether the 000-tor-browser.js +// pref overrides are being used at all or not. More comprehensive +// pref tests are maintained in the tor-browser-bundle-testsuite project. function test() {

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 23104: Add a default line height compensation
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 7ff72b429066ffa0dff343f6fd1d4aad44d8866d Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Apr 3 21:34:55 2020 +0200 fixup! Bug 23104: Add a default line height compensation --- layout/generic/test/test_tor_bug23104.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/layout/generic/test/test_tor_bug23104.html b/layout/generic/test/test_tor_bug23104.html index ae73a3446037..8ff1d2190c45 100644 --- a/layout/generic/test/test_tor_bug23104.html +++ b/layout/generic/test/test_tor_bug23104.html @@ -17,12 +17,10 @@ <span id="test1">Test1</span> <span id="test2">كلمة</span> <span id="test3">ação</span> -<script type="application/javascript;version=1.7"> +<script> -let setPref = function* (key, value) { - return new Promise(function(resolve, reject) { - SpecialPowers.pushPrefEnv({"set": [[key, value]]}, resolve); - }); +let setPref = async function (key, value) { + await SpecialPowers.pushPrefEnv({"set": [[key, value]]}); } function getStyle(el, styleprop) { @@ -34,12 +32,13 @@ function validateElement(elementName, isFingerprintResistent) { var fontSize = getStyle(elementName, 'font-size'); var lineHeight = getStyle(elementName, 'line-height'); var validationCb = isFingerprintResistent ? is : isnot; - validationCb(parseFloat(lineHeight), parseFloat(fontSize) * 1.2, 'Line Height validation'); + validationCb(parseFloat(lineHeight), Math.round(parseFloat(fontSize)) * 1.2, 'Line Height validation'); } -add_task(function* () { +add_task(async function() { + await setPref("layout.css.line-height.normal-as-resolved-value.enabled", false); for (let resistFingerprintingValue of [true, false]) { - yield setPref("privacy.resistFingerprinting", resistFingerprintingValue); + await setPref("privacy.resistFingerprinting", resistFingerprintingValue); for (let elementId of ['test1', 'test2', 'test3']) { validateElement(elementId, resistFingerprintingValue); }

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 127f980e72fa200be9e88d887ebb8921d2f09c88 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jan 11 15:25:38 2021 +0100 fixup! Bug 12620: TorBrowser regression tests --- run-tbb-tests | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run-tbb-tests b/run-tbb-tests index 1566c37c43cb..bc09839f9f05 100755 --- a/run-tbb-tests +++ b/run-tbb-tests @@ -51,6 +51,9 @@ fi rm -f tbb-tests.log echo $'\n''Starting tests' +# We need `security.nocertdb = false` because of #18087. That pref is +# forced to have the same value as `browser.privatebrowsing.autostart` in +# torbutton, so we just set `browser.privatebrowsing.autostart=false` here. ./mach mochitest --log-tbpl tbb-tests.log \ --setpref network.file.path_blacklist='' \ --setpref extensions.torbutton.use_nontor_proxy=true \

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 2f1ce111ad6e8ee6b189f501576f38ab2d259894 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 12 08:36:12 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 968c2565ceb8..ba38a0f51e25 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 968c2565ceb8417ef026cf639cd5c2e80f6057a4 +Subproject commit ba38a0f51e2556a896feb0baf1fb4fd7f3970c3b

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit ea7eb55e79fd4bd7856efb043540fe62f0331fc8 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 21:05:43 2020 +0100 fixup! Bug 12620: TorBrowser regression tests --- tbb-tests/browser_tor_bug2950.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tbb-tests/browser_tor_bug2950.js b/tbb-tests/browser_tor_bug2950.js index 010cc6356202..add683022d8e 100644 --- a/tbb-tests/browser_tor_bug2950.js +++ b/tbb-tests/browser_tor_bug2950.js @@ -13,19 +13,19 @@ let Ci = Components.interfaces; // ## utility functions -// __uri(spec)__. -// Creates an nsIURI instance from a spec +// __principal(spec)__. +// Creates a principal instance from a spec // (string address such as "http://torproject.org"). -let uri = spec => Services.io.newURI(spec, null, null); +let principal = spec => Services.scriptSecurityManager.createContentPrincipalFromOrigin(spec); // __setPermission(spec, key, value)__. // Sets the site permission of type key to value, for the site located at address spec. -let setPermission = (spec, key, value) => SitePermissions.set(uri(spec), key, value); +let setPermission = (spec, key, value) => SitePermissions.setForPrincipal(principal(spec), key, value); // __getPermission(spec, key)__. // Reads the site permission value for permission type key, for the site // located at address spec. -let getPermission = (spec, key) => SitePermissions.get(uri(spec), key); +let getPermission = (spec, key) => SitePermissions.getForPrincipal(principal(spec), key); // __profileDirPath__. // The Firefox Profile directory. Expected location of various persistent files. @@ -54,12 +54,12 @@ let originalValue = getPermission(SITE, KEY); window.setTimeout( function () { // Set the permission to a new value. - setPermission(SITE, KEY, (originalValue === 0) ? 1 : 0); + setPermission(SITE, KEY, SitePermissions.BLOCK); // Now read back the permission value again. let newReadValue = getPermission(SITE, KEY); // Compare to confirm that the permission // value was successfully changed. - isnot(newReadValue, originalValue, "Set a value in permissions db (perhaps in memory).");; + Assert.notDeepEqual(originalValue, newReadValue, "Set a value in permissions db (perhaps in memory)."); // If file existed or now exists, get the current time stamp. if (permissionsFile.exists()) { newModifiedTime = permissionsFile.lastModifiedTime;

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 9103b99a73dfb13bc5c3490b7d24d86fa386c4e6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 12 08:35:43 2021 +0000 fixup! Bug 12620: TorBrowser regression tests --- tbb-tests-ignore.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt index f965010a7cd4..ee3927a9e7c4 100644 --- a/tbb-tests-ignore.txt +++ b/tbb-tests-ignore.txt @@ -11,4 +11,3 @@ browser/extensions/onboarding/test/browser/browser_onboarding_skip_tour.js browser/extensions/onboarding/test/browser/browser_onboarding_tours.js browser/extensions/onboarding/test/browser/browser_onboarding_tourset.js browser/extensions/onboarding/test/browser/browser_onboarding_uitour.js -

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 08a6ea642852eba3e4cf460cc0c5371d2a485527 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jan 8 16:07:11 2021 +0100 fixup! Bug 12620: TorBrowser regression tests --- run-tbb-tests | 1 - tbb-tests/browser_tor_bug2950.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/run-tbb-tests b/run-tbb-tests index b12e62d942c9..1566c37c43cb 100755 --- a/run-tbb-tests +++ b/run-tbb-tests @@ -55,7 +55,6 @@ echo $'\n''Starting tests' --setpref network.file.path_blacklist='' \ --setpref extensions.torbutton.use_nontor_proxy=true \ --setpref browser.privatebrowsing.autostart=false \ - --setpref security.nocertdb=false \ "${tests[@]}" echo "*************************" diff --git a/tbb-tests/browser_tor_bug2950.js b/tbb-tests/browser_tor_bug2950.js index add683022d8e..16e41344a3c4 100644 --- a/tbb-tests/browser_tor_bug2950.js +++ b/tbb-tests/browser_tor_bug2950.js @@ -15,7 +15,7 @@ let Ci = Components.interfaces; // __principal(spec)__. // Creates a principal instance from a spec -// (string address such as "http://torproject.org"). +// (string address such as "https://www.torproject.org"). let principal = spec => Services.scriptSecurityManager.createContentPrincipalFromOrigin(spec); // __setPermission(spec, key, value)__. @@ -37,7 +37,7 @@ let fileInProfile = fileName => FileUtils.File(profileDirPath + "/" + fileName); // ## Now let's run the test. -let SITE = "http://torproject.org", +let SITE = "https://www.torproject.org", KEY = "popup"; let permissionsFile = fileInProfile("permissions.sqlite"),

1 0