- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 32658: Create a new MAR signing key
by sysrqb＠torproject.org 11 Jan '21

11 Jan '21

commit f88d29a1403b42536de9a13040dda7d9d3a257ad 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-build/master] Bug 40162: Build Fenix instrumented tests apk
by sysrqb＠torproject.org 11 Jan '21

11 Jan '21

commit 7b8f7afa6a079618f6aac691ae002c00ec847c61 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Dec 11 23:13:12 2020 +0100 Bug 40162: Build Fenix instrumented tests apk --- projects/fenix/build | 9 +++++---- projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 2 ++ projects/tor-browser/build.android | 4 ++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index f1536f1..c91dce3 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -37,8 +37,10 @@ cd $builddir-[% c("version") %] cp $rootdir/[% c('input_files_by_name/topl') %]/* app/ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ +# XXX We need the build variant in lower case. Do something smarter here. +v=[% c("variant") %] [% IF c("var/fetch_gradle_dependencies") %] - $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint + $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} [% ELSE %] # Add our localized strings [% FOREACH lang = c('var/locales_mobile'); @@ -63,10 +65,9 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ fi version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])' - $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint - # XXX We need the build variant in lower case. Do something smarter here. - v=[% c("variant") %] + $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] + cp app/build/outputs/apk/androidTest/${v,}/app-${v,}-androidTest.apk $distdir/[% project %] cd $distdir [% c('tar', { diff --git a/projects/fenix/config b/projects/fenix/config index 592972b..cb2bafc 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -14,7 +14,7 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 14 + gradle_dependencies_version: 15 # Switch to make it easier to grab all dependencies during a dry-run. # Note: Use the commit that integrates Tor. fetch_gradle_dependencies: 0 diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index e056e9a..fbd0718 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -461,6 +461,8 @@ dbc2bb04ecb002b9f4046263ccad996f4a3d3c59a0cc98837e300a6700571f7c | https://jcent 4f8992dde784509e80917cabbc8406a7137e5f2ba2c1ae5b7250fc182a45bd88 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/4.9.0/okhttp-4.9.0.… e58c97406a6bb1138893750299ac63c6aa04b38b6b49eae1bfcad1a63ef9ba1b | https://jcenter.bintray.com/com/squareup/okio/okio/2.2.2/okio-2.2.2.jar fd621988f7f6957025735dc6dd090b00a20f3a3bb8d77ca79036077f629b140b | https://jcenter.bintray.com/com/squareup/okio/okio/2.2.2/okio-2.2.2.pom +4496b06e73982fcdd8a5393f46e5df2ce2fa4465df5895454cac68a32f09bbc8 | https://jcenter.bintray.com/com/squareup/okio/okio/2.8.0/okio-2.8.0.jar +26214068fd4c7f437ac8fe8576802a9a9dc151c457582807ad9af2af2e8c9481 | https://jcenter.bintray.com/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom 1d8518e3ac7532a104e4f7be77def37c982e530723c6bdb3d67708cce2b0c2c4 | https://jcenter.bintray.com/com/sun/activation/all/1.2.0/all-1.2.0.pom 993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce | https://jcenter.bintray.com/com/sun/activation/javax.activation/1.2.0/javax… f879b6e945854c6900b0dbee1c8384d7ab3de7e157fd7ac84937405c416d2a5e | https://jcenter.bintray.com/com/sun/activation/javax.activation/1.2.0/javax… diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 71b9d36..e9354bd 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -4,6 +4,8 @@ assets_dir=assets ext_dir=$assets_dir/extensions qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk apk=$rootdir/fenix/app-[% c("var/abi") %]-*.apk +test_out_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-androidTest.apk +test_in_apk=$rootdir/fenix/app-*-androidTest.apk tar xavf $rootdir/[% c('input_files_by_name/fenix') %] @@ -32,3 +34,5 @@ mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json # Sign a QA build. This .apk is not a debug version and doesn't contain a debug # flag in the manifest. java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android + +java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_out_apk --in $test_in_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android

1 0

[tor-browser-build/master] Merge remote-tracking branch 'acatgl/40162+2'
by sysrqb＠torproject.org 11 Jan '21

11 Jan '21

commit cada2163fd6c33e4600dc577751c6f8135c62096 Merge: ae8ab9d 7b8f7af Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jan 11 21:19:44 2021 +0000 Merge remote-tracking branch 'acatgl/40162+2' projects/fenix/build | 9 +++++---- projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 2 ++ projects/tor-browser/build.android | 4 ++++ 4 files changed, 12 insertions(+), 5 deletions(-)

1 0

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

11 Jan '21

commit 71105880483c5629b017c2fca9e7f5c2f551039e 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-78.6.0esr-10.5-1] fixup! Bug 16620: Clear window.name when no referrer sent
by gk＠torproject.org 11 Jan '21

11 Jan '21

commit 0523caa5191c3d976ff034c9ef621096079d89bf 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-78.6.0esr-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 11 Jan '21

11 Jan '21

commit 1bfd61b1fcea926e3050f5a4751299c38feeab93 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 20:55:03 2020 +0100 fixup! Bug 12620: TorBrowser regression tests --- tbb-tests/browser_tor_TB4.js | 141 +++---------------------------------------- 1 file changed, 8 insertions(+), 133 deletions(-) diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js index af688bee0226..f08d086e3815 100644 --- a/tbb-tests/browser_tor_TB4.js +++ b/tbb-tests/browser_tor_TB4.js @@ -3,151 +3,26 @@ // 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). +// causes the browser to have the desired behavior (a big task). function test() { let expectedPrefs = [ - // Disable browser auto updaters and associated homepage notifications - ["app.update.auto", false], - ["app.update.enabled", false], - ["browser.search.update", false], - ["browser.rights.3.shown", true], - ["browser.startup.homepage_override.mstone", "ignore"], - ["startup.homepage_welcome_url", ""], - ["startup.homepage_override_url", ""], + // Homepage + ["browser.startup.homepage", "about:tor"], // Disable the "Refresh" prompt that is displayed for stale profiles. ["browser.disableResetPrompt", true], - // Disk activity: Disable Browsing History Storage - ["browser.privatebrowsing.autostart", true], - ["browser.cache.disk.enable", false], - ["browser.cache.offline.enable", false], - ["dom.indexedDB.enabled", false], - ["permissions.memory_only", true], - ["network.cookie.lifetimePolicy", 2], - ["security.nocertdb", true], - - // Disk activity: TBB Directory Isolation - ["browser.download.useDownloadDir", false], - ["browser.shell.checkDefaultBrowser", false], - ["browser.download.manager.addToRecentDocs", false], - - // Misc privacy: Disk - ["signon.rememberSignons", false], - ["browser.formfill.enable", false], - ["signon.autofillForms", false], - ["browser.sessionstore.privacy_level", 2], - ["media.cache_size", 0], - - // Misc privacy: Remote - ["browser.send_pings", false], - ["geo.enabled", false], - ["geo.wifi.uri", ""], - ["browser.search.suggest.enabled", false], - ["browser.safebrowsing.malware.enabled", false], - ["extensions.ui.lastCategory", "addons://list/extension"], - ["datareporting.healthreport.uploadEnabled", false], - ["datareporting.policy.dataSubmissionEnabled", false], - ["security.mixed_content.block_active_content", false], // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched - ["browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"], // Don't promote sync - ["services.sync.engine.prefs", false], // Never sync prefs, addons, or tabs with other browsers - ["services.sync.engine.addons", false], - ["services.sync.engine.tabs", false], - ["extensions.getAddons.cache.enabled", false], // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ - - // Fingerprinting - ["webgl.min_capability_mode", true], - ["webgl.disable-extensions", true], - ["dom.battery.enabled", false], // fingerprinting due to differing OS implementations - ["browser.display.max_font_attempts",10], - ["browser.display.max_font_count",10], - ["gfx.downloadable_fonts.fallback_delay", -1], - ["browser.startup.homepage_override.buildID", "20100101"], - - // Third party stuff - ["network.cookie.cookieBehavior", 1], - ["security.enable_tls_session_tickets", false], - ["network.http.spdy.enabled", false], // Stores state and may have keepalive issues (both fixable) - ["network.http.spdy.enabled.v2", false], // Seems redundant, but just in case - ["network.http.spdy.enabled.v3", false], // Seems redundant, but just in case - - // Proxy and proxy security - ["network.proxy.socks", "127.0.0.1"], - ["network.proxy.socks_port", 9150], - ["network.proxy.socks_remote_dns", true], - ["network.proxy.no_proxies_on", ""], // For fingerprinting and local service vulns (#10419) - ["network.proxy.type", 1], - ["network.security.ports.banned", "9050,9051,9150,9151"], - ["network.dns.disablePrefetch", true], - ["network.protocol-handler.external-default", false], - ["network.protocol-handler.external.mailto", false], - ["network.protocol-handler.external.news", false], - ["network.protocol-handler.external.nntp", false], - ["network.protocol-handler.external.snews", false], - ["network.protocol-handler.warn-external.mailto", true], - ["network.protocol-handler.warn-external.news", true], - ["network.protocol-handler.warn-external.nntp", true], - ["network.protocol-handler.warn-external.snews", true], - - // Network and performance - ["network.http.pipelining", true], - ["network.http.pipelining.aggressive", true], - ["network.http.pipelining.maxrequests", 12], - ["network.http.pipelining.ssl", true], - ["network.http.proxy.pipelining", true], - ["security.ssl.enable_false_start", true], - ["network.http.keep-alive.timeout", 20], - ["network.http.connection-retry-timeout", 0], - ["network.http.max-persistent-connections-per-proxy", 256], - ["network.http.pipelining.reschedule-timeout", 15000], - ["network.http.pipelining.read-timeout", 60000], - // Hacked pref: Now means "Attempt to pipeline at least this many requests together" - ["network.http.pipelining.max-optimistic-requests", 3], - ["security.disable_session_identifiers", true], - - // Extension support - ["extensions.autoDisableScopes", 0], - ["extensions.bootstrappedAddons", "{}"], - ["extensions.checkCompatibility.4.*", false], - ["extensions.databaseSchema", 3], - ["extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"], - ["extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"], - ["extensions.enabledScopes", 1], - ["extensions.pendingOperations", false], - ["xpinstall.whitelist.add", ""], - ["xpinstall.whitelist.add.36", ""], - - // Omnibox settings - ["keyword.URL", "https://startpage.com/do/search?q="], - - // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? - // Nvida cards also experience crashes without the second pref set to disabled - ["gfx.direct2d.disabled", true], - ["layers.acceleration.disabled", true], - - // Security enhancements - // https://trac.torproject.org/projects/tor/ticket/9387#comment:17 - ["javascript.options.ion.content", false], - ["javascript.options.baselinejit.content", false], - ["javascript.options.asmjs", false], - ["javascript.options.typeinference", false], - - // Enable TLS 1.1 and 1.2: - // https://trac.torproject.org/projects/tor/ticket/11253 - ["security.tls.version.max", 3], - // Version placeholder - ["torbrowser.version", "UNKNOWN"], - + ["torbrowser.version", "dev-build"], ]; let getPref = function (prefName) { - let type = gPrefService.getPrefType(prefName); - if (type === gPrefService.PREF_INT) return gPrefService.getIntPref(prefName); - if (type === gPrefService.PREF_BOOL) return gPrefService.getBoolPref(prefName); - if (type === gPrefService.PREF_STRING) return gPrefService.getCharPref(prefName); + let type = Services.prefs.getPrefType(prefName); + if (type === Services.prefs.PREF_INT) return Services.prefs.getIntPref(prefName); + if (type === Services.prefs.PREF_BOOL) return Services.prefs.getBoolPref(prefName); + if (type === Services.prefs.PREF_STRING) return Services.prefs.getCharPref(prefName); // Something went wrong. throw new Error("Can't access pref " + prefName); };

1 0

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

11 Jan '21

commit af344650cbfb5527c9c6fc67a35eecf4e42a2560 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-78.6.0esr-10.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 11 Jan '21

11 Jan '21

commit 28ea631ca62814105ac9d7b54b006e5a8208d320 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 21:04:52 2020 +0100 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing --- tbb-tests/browser_tor_omnibox.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js index e18b2a84a3d8..f3efd0c3da5e 100644 --- a/tbb-tests/browser_tor_omnibox.js +++ b/tbb-tests/browser_tor_omnibox.js @@ -1,14 +1,14 @@ // # Test Tor Omnibox // Check what search engines are installed in the search box. -function test() { +add_task(async function() { // Grab engine IDs. let browserSearchService = Components.classes["@mozilla.org/browser/search-service;1"] - .getService(Components.interfaces.nsIBrowserSearchService), - engineIDs = browserSearchService.getEngines().map(e => e.identifier); + .getService(Components.interfaces.nsISearchService), + engineIDs = (await browserSearchService.getEngines()).map(e => e.identifier); // Check that we have the correct engines installed, in the right order. is(engineIDs[0], "ddg", "Default search engine is duckduckgo"); is(engineIDs[1], "youtube", "Secondary search engine is youtube"); is(engineIDs[2], "google", "Google is third search engine"); -} +});

1 0

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

11 Jan '21

commit fb5020a53fdf0c63533c4f7dc9697745f7c31163 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

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

11 Jan '21

commit 35ca9a2f3fcc7db381f9516ce570532bc9401717 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