- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bump tor-browser-bundle-testsuite commit
by gk＠torproject.org 16 Oct '20

16 Oct '20

commit e3063faf925e90b329bd97106d98dca9a8dc1a22 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 15 19:44:34 2020 +0000 Bump tor-browser-bundle-testsuite commit --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index 131983e..1e45b1a 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 3 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git -testsuite_git_commit: f87d747ce6dc5eee2bbc2b878203f0fefbb06be7 +testsuite_git_commit: 71bce1264f10e8f184095aad54cf27e81f56a7a4 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 3 commits: fixup! Bug 40026: Integrate Security Level settings
by Matthew Finkel 16 Oct '20

16 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 268e56f4 by Matthew Finkel at 2020-10-14T20:04:47+00:00 fixup! Bug 40026: Integrate Security Level settings Bug 40053: Provide feedback in onboarding Security Level card - - - - - be57d067 by Matthew Finkel at 2020-10-14T20:04:51+00:00 fixup! Bug 40026: Integrate Security Level settings Bug 40082: Use Security Level preference at startup - - - - - e8d4affa by Matthew Finkel at 2020-10-16T01:26:23+00:00 Merge branch 'bug_40053_00' into tor-browser-82.0.0b4-10.0-1 - - - - - 5 changed files: - app/src/main/java/org/mozilla/fenix/components/Core.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - app/src/main/java/org/mozilla/fenix/utils/Settings.kt - app/src/main/res/layout/tor_onboarding_security_level.xml - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -92,7 +92,8 @@ class Core(private val context: Context, private val crashReporter: CrashReporti fontInflationEnabled = context.settings().shouldUseAutoSize, suspendMediaWhenInactive = false, forceUserScalableContent = context.settings().forceEnableZoom, - loginAutofillEnabled = context.settings().shouldAutofillLogins + loginAutofillEnabled = context.settings().shouldAutofillLogins, + torSecurityLevel = context.settings().torSecurityLevel().intRepresentation ) GeckoEngine( ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt ===================================== @@ -69,9 +69,20 @@ class TorOnboardingSecurityLevelViewHolder( safestSecurityLevel.onClickListener { updateSecurityLevel(SecurityLevel.SAFEST) } + + updateSecurityLevel(securityLevel) } private fun updateSecurityLevel(newLevel: SecurityLevel) { + val resources = itemView.context.resources + val securityLevel = when (newLevel) { + SecurityLevel.STANDARD -> resources.getString(R.string.tor_security_level_standard_option) + SecurityLevel.SAFER -> resources.getString(R.string.tor_security_level_safer_option) + SecurityLevel.SAFEST -> resources.getString(R.string.tor_security_level_safest_option) + } + itemView.current_level.text = resources.getString( + R.string.tor_onboarding_chosen_security_level_label, securityLevel + ) itemView.context.components.let { it.core.engine.settings.torSecurityLevel = newLevel.intRepresentation } ===================================== app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -40,6 +40,7 @@ import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitTyp import org.mozilla.fenix.settings.logins.SavedLoginsSortingStrategyMenu import org.mozilla.fenix.settings.logins.SortingStrategy import org.mozilla.fenix.settings.registerOnSharedPreferenceChangeListener +import org.mozilla.fenix.tor.SecurityLevel import java.security.InvalidParameterException private const val AUTOPLAY_USER_SETTING = "AUTOPLAY_USER_SETTING" @@ -176,6 +177,33 @@ class Settings(private val appContext: Context) : PreferencesHolder { true ) + var standardSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.STANDARD.preferenceKey), + default = true + ) + + var saferSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.SAFER.preferenceKey), + default = false + ) + + var safestSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.SAFEST.preferenceKey), + default = false + ) + + // torSecurityLevel is defined as the first |true| preference, + // beginning at the safest level. + // If multiple preferences are true, then that is a bug and the + // highest |true| security level is chosen. + // Standard is the default level. + fun torSecurityLevel(): SecurityLevel = when { + safestSecurityLevel -> SecurityLevel.SAFEST + saferSecurityLevel -> SecurityLevel.SAFER + standardSecurityLevel -> SecurityLevel.STANDARD + else -> SecurityLevel.STANDARD + } + // If any of the prefs have been modified, quit displaying the fenix moved tip fun shouldDisplayFenixMovingTip(): Boolean = preferences.getBoolean( ===================================== app/src/main/res/layout/tor_onboarding_security_level.xml ===================================== @@ -32,9 +32,18 @@ android:textAppearance="@style/Body14TextStyle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/header_text" + app:layout_constraintTop_toBottomOf="@id/current_level" tools:text="@string/tor_onboarding_security_level_description" /> + <TextView + android:id="@+id/current_level" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/header_text" + tools:text="@string/tor_onboarding_chosen_security_level_label" /> <org.mozilla.fenix.onboarding.OnboardingRadioButton android:id="@+id/security_level_standard_option" ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -20,6 +20,7 @@ <string name="tor_onboarding_security_level">Set your Security Level</string> <string name="tor_onboarding_security_level_description">Disable certain web features that can be used to attack you, and harm your security, anonymity, and privacy.</string> + <string name="tor_onboarding_chosen_security_level_label">Current Security Level: %s</string> <string name="tor_onboarding_security_settings_button">Open Security Settings</string> <string name="tor_onboarding_donate_header">Donate and keep Tor safe</string> <string name="tor_onboarding_donate_description">Tor is free to use because of donations from people like you.</string> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/15968de01cbf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/15968de01cbf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40131: Remove unused binutils patches
by sysrqb＠torproject.org 15 Oct '20

15 Oct '20

commit 0d8484271a1eb7838bd4145e256231fbdb84bd72 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 14 09:16:34 2020 +0000 Bug 40131: Remove unused binutils patches --- projects/binutils/64bit-fixups.patch | 60 ------- projects/binutils/enable-reloc-section-ld.patch | 219 ------------------------ 2 files changed, 279 deletions(-) diff --git a/projects/binutils/64bit-fixups.patch b/projects/binutils/64bit-fixups.patch deleted file mode 100644 index 7dc1294..0000000 --- a/projects/binutils/64bit-fixups.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 05164a1162d5f6f696d7f7c4b1bc61ef06d1c288 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Tue, 12 Sep 2017 07:21:16 +0000 -Subject: [PATCH] 64bit fixups - ---- - ld/emultempl/pep.em | 4 ++-- - ld/pep-dll.c | 1 + - ld/pep-dll.h | 1 + - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index fccbd63..f7c0a57 100644 ---- a/ld/emultempl/pep.em -+++ b/ld/emultempl/pep.em -@@ -742,7 +742,7 @@ gld${EMULATION_NAME}_handle_option (int optc) - pep_dll_exclude_all_symbols = 1; - break; - case OPTION_ENABLE_RELOC_SECTION: -- pe_dll_enable_reloc_section = 1; -+ pep_dll_enable_reloc_section = 1; - break; - case OPTION_EXCLUDE_LIBS: - pep_dll_add_excludes (optarg, EXCLUDELIBS); -@@ -1862,7 +1862,7 @@ gld_${EMULATION_NAME}_finish (void) - #ifdef DLL_SUPPORT - if (bfd_link_pic (&link_info) - || (!bfd_link_relocatable (&link_info) -- && pe_dll_enable_reloc_section) -+ && pep_dll_enable_reloc_section) - || (!bfd_link_relocatable (&link_info) - && pep_def_file->num_exports != 0)) - { -diff --git a/ld/pep-dll.c b/ld/pep-dll.c -index b8c017f..5ad5733 100644 ---- a/ld/pep-dll.c -+++ b/ld/pep-dll.c -@@ -31,6 +31,7 @@ - #define pe_dll_export_everything pep_dll_export_everything - #define pe_dll_exclude_all_symbols pep_dll_exclude_all_symbols - #define pe_dll_do_default_excludes pep_dll_do_default_excludes -+#define pe_dll_enable_reloc_section pep_dll_enable_reloc_section - #define pe_dll_kill_ats pep_dll_kill_ats - #define pe_dll_stdcall_aliases pep_dll_stdcall_aliases - #define pe_dll_warn_dup_exports pep_dll_warn_dup_exports -diff --git a/ld/pep-dll.h b/ld/pep-dll.h -index 0a27c1f..95d9c15 100644 ---- a/ld/pep-dll.h -+++ b/ld/pep-dll.h -@@ -31,6 +31,7 @@ extern def_file * pep_def_file; - extern int pep_dll_export_everything; - extern int pep_dll_exclude_all_symbols; - extern int pep_dll_do_default_excludes; -+extern int pep_dll_enable_reloc_section; - extern int pep_dll_kill_ats; - extern int pep_dll_stdcall_aliases; - extern int pep_dll_warn_dup_exports; --- -2.1.4 - diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch deleted file mode 100644 index a6600c3..0000000 --- a/projects/binutils/enable-reloc-section-ld.patch +++ /dev/null @@ -1,219 +0,0 @@ -From fba503a78c50d6134943245d55e820f53e8f19cd Mon Sep 17 00:00:00 2001 -From: Erinn Clark <erinn(a)torproject.org> -Date: Fri, 8 Aug 2014 14:23:44 -0400 -Subject: [PATCH] add relocation section so Windows bundles can have ASLR - -Patch by skruffy. ---- - ld/emultempl/pe.em | 7 ++++++ - ld/emultempl/pep.em | 11 ++++++++-- - ld/pe-dll.c | 63 ++++++++++++++++++++++++++++++----------------------- - ld/pe-dll.h | 1 + - 4 files changed, 53 insertions(+), 29 deletions(-) - -diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 339b7c5..3958b81 100644 ---- a/ld/emultempl/pe.em -+++ b/ld/emultempl/pe.em -@@ -272,6 +272,7 @@ fragment <<EOF - #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) - #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) - #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) - - static void - gld${EMULATION_NAME}_add_options -@@ -315,6 +316,7 @@ gld${EMULATION_NAME}_add_options - {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, - {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, - {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, -+ {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION}, - {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, - {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, - {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -782,6 +784,9 @@ gld${EMULATION_NAME}_handle_option (int optc) - case OPTION_EXCLUDE_ALL_SYMBOLS: - pe_dll_exclude_all_symbols = 1; - break; -+ case OPTION_ENABLE_RELOC_SECTION: -+ pe_dll_enable_reloc_section = 1; -+ break; - case OPTION_EXCLUDE_LIBS: - pe_dll_add_excludes (optarg, EXCLUDELIBS); - break; -@@ -2076,6 +2081,8 @@ gld_${EMULATION_NAME}_finish (void) - #if !defined(TARGET_IS_shpe) - || (!bfd_link_relocatable (&link_info) - && pe_def_file->num_exports != 0) -+ || (!bfd_link_relocatable (&link_info) -+ && pe_dll_enable_reloc_section) - #endif - ) - { -diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index c253d2f..fccbd63 100644 ---- a/ld/emultempl/pep.em -+++ b/ld/emultempl/pep.em -@@ -246,7 +246,8 @@ enum options - OPTION_INSERT_TIMESTAMP, - OPTION_NO_INSERT_TIMESTAMP, - OPTION_TERMINAL_SERVER_AWARE, -- OPTION_BUILD_ID -+ OPTION_BUILD_ID, -+ OPTION_ENABLE_RELOC_SECTION - }; - - static void -@@ -288,6 +289,7 @@ gld${EMULATION_NAME}_add_options - {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, - {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, - {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, -+ {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION}, - {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, - {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, - {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -739,6 +741,9 @@ gld${EMULATION_NAME}_handle_option (int optc) - case OPTION_EXCLUDE_ALL_SYMBOLS: - pep_dll_exclude_all_symbols = 1; - break; -+ case OPTION_ENABLE_RELOC_SECTION: -+ pe_dll_enable_reloc_section = 1; -+ break; - case OPTION_EXCLUDE_LIBS: - pep_dll_add_excludes (optarg, EXCLUDELIBS); - break; -@@ -1857,7 +1862,9 @@ gld_${EMULATION_NAME}_finish (void) - #ifdef DLL_SUPPORT - if (bfd_link_pic (&link_info) - || (!bfd_link_relocatable (&link_info) -- && pep_def_file->num_exports != 0)) -+ && pe_dll_enable_reloc_section) -+ || (!bfd_link_relocatable (&link_info) -+ && pep_def_file->num_exports != 0)) - { - pep_dll_fill_sections (link_info.output_bfd, &link_info); - if (command_line.out_implib_filename) -diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index c398f23..3797f1a 100644 ---- a/ld/pe-dll.c -+++ b/ld/pe-dll.c -@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; - int pe_dll_export_everything = 0; - int pe_dll_exclude_all_symbols = 0; - int pe_dll_do_default_excludes = 1; -+int pe_dll_enable_reloc_section = 0; - int pe_dll_kill_ats = 0; - int pe_dll_stdcall_aliases = 0; - int pe_dll_warn_dup_exports = 0; -@@ -3430,8 +3431,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) - process_def_file_and_drectve (abfd, info); - - if (pe_def_file->num_exports == 0 && !bfd_link_pic (info)) -- return; -- -+ { -+ if (pe_dll_enable_reloc_section) -+ { -+ build_filler_bfd (0); -+ pe_output_file_set_long_section_names (filler_bfd); -+ } -+ return; -+ } -+ - generate_edata (abfd, info); - build_filler_bfd (1); - pe_output_file_set_long_section_names (filler_bfd); -@@ -3446,13 +3454,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) - pe_output_file_set_long_section_names (filler_bfd); - } - --void --pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) -+static void -+pe_dll_create_reloc (bfd *abfd, struct bfd_link_info *info) - { -- pe_dll_id_target (bfd_get_target (abfd)); -- pe_output_file_set_long_section_names (abfd); -- image_base = pe_data (abfd)->pe_opthdr.ImageBase; -- - generate_reloc (abfd, info); - if (reloc_sz > 0) - { -@@ -3469,38 +3473,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) - lang_do_assignments (lang_final_phase_enum); - } - -- fill_edata (abfd, info); -- -- if (bfd_link_dll (info)) -- pe_data (abfd)->dll = 1; -- -- edata_s->contents = edata_d; - reloc_s->contents = reloc_d; - } - - void --pe_exe_fill_sections (bfd *abfd, struct bfd_link_info *info) -+pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) - { -+ if (!reloc_s && !edata_s) -+ return; - pe_dll_id_target (bfd_get_target (abfd)); - pe_output_file_set_long_section_names (abfd); - image_base = pe_data (abfd)->pe_opthdr.ImageBase; - -- generate_reloc (abfd, info); -- if (reloc_sz > 0) -+ if (reloc_s) -+ pe_dll_create_reloc (abfd, info); -+ -+ if (edata_s) - { -- bfd_set_section_size (filler_bfd, reloc_s, reloc_sz); -+ fill_edata (abfd, info); -+ edata_s->contents = edata_d; -+ } - -- /* Resize the sections. */ -- lang_reset_memory_regions (); -- lang_size_sections (NULL, TRUE); -+ if (bfd_link_pic (info) && !bfd_link_pie (info)) -+ pe_data (abfd)->dll = 1; - -- /* Redo special stuff. */ -- ldemul_after_allocation (); - -- /* Do the assignments again. */ -- lang_do_assignments (lang_final_phase_enum); -- } -- reloc_s->contents = reloc_d; -+} -+ -+void -+pe_exe_fill_sections (bfd *abfd, struct bfd_link_info *info) -+{ -+ if (!reloc_s) -+ return; -+ pe_dll_id_target (bfd_get_target (abfd)); -+ pe_output_file_set_long_section_names (abfd); -+ image_base = pe_data (abfd)->pe_opthdr.ImageBase; -+ -+ pe_dll_create_reloc (abfd, info); - } - - bfd_boolean -diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 48d169b..05ff72b 100644 ---- a/ld/pe-dll.h -+++ b/ld/pe-dll.h -@@ -30,6 +30,7 @@ extern def_file *pe_def_file; - extern int pe_dll_export_everything; - extern int pe_dll_exclude_all_symbols; - extern int pe_dll_do_default_excludes; -+extern int pe_dll_enable_reloc_section; - extern int pe_dll_kill_ats; - extern int pe_dll_stdcall_aliases; - extern int pe_dll_warn_dup_exports; --- -2.1.4 -

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 4 commits: fixup! Bug 40058: Hide option for disallowing addon in private mode
by Matthew Finkel 15 Oct '20

15 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 8031e181 by Alex Catarineu at 2020-10-15T13:11:10+02:00 fixup! Bug 40058: Hide option for disallowing addon in private mode Fixes #40086: Disabling/Enabling addon still shows option to disallow in private mode. - - - - - 53ea7a05 by Alex Catarineu at 2020-10-15T17:30:46+02:00 fixup! Bug 40028: Implement Tor Service controller Part of #40078 fix. - - - - - 10fcc45a by Matthew Finkel at 2020-10-15T20:41:28+00:00 Merge remote-tracking branch 'acatgl/40078+1' into tor-browser-82.0.0b4-10.0-1 - - - - - 15968de0 by Matthew Finkel at 2020-10-15T20:42:44+00:00 Merge remote-tracking branch 'acatgl/40086' into tor-browser-82.0.0b4-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - app/src/main/java/org/mozilla/fenix/tor/TorController.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt ===================================== @@ -113,7 +113,7 @@ class InstalledAddonDetailsFragment : Fragment() { runIfFragmentIsAttached { this.addon = it switch.isClickable = true - privateBrowsingSwitch.isVisible = it.isEnabled() + privateBrowsingSwitch.isVisible = false privateBrowsingSwitch.isChecked = it.isAllowedInPrivateBrowsing() switch.setText(R.string.mozac_feature_addons_enabled) view.settings.isVisible = shouldSettingsBeVisible() ===================================== app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -119,13 +119,6 @@ class TorController( Prefs.setBridgesList(value) } - init { - // Bug 40040: Hacky: Initialize TorService when we are instantiated. This should - // help avoid a race condition involving copying assets and starting tor in TorService. - val torServiceStatus = Intent(context, TorService::class.java) - context.startService(torServiceStatus) - } - fun start() { // Register receiver lbm.registerReceiver( View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/460d5891f278… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/460d5891f278… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-78.4.0esr-10.0-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 15 Oct '20

15 Oct '20

commit 301b7a0134ec3f28f49ce87952d19e0805917a45 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 15 20:30:12 2020 +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 dd24967b1bb8..ad7c0b884586 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit dd24967b1bb89e83b656a22ff887eff81946be45 +Subproject commit ad7c0b884586f5d1f3cc8e9223ae806f77ca05af

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 15 Oct '20

15 Oct '20

commit ad7c0b884586f5d1f3cc8e9223ae806f77ca05af Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 15 20:27:15 2020 +0000 Translations update --- chrome/locale/es-AR/aboutTor.dtd | 2 +- chrome/locale/he/aboutTor.dtd | 4 ++-- chrome/locale/mk/aboutTor.dtd | 2 +- chrome/locale/nl/aboutTor.dtd | 2 +- chrome/locale/pt-BR/aboutTor.dtd | 2 +- chrome/locale/th/browserOnboarding.properties | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd index ce843db0..c86c5eb8 100644 --- a/chrome/locale/es-AR/aboutTor.dtd +++ b/chrome/locale/es-AR/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Doná ahora">  -<!ENTITY aboutTor.ey2020.useamask "Usá un tapaboca, usá Tor."> +<!ENTITY aboutTor.ey2020.useamask "Usa un tapaboca, usa Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Resistí a la pandemia de vigilancia."> diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd index 90c2e8f0..be1a52eb 100644 --- a/chrome/locale/he/aboutTor.dtd +++ b/chrome/locale/he/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">  -<!ENTITY aboutTor.ey2020.useamask "שים מסיכה, שים Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "התנגד למגפת המעקב הסמוי."> +<!ENTITY aboutTor.ey2020.useamask "שימו מסכה, שימו Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "התנגדו למגפת הריגול."> diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd index 67a47e79..0ff2075f 100644 --- a/chrome/locale/mk/aboutTor.dtd +++ b/chrome/locale/mk/aboutTor.dtd @@ -32,4 +32,4 @@  <!ENTITY aboutTor.ey2020.useamask "Користи маска, користи Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Спротистави се на надзорот за време на пандемијата."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Спротивстави се на надзорот за време на пандемијата."> diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index b191f724..252902a9 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -32,4 +32,4 @@  <!ENTITY aboutTor.ey2020.useamask "Gebruik een masker, gebruik Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Weersta de surveillancepandemie."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Wees bestand tegen de surveillancepandemie."> diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd index 55f1000d..1ba8a0bb 100644 --- a/chrome/locale/pt-BR/aboutTor.dtd +++ b/chrome/locale/pt-BR/aboutTor.dtd @@ -32,5 +32,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Doe Agora">  -<!ENTITY aboutTor.ey2020.useamask "Use uma máscara, use Tor."> +<!ENTITY aboutTor.ey2020.useamask "Use uma mascara, use Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Resista à pandemia de vigilância."> diff --git a/chrome/locale/th/browserOnboarding.properties b/chrome/locale/th/browserOnboarding.properties index 1ae6bafc..d216d3cf 100644 --- a/chrome/locale/th/browserOnboarding.properties +++ b/chrome/locale/th/browserOnboarding.properties @@ -16,7 +16,7 @@ onboarding.tour-tor-network=เครือข่าย Tor onboarding.tour-tor-network.title=นำทางเพื่อกระจายเครือข่าย onboarding.tour-tor-network.description=Tor Browser เชื่อมต่อคุณเข้ากับเครือข่าย Tor ที่ทำงานโดยอาสาสมัครกว่าพันคนทั่วโลก Tor Browser ต่างจาก VPN เพราะไม่มีใครสามารถระบุความผิดพลาดหรือหน่วยงานกลางได้ คุณต้องไว้วางใจเพื่อความเพลิดเพลินในการใช้อินเทอร์เน็ตอย่างเป็นส่วนตัว onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.action-button=ปรับแต่งการตั้งค่าเครือข่าย Tor ของคุณ onboarding.tour-tor-network.button=ไปที่วงจรหน้าจอ onboarding.tour-tor-circuit-display=วงจรหน้าจอ

1 0

[tor-browser-bundle-testsuite/master] Bug 32537: Update marionette version
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit b21127c7a42e0855ef56cf70c777e0adc451cc60 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 11 14:00:37 2020 +0200 Bug 32537: Update marionette version Also check for virtualenv2, as in some systems virtualenv is the Python3 one, and remove code for https://bugzilla.mozilla.org/show_bug.cgi?id=1345274 workaround. --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 +- marionette/setup.py | 7 ++----- setup-virtualenv | 13 ++++--------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index cf580f0..44c800e 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -826,7 +826,7 @@ sub marionette_run { $test->{screenshots} = []; my $screenshots_tmp = File::Temp::newdir('XXXXXX', DIR => $options->{tmpdir}); $ENV{'MARIONETTE_SCREENSHOTS'} = winpath($screenshots_tmp); - system(xvfb_run($test), "$FindBin::Bin/virtualenv-marionette-4.3.0/$bin/tor-browser-tests", + system(xvfb_run($test), "$FindBin::Bin/virtualenv-marionette-5.0.0/$bin/tor-browser-tests", '--log-unittest', winpath($result_file_txt), '--log-html', winpath($result_file_html), '--binary', ffbin_path($tbbinfos, $test), diff --git a/marionette/setup.py b/marionette/setup.py index 13970e8..78f4522 100644 --- a/marionette/setup.py +++ b/marionette/setup.py @@ -3,11 +3,8 @@ from setuptools import setup, find_packages PACKAGE_VERSION = '0.3' deps = [ - 'marionette_harness == 4.3.0', - 'marionette_driver == 2.5.0', - 'mozfile == 1.2', - 'mozinfo == 0.8', - 'mozlog == 3.0', + 'marionette_harness == 5.0.0', + 'marionette_driver == 3.0.0', ] setup(name='tor-browser-tests', diff --git a/setup-virtualenv b/setup-virtualenv index b3a412f..f0c6288 100755 --- a/setup-virtualenv +++ b/setup-virtualenv @@ -5,6 +5,8 @@ use File::Copy; use IO::CaptureOutput qw(qxx); use Cwd; use English; +use lib $FindBin::Bin; +use TBBTestSuite::Common qw(has_bin); sub winpath { return $_[0] unless $OSNAME eq 'cygwin'; @@ -13,7 +15,7 @@ sub winpath { return $res; } -my $virtenv_marionette_dir = winpath("$FindBin::Bin/virtualenv-marionette-4.3.0"); +my $virtenv_marionette_dir = winpath("$FindBin::Bin/virtualenv-marionette-5.0.0"); my $virtenv_pefile_dir = winpath("$FindBin::Bin/virtualenv-pefile"); sub run { @@ -28,7 +30,7 @@ sub run_from_dir { return $res; } -my $virtualenv_cmd = 'virtualenv'; +my $virtualenv_cmd = has_bin('virtualenv2') ? 'virtualenv2' : 'virtualenv'; my $bin = 'bin'; my $lib = 'lib'; if ($OSNAME eq 'cygwin') { @@ -45,13 +47,6 @@ unless (-d $virtenv_marionette_dir) { run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'pip'); run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'setuptools'); run_from_dir('marionette', "$virtenv_marionette_dir/$bin/python", 'setup.py', 'develop'); - # Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1345274 - my $sitepackage = 'site-packages/marionette_harness-4.3.0-py2.7.egg/marionette_harness/runner/'; - my $marionette_runner_dir = "$virtenv_marionette_dir/$lib/python2.7/$sitepackage"; - $marionette_runner_dir = "$virtenv_marionette_dir/$lib/$sitepackage" - unless -d $marionette_runner_dir; - copy "$FindBin::Bin/data/marionette_certs/test.cert", $marionette_runner_dir; - copy "$FindBin::Bin/data/marionette_certs/test.key", $marionette_runner_dir; } if ($OSNAME eq 'cygwin') {

1 0

[tor-browser-bundle-testsuite/master] Fix url for screenshot test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 6891edfe6228654940808a93fd36bfa6d24ae935 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri May 15 13:47:01 2020 +0200 Fix url for screenshot test --- marionette/tor_browser_tests/test_screenshots.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marionette/tor_browser_tests/test_screenshots.py b/marionette/tor_browser_tests/test_screenshots.py index 3e3a089..b7cc3d6 100755 --- a/marionette/tor_browser_tests/test_screenshots.py +++ b/marionette/tor_browser_tests/test_screenshots.py @@ -13,7 +13,7 @@ class Test(MarionetteTestCase): self.ts = ts self.URLs = [ - 'chrome://torlauncher/content/network-settings-wizard.xul', + 'chrome://torlauncher/content/network-settings-wizard.xhtml', ]; def test_check_tpo(self):

1 0

[tor-browser-bundle-testsuite/master] Bug 34189: Fix the settings test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit f4b6d697a47c2b7d856f626363152777126369ad Author: Alex Catarineu <acat(a)torproject.org> Date: Tue May 12 12:33:57 2020 +0200 Bug 34189: Fix the settings test --- marionette/tor_browser_tests/test_settings.py | 98 ++++----------------------- 1 file changed, 15 insertions(+), 83 deletions(-) diff --git a/marionette/tor_browser_tests/test_settings.py b/marionette/tor_browser_tests/test_settings.py index 97918d2..b0a9be4 100644 --- a/marionette/tor_browser_tests/test_settings.py +++ b/marionette/tor_browser_tests/test_settings.py @@ -17,7 +17,7 @@ class Test(MarionetteTestCase): # This variable contains settings we want to check on all versions of # Tor Browser. See below for settings to check on specific versions. # - # Most of the following checks and comments are taken from + # Most of the following checks and comments are taken from # https://github.com/arthuredelstein/tor-browser/blob/12620/tbb-tests/browser… self.SETTINGS = { "privacy.clearOnShutdown.cache": True, @@ -27,9 +27,6 @@ class Test(MarionetteTestCase): "privacy.clearOnShutdown.history": True, "privacy.clearOnShutdown.sessions": True, - # #16632 : Turn on the background autoupdater - "app.update.auto": True, - "browser.search.update": False, "browser.rights.3.shown": True, @@ -41,10 +38,8 @@ class Test(MarionetteTestCase): "browser.privatebrowsing.autostart": True, "browser.cache.disk.enable": False, "browser.cache.offline.enable": False, - "dom.indexedDB.enabled": True, "permissions.memory_only": True, "network.cookie.lifetimePolicy": 2, - "browser.download.manager.retention": 1, "security.nocertdb": True, # Disk activity: TBB Directory Isolation @@ -61,44 +56,30 @@ class Test(MarionetteTestCase): # Misc privacy: Remote "browser.send_pings": False, "geo.enabled": False, - "geo.wifi.uri": "", + "geo.provider.network.url": "", "browser.search.suggest.enabled": False, - "browser.safebrowsing.enabled": False, + "browser.safebrowsing.phishing.enabled": False, "browser.safebrowsing.malware.enabled": False, - "browser.download.manager.scanWhenDone": False, # prevents AV remote reporting of downloads "extensions.ui.lastCategory": "addons://list/extension", - "datareporting.healthreport.service.enabled": False, # Yes, all three of these must be set "datareporting.healthreport.uploadEnabled": False, "datareporting.policy.dataSubmissionEnabled": False, "security.mixed_content.block_active_content": True, # Activated with bug #21323 - # Don't fetch a localized remote page that Tor Browser interacts with, see - # #16727. And, yes, it is "reportUrl" and not "reportURL". - "datareporting.healthreport.about.reportUrl": "data:text/plain,", - "datareporting.healthreport.about.reportUrlUnified": "data:text/plain,", - # Make sure Unified Telemetry is really disabled, see: #18738. "toolkit.telemetry.unified": False, - "toolkit.telemetry.enabled": False, - # No experiments, use Tor Browser. See 21797. - "experiments.enabled": False, - "browser.syncPromoViewsLeftMap": "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}", # Don't promote sync + "toolkit.telemetry.enabled": True if ts.t["tbbinfos"]["version"].startswith("tbb-nightly") else False, "identity.fxaccounts.enabled": False, # Disable sync by default "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/ - "browser.newtabpage.preload": False, # Bug 16316 - Avoid potential confusion over tiles for now. - "browser.search.countryCode": "US", # The next three prefs disable GeoIP search lookups (#16254) "browser.search.region": "US", "browser.search.geoip.url": "", "browser.fixup.alternate.enabled": False, # Bug #16783: Prevent .onion fixups # Make sure there is no Tracking Protection active in Tor Browser, see: #17898. "privacy.trackingprotection.pbmode.enabled": False, - # Disable the Pocket extension (Bug #18886) - "browser.pocket.enabled": False, - "browser.pocket.api": "", - "browser.pocket.site": "", + # Disable the Pocket extension (Bug #18886 and #31602) + "extensions.pocket.enabled": False, "network.http.referer.hideOnionSource": True, # Fingerprinting @@ -106,45 +87,20 @@ class Test(MarionetteTestCase): "webgl.disable-fail-if-major-performance-caveat": True, "webgl.enable-webgl2": False, "gfx.downloadable_fonts.fallback_delay": -1, - "general.appname.override": "Netscape", - "general.appversion.override": "5.0 (Windows)", - "general.oscpu.override": "Windows NT 6.1", - "general.platform.override": "Win32", - "general.productSub.override": "20100101", - "general.buildID.override": "20100101", "browser.startup.homepage_override.buildID": "20100101", - "general.useragent.vendor": "", - "general.useragent.vendorSub": "", - "dom.enable_performance": False, - "plugin.expose_full_path": False, - "browser.zoom.siteSpecific": False, - "intl.charset.default": "windows-1252", "browser.link.open_newwindow.restriction": 0, # Bug 9881: Open popups in new tabs (to avoid fullscreen popups) - "dom.gamepad.enabled": False, # bugs.torproject.org/13023 - # Disable video statistics fingerprinting vector (bug 15757) - "media.video_stats.enabled": False, # Set video VP9 to 0 for everyone (bug 22548) "media.benchmark.vp9.threshold": 0, - # Disable device sensors as possible fingerprinting vector (bug 15758) - "device.sensors.enabled": False, "dom.enable_resource_timing": False, # Bug 13024: To hell with this API - "dom.enable_user_timing": False, # Bug 16336: To hell with this API "privacy.resistFingerprinting": True, "privacy.resistFingerprinting.block_mozAddonManager": True, # Bug 26114 - "dom.event.highrestimestamp.enabled": True, # Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks - "privacy.suppressModifierKeyEvents": True, # Bug #17009: Suppress ALT and SHIFT events" - "ui.use_standins_for_native_colors": True, # https://bugzilla.mozilla.org/232227 - "privacy.use_utc_timezone": True, - "media.webspeech.synth.enabled": False, # Bug 10283: Disable SpeechSynthesis API "dom.webaudio.enabled": False, # Bug 13017: Disable Web Audio API - "dom.maxHardwareConcurrency": 1, # Bug 21675: Spoof single-core cpu "dom.w3c_touch_events.enabled": 0, # Bug 10286: Always disable Touch API "dom.w3c_pointer_events.enabled": False, "dom.vr.enabled": False, # Bug 21607: Disable WebVR for now # Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) "security.webauth.webauthn": False, # Bug 26614: Disable Web Authentication API for now - "browser.cache.frecency_experiment": -1, - + # Third party stuff "network.cookie.cookieBehavior": 1, "privacy.firstparty.isolate": True, @@ -167,8 +123,7 @@ class Test(MarionetteTestCase): "network.protocol-handler.warn-external.news": True, "network.protocol-handler.warn-external.nntp": True, "network.protocol-handler.warn-external.snews": True, - "plugins.click_to_play": True, - "plugin.state.flash": 1, + "plugin.state.flash": 0, "media.peerconnection.enabled": False, # Disable WebRTC interfaces # Disables media devices but only if `media.peerconnection.enabled` is set to # `false` as well. (see bug 16328 for this defense-in-depth measure) @@ -187,18 +142,13 @@ class Test(MarionetteTestCase): # --disable-eme (which we do), we disable all of them here as well for defense # in depth. "browser.eme.ui.enabled": False, - "media.gmp-eme-adobe.visible": False, - "media.gmp-eme-adobe.enabled": False, "media.gmp-widevinecdm.visible": False, "media.gmp-widevinecdm.enabled": False, "media.eme.enabled": False, - "media.eme.apiVisible": False, # WebIDE can bypass proxy settings for remote debugging. It also downloads # some additional addons that we have not reviewed. Turn all that off. - "devtools.webide.autoinstallADBHelper": False, - "devtools.webide.autoinstallFxdtAdapters": False, + "devtools.webide.autoinstallADBExtension": False, "devtools.webide.enabled": False, - "devtools.appmanager.enabled": False, # The in-browser debugger for debugging chrome code is not coping with our # restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as # a workaround. See bug 16523 for more details. @@ -225,8 +175,6 @@ class Test(MarionetteTestCase): "extensions.autoDisableScopes": 0, "extensions.bootstrappedAddons": "{}", "extensions.checkCompatibility.4.*": False, - "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,tor-launcher%40torproject.org:0.1.1pre-alpha,%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 is set to 5 by marionette_driver #"extensions.enabledScopes": 1, "extensions.pendingOperations": False, @@ -236,25 +184,13 @@ class Test(MarionetteTestCase): # don't want to have some random Google Analytics script running either on the # about:addons page, see bug 22073 and 22900. "extensions.getAddons.showPane": False, - # Show our legacy extensions directly on about:addons and get rid of the - # warning for the default theme. - "extensions.legacy.exceptions": "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org,tor-launcher@torproject.org", # Bug 26114: Allow NoScript to access addons.mozilla.org etc. "extensions.webextensions.restrictedDomains": "", - # Audio_data is deprecated in future releases, but still present - # in FF24. This is a dangerous combination (spotted by iSec) - "media.audio_data.enabled": False, - "dom.enable_resource_timing": False, - # If true, remote JAR files will not be opened, regardless of content type - # Patch written by Jeff Gibat (iSEC). - "network.jar.block-remote-files": True, - # Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: # https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ - "security.tls.unrestricted_rc4_fallback": False, # Enforce certificate pinning, see: https://bugs.torproject.org/16206 "security.cert_pinning.enforcement_level": 2, @@ -262,11 +198,7 @@ class Test(MarionetteTestCase): # Don't allow MitM via Microsoft Family Safety, see bug 21686 "security.family_safety.mode": 0, - # Enforce SHA1 deprecation, see: bug 18042. - "security.pki.sha1_enforcement_level": 2, - # Disable the language pack signing check for now, see: bug 26465 - "extensions.langpacks.signatures.required": False, # Avoid report TLS errors to Mozilla. We might want to repurpose this feature # one day to help detecting bad relays (which is bug 19119). For now we just @@ -283,14 +215,14 @@ class Test(MarionetteTestCase): # checking torbrowser.version match the version from the filename "torbrowser.version": ts.t["tbbinfos"]["version"], - - # Disable device sensors as possible fingerprinting vector (bug 15758) - "device.sensors.enabled": False, - # Disable video statistics fingerprinting vector (bug 15757) - "media.video_stats.enabled": False, "startup.homepage_override_url": "https://blog.torproject.org/category/tags/tor-browser", - "network.jar.block-remote-files": True, + + # Disable network information API everywhere + # but, alas, the behavior is inconsistent across platforms, see: + # https://trac.torproject.org/projects/tor/ticket/27268#comment:19. We should + # not leak that difference if possible. + "dom.netinfo.enabled": False, } # Settings for the Tor Browser 8.0

1 0

[tor-browser-bundle-testsuite/master] Fix dom-objects-enumeration tests
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 36cc780d129bd7cb9a1f47d5039918f9f759488a Author: Alex Catarineu <acat(a)torproject.org> Date: Thu May 14 16:42:41 2020 +0200 Fix dom-objects-enumeration tests - Use fixture server. - Use same method for both worker and window tests. - Require results to exactly match what we expect. --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 1 + .../test_dom-objects-enumeration-worker.py | 62 +-- .../test_dom-objects-enumeration.py | 451 ++++----------------- test-data/dom-objects-enumeration.html | 14 + test-data/dom-objects-enumeration.js | 44 ++ .../workers/dom-objects-enumeration-worker.js | 22 - test-data/workers/dom-objects-enumeration.html | 15 - test-data/workers/dom-objects-enumeration.js | 15 - 8 files changed, 188 insertions(+), 436 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 44c800e..ce5ffeb 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -829,6 +829,7 @@ sub marionette_run { system(xvfb_run($test), "$FindBin::Bin/virtualenv-marionette-5.0.0/$bin/tor-browser-tests", '--log-unittest', winpath($result_file_txt), '--log-html', winpath($result_file_html), + '--server-root', winpath("$FindBin::Bin/test-data"), '--binary', ffbin_path($tbbinfos, $test), '--profile', winpath($tbbinfos->{ffprofiledir}), $OSNAME eq 'cygwin' ? () : ('--workspace', $test->{workspace}), diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py index a22e317..59d771b 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py @@ -1,18 +1,12 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase -import testsuite - - class Test(MarionetteTestCase): def setUp(self): MarionetteTestCase.setUp(self) - ts = testsuite.TestSuite() - self.ts = ts + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) + self.test_page_file_url = self.marionette.absolute_url("dom-objects-enumeration.html?testType=worker") self.expectedObjects = [ "AbortController", @@ -21,10 +15,15 @@ class Test(MarionetteTestCase): "Array", "ArrayBuffer", "atob", + "Atomics", + "BigInt", + "BigInt64Array", + "BigUint64Array", "Blob", "Boolean", "BroadcastChannel", "btoa", + "ByteLengthQueuingStrategy", "Cache", "caches", "CacheStorage", @@ -34,7 +33,9 @@ class Test(MarionetteTestCase): "CloseEvent", "console", "constructor", + "CountQueuingStrategy", "createImageBitmap", + "crossOriginIsolated", "crypto", "Crypto", "CustomEvent", @@ -47,9 +48,14 @@ class Test(MarionetteTestCase): "__defineSetter__", "Directory", "dispatchEvent", - "DOMCursor", - "DOMError", "DOMException", + "DOMMatrix", + "DOMMatrixReadOnly", + "DOMPoint", + "DOMPointReadOnly", + "DOMQuad", + "DOMRect", + "DOMRectReadOnly", "DOMRequest", "DOMStringList", "dump", @@ -72,7 +78,7 @@ class Test(MarionetteTestCase): "Float64Array", "FormData", "Function", - "getAllPropertyNames", + "globalThis", "hasOwnProperty", "Headers", "IDBCursor", @@ -101,13 +107,14 @@ class Test(MarionetteTestCase): "isNaN", "isPrototypeOf", "isSecureContext", - "Iterator", "JSON", "location", "__lookupGetter__", "__lookupSetter__", "Map", "Math", + "MediaCapabilities", + "MediaCapabilitiesInfo", "MessageChannel", "MessageEvent", "MessagePort", @@ -117,12 +124,14 @@ class Test(MarionetteTestCase): "Notification", "Number", "Object", - "onclose", "onerror", + "onlanguagechange", "onmessage", "onmessageerror", "onoffline", "ononline", + "onrejectionhandled", + "onunhandledrejection", "origin", "parseFloat", "parseInt", @@ -134,13 +143,17 @@ class Test(MarionetteTestCase): "PerformanceObserver", "PerformanceObserverEntryList", "PerformanceResourceTiming", + "PerformanceServerTiming", "postMessage", "ProgressEvent", "Promise", + "PromiseRejectionEvent", "propertyIsEnumerable", "__proto__", "Proxy", + "queueMicrotask", "RangeError", + "ReadableStream", "ReferenceError", "Reflect", "RegExp", @@ -151,7 +164,6 @@ class Test(MarionetteTestCase): "Set", "setInterval", "setTimeout", - "StopIteration", "StorageManager", "String", "SubtleCrypto", @@ -160,7 +172,6 @@ class Test(MarionetteTestCase): "TextDecoder", "TextEncoder", "toLocaleString", - "toSource", "toString", "TypeError", "Uint16Array", @@ -169,13 +180,10 @@ class Test(MarionetteTestCase): "Uint8ClampedArray", "undefined", "unescape", - "uneval", - "unwatch", "URIError", "URL", "URLSearchParams", "valueOf", - "watch", "WeakMap", "WeakSet", "WebAssembly", @@ -191,14 +199,13 @@ class Test(MarionetteTestCase): def test_dom_objects_enumeration_workers(self): with self.marionette.using_context('content'): - URL = "file://%s/workers/dom-objects-enumeration.html" % self.ts.t['options']['test_data_dir'] - self.marionette.navigate(URL) - self.marionette.set_search_timeout(50000) + self.marionette.navigate(self.test_page_file_url) + self.marionette.timeout.implicit = 5 elt = self.marionette.find_element('id', 'enumeration') - + r = elt.text.split("\n") err = False unknown_objects = '' - for l in elt.text.split("\n"): + for l in r: if l in self.expectedObjects: continue err = True @@ -206,3 +213,12 @@ class Test(MarionetteTestCase): err_msg = "Unknown objects:\n%s" % unknown_objects self.assertFalse(err, msg=err_msg) + + for l in self.expectedObjects: + if l in r: + continue + err = True + unknown_objects += l + "\n" + + err_msg = "Expected objects not found:\n%s" % unknown_objects + self.assertFalse(err, msg=err_msg) \ No newline at end of file diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration.py b/marionette/tor_browser_tests/test_dom-objects-enumeration.py index 84b58f5..be2ae65 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration.py @@ -9,79 +9,49 @@ from marionette_driver.errors import MarionetteException from marionette_harness import MarionetteTestCase -import testsuite - - class Test(MarionetteTestCase): - def setUp(self): MarionetteTestCase.setUp(self) - - ts = testsuite.TestSuite() - self.ts = ts - + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) + self.test_page_file_url = self.marionette.absolute_url("dom-objects-enumeration.html?testType=window") # The list of expected DOM objects - self.interfaceNamesInGlobalScope = [ + self.expectedObjects = [ "AbortController", "AbortSignal", + "AbstractRange", "addEventListener", - "adjustToolbarIconArrow", "alert", - "AnalyserNode", "Animation", "AnimationEffect", "AnimationEvent", - "AnimationPlayer", + "AnimationPlaybackEvent", "AnimationTimeline", - "AnonymousContent", - "Application", - "applicationCache", - "ArchiveRequest", "Array", "ArrayBuffer", - "AsyncScrollEventDetail", "atob", + "Atomics", "Attr", "Audio", - "AudioBuffer", - "AudioBufferSourceNode", - "AudioContext", - "AudioDestinationNode", - "AudioListener", - "AudioNode", - "AudioParam", - "AudioProcessingEvent", + "AudioParamMap", "AudioScheduledSourceNode", - "AudioStreamTrack", - "back", + "AudioWorklet", + "AudioWorkletNode", "BarProp", "BaseAudioContext", - "BatteryManager", "BeforeUnloadEvent", - "BiquadFilterNode", + "BigInt", + "BigInt64Array", + "BigUint64Array", "Blob", "BlobEvent", "blur", "Boolean", - "BoxObject", "BroadcastChannel", - "BrowserFeedWriter", "btoa", + "ByteLengthQueuingStrategy", "Cache", "caches", "CacheStorage", - "CameraCapabilities", - "CameraClosedEvent", - "CameraConfigurationEvent", - "CameraControl", - "CameraDetectedFace", - "CameraFacesDetectedEvent", - "CameraManager", - "CameraRecorderAudioProfile", - "CameraRecorderProfile", - "CameraRecorderProfiles", - "CameraRecorderVideoProfile", - "CameraStateChangeEvent", "cancelAnimationFrame", "cancelIdleCallback", "CanvasCaptureMediaStream", @@ -91,77 +61,51 @@ class Test(MarionetteTestCase): "captureEvents", "CaretPosition", "CDATASection", - "ChannelMergerNode", - "ChannelSplitterNode", "CharacterData", - "ChromeMessageBroadcaster", - "ChromeMessageSender", - "ChromeWindow", - "ChromeWorker", "clearInterval", "clearTimeout", - "ClientInformation", - "ClientRect", - "ClientRectList", + "Clipboard", "ClipboardEvent", "close", "closed", "CloseEvent", - "CommandEvent", "Comment", - "Components", "CompositionEvent", "confirm", "console", - "Console", - "Contact", - "ContactManager", - "_content", + "constructor", "content", - "ContentFrameMessageManager", - "ContentProcessMessageManager", - "controllers", - "Controllers", - "ConvolverNode", - "Counter", + "CountQueuingStrategy", "createImageBitmap", - "CRMFObject", + "crossOriginIsolated", "crypto", "Crypto", - "CryptoDialogs", "CryptoKey", "CSS", "CSS2Properties", - "CSSCharsetRule", + "CSSAnimation", "CSSConditionRule", "CSSCounterStyleRule", "CSSFontFaceRule", "CSSFontFeatureValuesRule", "CSSGroupingRule", - "CSSGroupRuleRuleList", "CSSImportRule", "CSSKeyframeRule", "CSSKeyframesRule", "CSSMediaRule", "CSSMozDocumentRule", "CSSNamespaceRule", - "CSSNameSpaceRule", "CSSPageRule", - "CSSPrimitiveValue", - "CSSRect", "CSSRule", "CSSRuleList", "CSSStyleDeclaration", "CSSStyleRule", "CSSStyleSheet", "CSSSupportsRule", - "CSSUnknownRule", - "CSSValue", - "CSSValueList", + "CSSTransition", + "CustomElementRegistry", + "customElements", "CustomEvent", - "DataChannel", - "DataContainerEvent", - "DataErrorEvent", "DataTransfer", "DataTransferItem", "DataTransferItemList", @@ -169,37 +113,22 @@ class Test(MarionetteTestCase): "Date", "decodeURI", "decodeURIComponent", - "DelayNode", - "DesktopNotification", - "DesktopNotificationCenter", - "DeviceAcceleration", - "DeviceLightEvent", + "__defineGetter__", + "__defineSetter__", "DeviceMotionEvent", "DeviceOrientationEvent", "devicePixelRatio", - "DeviceProximityEvent", - "DeviceRotationRate", - "DeviceStorage", - "DeviceStorageChangeEvent", - "DeviceStorageCursor", "Directory", "dispatchEvent", "document", "Document", "DocumentFragment", - "DocumentTouch", + "DocumentTimeline", "DocumentType", - "DocumentXBL", - "DOMApplication", - "DOMApplicationsManager", - "DOMConstructor", - "DOMCursor", - "DOMError", "DOMException", "DOMImplementation", "DOMMatrix", "DOMMatrixReadOnly", - "DOMMMIError", "DOMParser", "DOMPoint", "DOMPointReadOnly", @@ -208,18 +137,12 @@ class Test(MarionetteTestCase): "DOMRectList", "DOMRectReadOnly", "DOMRequest", - "DOMSettableTokenList", "DOMStringList", "DOMStringMap", "DOMTokenList", - "DOMTransactionEvent", "DragEvent", "dump", - "DynamicsCompressorNode", "Element", - "ElementCSSInlineStyle", - "ElementReplaceEvent", - "ElementTimeControl", "encodeURI", "encodeURIComponent", "Error", @@ -227,19 +150,15 @@ class Test(MarionetteTestCase): "escape", "eval", "EvalError", + "event", "Event", - "EventListener", - "EventListenerInfo", "EventSource", "EventTarget", "external", - "External", "fetch", "File", - "FileHandle", "FileList", "FileReader", - "FileRequest", "FileSystem", "FileSystemDirectoryEntry", "FileSystemDirectoryReader", @@ -251,56 +170,42 @@ class Test(MarionetteTestCase): "focus", "FocusEvent", "FontFace", - "FontFaceList", "FontFaceSet", "FontFaceSetLoadEvent", "FormData", - "forward", + "FormDataEvent", "frameElement", "frames", "fullScreen", "Function", - "FutureResolver", - "GainNode", "Gamepad", - "GamepadAxisMoveEvent", - "GamepadButtonEvent", + "GamepadButton", "GamepadEvent", "GamepadHapticActuator", "GamepadPose", - "GeoGeolocation", - "GeoPosition", - "GeoPositionCallback", - "GeoPositionCoords", - "GeoPositionError", - "GeoPositionErrorCallback", + "Geolocation", + "GeolocationCoordinates", + "GeolocationPosition", + "GeolocationPositionError", "getComputedStyle", "getDefaultComputedStyle", - "getInterface", "getSelection", - "GetUserMediaErrorCallback", - "GetUserMediaSuccessCallback", - "GlobalObjectConstructor", - "GlobalPropertyInitializer", + "globalThis", "HashChangeEvent", + "hasOwnProperty", "Headers", "history", "History", - "home", "HTMLAllCollection", "HTMLAnchorElement", - "HTMLAppletElement", "HTMLAreaElement", "HTMLAudioElement", "HTMLBaseElement", "HTMLBodyElement", "HTMLBRElement", "HTMLButtonElement", - "HTMLByteRanges", "HTMLCanvasElement", "HTMLCollection", - "HTMLCommandElement", - "HTMLContentElement", "HTMLDataElement", "HTMLDataListElement", "HTMLDetailsElement", @@ -328,6 +233,7 @@ class Test(MarionetteTestCase): "HTMLLIElement", "HTMLLinkElement", "HTMLMapElement", + "HTMLMarqueeElement", "HTMLMediaElement", "HTMLMenuElement", "HTMLMenuItemElement", @@ -345,11 +251,10 @@ class Test(MarionetteTestCase): "HTMLPictureElement", "HTMLPreElement", "HTMLProgressElement", - "HTMLPropertiesCollection", "HTMLQuoteElement", "HTMLScriptElement", "HTMLSelectElement", - "HTMLShadowElement", + "HTMLSlotElement", "HTMLSourceElement", "HTMLSpanElement", "HTMLStyleElement", @@ -386,15 +291,12 @@ class Test(MarionetteTestCase): "ImageBitmap", "ImageBitmapRenderingContext", "ImageData", - "ImageDocument", "indexedDB", "Infinity", "innerHeight", "innerWidth", "InputEvent", - "insertPropertyStrings", "InstallTrigger", - "InstallTriggerImpl", "Int16Array", "Int32Array", "Int8Array", @@ -404,105 +306,54 @@ class Test(MarionetteTestCase): "Intl", "isFinite", "isNaN", + "isPrototypeOf", "isSecureContext", - "Iterator", "JSON", - "JSWindow", "KeyboardEvent", "KeyEvent", + "KeyframeEffect", "length", - "LinkStyle", - "LoadStatus", - "LocalMediaStream", "localStorage", "location", "Location", "locationbar", - "LockedFile", - "LSProgressEvent", + "__lookupGetter__", + "__lookupSetter__", "Map", "matchMedia", "Math", - "MediaElementAudioSourceNode", + "MathMLElement", + "MediaCapabilities", + "MediaCapabilitiesInfo", "MediaEncryptedEvent", "MediaError", - "MediaKeys", "MediaKeyError", "MediaKeyMessageEvent", + "MediaKeys", "MediaKeySession", "MediaKeyStatusMap", "MediaKeySystemAccess", "MediaList", "MediaQueryList", "MediaQueryListEvent", - "MediaQueryListListener", "MediaRecorder", "MediaRecorderErrorEvent", "MediaSource", "MediaStream", - "MediaStreamAudioDestinationNode", - "MediaStreamAudioSourceNode", "MediaStreamTrack", "MediaStreamTrackEvent", "menubar", - "MenuBoxObject", "MessageChannel", "MessageEvent", "MessagePort", "MimeType", "MimeTypeArray", - "ModalContentWindow", "MouseEvent", "MouseScrollEvent", "moveBy", "moveTo", - "MozAlarmsManager", - "mozAnimationStartTime", - "MozApplicationEvent", - "MozBlobBuilder", - "MozBrowserFrame", - "mozCancelAnimationFrame", - "mozCancelRequestAnimationFrame", - "MozCanvasPrintState", - "MozConnection", - "mozContact", - "MozContactChangeEvent", - "MozCSSKeyframeRule", - "MozCSSKeyframesRule", - "mozIndexedDB", "mozInnerScreenX", "mozInnerScreenY", - "MozMmsEvent", - "MozMmsMessage", - "MozMobileCellInfo", - "MozMobileConnectionInfo", - "MozMobileMessageManager", - "MozMobileMessageThread", - "MozMobileNetworkInfo", - "MozNamedAttrMap", - "MozNavigatorMobileMessage", - "MozNavigatorNetwork", - "MozNavigatorSms", - "MozNavigatorTime", - "MozNetworkStats", - "MozNetworkStatsData", - "MozNetworkStatsManager", - "mozPaintCount", - "MozPowerManager", - "mozRequestAnimationFrame", - "mozRequestOverfill", - "MozSelfSupport", - "MozSettingsEvent", - "MozSettingsTransactionEvent", - "MozSmsEvent", - "MozSmsFilter", - "MozSmsManager", - "MozSmsMessage", - "MozSmsSegmentInfo", - "MozTimeManager", - "MozTouchEvent", - "MozWakeLock", - "MozWakeLockListener", "MutationEvent", "MutationObserver", "MutationRecord", @@ -511,30 +362,15 @@ class Test(MarionetteTestCase): "NaN", "navigator", "Navigator", - "NavigatorCamera", - "NavigatorDesktopNotification", - "NavigatorDeviceStorage", - "NavigatorGeolocation", - "NavigatorUserMedia", "netscape", "Node", "NodeFilter", "NodeIterator", "NodeList", - "NodeSelector", - "__noscriptStorage", "Notification", - "NotifyAudioAvailableEvent", "NotifyPaintEvent", - "NSEditableElement", - "NSEvent", - "NSRGBAColor", - "NSXPathExpression", "Number", "Object", - "OfflineAudioCompletionEvent", - "OfflineAudioContext", - "OfflineResourceList", "onabort", "onabsolutedeviceorientation", "onafterprint", @@ -552,6 +388,7 @@ class Test(MarionetteTestCase): "onclick", "onclose", "oncontextmenu", + "oncuechange", "ondblclick", "ondevicelight", "ondevicemotion", @@ -570,7 +407,7 @@ class Test(MarionetteTestCase): "onended", "onerror", "onfocus", - "ongotpointercapture", + "onformdata", "onhashchange", "oninput", "oninvalid", @@ -579,12 +416,10 @@ class Test(MarionetteTestCase): "onkeyup", "onlanguagechange", "onload", - "onLoad", "onloadeddata", "onloadedmetadata", "onloadend", "onloadstart", - "onlostpointercapture", "onmessage", "onmessageerror", "onmousedown", @@ -596,8 +431,6 @@ class Test(MarionetteTestCase): "onmouseup", "onmozfullscreenchange", "onmozfullscreenerror", - "onmozpointerlockchange", - "onmozpointerlockerror", "onoffline", "ononline", "onpagehide", @@ -605,17 +438,10 @@ class Test(MarionetteTestCase): "onpause", "onplay", "onplaying", - "onpointercancel", - "onpointerdown", - "onpointerenter", - "onpointerleave", - "onpointermove", - "onpointerout", - "onpointerover", - "onpointerup", "onpopstate", "onprogress", "onratechange", + "onrejectionhandled", "onreset", "onresize", "onscroll", @@ -634,6 +460,7 @@ class Test(MarionetteTestCase): "ontransitionend", "ontransitionrun", "ontransitionstart", + "onunhandledrejection", "onunload", "onuserproximity", "onvolumechange", @@ -644,12 +471,9 @@ class Test(MarionetteTestCase): "onwebkittransitionend", "onwheel", "open", - "openDialog", "opener", - "OpenWindowEventDetail", "Option", "origin", - "OscillatorNode", "outerHeight", "outerWidth", "PageTransitionEvent", @@ -657,79 +481,64 @@ class Test(MarionetteTestCase): "pageYOffset", "PaintRequest", "PaintRequestList", - "PannerNode", "parent", "parseFloat", "parseInt", - "Parser", - "ParserJS", "Path2D", - "PaymentRequestInfo", "performance", "Performance", "PerformanceEntry", "PerformanceMark", "PerformanceMeasure", "PerformanceNavigation", - "PerformanceNavigationTiming", "PerformanceObserver", "PerformanceObserverEntryList", "PerformanceResourceTiming", + "PerformanceServerTiming", "PerformanceTiming", - "PeriodicWave", "Permissions", - "PermissionSettings", "PermissionStatus", "personalbar", - "PhoneNumberService", - "Pkcs11", "Plugin", "PluginArray", - "PluginCrashedEvent", - "PointerEvent", "PopStateEvent", "PopupBlockedEvent", - "PopupBoxObject", "postMessage", "print", "ProcessingInstruction", "ProgressEvent", "Promise", - "PromiseDebugging", + "PromiseRejectionEvent", "prompt", - "PropertyNodeList", + "propertyIsEnumerable", + "__proto__", "Proxy", - "PushManager", - "QueryInterface", + "queueMicrotask", "RadioNodeList", "Range", "RangeError", - "realFrameElement", - "RecordErrorEvent", - "Rect", + "ReadableStream", "ReferenceError", + "Reflect", "RegExp", "releaseEvents", "removeEventListener", "Request", "requestAnimationFrame", "requestIdleCallback", - "RequestService", "resizeBy", + "ResizeObserver", + "ResizeObserverEntry", + "ResizeObserverSize", "resizeTo", "Response", - "RGBColor", - "RTCIceCandidate", - "RTCPeerConnection", - "RTCPeerConnectionIdentityErrorEvent", - "RTCPeerConnectionIdentityEvent", - "RTCSessionDescription", "screen", "Screen", + "screenLeft", "ScreenOrientation", + "screenTop", "screenX", "screenY", - "ScriptProcessorNode", "scroll", "ScrollAreaEvent", "scrollbars", @@ -739,53 +548,41 @@ class Test(MarionetteTestCase): "scrollMaxX", "scrollMaxY", "scrollTo", - "ScrollViewChangeEvent", "scrollX", "scrollY", + "SecurityPolicyViolationEvent", "Selection", - "SelectionStateChangedEvent", "self", - "Serializer", - "Services", "sessionStorage", "Set", "setInterval", "setResizable", "setTimeout", - "SettingsLock", - "SettingsManager", + "ShadowRoot", "SharedWorker", - "showModalDialog", "sidebar", - "SimpleGestureEvent", "sizeToContent", - "SmartCardEvent", "SourceBuffer", "SourceBufferList", - "SpeechRecognitionError", - "SpeechRecognitionEvent", "speechSynthesis", + "SpeechSynthesis", + "SpeechSynthesisErrorEvent", "SpeechSynthesisEvent", + "SpeechSynthesisUtterance", + "SpeechSynthesisVoice", + "StaticRange", "status", "statusbar", - "StereoPannerNode", "stop", - "StopIteration", "Storage", "StorageEvent", - "StorageIndexedDB", - "StorageItem", "StorageManager", - "StorageObsolete", "String", - "StyleRuleChangeEvent", "StyleSheet", - "StyleSheetApplicableStateChangeEvent", - "StyleSheetChangeEvent", "StyleSheetList", + "SubmitEvent", "SubtleCrypto", "SVGAElement", - "SVGAltGlyphElement", "SVGAngle", "SVGAnimatedAngle", "SVGAnimatedBoolean", @@ -795,8 +592,6 @@ class Test(MarionetteTestCase): "SVGAnimatedLengthList", "SVGAnimatedNumber", "SVGAnimatedNumberList", - "SVGAnimatedPathData", - "SVGAnimatedPoints", "SVGAnimatedPreserveAspectRatio", "SVGAnimatedRect", "SVGAnimatedString", @@ -810,10 +605,8 @@ class Test(MarionetteTestCase): "SVGComponentTransferFunctionElement", "SVGDefsElement", "SVGDescElement", - "SVGDocument", "SVGElement", "SVGEllipseElement", - "SVGEvent", "SVGFEBlendElement", "SVGFEColorMatrixElement", "SVGFEComponentTransferElement", @@ -840,8 +633,6 @@ class Test(MarionetteTestCase): "SVGFETileElement", "SVGFETurbulenceElement", "SVGFilterElement", - "SVGFilterPrimitiveStandardAttributes", - "SVGFitToViewBox", "SVGForeignObjectElement", "SVGGElement", "SVGGeometryElement", @@ -852,37 +643,15 @@ class Test(MarionetteTestCase): "SVGLengthList", "SVGLinearGradientElement", "SVGLineElement", - "SVGLocatable", "SVGMarkerElement", "SVGMaskElement", "SVGMatrix", "SVGMetadataElement", - "SVGMpathElement", "SVGMPathElement", "SVGNumber", "SVGNumberList", "SVGPathElement", - "SVGPathSeg", - "SVGPathSegArcAbs", - "SVGPathSegArcRel", - "SVGPathSegClosePath", - "SVGPathSegCurvetoCubicAbs", - "SVGPathSegCurvetoCubicRel", - "SVGPathSegCurvetoCubicSmoothAbs", - "SVGPathSegCurvetoCubicSmoothRel", - "SVGPathSegCurvetoQuadraticAbs", - "SVGPathSegCurvetoQuadraticRel", - "SVGPathSegCurvetoQuadraticSmoothAbs", - "SVGPathSegCurvetoQuadraticSmoothRel", - "SVGPathSegLinetoAbs", - "SVGPathSegLinetoHorizontalAbs", - "SVGPathSegLinetoHorizontalRel", - "SVGPathSegLinetoRel", - "SVGPathSegLinetoVerticalAbs", - "SVGPathSegLinetoVerticalRel", "SVGPathSegList", - "SVGPathSegMovetoAbs", - "SVGPathSegMovetoRel", "SVGPatternElement", "SVGPoint", "SVGPointList", @@ -896,31 +665,23 @@ class Test(MarionetteTestCase): "SVGSetElement", "SVGStopElement", "SVGStringList", - "SVGStylable", "SVGStyleElement", "SVGSVGElement", "SVGSwitchElement", "SVGSymbolElement", - "SVGTests", "SVGTextContentElement", "SVGTextElement", "SVGTextPathElement", "SVGTextPositioningElement", "SVGTitleElement", "SVGTransform", - "SVGTransformable", "SVGTransformList", "SVGTSpanElement", "SVGUnitTypes", - "SVGURIReference", "SVGUseElement", "SVGViewElement", - "SVGViewSpec", - "SVGZoomAndPan", - "SVGZoomEvent", "Symbol", "SyntaxError", - "TCPSocket", "Text", "TextDecoder", "TextEncoder", @@ -931,45 +692,36 @@ class Test(MarionetteTestCase): "TextTrackList", "TimeEvent", "TimeRanges", + "toLocaleString", "toolbar", "top", - "toStaticHTML", - "ToString", - "Touch", - "TouchEvent", - "TouchList", + "toString", "TrackEvent", "TransitionEvent", - "TreeColumn", - "TreeColumns", - "TreeContentView", - "TreeSelection", "TreeWalker", "TypeError", + "u2f", + "U2F", "UIEvent", "Uint16Array", "Uint32Array", "Uint8Array", "Uint8ClampedArray", "undefined", - "UndoManager", "unescape", - "uneval", "updateCommands", "URIError", "URL", "URLSearchParams", - "UserDataHandler", - "UserProximityEvent", - "USSDReceivedEvent", "ValidityState", + "valueOf", "VideoPlaybackQuality", - "VideoStreamTrack", + "VisualViewport", "VTTCue", "VTTRegion", - "WaveShaperNode", "WeakMap", "WeakSet", + "WebAssembly", "WebGLActiveInfo", "WebGLBuffer", "WebGLContextEvent", @@ -982,68 +734,36 @@ class Test(MarionetteTestCase): "WebGLShaderPrecisionFormat", "WebGLTexture", "WebGLUniformLocation", - "WebGLVertexArray", "WebGLVertexArrayObject", "WebKitCSSMatrix", + "webkitURL", "WebSocket", "WheelEvent", "window", "Window", - "WindowCollection", - "WindowInternal", - "WindowPerformance", - "WindowRoot", - "WindowUtils", "Worker", - "__XBLClassObjectMap__", + "Worklet", "XMLDocument", "XMLHttpRequest", "XMLHttpRequestEventTarget", "XMLHttpRequestUpload", "XMLSerializer", - "XMLStylesheetProcessingInstruction", "XPathEvaluator", "XPathExpression", - "XPathNamespace", - "XPathNSResolver", "XPathResult", - "XPCNativeWrapper", "XSLTProcessor", - "XULButtonElement", - "XULCheckboxElement", - "XULCommandDispatcher", - "XULCommandEvent", - "XULContainerElement", - "XULContainerItemElement", - "XULControlElement", - "XULControllers", - "XULDescriptionElement", - "XULDocument", - "XULElement", - "XULImageElement", - "XULLabeledControlElement", - "XULLabelElement", - "XULMenuListElement", - "XULMultiSelectControlElement", - "XULPopupElement", - "XULRelatedElement", - "XULSelectControlElement", - "XULSelectControlItemElement", - "XULTemplateBuilder", - "XULTextBoxElement", - "XULTreeBuilder", - "XULTreeElement", ] def test_dom_objects_enumeration(self): with self.marionette.using_context('content'): - self.marionette.navigate('about:robots') - - r = self.marionette.execute_script('return Object.getOwnPropertyNames(window);') + self.marionette.navigate(self.test_page_file_url) + self.marionette.timeout.implicit = 5 + elt = self.marionette.find_element('id', 'enumeration') + r = elt.text.split("\n") err = False unknown_objects = '' for l in r: - if l in self.interfaceNamesInGlobalScope: + if l in self.expectedObjects: continue err = True unknown_objects += l + "\n" @@ -1051,3 +771,12 @@ class Test(MarionetteTestCase): err_msg = "Unknown objects:\n%s" % unknown_objects self.assertFalse(err, msg=err_msg) + for l in self.expectedObjects: + if l in r: + continue + err = True + unknown_objects += l + "\n" + + err_msg = "Expected objects not found:\n%s" % unknown_objects + self.assertFalse(err, msg=err_msg) + diff --git a/test-data/dom-objects-enumeration.html b/test-data/dom-objects-enumeration.html new file mode 100644 index 0000000..1f7e6c0 --- /dev/null +++ b/test-data/dom-objects-enumeration.html @@ -0,0 +1,14 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8"> + + <title>dom objects enumeration</title> + </head> + + <body> + <h1>dom objects enumeration</h1> + <script src="dom-objects-enumeration.js"></script> + </body> +</html> + diff --git a/test-data/dom-objects-enumeration.js b/test-data/dom-objects-enumeration.js new file mode 100644 index 0000000..b3e60c5 --- /dev/null +++ b/test-data/dom-objects-enumeration.js @@ -0,0 +1,44 @@ +(() => { + // getAllPropertyNames function taken from: + // https://stackoverflow.com/questions/8024149/is-it-possible-to-get-the-non-e… + function getAllPropertyNames(obj) { + const props = []; + do { + Object.getOwnPropertyNames(obj).forEach((prop) => { + if (props.indexOf(prop) === -1) { + props.push(prop); + } + }); + } while (obj = Object.getPrototypeOf(obj)); + return [...new Set(props)].sort(); + } + + function getGlobalNames() { + return getAllPropertyNames(globalThis); + } + + if (!self.document) { + // This is a worker + self.postMessage(getGlobalNames()); + } else { + // Not a worker, loaded via script. + const enumeration = document.createElement("div"); + enumeration.setAttribute("id", "enumeration"); + const queryString = window.location.search; + const urlParams = new URLSearchParams(queryString); + let onmessage = (allObjects) => { + for (const name of allObjects) { + enumeration.innerHTML += name + "<br/>"; + } + document.getElementsByTagName("body")[0].appendChild(enumeration); + }; + if (urlParams.get("testType") === "worker") { + // Must enumerate worker globals + const worker = new Worker("dom-objects-enumeration.js"); + worker.onmessage = (e) => onmessage(e.data); + } else { + // Must enumerate window global + onmessage(getGlobalNames()); + } + } +})(); \ No newline at end of file diff --git a/test-data/workers/dom-objects-enumeration-worker.js b/test-data/workers/dom-objects-enumeration-worker.js deleted file mode 100644 index 5ab3723..0000000 --- a/test-data/workers/dom-objects-enumeration-worker.js +++ /dev/null @@ -1,22 +0,0 @@ -// getAllPropertyNames function taken from: -// https://stackoverflow.com/questions/8024149/is-it-possible-to-get-the-non-e… -function getAllPropertyNames( obj ) { - var props = []; - do { - Object.getOwnPropertyNames( obj ).forEach(function ( prop ) { - if ( props.indexOf( prop ) === -1 ) { - props.push( prop ); - } - }); - } while ( obj = Object.getPrototypeOf( obj ) ); - return props; -} - -onmessage = function(e) { - var allObjects = getAllPropertyNames(self); - var res = Array(); - for (var i in allObjects.sort()) { - res.push(allObjects[i]); - } - postMessage(res); -} diff --git a/test-data/workers/dom-objects-enumeration.html b/test-data/workers/dom-objects-enumeration.html deleted file mode 100644 index 6a2fc19..0000000 --- a/test-data/workers/dom-objects-enumeration.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="utf-8"> - - <title>Web Workers dom objects enumeration</title> - </head> - - <body> - <h1>Web Workers dom objects enumeration</h1> - - </body> - <script src="dom-objects-enumeration.js"></script> -</html> - diff --git a/test-data/workers/dom-objects-enumeration.js b/test-data/workers/dom-objects-enumeration.js deleted file mode 100644 index 56d4a64..0000000 --- a/test-data/workers/dom-objects-enumeration.js +++ /dev/null @@ -1,15 +0,0 @@ -var enumeration = document.createElement('div'); -enumeration.setAttribute("id", "enumeration"); - -if (window.Worker) { - var myWorker = new Worker("dom-objects-enumeration-worker.js"); - myWorker.postMessage("Hello"); - myWorker.onmessage = function(e) { - var allObjects = e.data; - for (var i in allObjects.sort()) { - var name = allObjects[i]; - enumeration.innerHTML += name + "<br/>"; - } - document.getElementsByTagName("body")[0].appendChild(enumeration); - } -}

1 0

[tor-browser-bundle-testsuite/master] Fix pinning test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit eae3202691b96fc3d39e952eb0ca6a3d67dd28be Author: Alex Catarineu <acat(a)torproject.org> Date: Fri May 15 13:48:05 2020 +0200 Fix pinning test --- marionette/tor_browser_tests/test_pinning.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/marionette/tor_browser_tests/test_pinning.py b/marionette/tor_browser_tests/test_pinning.py index dc66236..23e029c 100644 --- a/marionette/tor_browser_tests/test_pinning.py +++ b/marionette/tor_browser_tests/test_pinning.py @@ -1,10 +1,7 @@ -from marionette_driver import By, Actions -from marionette_driver.errors import MarionetteException, JavascriptException - from marionette_harness import MarionetteTestCase import testsuite - +import json class Test(MarionetteTestCase): @@ -31,8 +28,8 @@ class Test(MarionetteTestCase): self.assertTrue(res, msg="Page could be loaded") if res: - errorCode = m.find_element('id', 'errorCode') - self.assertEqual(errorCode.get_attribute('title'), + errorCode = m.find_element('id', 'errorShortDescText2') + self.assertEqual(json.loads(errorCode.get_attribute('data-l10n-args'))["error"], 'MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE', msg='Wrong error code')

1 0

[tor-browser-bundle-testsuite/master] Fix performance-observer test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 1b30b27ffd9af1ef9a0a6bd81e3c1247a7e96637 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 08:56:21 2020 +0200 Fix performance-observer test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 7 ---- .../tor_browser_tests/test_performance-observer.py | 38 ++++++++++++---------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index e35e903..0bf4359 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -380,13 +380,6 @@ our @tests = ( type => 'marionette', descr => 'Check that the Performance Observer API is really disabled', use_net => 1, - # To check that the test fails when performance observer is enabled, - # uncomment this: - #prefs => { - # 'dom.enable_performance_observer' => 'true', - #}, - # Bug 27137: temporarily disable test - enable => sub { undef }, }, { name => 'searchengines', diff --git a/marionette/tor_browser_tests/test_performance-observer.py b/marionette/tor_browser_tests/test_performance-observer.py index 31c3c5f..b727a01 100644 --- a/marionette/tor_browser_tests/test_performance-observer.py +++ b/marionette/tor_browser_tests/test_performance-observer.py @@ -4,9 +4,6 @@ # Setting |dom.enable_performance_observer| to |false| and testing that # might not be sufficient. -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase): @@ -19,18 +16,25 @@ class Test(MarionetteTestCase): def test_performance_observer(self): + def is_perf_obs_working(marionette): + return self.marionette.execute_async_script(""" + let [resolve] = arguments; + var observer = new PerformanceObserver(function(...args) { resolve(true); }); + observer.observe({entryTypes: ['resource', 'mark', 'measure']}); + performance.mark("hello"); + setTimeout(function() { + resolve(false); + }, 2000); + """) + with self.marionette.using_context('content'): - self.marionette.navigate(self.TEST_URL) - - err_msg = 'performance observer is working' - self.assertTrue(self.marionette.execute_script(""" - var pass = false; - try { - var observer = new PerformanceObserver(function(list) { }); - observer.observe({entryTypes: ['resource', 'mark', 'measure']}); - } catch (e) { - pass = true; - } - return pass; - """), - msg=err_msg) + m = self.marionette + m.navigate(self.TEST_URL) + m.timeout.script = 10 + + # Performance observer should not work with default settings + self.assertFalse(is_perf_obs_working(m), 'performance observer is working') + + # Performance observer should work if `privacy.resistFingerprinting = false` + with self.marionette.using_prefs({"privacy.resistFingerprinting": False}): + self.assertTrue(is_perf_obs_working(m), 'performance observer is not working')

1 0

[tor-browser-bundle-testsuite/master] Fix download_pdf test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit b44d95b16beb891ae730cb24fc29b0edb1324701 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun May 17 19:42:48 2020 +0200 Fix download_pdf test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 -- marionette/tor_browser_tests/test_download_pdf.py | 38 +++++------------------ 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index ce5ffeb..a054438 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -485,8 +485,6 @@ our @tests = ( type => 'marionette', descr => 'Check if download of PDF is working (#19402)', use_net => 1, - # Bug 30333: temporarily disable test - enable => sub { undef }, }, { name => 'pinning_now', diff --git a/marionette/tor_browser_tests/test_download_pdf.py b/marionette/tor_browser_tests/test_download_pdf.py index 737a725..408f63a 100644 --- a/marionette/tor_browser_tests/test_download_pdf.py +++ b/marionette/tor_browser_tests/test_download_pdf.py @@ -1,6 +1,3 @@ -from marionette_driver import By, Actions -from marionette_driver.errors import MarionetteException, JavascriptException - from marionette_harness import MarionetteTestCase import testsuite @@ -19,31 +16,10 @@ class Test(MarionetteTestCase): def test_download_pdf(self): m = self.marionette - - m.set_search_timeout(1000) - m.set_window_size(1024, 300) - - with m.using_context('content'): - - current_window = m.current_chrome_window_handle - - m.navigate(self.URL) - download_button = m.find_element('id', 'download') - action = Actions(m) - action.click(download_button) - action.wait(time=3) - action.perform() - - closed_window = 0 - with m.using_context('chrome'): - for window in m.chrome_window_handles: - if window != current_window: - m.switch_to_window(window) - info_msg = m.find_element('id', 'info.body') - self.assertRegexpMatches(info_msg.text, 'Tails', - msg='Pop up window text does not include Tails') - m.close() - closed_window += 1 - m.switch_to_window(current_window) - self.assertEqual(closed_window, 1, msg="no download pop up") - + m.set_window_rect(width=1024, height=300) + m.navigate(self.URL) + download_button = m.find_element('id', 'download').click() + self.assertEqual(len(m.chrome_window_handles), 2, msg="Number of windows not correct") + dialog = m.switch_to_alert() + self.assertRegexpMatches(dialog.text, 'Tails', + msg='Pop up window text does not include Tails')

1 0

[tor-browser-bundle-testsuite/master] Fix fp_navigator and fp_useragent tests
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 376bbd63eff6a16e4b6c810ba0594d3efe529470 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 10:05:57 2020 +0200 Fix fp_navigator and fp_useragent tests --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 -- marionette/tor_browser_tests/test_fp_navigator.py | 9 +++------ marionette/tor_browser_tests/test_fp_useragent.py | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 91aa6f0..4223132 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -421,8 +421,6 @@ our @tests = ( name => 'fp_navigator', type => 'marionette', descr => 'Check that navigator properties are as expected', - # Bug 28665: temporarily disable test - enable => sub { undef }, }, { name => 'play_videos', diff --git a/marionette/tor_browser_tests/test_fp_navigator.py b/marionette/tor_browser_tests/test_fp_navigator.py index 0d47f82..1453b0f 100644 --- a/marionette/tor_browser_tests/test_fp_navigator.py +++ b/marionette/tor_browser_tests/test_fp_navigator.py @@ -15,9 +15,9 @@ nav_props = {"appCodeName": "Mozilla", "product": "Gecko", "productSub": "20100101", "plugins": "[object PluginArray]", -"cookieEnabled": "true", +"cookieEnabled": "false", "onLine": "true", -"buildID": "20100101", +"buildID": "20181001000000", "doNotTrack": "unspecified", "javaEnabled": """function javaEnabled() { [native code] @@ -28,9 +28,6 @@ nav_props = {"appCodeName": "Mozilla", "vibrate": """function vibrate() { [native code] }""", -"registerContentHandler": """function registerContentHandler() { - [native code] -}""", "registerProtocolHandler": """function registerProtocolHandler() { [native code] }""", @@ -63,7 +60,7 @@ class Test(MarionetteTestCase): app_version = "5.0 (Macintosh)" platform = "MacIntel" oscpu = "Intel Mac OS X 10.13" - nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:60.0) Gecko/20100101 Firefox/60.0" + nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0" nav_props["appVersion"] = app_version nav_props["platform"] = platform nav_props["oscpu"] = oscpu diff --git a/marionette/tor_browser_tests/test_fp_useragent.py b/marionette/tor_browser_tests/test_fp_useragent.py index af527c1..a2ef986 100644 --- a/marionette/tor_browser_tests/test_fp_useragent.py +++ b/marionette/tor_browser_tests/test_fp_useragent.py @@ -19,5 +19,5 @@ class Test(MarionetteTestCase): ua_os = 'Windows NT 6.1; Win64; x64' if osname == 'MacOSX': ua_os = 'Macintosh; Intel Mac OS X 10.13' - self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:60.0) Gecko/20100101 Firefox/60.0", + self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0", js("return navigator.userAgent"))

1 0

[tor-browser-bundle-testsuite/master] Fix user-timing-worker test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit e102b9b86988121fc1c14ca2a05bfb9a2ca1dae4 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun May 17 20:21:40 2020 +0200 Fix user-timing-worker test --- marionette/tor_browser_tests/test_page.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/marionette/tor_browser_tests/test_page.py b/marionette/tor_browser_tests/test_page.py index bc1eb69..d03367c 100644 --- a/marionette/tor_browser_tests/test_page.py +++ b/marionette/tor_browser_tests/test_page.py @@ -1,6 +1,3 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase import testsuite @@ -28,7 +25,7 @@ class Test(MarionetteTestCase): def test_page(self): with self.marionette.using_context('content'): self.marionette.navigate(self.test_page_url) - self.marionette.set_search_timeout(self.timeout) + self.marionette.timeout.implicit = self.timeout/1000 elt = self.marionette.find_element('id', 'test_result'); self.assertEqual(elt.text, 'OK')

1 0

[tor-browser-bundle-testsuite/master] Fix readelf_RELRO, readelf_stack_canary and readelf_PIE
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit cd6aa441e887e0a587e572e6e901219fbca14f69 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun May 17 20:36:53 2020 +0200 Fix readelf_RELRO, readelf_stack_canary and readelf_PIE --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index a054438..e92fe6d 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -99,6 +99,8 @@ our @tests = ( TorBrowser/Tor/PluggableTransports/meek-client-torbrowser TorBrowser/Tor/PluggableTransports/obfs4proxy TorBrowser/Tor/PluggableTransports/zope/interface/_zope_interface_coptimizations.so + TorBrowser/Tor/PluggableTransports/snowflake-client + TorBrowser/ncprop279/ncprop279 ) ], }, { @@ -106,7 +108,7 @@ our @tests = ( type => 'command', descr => 'Check for stack canary support', files => \&tbb_binfiles, - command => [ 'readelf', '-s' ], + command => [ 'readelf', '-s', '--wide' ], check_output => sub { $_[0] =~ m/__stack_chk_fail/ }, enable => sub { $OSNAME eq 'linux' }, # ticket 13056 @@ -115,7 +117,6 @@ our @tests = ( gtk2/libmozgtk.so libmozalloc.so libmozgtk.so - libnssckbi.so libplc4.so libplds4.so TorBrowser/Tor/libstdc++/libstdc++.so.6 @@ -130,6 +131,11 @@ our @tests = ( TorBrowser/Tor/PluggableTransports/zope/interface/_zope_interface_coptimizations.so TorBrowser/Tor/PluggableTransports/meek-client TorBrowser/Tor/PluggableTransports/obfs4proxy + TorBrowser/Tor/PluggableTransports/snowflake-client + TorBrowser/ncprop279/ncprop279 + libgraphitewasm.so + liboggwasm.so + libmozwayland.so ) ], }, { @@ -154,6 +160,7 @@ our @tests = ( TorBrowser/Tor/PluggableTransports/meek-client-torbrowser TorBrowser/Tor/PluggableTransports/obfs4proxy TorBrowser/Tor/PluggableTransports/snowflake-client + TorBrowser/ncprop279/ncprop279 ) ], }, {

1 0

[tor-browser-bundle-testsuite/master] Fix readelf_no_rpath test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit a05667015ccd4811a3b4901d8bcc97eb455773b7 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 15:52:27 2020 +0200 Fix readelf_no_rpath test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 90d445c..b7014f4 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -180,6 +180,9 @@ our @tests = ( command => [ 'readelf', '-d' ], check_output => sub { ! ( $_[0] =~ m/runpath/ ) }, enable => sub { $OSNAME eq 'linux' }, + skip_files => [ qw( + updater + ) ], # We have tor-browser-build#40092 for investigating this }, { name => 'otool_PIE',

1 0

[tor-browser-bundle-testsuite/master] Fix searchengines test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit aa420c446bacd1dd800ad75467261726037b5ec2 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 09:36:03 2020 +0200 Fix searchengines test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 -- marionette/tor_browser_tests/test_searchengines.py | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 0bf4359..91aa6f0 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -385,8 +385,6 @@ our @tests = ( name => 'searchengines', type => 'marionette', descr => 'Check that we have the default search engines set', - # Bug 30340: temporarily disable test - enable => sub { undef }, }, { name => 'noscript', diff --git a/marionette/tor_browser_tests/test_searchengines.py b/marionette/tor_browser_tests/test_searchengines.py index 69d0ffe..eeb2c6b 100644 --- a/marionette/tor_browser_tests/test_searchengines.py +++ b/marionette/tor_browser_tests/test_searchengines.py @@ -22,12 +22,15 @@ class Test(MarionetteTestCase): def test_searchengines(self): with self.marionette.using_context('content'): - self.marionette.navigate('about:') + self.marionette.navigate('about:robots') with self.marionette.using_context('chrome'): - searchbar = self.marionette.find_element('id', 'searchbar') - txtbox = searchbar.find_element('anon attribute', {'anonid': 'searchbar-textbox'}) - self.assertRegexpMatches(txtbox.get_attribute('label'), 'DuckDuckGo', - 'DuckDuckGo is not the default search engine!') + self.marionette.timeout.implicit = 5 + searchbar = self.marionette.find_element('id', 'urlbar-input') + searchbar.click() + searchbar.send_keys("test") + urlbarresults = self.marionette.find_element('id', 'urlbar-results') + result = urlbarresults.find_element("css selector", "div:first-child .urlbarView-action") + self.assertRegexpMatches(result.text, 'DuckDuckGo', 'DuckDuckGo is not the default search engine!') #XXX: Test whether the second and third engine are the ones we want as well.

1 0

[tor-browser-bundle-testsuite/master] Fix play_videos test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit e8a5a6b29969e9b68a2d4acc989508b6a5ee748f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 10:26:07 2020 +0200 Fix play_videos test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 4 +--- marionette/tor_browser_tests/test_page.py | 5 +++-- test-data/play_videos.html | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 4223132..365b7bc 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -428,10 +428,8 @@ our @tests = ( descr => 'Play some videos', use_net => 1, marionette_test => 'page', - remote => 1, + remote => 0, timeout => 50000, - # Bug 30339: temporarily disable test - enable => sub { undef }, }, { name => 'svg-disable', diff --git a/marionette/tor_browser_tests/test_page.py b/marionette/tor_browser_tests/test_page.py index d03367c..3d1f4cc 100644 --- a/marionette/tor_browser_tests/test_page.py +++ b/marionette/tor_browser_tests/test_page.py @@ -13,9 +13,10 @@ class Test(MarionetteTestCase): if ts.t['test']['remote']: test_data_url = ts.t['options']['test_data_url'] + self.test_page_url = '%s/%s.html' % (test_data_url, ts.t['test']['name']) else: - test_data_url = "file://%s" % ts.t['options']['test_data_dir'] - self.test_page_url = '%s/%s.html' % (test_data_url, ts.t['test']['name']) + self.test_page_url = self.marionette.absolute_url('%s.html' % (ts.t['test']['name'])) + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) if ts.t['test']['timeout']: self.timeout = ts.t['test']['timeout'] diff --git a/test-data/play_videos.html b/test-data/play_videos.html index 76e4d1f..a2f4112 100644 --- a/test-data/play_videos.html +++ b/test-data/play_videos.html @@ -34,7 +34,8 @@ for (var i = 0; i < videos.length; i++) { next[v.id] = 'videos_' + (i + 1).toString(); document.getElementById("videos").appendChild(v); } -document.getElementById("videos_0").play(); +const first = document.getElementById("videos_0"); +first.addEventListener("canplay", () => first.play()); </script> </body>

1 0

[tor-browser-bundle-testsuite/master] Fix svg tests
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 838c00e3f9b562ccd3b4b5809b6fb4fe34b3814d Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 11:42:53 2020 +0200 Fix svg tests --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 10 +---- marionette/tor_browser_tests/test_svg.py | 67 +++++++++++++--------------- test-data/svg/object_data_url.html | 2 +- 3 files changed, 33 insertions(+), 46 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 365b7bc..90d445c 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -439,11 +439,8 @@ our @tests = ( use_net => 1, prefs => { 'extensions.torbutton.security_custom' => 'true', - 'svg.in-content.enabled' => 'false', + 'svg.disabled' => 'true', }, - # Bug 28798: temporarily disable test - enable => sub { undef }, - #enable => sub { $OSNAME eq 'linux' }, }, { name => 'svg-enable', @@ -453,11 +450,8 @@ our @tests = ( use_net => 1, prefs => { 'extensions.torbutton.security_custom' => 'true', - 'svg.in-content.enabled' => 'true', + 'svg.disabled' => 'false', }, - # Bug 28798: temporarily disable test - enable => sub { undef }, - #enable => sub { $OSNAME eq 'linux' }, }, { name => 'download_pdf', diff --git a/marionette/tor_browser_tests/test_svg.py b/marionette/tor_browser_tests/test_svg.py index e420d60..af55b1b 100644 --- a/marionette/tor_browser_tests/test_svg.py +++ b/marionette/tor_browser_tests/test_svg.py @@ -1,11 +1,9 @@ -from marionette_driver import By from marionette_driver.errors import MarionetteException, JavascriptException, NoSuchElementException from marionette_harness import MarionetteTestCase import testsuite - class Test(MarionetteTestCase): def setUp(self): @@ -14,62 +12,58 @@ class Test(MarionetteTestCase): ts = testsuite.TestSuite() self.ts = ts - self.svg_dir = "file://%s/svg/" % ts.t['options']['test_data_dir'] + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) def test_svg(self): m = self.marionette svg_enabled = self.ts.t['test']['name'] == 'svg-enable' - self.assertEqual(self.marionette.get_pref('svg.in-content.enabled'), - svg_enabled, - msg="svg.in-content.enabled is not set correctly") + self.assertEqual(self.marionette.get_pref('svg.disabled'), + not svg_enabled, + msg="svg.disabled is not set correctly") - m.set_search_timeout(1000) + self.marionette.timeout.implicit = 1 with m.using_context('content'): # img src url - m.navigate("%s/img_src_url.html" % self.svg_dir) + m.navigate(self.marionette.absolute_url("svg/img_src_url.html")) svg_elt = m.find_element('id', 'svgImgElem') self.assertEqual(svg_elt.get_property('width'), 450 if svg_enabled else 24, msg="img src url") # img data url - m.navigate("%s/img_data_url.html" % self.svg_dir) + m.navigate(self.marionette.absolute_url("svg/img_data_url.html")) svg_elt = m.find_element('id', 'svgImgElem') self.assertEqual(svg_elt.get_property('width'), 300 if svg_enabled else 24, msg="img data url") # object data url - m.navigate("%s/object_data_url.html" % self.svg_dir) - try: - visibility = m.execute_script(''' + m.navigate(self.marionette.absolute_url("svg/object_data_url.html")) + width = m.execute_script(''' var elt = document.getElementById("svgObjectElem"); - return elt.contentDocument.visibilityState; + return elt.getBoundingClientRect().width; ''') - except JavascriptException: - visibility = 'invisible' - self.assertEqual(visibility, - 'visible' if svg_enabled else 'invisible', - msg='object data url') + self.assertEqual(width, + 450 if svg_enabled else 300, + msg="object data url") # object remote url - m.navigate("%s/object_remote_url.html" % self.svg_dir) - try: - visibility = m.execute_script(''' + m.navigate(self.marionette.absolute_url("svg/object_remote_url.html")) + svg_elt = m.find_element('id', 'svgObjectElem') + + width = m.execute_script(''' var elt = document.getElementById("svgObjectElem"); - return elt.contentDocument.visibilityState; + return elt.getBoundingClientRect().width; ''') - except JavascriptException: - visibility = 'invisible' - self.assertEqual(visibility, - 'visible' if svg_enabled else 'invisible', - msg='object remote url') + self.assertEqual(width, + 450 if svg_enabled else 300, + msg="object remote url") # inline svg - m.navigate('%s/inline_svg.html' % self.svg_dir) + m.navigate(self.marionette.absolute_url("svg/inline_svg.html")) try: elt_width = m.execute_script(''' var elt = document.getElementById("inlineSVG"); @@ -77,19 +71,18 @@ class Test(MarionetteTestCase): ''') except JavascriptException: elt_width = None - print "width: %s" % elt_width self.assertEqual(elt_width, 300 if svg_enabled else None, msg='inline svg') # iframe remote url - m.navigate('%s/iframe_remote_url.html' % self.svg_dir) + m.navigate(self.marionette.absolute_url("svg/iframe_remote_url.html")) m.switch_to_frame(m.find_element('id', 'svgIframeElem')) - found_elt = True - try: - svg_elt = m.find_element('tag name', 'svg') - except NoSuchElementException: - found_elt = False - self.assertEqual(found_elt, True if svg_enabled else False, + svg_elt = m.find_element('tag name', 'svg') + width = m.execute_script(''' + var elt = document.getElementsByTagName("svg")[0]; + return elt.getBoundingClientRect().width; + ''') + self.assertEqual(width, + 450 if svg_enabled else 500, msg="iframe remote url prompt") - diff --git a/test-data/svg/object_data_url.html b/test-data/svg/object_data_url.html index 6d2a8b4..9e3344d 100644 --- a/test-data/svg/object_data_url.html +++ b/test-data/svg/object_data_url.html @@ -5,7 +5,7 @@ <title>SVG Test</title> <body> <div>object with data URL:<br> - <object id="svgObjectElem" type="image/svg+xml" data="data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><linearGradient id='g' x2='0' y2='100%'><stop stop-color='%23faf'/><stop offset='100%' stop-color='white'/></linearGradient><rect fill='url(%23g)' width='100%' height='100%'/></svg>"> + <object id="svgObjectElem" type="image/svg+xml" data="data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='450'><linearGradient id='g' x2='0' y2='100%'><stop stop-color='%23faf'/><stop offset='100%' stop-color='white'/></linearGradient><rect fill='url(%23g)' width='100%' height='100%'/></svg>"> this text appears when SVG is disabled </object> </div>

1 0

[tor-browser-bundle-testsuite/master] Bug 30431: Fix the https-everywhere test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 3f07e512d087e40845ce4d52ec4221f98baed878 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 14 18:26:12 2020 +0200 Bug 30431: Fix the https-everywhere test Temptatively fixing this flaky test by waiting until HTTPS Everywhere has loaded some rulesets. Also fix https-everywhere tests for builtin addon. --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 15 -------- .../tor_browser_tests/test_https-everywhere.py | 44 ++++++++++++++++++---- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index e92fe6d..e35e903 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -272,27 +272,12 @@ our @tests = ( type => 'marionette', descr => 'Check that https everywhere is not doing anything when disabled', use_net => 1, - pre => sub { - my ($tbbinfos, $t) = @_; - my $hdir = "$tbbinfos->{tmpdir}/https-everywhere"; - mkdir "$hdir"; - move($tbbinfos->{ffprofiledir} . '/extensions/https-everywhere-eff(a)eff.org.xpi', - $hdir . '/https-everywhere-eff(a)eff.org.xpi'); - }, - post => sub { - my ($tbbinfos, $t) = @_; - my $hdir = "$tbbinfos->{tmpdir}/https-everywhere"; - move($hdir . '/https-everywhere-eff(a)eff.org.xpi', - $tbbinfos->{ffprofiledir} . '/extensions/https-everywhere-eff(a)eff.org.xpi'); - }, }, { name => 'https-everywhere', type => 'marionette', use_net => 1, descr => 'Check that https everywhere is working', - # Bug 30431: temporarily disable test - enable => sub { undef }, }, { name => 'settings', diff --git a/marionette/tor_browser_tests/test_https-everywhere.py b/marionette/tor_browser_tests/test_https-everywhere.py index 25d959e..7819771 100644 --- a/marionette/tor_browser_tests/test_https-everywhere.py +++ b/marionette/tor_browser_tests/test_https-everywhere.py @@ -1,11 +1,7 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - +from marionette_driver import Wait import testsuite - class Test(MarionetteTestCase): def setUp(self): @@ -17,13 +13,47 @@ class Test(MarionetteTestCase): self.HTTP_URL = "http://httpbin.org/" self.HTTPS_URL = "https://httpbin.org/" + self.is_disabled = self.ts.t['test']['name'] == 'https-everywhere-disabled' + + if self.is_disabled: + with self.marionette.using_context('chrome'): + self.marionette.execute_async_script(""" + let [resolve] = arguments; + const { AddonManager } = ChromeUtils.import( + "resource://gre/modules/AddonManager.jsm" + ); + AddonManager.getAddonByID("https-everywhere-eff(a)eff.org") + .then(addon => addon.disable()) + .then(resolve); + """) + + def tearDown(self): + super(Test, self).tearDown() + if self.is_disabled: + with self.marionette.using_context('chrome'): + self.marionette.execute_async_script(""" + let [resolve] = arguments; + const { AddonManager } = ChromeUtils.import( + "resource://gre/modules/AddonManager.jsm" + ); + AddonManager.getAddonByID("https-everywhere-eff(a)eff.org") + .then(addon => addon.enable()) + .then(resolve); + """) def test_https_everywhere(self): + # Wait until .tor.onion rules have been loaded, to make sure HTTPS Everywhere + # has loaded correctly. + m = self.marionette + if not self.is_disabled: + with m.using_context('chrome'): + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.execute_script("return OnionAliasStore._onionMap.size;") > 0) + with self.marionette.using_context('content'): self.marionette.navigate(self.HTTP_URL) - if self.ts.t['test']['name'] == 'https-everywhere': + if not self.is_disabled: self.assertEqual(self.marionette.get_url(), self.HTTPS_URL) else: self.assertEqual(self.marionette.get_url(), self.HTTP_URL) -

1 0

[tor-browser-bundle-testsuite/master] Fix several bridge tests
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 7b3991c9ba73b514cdedf23d2d54df3166454466 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 15:55:45 2020 +0200 Fix several bridge tests --- tor-config/meek_config | 2 +- tor-config/tor_bridge.conf | 2 +- tor-config/tor_meek-azure.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tor-config/meek_config b/tor-config/meek_config index c851390..a795e1d 100644 --- a/tor-config/meek_config +++ b/tor-config/meek_config @@ -1,4 +1,4 @@ [% INCLUDE main_config %] -ClientTransportPlugin meek exec [% tbbinfos.ptdir %]/meek-client-torbrowser -- [% tbbinfos.ptdir %]/meek-client +ClientTransportPlugin meek_lite exec [% tbbinfos.ptdir %]/obfs4proxy diff --git a/tor-config/tor_bridge.conf b/tor-config/tor_bridge.conf index f9a5d7e..5d82115 100644 --- a/tor-config/tor_bridge.conf +++ b/tor-config/tor_bridge.conf @@ -1,4 +1,4 @@ [% INCLUDE main_config %] UseBridges 1 -Bridge 83.212.101.3:6666 +Bridge 35.170.192.213:12358 diff --git a/tor-config/tor_meek-azure.conf b/tor-config/tor_meek-azure.conf index 29f8601..0da1b9f 100644 --- a/tor-config/tor_meek-azure.conf +++ b/tor-config/tor_meek-azure.conf @@ -1,4 +1,4 @@ [% INCLUDE meek_config %] UseBridges 1 -Bridge meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com +Bridge meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[tor-browser-bundle-testsuite/master] Enable noscript test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 72d4af38812d87fc43e66891bc1e049f83f9ddb1 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 17:44:23 2020 +0200 Enable noscript test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 -- marionette/tor_browser_tests/test_noscript.py | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index b7014f4..4a8908e 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -397,8 +397,6 @@ our @tests = ( prefs => { 'extensions.torbutton.security_slider' => 2, }, - # Bug 28876: temporarily disable test - enable => sub { undef }, }, { name => 'fp_screen_dimensions', diff --git a/marionette/tor_browser_tests/test_noscript.py b/marionette/tor_browser_tests/test_noscript.py index 6c3fdeb..8083098 100644 --- a/marionette/tor_browser_tests/test_noscript.py +++ b/marionette/tor_browser_tests/test_noscript.py @@ -7,7 +7,6 @@ from marionette_harness import MarionetteTestCase import testsuite - class Test(MarionetteTestCase): def setUp(self): @@ -21,7 +20,7 @@ class Test(MarionetteTestCase): def test_noscript(self): - self.marionette.set_search_timeout(1000) + self.marionette.timeout.implicit = 1 with self.marionette.using_context('content'):

1 0

[tor-browser-bundle-testsuite/master] Bug 40002: Add test for 'Add v3 onion services client authentication prompt' TB patch
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 5c0a4650a88d4b616fb36afc2a57ebb78ab7f539 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jul 3 00:53:46 2020 +0200 Bug 40002: Add test for 'Add v3 onion services client authentication prompt' TB patch --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 7 + TBBTestSuite/Tests/TorBootstrap.pm | 4 + .../tor_browser_tests/test_onion_client_auth.py | 215 +++++++++++++++++++++ 3 files changed, 226 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 37efae6..7d6c110 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -494,6 +494,13 @@ our @tests = ( use_net => 1, descr => 'Check that onion alias urlbar rewrites work properly', }, + { + name => 'onion_client_auth', + type => 'marionette', + use_net => 1, + descr => 'Check that onion client auth works properly', + run_once => 1, + }, { name => 'security_level_ui', type => 'marionette', diff --git a/TBBTestSuite/Tests/TorBootstrap.pm b/TBBTestSuite/Tests/TorBootstrap.pm index f35b4a2..006be59 100644 --- a/TBBTestSuite/Tests/TorBootstrap.pm +++ b/TBBTestSuite/Tests/TorBootstrap.pm @@ -153,11 +153,15 @@ sub start_tor { } write_file("$tbbinfos->{datadir}/Tor/torrc", ()) unless -f "$tbbinfos->{datadir}/Tor/torrc"; + # These arguments should be kept in sync with tor-launcher + mkdir "$tbbinfos->{datadir}/Tor/onion-auth" unless -d "$tbbinfos->{datadir}/Tor/onion-auth"; my @cmd = (winpath($tbbinfos->{torbin}), '--defaults-torrc', winpath($torrc_file), '-f', winpath("$tbbinfos->{datadir}/Tor/torrc"), 'DataDirectory', winpath("$tbbinfos->{datadir}/Tor"), 'GeoIPFile', winpath($tbbinfos->{torgeoip}), + 'ClientOnionAuthDir', winpath("$tbbinfos->{datadir}/Tor/onion-auth"), + '__SocksPort', "$options->{'tor-socks-port'} ExtendedErrors IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth", '__OwningControllerProcess', winpid($$)); $tbbinfos->{torpid} = fork; if ($tbbinfos->{torpid} == 0) { diff --git a/marionette/tor_browser_tests/test_onion_client_auth.py b/marionette/tor_browser_tests/test_onion_client_auth.py new file mode 100644 index 0000000..38c8a34 --- /dev/null +++ b/marionette/tor_browser_tests/test_onion_client_auth.py @@ -0,0 +1,215 @@ +from marionette_driver import By, Wait +from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException +from marionette_driver.legacy_actions import Actions +from marionette_harness import MarionetteTestCase, WindowManagerMixin + +import testsuite + +from stem.control import Controller +from stem.process import launch_tor_with_config + +from urlparse import urlparse +from tempfile import mkdtemp +import shutil +import os +import base64 + +import time + + +class Test(WindowManagerMixin, MarionetteTestCase): + def setUp(self): + super(Test, self).setUp() + + self.public_key = 'E4ST65PDZDVZRAW2FLT5RBFKYEM3GW73SRQDMEBLBDHQP3Y4NADQ' + self.private_key = 'B7H4TVVQNEOIENRS3GW3GI4VLVTSZPKS7NVSJAIDTNLBRWKWPHLQ' + + self.tmp_dir = mkdtemp() + fixtures_port = urlparse(self.marionette.absolute_url('')).port + os.mkdir(os.path.join(self.tmp_dir, 'hidden_service'), 0700) + os.mkdir(os.path.join(self.tmp_dir, 'hidden_service', + 'authorized_clients'), 0700) + with open(os.path.join(self.tmp_dir, 'hidden_service', 'authorized_clients', 'alice.auth'), "w") as myfile: + myfile.write("descriptor:x25519:" + self.public_key + '\n') + + # Add tor executable directory to the LD_LIBRARY_PATH + ld_lib_list = filter(len, os.environ.get( + "LD_LIBRARY_PATH", "").split(":")) + tor_dirname = os.path.dirname( + testsuite.TestSuite().t['tbbinfos']['torbin']) + if tor_dirname not in ld_lib_list: + ld_lib_list = [tor_dirname] + ld_lib_list + os.environ["LD_LIBRARY_PATH"] = ":".join(ld_lib_list) + + self.tor_process = launch_tor_with_config( + config={ + 'ControlPort': '9999', + 'SOCKSPort': '0', + 'DataDirectory': self.tmp_dir, + 'HiddenServiceDir': os.path.join(self.tmp_dir, 'hidden_service'), + 'HiddenServicePort': '80 127.0.0.1:' + str(fixtures_port), + }, + take_ownership=True, + tor_cmd=testsuite.TestSuite().t['tbbinfos']['torbin'] + ) + + with open(os.path.join(self.tmp_dir, 'hidden_service', 'hostname'), 'r') as myfile: + self.onion = myfile.read().strip() + + self.controller = Controller.from_port(port=9999) + self.controller.authenticate() + + def is_published(_): + try: + self.controller.get_hidden_service_descriptor(self.onion) + return True + except: + return False + Wait(self.marionette, timeout=10).until(is_published) + # Wait a reasonable amount of time to increase the chances of the service to work + time.sleep(10) + + def tearDown(self): + self.controller.close() + self.tor_process.terminate() + shutil.rmtree(self.tmp_dir, ignore_errors=True) + super(Test, self).tearDown() + + def load_onion(self, onion=None, wait_auth=True): + if not onion: + onion = self.onion + m = self.marionette + with m.using_context('content'): + self.marionette.execute_script( + 'window.location = "http://' + onion + '/dom-objects-enumeration.html";') + if wait_auth: + with m.using_context('chrome'): + Wait(m, timeout=m.timeout.page_load).until(lambda _: m.find_element( + 'id', 'tor-clientauth-notification-key').is_displayed()) + + def check_errors(self, title, short, long): + m = self.marionette + with m.using_context('content'): + Wait(m, timeout=m.timeout.page_load).until(lambda _: m.find_element( + 'css selector', '#text-container .title-text').text != '') + self.assertEqual(m.find_element( + 'css selector', '#text-container .title-text').text, title) + self.assertEqual(m.find_element( + 'id', 'errorShortDescText').text, short) + self.assertEqual(m.find_element('id', 'errorLongDesc').text, long) + + def get_keys(self): + with self.marionette.using_context('content'): + self.marionette.navigate("about:preferences#privacy") + self.marionette.find_element( + 'id', 'torOnionServiceKeys-savedKeys').click() + return self.marionette.execute_script(''' + const dialog = document.querySelector('.dialogFrame'); + const tree = dialog.contentDocument.querySelector('#onionservices-savedkeys-tree'); + const view = tree.view; + const rowCount = view.rowCount; + const result = []; + for (let i = 0; i < rowCount; ++i) { + result.push([ + view.getCellText(i, tree.columns[0]), + view.getCellText(i, tree.columns[1]), + ]); + } + return result; + ''') + + def new_identity(self): + m = self.marionette + with m.using_context('chrome'): + m.set_pref('extensions.torbutton.confirm_newnym', False) + m.find_element('id', 'new-identity-button').click() + # Wait some time for new identity to finish. + time.sleep(2) + # Reload marionette session after new identity. + self.marionette.quit() + self.marionette.start_session() + self.marionette.timeout.implicit = 10 + + def delete_all_keys(self): + with self.marionette.using_context('content'): + self.marionette.navigate("about:preferences#privacy") + self.marionette.find_element( + 'id', 'torOnionServiceKeys-savedKeys').click() + return self.marionette.execute_script(''' + const dialog = document.querySelector('.dialogFrame'); + dialog.contentDocument.querySelector('#onionservices-savedkeys-removeall').click(); + ''') + + def test_client_auth(self): + m = self.marionette + m.timeout.implicit = 10 + + # Cancel auth + self.load_onion() + with m.using_context('chrome'): + cancel = m.find_element( + 'css selector', '#tor-clientauth-notification .popup-notification-secondary-button') + cancel.click() + + self.check_errors('Onionsite Requires Authentication', 'Access to the onionsite requires a key but none was provided.', + u'Details: 0xF4 \u2014 The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.') + + # Wrong auth + self.load_onion() + with m.using_context('chrome'): + m.find_element('id', 'tor-clientauth-notification-key').send_keys( + 'E4ST65PDZDVZRAW2FLT5RBFKYEM3GW73SRQDMEBLBDHQP3Y4NADQ') + m.find_element( + 'css selector', '#tor-clientauth-notification .popup-notification-primary-button').click() + Wait(m, timeout=m.timeout.page_load).until(lambda _: not m.find_element( + 'id', 'tor-clientauth-notification-key').is_displayed()) + Wait(m, timeout=m.timeout.page_load).until(lambda _: m.find_element( + 'id', 'tor-clientauth-notification-key').is_displayed()) + + # Good auth, don't remember key + with m.using_context('chrome'): + m.find_element( + 'id', 'tor-clientauth-notification-key').send_keys(self.private_key) + m.find_element( + 'css selector', '#tor-clientauth-notification .popup-notification-primary-button').click() + with m.using_context('content'): + m.find_element('id', 'enumeration') + keys = self.get_keys() + self.assertEqual(len(keys), 0) + self.new_identity() + self.load_onion() # This will block if the auth prompt is not displayed + + # Good auth, remember key + with m.using_context('chrome'): + m.find_element( + 'id', 'tor-clientauth-notification-key').send_keys(self.private_key) + m.find_element('id', 'tor-clientauth-persistkey-checkbox').click() + m.find_element( + 'css selector', '#tor-clientauth-notification .popup-notification-primary-button').click() + with m.using_context('content'): + m.find_element('id', 'enumeration') + keys = self.get_keys() + self.assertEqual(len(keys), 1) + self.assertEqual(keys[0][0], self.onion[:-6]) + self.assertEqual(keys[0][1], base64.b64encode( + base64.b32decode(self.private_key + '===='))) + self.new_identity() + with m.using_context('content'): + m.navigate('http://' + self.onion + + '/dom-objects-enumeration.html') # Should not block + + self.delete_all_keys() + # Wait a bit, otherwise it sometimes loads the onion without the auth prompt + time.sleep(5) + with m.using_context('content'): + self.load_onion() # Load and wait for the auth doorgahnger + + # Check invalid onion address error + with m.using_context('content'): + bad_char = 'a' if self.onion[-7:-6] != 'a' else 'b' + self.load_onion( + onion=self.onion[:-7] + bad_char + ".onion", wait_auth=False) + self.check_errors('Invalid Onionsite Address', 'The provided onionsite address is invalid. Please check that you entered it correctly.', + u'Details: 0xF6 \u2014 The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn\'t match, the ed25519 public key is invalid, or the encoding is invalid.') + + # TODO: check other onion errors

1 0

[tor-browser-bundle-testsuite/master] Bug 40004: Add test for 'Implement .onion alias urlbar rewrites' TB patch
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit cf696e9f07b8716e8115d59d9651982f3702fa32 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 29 19:54:14 2020 +0200 Bug 40004: Add test for 'Implement .onion alias urlbar rewrites' TB patch --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 6 +++ marionette/tor_browser_tests/test_onion_alias.py | 67 ++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 5a642ef..931ab70 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -488,6 +488,12 @@ our @tests = ( use_net => 1, descr => 'Check that Onion-Location header handling works correctly', }, + { + name => 'onion_alias', + type => 'marionette', + use_net => 1, + descr => 'Check that onion alias urlbar rewrites work properly', + }, ); sub set_test_prefs { diff --git a/marionette/tor_browser_tests/test_onion_alias.py b/marionette/tor_browser_tests/test_onion_alias.py new file mode 100644 index 0000000..1495906 --- /dev/null +++ b/marionette/tor_browser_tests/test_onion_alias.py @@ -0,0 +1,67 @@ +from marionette_driver import By, Wait +from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException +from marionette_driver.legacy_actions import Actions +from marionette_harness import MarionetteTestCase, WindowManagerMixin + +import time + + +class Test(WindowManagerMixin, MarionetteTestCase): + def get_urlbar_value(self): + with self.marionette.using_context('chrome'): + return self.marionette.execute_script("return gURLBar.value;") + + def test_onion_alias(self): + m = self.marionette + m.timeout.implicit = 10 + + # Wait until .tor.onion rules have been loaded + with m.using_context('chrome'): + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.execute_script("return OnionAliasStore._onionMap.size;") > 0) + + with m.using_context('content'): + # Navigating to a known .tor.onion should redirect and rewrite the urlbar with the alias. + m.navigate('http://theintercept.securedrop.tor.onion') + self.assertEqual(m.get_url( + ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/') + self.assertEqual(self.get_urlbar_value(), + 'theintercept.securedrop.tor.onion') + + # Bookmark should be created with the onion alias URL + with m.using_context('chrome'): + m.find_element('id', 'star-button-box').click() + m.find_element('id', 'editBookmarkPanelDoneButton').click() + recent_bookmarks = m.execute_script( + "return PlacesUtils.bookmarks.getRecent(1);") + self.assertEqual( + recent_bookmarks[0]["url"], "http://theintercept.securedrop.tor.onion/") + + # Opening a same-origin link should keep the onion alias in the urlbar + el = m.find_element('id', 'submit-documents-button') + action = Actions(m) + action.middle_click(el) + action.perform() + Wait(m, timeout=m.timeout.page_load).until( + lambda _: len(m.window_handles) > 1) + m.switch_to_window(m.window_handles[1]) + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.get_url() != 'about:blank') + self.assertEqual(m.get_url( + ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/gener…') + self.assertEqual(self.get_urlbar_value(), + 'theintercept.securedrop.tor.onion/generate') + m.close() + m.switch_to_window(m.window_handles[0]) + + # Going directly to .onion should not rewrite the urlbar + new_tab = self.open_tab() + m.switch_to_window(new_tab) + m.navigate( + 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion') + self.assertEqual(m.get_url( + ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/') + self.assertEqual(self.get_urlbar_value( + ), 'xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion') + m.close() + m.switch_to_window(self.start_tab)

1 0