- tbb-commits - lists.torproject.org

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

08 Oct '20

commit 88640a08733bd28d359e2327ecc813391ca7f705 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 9 02:31:22 2020 +0000 Translations update --- chrome/locale/fr/aboutDialog.dtd | 2 +- chrome/locale/fr/torbutton.properties | 4 ++-- chrome/locale/ms/aboutTor.dtd | 2 +- chrome/locale/nl/torbutton.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chrome/locale/fr/aboutDialog.dtd b/chrome/locale/fr/aboutDialog.dtd index ede97d06..6630cd94 100644 --- a/chrome/locale/fr/aboutDialog.dtd +++ b/chrome/locale/fr/aboutDialog.dtd @@ -3,7 +3,7 @@ <!ENTITY project.tpoLink "le &vendorShortName;"> <!ENTITY project.end ", un organisme sans but lucratif qui s’efforce de protéger votre vie privée, vos données personnels et votre liberté en ligne."> -<!ENTITY help.start "Souhaitez-vous aider ?"> +<!ENTITY help.start "Voulez-vous aider ?">  <!ENTITY help.donateLink "Faites un don"> <!ENTITY help.or "ou"> diff --git a/chrome/locale/fr/torbutton.properties b/chrome/locale/fr/torbutton.properties index bc04d816..ad54bc52 100644 --- a/chrome/locale/fr/torbutton.properties +++ b/chrome/locale/fr/torbutton.properties @@ -29,7 +29,7 @@ torbutton.title.prompt_torbrowser = Renseignements importants sur BoutonTor torbutton.popup.prompt_torbrowser = Dorénavant, BoutonTor fonctionne différemment : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement, car il n’est pas sécuritaire d’utiliser BoutonTor dans un navigateur qui est aussi utilisé pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l’offre groupée du Navigateur Tor. Les propriétés de confidentialité du Navigateur Tor sont aussi supérieures à celles de Firefox, même s’il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. torbutton.popup.short_torbrowser = Renseignements importants sur BoutonTor !\n\nBoutonTor est dorénavant toujours activé.\n\nCliquer sur BoutonTor pour plus de précisons. -torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à la protection de vos données personnels et à votre anonymat.\n\nIls peuvent aussi contourner Tor afin de divulguer votre position actuelle ainsi que votre adresse IP.\n\nSouhaitez-vous vraiment activer les greffons ?\n\n +torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à la protection de vos données personnels et à votre anonymat.\n\nIls peuvent aussi contourner Tor afin de divulguer votre position actuelle ainsi que votre adresse IP.\n\nVoulez-vous vraiment activer les greffons ?\n\n torbutton.popup.never_ask_again = Ne plus me poser la question. torbutton.popup.confirm_newnym = Le Navigateur Tor fermera tous les fenêtres et onglets. Les sessions des sites Web seront toutes perdues.\n\nRedémarrer le Navigateur Tor maintenant pour réinitialiser votre identité ?\n\n @@ -92,7 +92,7 @@ onionServices.rendezvousFailed.longDescription=Détails : %S – Échec de renc # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Une autorisation est exigée onionServices.clientAuthMissing.header=Le site onion exige une authentification -onionServices.clientAuthMissing=Le site onion exige une clé, mais aucune n'a été indiquée. +onionServices.clientAuthMissing=Le site onion exige une clé, mais aucune n’a été indiquée. onionServices.clientAuthMissing.longDescription=Détails : %S – Le client a téléchargé le descripteur du site demandé, mais n’a pas réussi à déchiffrer son contenu, car il manque les renseignements d’autorisation du client. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Échec d’autorisation diff --git a/chrome/locale/ms/aboutTor.dtd b/chrome/locale/ms/aboutTor.dtd index e33fe237..28fd2aaf 100644 --- a/chrome/locale/ms/aboutTor.dtd +++ b/chrome/locale/ms/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Dermalah Sekarang">  -<!ENTITY aboutTor.ey2020.useamask "Guna pelitup separuh muka, guna juga Tor."> +<!ENTITY aboutTor.ey2020.useamask "Guna pelitup muka, guna juga Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Tangani pandemik pengawasan."> diff --git a/chrome/locale/nl/torbutton.properties b/chrome/locale/nl/torbutton.properties index a037f2d0..289200be 100644 --- a/chrome/locale/nl/torbutton.properties +++ b/chrome/locale/nl/torbutton.properties @@ -49,7 +49,7 @@ canvas.neverAccessKey=o profileProblemTitle=%S-profielprobleem profileReadOnly=U kunt %S niet vanaf een alleen-lezen-bestandssysteem uitvoeren. Kopieer %S naar een andere locatie voordat u het probeert te gebruiken. profileReadOnlyMac=U kunt %S niet vanaf een alleen-lezen-bestandssysteem uitvoeren. Kopieer %S naar uw map Bureaublad of Programma’s voordat u het probeert te gebruiken. -profileAccessDenied=%S heeft geen rechten voor toegang tot het profiel. Pas de bestandssysteemmachtigingen aan en probeer het opnieuw. +profileAccessDenied=%S heeft geen rechten voor toegang tot het profiel. Pas uw rechten van het bestandssysteem aan en probeer het opnieuw. profileMigrationFailed=Migratie van uw bestaande %S-profiel is mislukt.\nEr worden nieuwe instellingen gebruikt. # "Downloading update" string for the hamburger menu (see #28885).

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.2-10.0-2] Bug 40072: Disable Tracking Protection
by Matthew Finkel 08 Oct '20

08 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.2-10.0-2 at The Tor Project / Applications / fenix Commits: 6afc782a by Matthew Finkel at 2020-10-07T13:21:27+00:00 Bug 40072: Disable Tracking Protection - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/utils/Settings.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -387,7 +387,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { var shouldUseTrackingProtection by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_tracking_protection), - default = true + default = false ) /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/6afc782a63776… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/6afc782a63776… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-82.0b7-10.0-1] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 08 Oct '20

08 Oct '20

commit 30175f1fa9c151a4cd6e5171002d0ff4328c2d3f Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 8 11:51:44 2020 +0200 fixup! Bug 26961: New user onboarding. Bug 40139: Update Onboarding icon for 10.0 --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index b411a3039a3e..9f51fb4bd28a 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -909,7 +909,7 @@ class Onboarding { } const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo - const kLearnMore = "https://www.torproject.org/releases/tor-browser-95/"; + const kLearnMore = "https://www.torproject.org/releases/tor-browser-10-0/"; let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button-icon":

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 08 Oct '20

08 Oct '20

commit 827222ef3dc5ddd8f247b1861988ad6f29103653 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 8 11:51:44 2020 +0200 fixup! Bug 26961: New user onboarding. Bug 40139: Update Onboarding icon for 10.0 --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index b411a3039a3e..9f51fb4bd28a 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -909,7 +909,7 @@ class Onboarding { } const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo - const kLearnMore = "https://www.torproject.org/releases/tor-browser-95/"; + const kLearnMore = "https://www.torproject.org/releases/tor-browser-10-0/"; let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button-icon":

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-2] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 08 Oct '20

08 Oct '20

commit 866aded0a51a02ef3695ec76dc0df12d3b0651da Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 8 11:51:44 2020 +0200 fixup! Bug 26961: New user onboarding. Bug 40139: Update Onboarding icon for 10.0 --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index b411a3039a3e..9f51fb4bd28a 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -909,7 +909,7 @@ class Onboarding { } const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo - const kLearnMore = "https://www.torproject.org/releases/tor-browser-95/"; + const kLearnMore = "https://www.torproject.org/releases/tor-browser-10-0/"; let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button-icon":

1 0

[tor-browser-build/master] Pick up Fenix 81.1.2
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 6f9a7e36846404c17cf2aa59a2143e4af0741d65 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 7 21:04:35 2020 +0000 Pick up Fenix 81.1.2 --- projects/android-components/config | 8 +- .../gradle-dependencies-list.txt | 4 +- projects/fenix/config | 8 +- projects/fenix/gradle-dependencies-list.txt | 340 ++++++++++----------- projects/geckoview/config | 4 +- projects/tba-translation/config | 2 +- 6 files changed, 181 insertions(+), 185 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 0424b03..e42c0c9 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -1,18 +1,18 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://gitlab.torproject.org/tpo/applications/android-components.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg var: - android_components_version: 57.0.6 + android_components_version: 57.0.7 torbrowser_branch: 10.0 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 4 + gradle_dependencies_version: 5 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 # Overwrite `glean_parser` for now to fix #40085. @@ -20,7 +20,7 @@ var: targets: nightly: - git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 input_files: diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index ff3b587..a82d51e 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -432,8 +432,8 @@ dbc48baf933d7e57eaf7f50c1fabb4c45ecabd0a8bd7a21f5533ab05d1b821d8 | https://maven 3fe97c6a7bf5bb85cd85f1b2b732bece663fce5a87e4406f95334b9c866f3e20 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/81.0.… e3307e77325cf8e5bd1a4bbfb6f69b1dba208c0cd840ed41438790d6862008da | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82… 41d405815f5c5c1df8d8f31d61f6a556d0d6b2bc9e02c0f905f41321da1f7f8a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82… -b3acbeebbfca2cb7e6d5afa5c23672debd76679752c124e3ae8aa4c5673cdd12 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… -e6754e5153344bacbbe164b1012743db0378b7253b259a1baaa140564fa2aa32 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… +f654485c119c284c7e8132154753e11089254ef27b47abe880e4830abe0bf804 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… +9aee6e0f93d25b480c8bce9720f6e9ef73d0e866b1eddf68492805f021076bb3 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… diff --git a/projects/fenix/config b/projects/fenix/config index 2ecc2be..79a1ccf 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,20 +1,20 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build1' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg variant: Beta var: - fenix_version: 81.1.1 + fenix_version: 81.1.2 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 6 + gradle_dependencies_version: 7 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 # Overwrite `glean_parser` for now to fix #40085. @@ -22,7 +22,7 @@ var: targets: nightly: - git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 variant: Nightly diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 1a84cab..767330f 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -900,180 +900,176 @@ b8740d75ff31c0402f8b75edd26046ddb1c6dcb28e880366b00227d8ec7e1d4b | https://maven 54d1a69f5a00b84bd4bf61ef024e73371b13c2b57c31ebcd6cf7581b18267e3b | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/61.0.1… b509686c9eb57b4a89b6ad5482ce99221a41ec8de410427d6a90bc6fc1a8315a | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/61.0.13/tabs-… 0cfa4b1f7e0da13288a81551aafabb7429990957451937c7c1a747f8c7cf22a4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/61.0.13/tabs-… -5f6bfe0a609eb050c938b08e4342916b35627e85b8e83b8aafd13d41c227ffc3 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/… -fbdb87b94b98deade6b52c56fa34b7ddb6d8bf1a08abbc27740ca4a089fa75bd | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/… -5a55d12b1fd3d08d00f9cc87cecbc634a634ed5af5874fb5e5c2fb65ae150410 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/57.… -6ff7fd4e8848f8cc8531b0e23d0950164695bf7ed67cf6a18613b79218ae9d67 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/57.… -a506b0242ad46ffd2303760baa5649eb09223c1781adc9b70c4f2d20cbd81875 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… -12d83745de13bf270d8a9bc1adbae256fcd5a6e1987d8de29774c463295c213b | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… -9a58ee0c8a2f3e8150c2196beefc952e968869f2c654c8a4d5f090451175f16a | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… -205a0d47f02614a0b98026c3b3fa3f995f7cf7cfcdd94bd27b8f419ab156df1e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… -fa7956704606a43792c708d7749dd8e003f8f0d3bcc8ae61b2a2aeb4177cd470 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… -a6140a973fac305b4bb02dcf63d892728dc6f1a8cc51c109e61f80737ecd00bc | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… -371257933c6ce25b3c19be1460610ac0379461d898d4fee03e892df707ae2483 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/… -065e0008c3df9321cbc5e5a02e33e1c77be4b5020d3902287dac3ac6f86756d0 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/… -8bc0a060ee040bff880f3a6cc57eaa813dca6ee4950c21a343bd7a34ad2b92f5 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/57.0.… -b1a4e29a36649c1f8035bbdf4cdae49e29e1ebc65a7269dc2cf4ef8f2307636e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/57.0.… -31b441240cd7137ee5fbad950ca18fd650f176fc68f469f0c41fa4d60adad324 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/57.0.6… -05ac663842cffe652760f6aef76cf09b50d1ecb6e149a54b3c23569040a3ca79 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/57.0.6… -74e46d1d56a4bb2f4cf8275300476e8f55c70770ff50af008a8bdf1a52bfd001 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/57.0.… -168a59357a7e60855efb7d6df6d314ce518c37c7d2d073c2fd469a305bcc1768 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/57.0.… -39744aaee8b6aa9183f9ec96d5e960fe55f5ada1963756d555283720e6cc4f98 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-search/57.0… -05e44f11fcc5f4652befcc91c0c4125655a75cc860f8006ed5c75ae4640db9e4 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-search/57.0… -67451ba96f48cb0fdccfdf645283c593a5117b149dc5ebb527a24f457c7dd0f5 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session/57.… -16a9134562515143f14624207c29c5982d9a7a66bee9ba478446fec5390b5e03 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session/57.… -366101efe7a954b82dc9b3cd9e108553871d87d719ccd93c6df3ae2e0d472e04 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/57.0.… -9e33e29c58789d5c46b18879ad65ac0571b5ef5ab62e07417bfbf51ed47c2479 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/57.0.… -39a1f741d7fc9760287053c81157caffba1f4a318530ea192d48f45e1f5eaa31 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn… -187faeae36c484be1d2c67fb71c6e483a1df6e4a5ce1894be9d0ae8a51d1142d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn… -88bc2639447874d810900dae880c4dc44a1f5db431ce7e6a0f9dfd21fcd79efa | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/57… -d725b77b6f6ef112d130ac72c1c72711c4475432ba994ec84b09f8d8fd74f5ba | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/57… -375062f26e552de415511c0e85f108e847eaa2c353f8f73d79b8fa0a00c0b7fd | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/… -d2a40f302b661c85d0b19a7d8f06ec6263307e016af77687dba53d15c29f54fe | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/… -fbb056d3886cf543b68e70c3a31fc05d8a80d8b581e77c50a9d22ff45de3f81d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/57.… -13bcd372c11400b1b5b03cd14b217f11ca7cb5c945092fe8e06a1a3874c3cc13 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/57.… -389b0ad314e88bbf7b849cc14739a442ddc8916dbf40d2b28d9caa5197dc015d | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/… -26296f07b0dd9adda37a79129bc7abb9016a1e618b938bccd7285941cf22c3fb | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/… -57fd18d3b217015c39cefedfed5a8231191bd5b25945f4c984c476515260c2c2 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/57.0… -7b42d2f927057c466b167ab36c5688ede9fc08a1945af954895c416f9afb516c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/57.0… -ca24b54e1d01bb0f2dcfa11e92d1f340e5b632e05e2a68ac6a6a76fa7482274a | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/57.0.… -839e32346c8d51db17fd034cea99748abae285c7cba82bb0f15b0d287c9856a2 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/57.0.… -bbe901d57b1e16e6ea12f046337e1c3fdef728f0f400e209a33b170eb7069956 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/57.0.6… -86e29fac30934d9971b2367744e27e1dd4812adbeb9387388b86105d90c94e23 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/57.0.6… -86425d68f958653f4ea53e2ecf18ed6ef33aa85382b90dc4cadfbc45dfe1cef1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/57.0.6… -93d0a9ddc7b281be828ab63d9e38f3b29d88e7e79dc91b567c520b2154c16fee | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/57.0.6… -4d0677e3e8af4559125239ac5520d5ab2869456b538cdecca69a0b6764a4bbe1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/57.… -c1f8ed0117eeefead1ec062a2fe459811177b9e6c77dc0ea66eb19b013ee29ff | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/57.… -2b5332173768e003c5796a74ca6373187271317cd988e2436710903369f457ac | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/57.0.6… -93cc5a3ea60db9d3a5c55b9eefa6501177cd683f656b680ea52f5474d2f1eac1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/57.0.6… -21617e6dac8fedac91066962b5c43acc3d7d3aa8c110970eee6a59730f26b59f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/57… -f40be22734dbf26820039bcaf13f137b231551de807b6a2c1d22d17bb65123c8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/57… -5cecb07810e9904bc1d78e5128713a1f0395d68bb23a9e54d5fc439712d97822 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/57.… -b578cfc404c65c23425cb1e614161126b6ba23dd9f3ddf69f1bf3b818392ad69 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/57.… -b752b3cfb542ef545e5a2ba85b73866571f7cc023ef33c5837c023e2f1cde688 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu… -d40c5e8f1685be6a4aae237fc791c1ed9039825a8ad359e43852080a1bfc7534 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu… -d14d346433e70d7421d90354fe872648c7792590f0d55616b6260043388a885f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/57… -d90514f55b1e3913636cc6bfb7f2315af2e9c96d6260c8eb91e7893f9d967abb | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/57… -824a14ce95db32a21650e7a52089c6a831b721d98692da2c149ea1796f725a98 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/57.0… -9c51fdaecd82272638cbdc1a3cccbaac2b0a2bc7038d1369c16fba01f0b7998b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/57.0… -f6626406a628a813a98cd0161f3272e0889f8826d86af808d16b23e794e02c66 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/5… -077de1941fb61a960cfca42f464ea46b2ea586dce6f72f5c788b7ab28416ac29 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/5… -78851fa5778ab76e45d499e0779c5b09e2b29459013a62021f14effd8b5204d0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/… -bc47e999eff0933a4063239a0d9833c7c66bb1b2fbe68b7278b6b124577d6009 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/… -ec99a44f4790c551af40bc0adfe9ff935cd8bb4b67e126fa5aa749a4c9433ba6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu… -1ca2614fe938dbf2cddc607d015475ac0e0071fbd82d44f8b6a83a9ccfec744d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu… -d91b5fba16cd43cb3dd2668f16d7d657eea7b4ee32375e8c14a6904b13faabe0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/… -1b885f9aee719a2377cb4a16438cef620a59a80f93813df704c0c1c49213545e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/… -7f5d6a32e28afbfcc05909e3c8679fef539220f45c6acc0ee74c8ee068ecc5b1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/5… -ce39ef13ce3783d215b34f4632c2aac0e640adc639ebc28a21e61836cf6436fc | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/5… -fa6355a90e334f6f4d25ef07b056e16ad25403f399e9a90bc63ec5f0028da6af | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/… -c39831a3980470dcf95506afa01f8eda55794a136f13ea48475e44dc659d9ae0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/… -c75f368f829f04a7e4b8f673083c58306d5b2ca228af78fee30c86d8f3ceed05 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/57.0… -b89140ae0ecd08853b1d2e751d767e8f153ed72b7a136cb512274a2c1fbeb7b6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/57.0… -d94918b35844bbea31ad66b2a26d26723818ffc6380a0881d8a3445029405a1e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/57.0… -7900d717d33e198d34d39dc32f3e2cb7134c3ae78a4fd45198981959080c94ac | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/57.0… -1b2ccbddf93c88284c73b4b3644b92ff70f2b62ddc936157821353167ca9cb42 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/57.0.… -3e0ab866e0ef21c8fa17ecbc849a089631a9ea15cff3fa67fa1fdc0ee04cdc54 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/57.0.… -7e730c67df298467356c24f1f9968f893b3971b64f7e965557ce073b34d4fba4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode… -8014f6dc8df78d6a2be02b4d67f971f98884c1374716410c7f3165f7aa1f1ca3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode… -7270e4b638e2cf663dcba72fa63aa39d923b0c620fda0d2ef8631675b51f7f10 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/57.… -8b1da04fac23af9adb6b43452a067b8c4cbe6a39ea51dfa4d85c2c0f6e381104 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/57.… -ab7652da779fbea7b951c44664452a3e221bf955ccbe4e1863b88d344963ab40 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/57.0.6… -330502059a238f4e436166a5d7ec0bbb6ca9951928c559cc472c712fbb31e9bc | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/57.0.6… -d912b000fcbe608593782b6417c37c0088e37766eb00557a2bcc68f21183ce9c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/57.0.6/… -04627d4139825e3554178c6049dca15207e7806731b73117bee2595a03e922df | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/57.0.6/… -af4fe332e5ccad6c4c4770fd5f25d1a2fa2d56985231c25dd44ae02c570861bc | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/57.0.6/f… -96e74ec517c81c42e4a0e97ba7d534b9392e11fd2008ad9e6f4f2eb00bddc437 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/57.0.6/f… -b8c57d88b152e7ab8b9c36dd8cb7abb85118dee0f28663afcbd2b2380a7ea393 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/… -0d0622ddec9cec4669eef180e0e9e5567414afae44f5816a66ea1c8d28a07c7e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/… -1f757d03617812c059cbb023b9fa320d9c6dba739b66aacb46c02f0339a46547 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/57.0… -1df5c4655756c0f3bd648429d3905a6ff7fcc85ba035b0a3a043f72d82f51aaf | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/57.0… -f8677e5e50c30f186ac473c694b2263adcc5b0d8cec10fdf94e65d46c4804516 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/57.… -dd9f790e13dbc7f9470da6cf526d4d41790ea247ad1b8ecc35347fbad9e6d319 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/57.… -e048d388d04e3883e55b5cb9c5a50c43b6e3ad7c11659be487929417612afef5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/57.0.… -8e75859f5a7a03954a79a2651e4b1f2f3f8269bf7ff6087699f84fe3d5495a7a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/57.0.… -c9582aef3b2ebc06dba329937afcf5ffce378ed02c5debc7eb58b68cda46f75a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss… -86f557ffdda8e06afe64f3ba02348191215fe71f21c894a8fb5af98cf25471fd | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss… -b75b1b868f3772e9fef9ce40d5912823f90116caaec7dc46540fdac333f4256e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/… -2ca20001b9037f09655d13ff7387d2fcd57a87ed3fe09cb38bb53ebe6fd0e338 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/… -5072447af10b43e49519e447c5f20e683aed8b1527552d89b1edefd13dac6dc1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect… -e05fb83b19a4e75faec544ab6e61b2dca5756c686d498af06ee9a3159c49752d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect… -d628ae3063a463210d2dacd96f8b8b6b4649d99a2fd3f3b85618e1d1b2538e5d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/57.0.6… -d731877200e808fa376445e3e5eccbcc79d8c82fbb72bac8cb708a027f54035c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/57.0.6… -ccf0ba0db3bb4f2de02e90a941fc3f62005726298a7facb81fa53ab060c5748c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/57.… -17d0e97a0983221669ebb9021f2361c34c98d57164ce57bb84f253e3a83adcd4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/57.… -e0cffe2492ebc285afad787478e1dfcc582580990b080a5960702e12973c7427 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/5… -58eab8f596877d7fb6509817ce5f7076ccd0d7fa610f5dc9fffec40a2c29b8f2 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/5… -b5721d1284a1cda0fed50837933294a5e95665fb34f34c1e37156263e3d82750 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r… -e498921f4c859ac62f53c3cb1406b3c32266b5dda207842bc0fbba36199b6853 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r… -74e7c382c163887910091e7916f7fce51cf160134f0ca54d34e3311f80fda908 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/5… -4302c33eadd987eb5c68a0de462548d99fec91d23e55b09addb7b4d6aa953faf | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/5… -9d182c04f3f4a84ba43fadefae9e2592890c6e03988b997f8f143f78420ddcfd | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica… -f528513d28218948ccb3026b1a03b3edabd2a65868218c14191486a0dd6ec581 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica… -528eace68a32202ac5c54a644a0dbd72f3ad9941581cc9913ec5e89ef8f8760d | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/57.0.6/li… -87a78de78619d1a608d787c5cb7f6d8e844aa12b40ea23b51458941c6cacad9c | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/57.0.6/li… -270ea22bc03b84f7b1b6fcb87b2eeb3e31c8e8e8b207ea962db0a9d643579589 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/57.… -16bb72c57462d72fb623d8af8e95197f2c217b0f1c7fc54354864ac0a3e4641e | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/57.… -72eb146d4a42333f6721613c6c2856c35bff3eecbceddec7dd150adcde18853a | https://maven.mozilla.org/maven2/org/mozilla/components/lib-fetch-httpurlco… -af78ec8ea0130fee2a2e3592e983b8611bc513a1e977de8da962296df50de284 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-fetch-httpurlco… -5464597fd0116f6e799464e42f4a4c90bb746919936138dc3e376b65a3d1a36e | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis… -f3d1e0006298d3244e6777df1174248afdaa6c14f93561c7f2aae749d122bda9 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis… -a8daa7620dd417ce28dc2ef6733bee2d31724d3781c1267c38e1da21e43b43b3 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/5… -de9321be7e68314100fb643e2a70f7831a3a739e2a8095a48d10f119758fc7d9 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/5… -502ef281da0b593b459f6797187300c5399a3b705878759605e2033ff2508b05 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/57.0.6/li… -e163932078a3a7ce43595783ee2e432cfc3f4fe5beeb1f30f12f65b0af4d7eb4 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/57.0.6/li… -809bfd11357b6dcc11c606e5bc183fbdaa2e13606a30c597c99a0b0e4d5281cb | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse… -77468e63139d1d7757a12e559cc6df328b7c738a9be1e8ad23a748f91cfeb701 | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse… -a483fbb43dbaa8790e21f51e9cfdc919b363f649983bbae807bfb6aeeea780ce | https://maven.mozilla.org/maven2/org/mozilla/components/service-experiments… -eba3f94fdc31a478b0430df91d15f421937299e86a22e25f3457aebc12dc44ee | https://maven.mozilla.org/maven2/org/mozilla/components/service-experiments… -1282c766aa075bf869c4e9e12703e8b76c5f24642f291f41b03e609a4a055f40 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc… -a7759c7f2de7b975b52ee4e13014104f1229e1e6321a67c806e3b128002ac27d | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc… -e79f67b5180f06a4680ffea310ceb2c5b0af205a88b3fb1cc76ce96e5b4a7ea7 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/57.0.… -1d0a604b2edd7a7f98d1fa0368d844c9cc188fd909d18a9bff12f2d1e57b753b | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/57.0.… -49cd8cc90341373fda6926b67fdacd6fadcbc0108b6c06b434ce57c52ad3fde3 | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/57… -90bf6cb1c15fcccf8719cc616bc672e08663b2a9c41e32676d612a3d33b1f6d6 | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/57… -f719ea6a50d05349c4f1a0104c55e1c449e8297f3203ab56b5492d9d1be0868a | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins… -d5ac4407e18d2f3a18203c34e12c042e21fe93076ff04620e91d3b92c56fce7b | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins… -493612b12a77aa189b3fa5d9f904133312a805817d7c6f1623317b80eb445ab0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/57.0.6… -fec3f03f0c6fb250a6fa348950374062441598a134f5408845d731256e774d48 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/57.0.6… -3834748245baf1c50a8a31e01910ef3f22c734e449eb7c428a3590dfeda7c0c0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/57.0… -725517b0643aeffb70f38dba9332e5ae7ff2ebe2d1a7b917d8a636d4da821e0c | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/57.0… -019a10b6717f62aa708e3fd7935452ecae6fedfddea440a087c079ebc75a0c7e | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/57.0.6/… -631482ea9ad809efc9e9de798f0f1a6b38cb7898d5f6d53240058464fbc35717 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/57.0.6/… -7aeadd17067d28d9aa92c18803854163b549f6d264edba6f01b22607a6027636 | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/57.0… -74f3cf0b5043ad89a448648aef9cd6e3b7aa1e072332fe99b5115b7b4272fb17 | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/57.0… -a1f6f7337713dee6c06027fa65fd6fba9b6d8e043233db85970be2389ebf9c04 | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/5… -25c32ef65067a8faf12bb379b2c2e8b2f944ddae1ea4029810b8dffcc63160a4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/5… -d49f35d74db7a107ffc6b76d3a3b24a69c559bb11406878841115f0116002b88 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/57… -9d6f8572791f904cda816cbd03b6828650cb77bcf822a52ab3fd9fa6d8e57c44 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/57… -21e97bac96209bdc2eebb8fc939b2ed7f8bd3e2f720d772fae45f2cdb40f589d | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/57.… -2e1dea6d5695b320d557524f714042f746da206a2181bf692c7efcdbf5d7d2e1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/57.… -37b9f417c8d67f8bb2efc7b209b386d22927ae096023db4f44c88bf898cfc6bd | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme… -fe4340378f48d59621199f7b5f498471a1674d2b0478d033dcaa81d0886f474b | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme… -8802d772db48d526b8241afe2eb9bc238be4e8e099a25b6cc1cbc0f573dfd85f | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/57.0.6… -bcea6f3966941122644245ea0913f640a0734d734d56311a0486e0ac7301c282 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/57.0.6… -22934a560b0bc34f01304efbdccc988d2e0fca039ae577894fcec52a7fdfd88e | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/57.0.… -9393c54a522b60febf82cd497b1b02ffef03aec6fc02d9cfc27188a19863bf7b | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/57.0.… -1782bab8651c49971b0c3e29ee8c7c15539db31fb1ad712e574e858e3727f182 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio… -033bb299eeb3856b3dda10b81ba436ccb84c3ba65cc481c3f229294fe8d8120a | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio… -47ea2b6dbdcc4b5e962e124dabee3b72f3dff3c7375923f157c62a670b8c7e6a | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… -82bc2dead6b2f24644fe9315a929a6d3fec89abe2ad75b2a0604fb6a43e23709 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… -5d22777052629c0f0ce689a8ffb051bd83103f4ba7a558d2b2645df1b0e0c5a5 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/57.… -35482b4e765391c1f9e4516dad4fe22fab397371d5f98527f6dfb1c0c4508282 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/57.… -f0b20de68ace4793cf51d8ecd39bba6356134fa290ec8a3c457ed3e1e100f47f | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/57.0.6/ui… -99ba029088a186e2aa22cd43a9efe4376401f012d4587ba371023f184f195401 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/57.0.6/ui… -52728c6033d046cda35f0e37e6cc1b62105ec9e19e263d74603ef73d938ec8bb | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/57.0.6/ui-… -b8f4e6be17baa10ed0f7a6b9c328571e125da2b21a8407dc54c6a2185a2b573c | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/57.0.6/ui-… -81eb04ab0931b48c0e49782528f197ef2a09ba8480db02b1463f7d56931f858b | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/57.0.… -4c581334228464618e362c4c4401ef1aae461e31da5cfc48ce8412e29a347036 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/57.0.… -465a618f0723991c14f9b7569289c889572f534a47f98819250585df1dbdcfa0 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/57.0.6/u… -050fde2edbb43e74951db0f0e564ee0364058e4023e0d2ee24ceeca670acca84 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/57.0.6/u… +5f6bfe0a609eb050c938b08e4342916b35627e85b8e83b8aafd13d41c227ffc3 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/… +f7b960f8403293774e2525baa17a248980bb66a1597d402c3dd994d2e1faffd3 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/… +5a55d12b1fd3d08d00f9cc87cecbc634a634ed5af5874fb5e5c2fb65ae150410 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/57.… +68fe053675190d3488b60ee9a5472cfe4d3f9eb6cf73251162da5e90aac8e729 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/57.… +1dd2e8cb21d1d48b72bbec5f8978827f0ec40de5a34b0720441731397094b9d7 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… +a366a8a7698d5e717445a9cf0cba32c263ab3468538e0039be4fcf71885440d6 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… +067543abe32b8c57c50ca08c9250a40563dcd7e8fcc91777beb8f6a3a4280427 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… +cd1bef87d7106aac5b269c078e8fc30d924a565176394aa6cfe845e067ab1ee6 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… +371257933c6ce25b3c19be1460610ac0379461d898d4fee03e892df707ae2483 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/… +337de5e2ab9c77bd93e4ccd2036722c4e0019b3c9bace33fb11930880fb1d20f | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/… +28c81a07de6d7d519be2a63fb0d0389aed84b1a7857037ccba9e4aa752d64700 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/57.0.… +0b4b2f4fb121b2bc8864ebd36864537040f31b3f1a053d77d219e897c998b4cf | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/57.0.… +31b441240cd7137ee5fbad950ca18fd650f176fc68f469f0c41fa4d60adad324 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/57.0.7… +2d89061a9312e4d38fa39a232e59d6c16c1587f29c56b34e6e70bd85a77b5f01 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/57.0.7… +74e46d1d56a4bb2f4cf8275300476e8f55c70770ff50af008a8bdf1a52bfd001 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/57.0.… +345dbd71f578b2a3615e7a86f7f9d0b1786edfa21ba9ecf294b48e58e7e08a32 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/57.0.… +39744aaee8b6aa9183f9ec96d5e960fe55f5ada1963756d555283720e6cc4f98 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-search/57.0… +d15fae48071c32407bca938c0dfdd6f83679439f27ceee509b27e4952c7058b1 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-search/57.0… +67451ba96f48cb0fdccfdf645283c593a5117b149dc5ebb527a24f457c7dd0f5 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session/57.… +f65da7fce8bb94dfb55b07bab82677428c2169998e1f7924e132dddb7eb9ace9 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session/57.… +366101efe7a954b82dc9b3cd9e108553871d87d719ccd93c6df3ae2e0d472e04 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/57.0.… +ead7e197ec517847f725989e7dba3575892114b8c586dbe58d2dcb2cb6edfefe | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/57.0.… +39a1f741d7fc9760287053c81157caffba1f4a318530ea192d48f45e1f5eaa31 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn… +e22802553715ef7a43c527ea2e77323ee668b918024de7f933ea8cef352f2ba4 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn… +88bc2639447874d810900dae880c4dc44a1f5db431ce7e6a0f9dfd21fcd79efa | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/57… +a4b06488f68d6e3ec75661341aa505b4c490a483ee0f7a2da86ddb466148cb8f | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/57… +375062f26e552de415511c0e85f108e847eaa2c353f8f73d79b8fa0a00c0b7fd | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/… +c513510cce5042db56b1a0669b4f907345f2066e508ef607defe93c9a9be4546 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/… +fbb056d3886cf543b68e70c3a31fc05d8a80d8b581e77c50a9d22ff45de3f81d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/57.… +c4546168c850a90712a097eff072a00a56bbcd6eccdd7e16d72d1a18cd8dbe20 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/57.… +389b0ad314e88bbf7b849cc14739a442ddc8916dbf40d2b28d9caa5197dc015d | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/… +cdfd32a01705f0ad3016e997c19464fc62287e1c94e209ecf329f97f78af15dc | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/… +57fd18d3b217015c39cefedfed5a8231191bd5b25945f4c984c476515260c2c2 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/57.0… +c2296ca92d8e1f2544204c81ac591026b52c7ef41925a88e7e61f2a954c6f035 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/57.0… +1bad0185cb4fa997f8843b976a42b648047ee42761c3adb32395940dafca1fc1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/57.0.… +94e14fb5cbc5a337e01577bc4b3b4ff1f44c3ab4c7c837dffe7851369566d7d2 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/57.0.… +bbe901d57b1e16e6ea12f046337e1c3fdef728f0f400e209a33b170eb7069956 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/57.0.7… +7410a8b18728006b5c46be479778158d788f758897262c93aa4b0f00bb0a1521 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/57.0.7… +86425d68f958653f4ea53e2ecf18ed6ef33aa85382b90dc4cadfbc45dfe1cef1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/57.0.7… +34ba5187405ccb4bb19e75d1d84e183e8676447b1e5b597e6bee0c520481207c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/57.0.7… +4d0677e3e8af4559125239ac5520d5ab2869456b538cdecca69a0b6764a4bbe1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/57.… +761f9795c8d74c360897732d600402dd6d0a1005f6921ea1638523524cd7640a | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/57.… +2b5332173768e003c5796a74ca6373187271317cd988e2436710903369f457ac | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/57.0.7… +12aa92e9393c5cc3fa81490d5c4b5c8e80de2383505f3ce1223f789d9b3f394d | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/57.0.7… +21617e6dac8fedac91066962b5c43acc3d7d3aa8c110970eee6a59730f26b59f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/57… +3f36cd15046a97ab9d34fb6684d28014fc0dbb50ab81d1995e9d43757fee10ba | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/57… +5cecb07810e9904bc1d78e5128713a1f0395d68bb23a9e54d5fc439712d97822 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/57.… +6b1263f6962e6a487a9b97e72b20fda7ca1869eb74cf55a6f9b32f87943c81b3 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/57.… +b752b3cfb542ef545e5a2ba85b73866571f7cc023ef33c5837c023e2f1cde688 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu… +d4411f4c8e5fd49ff1083512b97c421c6ef861b0a061cd3b20f18b09c23f613a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu… +9e2da0973a44b6b1479c49002f12f654bcf436840bd958e1ade106179256b884 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/57… +fca2019cbbb6821f2d44d8763d045abcfd2439b764f29427ebc00a0eef30bc76 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/57… +824a14ce95db32a21650e7a52089c6a831b721d98692da2c149ea1796f725a98 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/57.0… +fed6ad3e564104cf17f17a43f87d1662500688d3f610e98d77c8f8535db9227b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/57.0… +f6626406a628a813a98cd0161f3272e0889f8826d86af808d16b23e794e02c66 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/5… +eb910185a541f3422e0571a1d20f4b4a6b4a7709c178c239442178ac3f939eb8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/5… +78851fa5778ab76e45d499e0779c5b09e2b29459013a62021f14effd8b5204d0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/… +b34b93fa11ac22d1db753cd3c518bf31e03a9062fe7f6c404904b23ff16d5281 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/… +ec99a44f4790c551af40bc0adfe9ff935cd8bb4b67e126fa5aa749a4c9433ba6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu… +4150a564658e1230e6c81d2327847adbf1597f67b9fba3ed92456ad58b871835 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu… +d91b5fba16cd43cb3dd2668f16d7d657eea7b4ee32375e8c14a6904b13faabe0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/… +e193afc5ea1d8339e607d76e399267dfcf5921a240bbd966f8cfa18fc70b311e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/… +7f5d6a32e28afbfcc05909e3c8679fef539220f45c6acc0ee74c8ee068ecc5b1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/5… +41406c0c0c2c6e4337b075cdf59ce10c03de08be48d08040d05fe25b7b42487e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/5… +fa6355a90e334f6f4d25ef07b056e16ad25403f399e9a90bc63ec5f0028da6af | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/… +43b41bb4fed4b93e92a9930e5262636dd24c04b31691de52bf9584c4f45049a4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/… +c75f368f829f04a7e4b8f673083c58306d5b2ca228af78fee30c86d8f3ceed05 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/57.0… +b81499285e515e50c54287d36b92a9b33c9201aa578641e9393aa55c4a5ccb05 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/57.0… +d94918b35844bbea31ad66b2a26d26723818ffc6380a0881d8a3445029405a1e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/57.0… +06eec5063ab9361b66ceda0bcc21b0a2c0929d32fe4518712d59100218e8c744 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/57.0… +1b2ccbddf93c88284c73b4b3644b92ff70f2b62ddc936157821353167ca9cb42 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/57.0.… +fdd63ea6bda72b44e432906e2304ffc7380c5f4877bed4c8e35cf9826586c1f5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/57.0.… +7e730c67df298467356c24f1f9968f893b3971b64f7e965557ce073b34d4fba4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode… +c64ae220671560cddb0188ffac0991da68b5a28ad15ad01eb0f5817f3625ca9d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode… +7270e4b638e2cf663dcba72fa63aa39d923b0c620fda0d2ef8631675b51f7f10 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/57.… +4a0d4f65cd5f05c95add0cf5ecbd313eba3a37e5f8bff54c982287149692c198 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/57.… +ab7652da779fbea7b951c44664452a3e221bf955ccbe4e1863b88d344963ab40 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/57.0.7… +7f49ae36500da9891717262879fd15ec5dcccdbf6c5ce743a22290da2a81a97a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/57.0.7… +d912b000fcbe608593782b6417c37c0088e37766eb00557a2bcc68f21183ce9c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/57.0.7/… +9694dc1a3e2938f9d046961ec1238ef477b4aa25d38a88fde07d3a2a0c0baa07 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/57.0.7/… +af4fe332e5ccad6c4c4770fd5f25d1a2fa2d56985231c25dd44ae02c570861bc | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/57.0.7/f… +625bdd392457d25677fc0dd9940917560b6d37280c0117808e6049147c06d2ac | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/57.0.7/f… +1d8d3981e1984e95204542a87bb65518873bfe424dbeabfe1707a18d2fafeb78 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/… +86a2672781f511990eca224650742e42649593c900056398ca673e910e5fb60c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/… +1f757d03617812c059cbb023b9fa320d9c6dba739b66aacb46c02f0339a46547 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/57.0… +c5c88d057fb615d1424a3b364ae73acd6b010d8e0e87cd5be40a70ac263d7892 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/57.0… +f8677e5e50c30f186ac473c694b2263adcc5b0d8cec10fdf94e65d46c4804516 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/57.… +070fee0ec8b421ed8a8e94759760bc64d4e91d0d863bc253657c4ae0c3550a6f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/57.… +e048d388d04e3883e55b5cb9c5a50c43b6e3ad7c11659be487929417612afef5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/57.0.… +fc097fc9fe3da557816bd3f8f00b3fd30b536db5cbbb1ae5b8bfacd6648081e3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/57.0.… +c9582aef3b2ebc06dba329937afcf5ffce378ed02c5debc7eb58b68cda46f75a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss… +d0feabe1a6b1bdb880f71e2074a29a032fd95af4225f19927fb8af1cf35d5bd4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss… +b75b1b868f3772e9fef9ce40d5912823f90116caaec7dc46540fdac333f4256e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/… +fe1616612cf5968a2923886178fce630e89659bdcaddf2089c47d6c5c72ae8ad | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/… +5072447af10b43e49519e447c5f20e683aed8b1527552d89b1edefd13dac6dc1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect… +9598822e46f859cebc277b3c1948413e24beb8bf6026b1de7f22706c5ac20eb3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect… +d628ae3063a463210d2dacd96f8b8b6b4649d99a2fd3f3b85618e1d1b2538e5d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/57.0.7… +1fe9ddd87e90343cd9f431a8889d42a48031844e7e013951894e94a16ed73996 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/57.0.7… +ccf0ba0db3bb4f2de02e90a941fc3f62005726298a7facb81fa53ab060c5748c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/57.… +964eaaac18eb8e7ab61030341d5b45ecdf82423925edaf7705d85e23780dc990 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/57.… +e0cffe2492ebc285afad787478e1dfcc582580990b080a5960702e12973c7427 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/5… +046bec45ba286f2c384e252a99568cb17ed17f64466831763cc82b5de27001e3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/5… +b5721d1284a1cda0fed50837933294a5e95665fb34f34c1e37156263e3d82750 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r… +046bdd3fa92ae885de544832724cc6b459ede604ff07ccb84df0a77c63cb0d56 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r… +74e7c382c163887910091e7916f7fce51cf160134f0ca54d34e3311f80fda908 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/5… +d44c3d42f0289e960da61db34f067d74f99d926b9d76cb1b93fcc5d4bd1f721d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/5… +9d182c04f3f4a84ba43fadefae9e2592890c6e03988b997f8f143f78420ddcfd | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica… +4c014cc610f97b1d5f75fcced17b3b21e09b5b168d4cb858c52e0622075b9bc6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica… +297bdc9f2cc52bade3efeeff663ab04ab88980940b46d08033bde449f950da6f | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/57.0.7/li… +74da322dfcebaf0a9529d8e202362fe5acad370c026c4119c8c6bb447d4b9a5d | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/57.0.7/li… +270ea22bc03b84f7b1b6fcb87b2eeb3e31c8e8e8b207ea962db0a9d643579589 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/57.… +f438e466565d15dd291f1f8697138ade8d801395be824a168c27bcc577fe4652 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/57.… +72eb146d4a42333f6721613c6c2856c35bff3eecbceddec7dd150adcde18853a | https://maven.mozilla.org/maven2/org/mozilla/components/lib-fetch-httpurlco… +2ebe0b1a9ca60fb2d870ad7ce1eec7b27935889db22e8a030640969078834a3d | https://maven.mozilla.org/maven2/org/mozilla/components/lib-fetch-httpurlco… +5464597fd0116f6e799464e42f4a4c90bb746919936138dc3e376b65a3d1a36e | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis… +cc14c4a0c4a311bf7eec092e5d5c4e5784c09be38ebb2d2b8d32c3d0c5c94bef | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis… +a8daa7620dd417ce28dc2ef6733bee2d31724d3781c1267c38e1da21e43b43b3 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/5… +0a4c9a6c6972d0e54a858ec65caade3ae899810fa35475e5d5a5f743ebd03964 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/5… +502ef281da0b593b459f6797187300c5399a3b705878759605e2033ff2508b05 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/57.0.7/li… +ac061c9f14d2ee8466e1b022bb461f9458662a5efabcc38ae9c0ed6b935ac701 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/57.0.7/li… +809bfd11357b6dcc11c606e5bc183fbdaa2e13606a30c597c99a0b0e4d5281cb | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse… +eb0c9cbf164cd587d5a8cf0a7d5432c66c6f9f0d0de3e54dd584094b7d9be726 | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse… +a483fbb43dbaa8790e21f51e9cfdc919b363f649983bbae807bfb6aeeea780ce | https://maven.mozilla.org/maven2/org/mozilla/components/service-experiments… +87c6cefc40a5dca772adb723e923363301d5d8843d40e60ac59ea5f270c3a88a | https://maven.mozilla.org/maven2/org/mozilla/components/service-experiments… +1282c766aa075bf869c4e9e12703e8b76c5f24642f291f41b03e609a4a055f40 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc… +cffbfc708ed4d4a7c3c6cd61499a128731728fe6f639c5789ebd684053059c8b | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc… +e79f67b5180f06a4680ffea310ceb2c5b0af205a88b3fb1cc76ce96e5b4a7ea7 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/57.0.… +939501a31ee560e321aee2a71241a7d916a619d79fa1215392ea3856378bd063 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/57.0.… +1407414df4c5439c970e1423106a599c818946c3536d9865caee45a8377d2115 | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/57… +905886d366c0bc916f24c2ce16629f0d695856944612cc077e579e1571448aac | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/57… +f719ea6a50d05349c4f1a0104c55e1c449e8297f3203ab56b5492d9d1be0868a | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins… +d4e6cb9371aa715f13ff74e25a4cf95f3c6f5a50c1af9b1d6d71236a050319e3 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins… +4233fd5a2f5089e5d7a835b4047cd4bc83ea3843fba979514a75ad483811c155 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/57.0.7… +8f6f373efd8131a67016cd80e541539ab1c2b6909e62b69f270210ae7ac6b559 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/57.0.7… +3834748245baf1c50a8a31e01910ef3f22c734e449eb7c428a3590dfeda7c0c0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/57.0… +2c8fa07ad5665bb715e55a10de02804958551b160c25e72527230ff6776611e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/57.0… +019a10b6717f62aa708e3fd7935452ecae6fedfddea440a087c079ebc75a0c7e | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/57.0.7/… +b8f4b5d7098d1c1793b4ab4aa8b64a8fb44a72a4c6aa0a479b7beb618f5870f4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/57.0.7/… +7aeadd17067d28d9aa92c18803854163b549f6d264edba6f01b22607a6027636 | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/57.0… +a37bd3ed957ac72178ceb3a011767bdd6e85c8808a1a5351af9f0dda465db440 | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/57.0… +bc0ed8e77330270375e6fe4d5793453d40d2d4f77aeae9110b4134a98cf539b6 | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/5… +6a0af6487e59ec6a4fa9cd7be5307d99accb2ec26abe2ffa0f0523cfbd8e8502 | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/5… +d49f35d74db7a107ffc6b76d3a3b24a69c559bb11406878841115f0116002b88 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/57… +099db076785fd75ad48bfe002f08c4a0d464c0f7acc19eaaf245faca909771f9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/57… +21e97bac96209bdc2eebb8fc939b2ed7f8bd3e2f720d772fae45f2cdb40f589d | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/57.… +dbf86d3bd39983e494d7d07cafe3eab30ea699fff532aeb66d661876f2e1c243 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/57.… +58795c3c6c1dad701cfec9f8dbf4f715eb381481e8d20778107b0bfe95209d04 | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme… +718fef4b5d48cd9f22720c120e7cd036a58ef552ff10e6438ab63f1cc9d6e7e4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme… +8802d772db48d526b8241afe2eb9bc238be4e8e099a25b6cc1cbc0f573dfd85f | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/57.0.7… +cb813dea89e6baabd045245a59654a306e48482c60178e376cd44378a63a4c01 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/57.0.7… +22934a560b0bc34f01304efbdccc988d2e0fca039ae577894fcec52a7fdfd88e | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/57.0.… +c0a54cf4564d67f2666627daece7e2fee02974c6f7a0ccdee71cf124851d0bfe | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/57.0.… +1782bab8651c49971b0c3e29ee8c7c15539db31fb1ad712e574e858e3727f182 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio… +3e27886e88f21ca74be523b7f8ab61a5f79d7151448d1ca267d5045abee2f454 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio… +4173b499da754c1f90c75deaccd164f6baf61b01718e59084c267f167cf327f6 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… +0f5a7bd36f3e9e64f6dafdc9d49591c57f23cc74c4227118a7d2a957219ddd1f | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… +5d22777052629c0f0ce689a8ffb051bd83103f4ba7a558d2b2645df1b0e0c5a5 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/57.… +96bdc3f268716c76989bb9df297b4cc0636fcbf74917e281948c1d07342c3e3f | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/57.… +f0b20de68ace4793cf51d8ecd39bba6356134fa290ec8a3c457ed3e1e100f47f | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/57.0.7/ui… +27bbdc571ffce43119cba811798899ab561efb6419e35ebcec36cea22069619e | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/57.0.7/ui… +52728c6033d046cda35f0e37e6cc1b62105ec9e19e263d74603ef73d938ec8bb | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/57.0.7/ui-… +58706d0c3aa601059b10f31eb33d7dbb7381c8294a8ca5f3b53445eee4cc78b4 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/57.0.7/ui-… +81eb04ab0931b48c0e49782528f197ef2a09ba8480db02b1463f7d56931f858b | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/57.0.… +f548e10c1d76cd6e2b137fb66aa89d3a5f9241beaff9b3e54807ce44818a5f4c | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/57.0.… +465a618f0723991c14f9b7569289c889572f534a47f98819250585df1dbdcfa0 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/57.0.7/u… +8637659f0ffc8618cabbdeee8c0cac17478681df821fae3de50b8dfe6360d9c0 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/57.0.7/u… dbc48baf933d7e57eaf7f50c1fabb4c45ecabd0a8bd7a21f5533ab05d1b821d8 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/81.0.… 3fe97c6a7bf5bb85cd85f1b2b732bece663fce5a87e4406f95334b9c866f3e20 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/81.0.… -e3307e77325cf8e5bd1a4bbfb6f69b1dba208c0cd840ed41438790d6862008da | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82… -41d405815f5c5c1df8d8f31d61f6a556d0d6b2bc9e02c0f905f41321da1f7f8a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82… -b3acbeebbfca2cb7e6d5afa5c23672debd76679752c124e3ae8aa4c5673cdd12 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… -e6754e5153344bacbbe164b1012743db0378b7253b259a1baaa140564fa2aa32 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… +f654485c119c284c7e8132154753e11089254ef27b47abe880e4830abe0bf804 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… +9aee6e0f93d25b480c8bce9720f6e9ef73d0e866b1eddf68492805f021076bb3 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… diff --git a/projects/geckoview/config b/projects/geckoview/config index 2468f63..d2ce0f6 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 81.0b9 + geckoview_version: 81.0.1 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 3ab638c..8df2663 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 273c5751b135f9d1f6a266b8f66bc43c92976fd9 +git_hash: 428b53e651f16be63b17835cd76474130347c73e version: '[% c("abbrev") %]'

1 0

[tor-browser-build/maint-10.0a8] Bump gradle dependency versions, changelog fixups, and build3
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit f3968ad15416d7859ea83651d17a220154923eab Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 7 19:32:45 2020 +0000 Bump gradle dependency versions, changelog fixups, and build3 --- projects/android-components/config | 2 +- projects/fenix/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++---- rbm.conf | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 2cbc4d9..e42c0c9 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -12,7 +12,7 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 4 + gradle_dependencies_version: 5 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 # Overwrite `glean_parser` for now to fix #40085. diff --git a/projects/fenix/config b/projects/fenix/config index 01b5225..79a1ccf 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -14,7 +14,7 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 6 + gradle_dependencies_version: 7 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 # Overwrite `glean_parser` for now to fix #40085. diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0e54d03..f36b366 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,6 @@ Tor Browser 10.0a8 -- October 8 2020 * Update Fenix to 81.1.2 * Update Tor to 0.4.4.5 * Update NoScript to 11.0.46 - * Update HTTPS Everywhere to 2020.08.13 * Bug 10394: Let Tor Browser update HTTPS Everywhere * Bug 11154: Disable TLS 1.0 (and 1.1) by default * Bug 16931: Sanitize the add-on blocklist update URL @@ -123,9 +122,9 @@ Tor Browser 10.0a8 -- October 8 2020 * Bug 34187: Update zlib to use Android NDK 20 * Bug 40010: Add nss project for application-services [tor-browser-build] * Bug 40011: Add sqlcipher for application-services [tor-browser-build] - * Bug 40029: Clean-up all projects to remove fennec bits we don't need for fenix + * Bug 40029: Clean-up all projects to remove fennec bits we don't need for fenix [tor-browser-build] * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] - * Bug 40039: Remove version_path in nss project + * Bug 40039: Remove version_path in nss project [tor-browser-build] * Bug 40040: Wire geckoview, application-services, android-components, and fenix together [tor-browser-build] * Bug 40054: Adapt build.android script in tor-browser project for fenix [tor-browser-build] * Bug 40055: Integrate building Glean in offline mode [tor-browser-build] @@ -142,7 +141,7 @@ Tor Browser 10.0a8 -- October 8 2020 * Bug 40085+40086: classes.dex files are not reproducible in Fenix [tor-browser-build] * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build] * Bug 40088+40117: Use MOZ_BUILD_DATE for extension manifest timestamps [tor-browser-build] - * Bug 40093: Ensure application-services libs do not include libc networking symbols + * Bug 40093: Ensure application-services libs do not include libc networking symbols [tor-browser-build] * Bug 40094: Aarch64 fenix rust cross-compilation fails [tor-browser-build] * Bug 40095: The pattern for the apk variable in build.android is matching too much [tor-browser-build] * Bug 40101: Pick up Fenix 81.1.1 [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index 5d287af..e3649c9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0a8' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 10.0a7 project_name: tor-browser

1 0

[tor-browser/tor-browser-82.0b7-10.0-1] Revert "fixup! TB4: Tor Browser's Firefox preference overrides."
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 6f0a67881b3163073db96fc6273b3fde4d8d64e5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 7 13:29:31 2020 +0000 Revert "fixup! TB4: Tor Browser's Firefox preference overrides." This reverts commit c386fb3312237fd6c0d123ba9aaad662f8740e56. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 786e77fffd55..06e9e17086f8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -287,6 +287,8 @@ pref("extensions.htmlaboutaddons.recommendations.enabled", false); pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton(a)torproject.org"); // Bug 26114: Allow NoScript to access addons.mozilla.org etc. pref("extensions.webextensions.restrictedDomains", ""); +// Bug 31396: Disable indexedDB WebExtension storage backend. +pref("extensions.webextensions.ExtensionStorageIDB.enabled", false); // Bug 28896: Make sure our bundled WebExtensions are running in Private Browsing Mode pref("extensions.allowPrivateBrowsingByDefault", true);

1 0

[tor-browser-build/maint-10.0a8] Use geckoview -build1
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 642fa340ce009dfc5d1c62d98c9cb6ac32af5e27 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 7 15:59:07 2020 +0000 Use geckoview -build1 --- projects/geckoview/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index 1b1801d..d2ce0f6 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 2ec9b33..5d287af 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0a8' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.0a7 project_name: tor-browser

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Revert "fixup! TB4: Tor Browser's Firefox preference overrides."
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit f6d5a694b33d08f7e4d955e14a8405a82452bf84 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 7 13:29:31 2020 +0000 Revert "fixup! TB4: Tor Browser's Firefox preference overrides." This reverts commit c386fb3312237fd6c0d123ba9aaad662f8740e56. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 278c368c823c..304443230cf0 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -287,6 +287,8 @@ pref("extensions.htmlaboutaddons.recommendations.enabled", false); pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton(a)torproject.org"); // Bug 26114: Allow NoScript to access addons.mozilla.org etc. pref("extensions.webextensions.restrictedDomains", ""); +// Bug 31396: Disable indexedDB WebExtension storage backend. +pref("extensions.webextensions.ExtensionStorageIDB.enabled", false); // Bug 28896: Make sure our bundled WebExtensions are running in Private Browsing Mode pref("extensions.allowPrivateBrowsingByDefault", true);

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 13543: Spoof smooth and powerEfficient for Media Capabilities
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit c4c9fc906fc13926a2b9b3268e85ef01b297922b Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 10 15:08:12 2019 +0200 Bug 13543: Spoof smooth and powerEfficient for Media Capabilities --- dom/media/mediacapabilities/MediaCapabilities.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp b/dom/media/mediacapabilities/MediaCapabilities.cpp index 9f2b0d8463ff..1cc5f0a8ff0f 100644 --- a/dom/media/mediacapabilities/MediaCapabilities.cpp +++ b/dom/media/mediacapabilities/MediaCapabilities.cpp @@ -288,6 +288,11 @@ already_AddRefed<Promise> MediaCapabilities::DecodingInfo( if (aValue.IsReject()) { p = CapabilitiesPromise::CreateAndReject( std::move(aValue.RejectValue()), __func__); + } else if (nsContentUtils:: + ShouldResistFingerprinting()) { + p = CapabilitiesPromise::CreateAndResolve( + MediaCapabilitiesInfo(true, true, false), + __func__); } else { MOZ_ASSERT(config->IsVideo()); if (StaticPrefs::media_mediacapabilities_from_database()) {

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 31607: App menu items stop working on macOS
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 34092628552a941e22ac5fb2715faf90da3ab1a0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 3 10:53:43 2019 -0400 Bug 31607: App menu items stop working on macOS Avoid re-creating the hidden window, since this causes the nsMenuBarX object that is associated with the app menu to be freed (which in turn causes all of the app menu items to stop working). More detail: There should only be one hidden window. XREMain::XRE_mainRun() contains an explicit call to create the hidden window and that is the normal path by which it is created. However, when Tor Launcher's wizard/progress window is opened during startup, a hidden window is created earlier as a side effect of calls to nsAppShellService::GetHiddenWindow(). Then, when XREMain::XRE_mainRun() creates its hidden window, the original one is freed which also causes the app menu's nsMenuBarX object which is associated with that window to be destroyed. When that happens, the menuGroupOwner property within each Cocoa menu items's MenuItemInfo object is cleared. This breaks the link that is necessary for NativeMenuItemTarget's menuItemHit method to dispatch a menu item event. --- xpfe/appshell/nsAppShellService.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp index d70fe4e6b239..9c6a09c10a0f 100644 --- a/xpfe/appshell/nsAppShellService.cpp +++ b/xpfe/appshell/nsAppShellService.cpp @@ -93,6 +93,10 @@ void nsAppShellService::EnsureHiddenWindow() { NS_IMETHODIMP nsAppShellService::CreateHiddenWindow() { + if (mHiddenWindow) { + return NS_OK; + } + if (!XRE_IsParentProcess()) { return NS_ERROR_NOT_IMPLEMENTED; }

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 32092: Fix Tor Browser Support link in preferences
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 5cca488d2e4ed1021464363a380b807aa62980b6 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Oct 15 22:54:10 2019 +0200 Bug 32092: Fix Tor Browser Support link in preferences --- browser/components/preferences/preferences.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index fcb722eea0b2..9e97ca2a2180 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -166,10 +166,7 @@ function init_all() { gotoPref().then(() => { let helpButton = document.getElementById("helpButton"); - let helpUrl = - Services.urlFormatter.formatURLPref("app.support.baseURL") + - "preferences"; - helpButton.setAttribute("href", helpUrl); + helpButton.setAttribute("href", "https://support.torproject.org/tbb"); document.getElementById("addonsButton").addEventListener("click", e => { if (e.button >= 2) {

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 27604: Fix addon issues when moving TB directory
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 3d7f75d7c006e5e4585fc2a1eca67b78e683b68d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Oct 30 10:44:48 2019 +0100 Bug 27604: Fix addon issues when moving TB directory --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index a27888278f77..78c0b0f7c702 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -485,7 +485,7 @@ class XPIState { // Builds prior to be 1512436 did not include the rootURI property. // If we're updating from such a build, add that property now. - if (!("rootURI" in this) && this.file) { + if (this.file) { this.rootURI = getURIForResourceInFile(this.file, "").spec; } @@ -498,7 +498,10 @@ class XPIState { saved.currentModifiedTime != this.lastModifiedTime ) { this.lastModifiedTime = saved.currentModifiedTime; - } else if (saved.currentModifiedTime === null) { + } else if ( + saved.currentModifiedTime === null && + (!this.file || !this.file.exists()) + ) { this.missing = true; } } @@ -1439,6 +1442,7 @@ var XPIStates = { if (oldState[loc.name]) { loc.restore(oldState[loc.name]); + changed = changed || loc.path != oldState[loc.name].path; } changed = changed || loc.changed;

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 31740: Remove some unnecessary RemoteSettings instances
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit ee5920f60931cc593fcf972c8f34acb0f68ecdc5 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Oct 16 23:01:12 2019 +0200 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. --- .../url-classifier/UrlClassifierFeatureBase.cpp | 2 +- netwerk/url-classifier/components.conf | 6 ------ security/manager/ssl/RemoteSecuritySettings.jsm | 22 ++++++++++++++++++++++ services/settings/IDBHelpers.jsm | 4 ++++ services/settings/dumps/blocklists/moz.build | 1 - services/settings/dumps/main/moz.build | 6 ------ services/settings/dumps/security-state/moz.build | 1 - .../components/antitracking/antitracking.manifest | 2 +- toolkit/components/antitracking/components.conf | 7 ------- toolkit/components/search/SearchService.jsm | 2 -- 10 files changed, 28 insertions(+), 25 deletions(-) diff --git a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp index 07da1fd07374..48bcc7d10af9 100644 --- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp +++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp @@ -78,7 +78,7 @@ void UrlClassifierFeatureBase::InitializePreferences() { nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService = do_GetService("@mozilla.org/url-classifier/exception-list-service;1"); - if (NS_WARN_IF(!exceptionListService)) { + if (!exceptionListService) { return; } diff --git a/netwerk/url-classifier/components.conf b/netwerk/url-classifier/components.conf index 03a02f0ebeab..b2e667247317 100644 --- a/netwerk/url-classifier/components.conf +++ b/netwerk/url-classifier/components.conf @@ -13,10 +13,4 @@ Classes = [ 'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton', 'headers': ['mozilla/net/ChannelClassifierService.h'], }, - { - 'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}', - 'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'], - 'jsm': 'resource://gre/modules/UrlClassifierExceptionListService.jsm', - 'constructor': 'UrlClassifierExceptionListService', - }, ] diff --git a/security/manager/ssl/RemoteSecuritySettings.jsm b/security/manager/ssl/RemoteSecuritySettings.jsm index 3fedd43ed9be..fd2b69bc6a4f 100644 --- a/security/manager/ssl/RemoteSecuritySettings.jsm +++ b/security/manager/ssl/RemoteSecuritySettings.jsm @@ -350,6 +350,16 @@ var RemoteSecuritySettings = { class IntermediatePreloads { constructor() { + this.maybeInit(); + } + + maybeInit() { + if ( + this.client || + !Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true) + ) { + return; + } this.client = RemoteSettings( Services.prefs.getCharPref(INTERMEDIATES_COLLECTION_PREF), { @@ -379,6 +389,7 @@ class IntermediatePreloads { ); return; } + this.maybeInit(); // Download attachments that are awaiting download, up to a max. const maxDownloadsPerRun = Services.prefs.getIntPref( @@ -709,6 +720,16 @@ function compareFilters(filterA, filterB) { class CRLiteFilters { constructor() { + this.maybeInit(); + } + + maybeInit() { + if ( + this.client || + !Services.prefs.getBoolPref(CRLITE_FILTERS_ENABLED_PREF, true) + ) { + return; + } this.client = RemoteSettings( Services.prefs.getCharPref(CRLITE_FILTERS_COLLECTION_PREF), { @@ -734,6 +755,7 @@ class CRLiteFilters { ); return; } + this.maybeInit(); let current = await this.client.db.list(); let fullFilters = current.filter(filter => !filter.incremental); if (fullFilters.length < 1) { diff --git a/services/settings/IDBHelpers.jsm b/services/settings/IDBHelpers.jsm index 5dc59c3687ef..010a5ea82987 100644 --- a/services/settings/IDBHelpers.jsm +++ b/services/settings/IDBHelpers.jsm @@ -188,6 +188,10 @@ async function openIDB(allowUpgrades = true) { }); } if (event.oldVersion < 3) { + // Clear existing stores for a fresh start + transaction.objectStore("records").clear(); + transaction.objectStore("timestamps").clear(); + transaction.objectStore("collections").clear(); // Attachment store db.createObjectStore("attachments", { keyPath: ["cid", "attachmentId"], diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 1683ab6aafa4..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -9,7 +9,6 @@ with Files('**'): # The addons blocklist is also in mobile/android/installer/package-manifest.in FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', - 'addons.json', 'gfx.json', 'plugins.json'] diff --git a/services/settings/dumps/main/moz.build b/services/settings/dumps/main/moz.build index 8e202303e9c8..e25fc4214042 100644 --- a/services/settings/dumps/main/moz.build +++ b/services/settings/dumps/main/moz.build @@ -3,16 +3,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. FINAL_TARGET_FILES.defaults.settings.main += [ - 'anti-tracking-url-decoration.json', 'example.json', 'hijack-blocklists.json', 'language-dictionaries.json', - 'onboarding.json', - 'search-config.json', 'search-default-override-allowlist.json', - 'sites-classification.json', - 'top-sites.json', - 'url-classifier-skip-urls.json', ] if CONFIG['MOZ_BUILD_APP'] == 'browser': diff --git a/services/settings/dumps/security-state/moz.build b/services/settings/dumps/security-state/moz.build index d8f8227a0278..37410d0fb054 100644 --- a/services/settings/dumps/security-state/moz.build +++ b/services/settings/dumps/security-state/moz.build @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. FINAL_TARGET_FILES.defaults.settings['security-state'] += [ - 'intermediates.json', 'onecrl.json', ] diff --git a/toolkit/components/antitracking/antitracking.manifest b/toolkit/components/antitracking/antitracking.manifest index 5eb37f9a3f99..872e6af07575 100644 --- a/toolkit/components/antitracking/antitracking.manifest +++ b/toolkit/components/antitracking/antitracking.manifest @@ -1 +1 @@ -category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main +# category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main diff --git a/toolkit/components/antitracking/components.conf b/toolkit/components/antitracking/components.conf index 74a8a21277d9..04b2ba1b815f 100644 --- a/toolkit/components/antitracking/components.conf +++ b/toolkit/components/antitracking/components.conf @@ -11,13 +11,6 @@ Classes = [ 'jsm': 'resource://gre/modules/TrackingDBService.jsm', 'constructor': 'TrackingDBService', }, - { - 'cid': '{5874af6d-5719-4e1b-b155-ef4eae7fcb32}', - 'contract_ids': ['@mozilla.org/tracking-url-decoration-service;1'], - 'jsm': 'resource://gre/modules/URLDecorationAnnotationsService.jsm', - 'constructor': 'URLDecorationAnnotationsService', - 'processes': ProcessSelector.MAIN_PROCESS_ONLY, - }, { 'cid': '{90d1fd17-2018-4e16-b73c-a04a26fa6dd4}', 'contract_ids': ['@mozilla.org/purge-tracker-service;1'], diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm index 86fd01c3b10a..a6d81ed66178 100644 --- a/toolkit/components/search/SearchService.jsm +++ b/toolkit/components/search/SearchService.jsm @@ -549,8 +549,6 @@ SearchService.prototype = { .catch(ex => logConsole.error("_init: failure determining region:", ex)) .finally(() => (this._ensureKnownRegionPromise = null)); - this._setupRemoteSettings().catch(Cu.reportError); - await this._loadEngines(cache); // If we've got this far, but the application is now shutting down,

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 32220: Improve the letterboxing experience
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 891f4add9c36a3c84c282ec27220617dcdf8071f Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 28 17:42:17 2019 -0700 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and border are tied to the currently selected theme. Also adds a 'needsLetterbox' property to tabbrowser.xml to fix a race condition present when using the 'isEmpty' property. Using 'isEmpty' as a proxy for 'needsLetterbox' resulted in over-zealous/unnecessary letterboxing of about:blank tabs. --- browser/base/content/browser.css | 8 ++ browser/base/content/tabbrowser-tab.js | 9 +++ browser/themes/shared/tabs.inc.css | 6 ++ .../components/resistfingerprinting/RFPHelper.jsm | 94 +++++++++++++++++++--- 4 files changed, 105 insertions(+), 12 deletions(-) diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 085e47cad9f0..07694dbd2c30 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -85,6 +85,14 @@ body { display: none; } + +.browserStack > browser.letterboxing { + border-color: var(--chrome-content-separator-color); + border-style: solid; + border-width : 1px; + border-top: none; +} + %ifdef MENUBAR_CAN_AUTOHIDE #toolbar-menubar[autohide="true"] { overflow: hidden; diff --git a/browser/base/content/tabbrowser-tab.js b/browser/base/content/tabbrowser-tab.js index 183eff1bab86..7f376ab1d122 100644 --- a/browser/base/content/tabbrowser-tab.js +++ b/browser/base/content/tabbrowser-tab.js @@ -225,6 +225,15 @@ return true; } + get needsLetterbox() { + let browser = this.linkedBrowser; + if (isBlankPageURL(browser.currentURI.spec)) { + return false; + } + + return true; + } + get lastAccessed() { return this._lastAccessed == Infinity ? Date.now() : this._lastAccessed; } diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css index b8a117532049..cf8f444b262d 100644 --- a/browser/themes/shared/tabs.inc.css +++ b/browser/themes/shared/tabs.inc.css @@ -33,6 +33,12 @@ background-color: #f9f9fa; } +/* extend down the toolbar's colors when letterboxing is enabled*/ +#tabbrowser-tabpanels.letterboxing { + background-color: var(--toolbar-bgcolor); + background-image: var(--toolbar-bgimage); +} + :root[privatebrowsingmode=temporary] #tabbrowser-tabpanels { /* Value for --in-content-page-background in aboutPrivateBrowsing.css */ background-color: #25003e; diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 166ad21e9013..9520d8720631 100644 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -40,6 +40,7 @@ class _RFPHelper { // ============================================================================ constructor() { this._initialized = false; + this._borderDimensions = null; } init() { @@ -361,6 +362,24 @@ class _RFPHelper { }); } + getBorderDimensions(aBrowser) { + if (this._borderDimensions) { + return this._borderDimensions; + } + + const win = aBrowser.ownerGlobal; + const browserStyle = win.getComputedStyle(aBrowser); + + this._borderDimensions = { + top : parseInt(browserStyle.borderTopWidth), + right: parseInt(browserStyle.borderRightWidth), + bottom : parseInt(browserStyle.borderBottomWidth), + left : parseInt(browserStyle.borderLeftWidth), + }; + + return this._borderDimensions; + } + _addOrClearContentMargin(aBrowser) { let tab = aBrowser.getTabBrowser().getTabForBrowser(aBrowser); @@ -369,9 +388,13 @@ class _RFPHelper { return; } + // we add the letterboxing class even if the content does not need letterboxing + // in which case margins are set such that the borders are hidden + aBrowser.classList.add("letterboxing"); + // We should apply no margin around an empty tab or a tab with system // principal. - if (tab.isEmpty || aBrowser.contentPrincipal.isSystemPrincipal) { + if (!tab.needsLetterbox || aBrowser.contentPrincipal.isSystemPrincipal) { this._clearContentViewMargin(aBrowser); } else { this._roundContentView(aBrowser); @@ -539,10 +562,29 @@ class _RFPHelper { // Calculating the margins around the browser element in order to round the // content viewport. We will use a 200x100 stepping if the dimension set // is not given. - let margins = calcMargins(containerWidth, containerHeight); + + const borderDimensions = this.getBorderDimensions(aBrowser); + const marginDims = calcMargins(containerWidth, containerHeight - borderDimensions.top); + + let margins = { + top : 0, + right : 0, + bottom : 0, + left : 0, + }; + + // snap browser element to top + margins.top = 0; + // and leave 'double' margin at the bottom + margins.bottom = 2 * marginDims.height - borderDimensions.bottom; + // identical margins left and right + margins.right = marginDims.width - borderDimensions.right; + margins.left = marginDims.width - borderDimensions.left; + + const marginStyleString = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`; // If the size of the content is already quantized, we do nothing. - if (aBrowser.style.margin == `${margins.height}px ${margins.width}px`) { + if (aBrowser.style.margin === marginStyleString) { log("_roundContentView[" + logId + "] is_rounded == true"); if (this._isLetterboxingTesting) { log( @@ -563,19 +605,35 @@ class _RFPHelper { "_roundContentView[" + logId + "] setting margins to " + - margins.width + - " x " + - margins.height + marginStyleString ); - // One cannot (easily) control the color of a margin unfortunately. - // An initial attempt to use a border instead of a margin resulted - // in offset event dispatching; so for now we use a colorless margin. - aBrowser.style.margin = `${margins.height}px ${margins.width}px`; + + // The margin background color is determined by the background color of the + // window's tabpanels#tabbrowser-tabpanels element + aBrowser.style.margin = marginStyleString; }); } _clearContentViewMargin(aBrowser) { + const borderDimensions = this.getBorderDimensions(aBrowser); + // set the margins such that the browser elements border is visible up top, but + // are rendered off-screen on the remaining sides + let margins = { + top : 0, + right : -borderDimensions.right, + bottom : -borderDimensions.bottom, + left : -borderDimensions.left, + }; + const marginStyleString = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`; + + aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.style.margin = marginStyleString; + }); + } + + _removeLetterboxing(aBrowser) { aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.classList.remove("letterboxing"); aBrowser.style.margin = ""; }); } @@ -593,6 +651,11 @@ class _RFPHelper { aWindow.gBrowser.addTabsProgressListener(this); aWindow.addEventListener("TabOpen", this); + const tabPanel = aWindow.document.getElementById("tabbrowser-tabpanels"); + if (tabPanel) { + tabPanel.classList.add("letterboxing"); + } + // Rounding the content viewport. this._updateMarginsForTabsInWindow(aWindow); } @@ -616,10 +679,17 @@ class _RFPHelper { tabBrowser.removeTabsProgressListener(this); aWindow.removeEventListener("TabOpen", this); - // Clear all margins and tooltip for all browsers. + // revert tabpanel's background colors to default + const tabPanel = aWindow.document.getElementById("tabbrowser-tabpanels"); + if (tabPanel) { + tabPanel.classList.remove("letterboxing"); + } + + // and revert each browser element to default, + // restore default margins and remove letterboxing class for (let tab of tabBrowser.tabs) { let browser = tab.linkedBrowser; - this._clearContentViewMargin(browser); + this._removeLetterboxing(browser); } }

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 28125 - Prevent non-Necko network connections
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit a4dd1ba88ff56eeef394722f1fa88f76e99c89b4 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 25 19:17:09 2018 +0000 Bug 28125 - Prevent non-Necko network connections --- .../gecko/media/GeckoMediaDrmBridgeV21.java | 49 +--------------------- .../exoplayer2/upstream/DefaultHttpDataSource.java | 47 ++------------------- 2 files changed, 4 insertions(+), 92 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java index 3ba59bfd6776..eb57b1013642 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java @@ -488,54 +488,7 @@ public class GeckoMediaDrmBridgeV21 implements GeckoMediaDrm { @Override protected Void doInBackground(final Void... params) { - HttpURLConnection urlConnection = null; - BufferedReader in = null; - try { - URI finalURI = new URI(mURL + "&signedRequest=" + URLEncoder.encode(new String(mDrmRequest), "UTF-8")); - urlConnection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(finalURI); - urlConnection.setRequestMethod("POST"); - if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" + finalURI.toString()); - - // Add data - urlConnection.setRequestProperty("Accept", "*/*"); - urlConnection.setRequestProperty("User-Agent", getCDMUserAgent()); - urlConnection.setRequestProperty("Content-Type", "application/json"); - - // Execute HTTP Post Request - urlConnection.connect(); - - int responseCode = urlConnection.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), StringUtils.UTF_8)); - String inputLine; - StringBuffer response = new StringBuffer(); - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); - mResponseBody = String.valueOf(response).getBytes(StringUtils.UTF_8); - if (DEBUG) Log.d(LOGTAG, "Provisioning, response received."); - if (mResponseBody != null) Log.d(LOGTAG, "response length=" + mResponseBody.length); - } else { - Log.d(LOGTAG, "Provisioning, server returned HTTP error code :" + responseCode); - } - } catch (IOException e) { - Log.e(LOGTAG, "Got exception during posting provisioning request ...", e); - } catch (URISyntaxException e) { - Log.e(LOGTAG, "Got exception during creating uri ...", e); - } finally { - if (urlConnection != null) { - urlConnection.disconnect(); - } - try { - if (in != null) { - in.close(); - } - } catch (IOException e) { - Log.e(LOGTAG, "Exception during closing in ...", e); - } - } + Log.i(LOGTAG, "This is Tor Browser. Skipping."); return null; } diff --git a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 6e5095b0a4c9..a585e283ed4e 100644 --- a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -46,6 +46,7 @@ import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; import org.mozilla.gecko.util.ProxySelector; + /** * An {@link HttpDataSource} that uses Android's {@link HttpURLConnection}. * @@ -516,50 +517,8 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou boolean followRedirects, Map<String, String> requestParameters) throws IOException, URISyntaxException { - /** - * Tor Project modified the way the connection object was created. For the sake of - * simplicity, instead of duplicating the whole file we changed the connection object - * to use the ProxySelector. - */ - HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); - - connection.setConnectTimeout(connectTimeoutMillis); - connection.setReadTimeout(readTimeoutMillis); - - Map<String, String> requestHeaders = new HashMap<>(); - if (defaultRequestProperties != null) { - requestHeaders.putAll(defaultRequestProperties.getSnapshot()); - } - requestHeaders.putAll(requestProperties.getSnapshot()); - requestHeaders.putAll(requestParameters); - - for (Map.Entry<String, String> property : requestHeaders.entrySet()) { - connection.setRequestProperty(property.getKey(), property.getValue()); - } - - if (!(position == 0 && length == C.LENGTH_UNSET)) { - String rangeRequest = "bytes=" + position + "-"; - if (length != C.LENGTH_UNSET) { - rangeRequest += (position + length - 1); - } - connection.setRequestProperty("Range", rangeRequest); - } - connection.setRequestProperty("User-Agent", userAgent); - connection.setRequestProperty("Accept-Encoding", allowGzip ? "gzip" : "identity"); - connection.setInstanceFollowRedirects(followRedirects); - connection.setDoOutput(httpBody != null); - connection.setRequestMethod(DataSpec.getStringForHttpMethod(httpMethod)); - - if (httpBody != null) { - connection.setFixedLengthStreamingMode(httpBody.length); - connection.connect(); - OutputStream os = connection.getOutputStream(); - os.write(httpBody); - os.close(); - } else { - connection.connect(); - } - return connection; + Log.i(TAG, "This is Tor Browser. Skipping."); + throw new IOException(); } /** Creates an {@link HttpURLConnection} that is connected with the {@code url}. */

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 32658: Create a new MAR signing key
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 9e1cfb5ab679bc28efafbd3bd8b8ddb60b65b8b1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 17 12:54:31 2020 +0000 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1225 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1225 -> 1229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 1d94f88ad73b..0103a171de88 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 474706c4b73c..fcee3944e9b7 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 30237: Add v3 onion services client authentication prompt
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit c6814ca41091fbb4ddd0891f26f36fec6c5589a1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Nov 12 16:11:05 2019 -0500 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. --- browser/actors/NetErrorChild.jsm | 7 + browser/base/content/aboutNetError.js | 10 +- browser/base/content/aboutNetError.xhtml | 1 + browser/base/content/browser.js | 10 + browser/base/content/browser.xhtml | 3 + browser/base/content/tab-content.js | 5 + browser/components/moz.build | 1 + .../content/authNotificationIcon.inc.xhtml | 6 + .../onionservices/content/authPopup.inc.xhtml | 16 ++ .../onionservices/content/authPreferences.css | 20 ++ .../content/authPreferences.inc.xhtml | 19 ++ .../onionservices/content/authPreferences.js | 66 +++++ .../components/onionservices/content/authPrompt.js | 316 +++++++++++++++++++++ .../components/onionservices/content/authUtil.jsm | 47 +++ .../onionservices/content/netError/browser.svg | 3 + .../onionservices/content/netError/network.svg | 3 + .../content/netError/onionNetError.css | 65 +++++ .../content/netError/onionNetError.js | 244 ++++++++++++++++ .../onionservices/content/netError/onionsite.svg | 7 + .../onionservices/content/onionservices.css | 69 +++++ .../onionservices/content/savedKeysDialog.js | 259 +++++++++++++++++ .../onionservices/content/savedKeysDialog.xhtml | 42 +++ browser/components/onionservices/jar.mn | 9 + browser/components/onionservices/moz.build | 1 + browser/components/preferences/preferences.xhtml | 1 + browser/components/preferences/privacy.inc.xhtml | 2 + browser/components/preferences/privacy.js | 7 + browser/themes/shared/notification-icons.inc.css | 3 + docshell/base/nsDocShell.cpp | 81 +++++- dom/ipc/BrowserParent.cpp | 21 ++ dom/ipc/BrowserParent.h | 3 + dom/ipc/PBrowser.ipdl | 9 + js/xpconnect/src/xpc.msg | 10 + netwerk/base/nsSocketTransport2.cpp | 6 + netwerk/socket/nsSOCKSIOLayer.cpp | 49 ++++ toolkit/modules/PopupNotifications.jsm | 6 + toolkit/modules/RemotePageAccessManager.jsm | 1 + .../lib/environments/frame-script.js | 1 + xpcom/base/ErrorList.py | 22 ++ 39 files changed, 1449 insertions(+), 2 deletions(-) diff --git a/browser/actors/NetErrorChild.jsm b/browser/actors/NetErrorChild.jsm index eea7ddd0cf97..58bab60c36f7 100644 --- a/browser/actors/NetErrorChild.jsm +++ b/browser/actors/NetErrorChild.jsm @@ -13,6 +13,8 @@ const { RemotePageChild } = ChromeUtils.import( "resource://gre/actors/RemotePageChild.jsm" ); +const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); + XPCOMUtils.defineLazyServiceGetter( this, "gSerializationHelper", @@ -30,6 +32,7 @@ class NetErrorChild extends RemotePageChild { "RPMAddToHistogram", "RPMRecordTelemetryEvent", "RPMGetHttpResponseHeader", + "RPMGetTorStrings", ]; this.exportFunctions(exportableFunctions); } @@ -103,4 +106,8 @@ class NetErrorChild extends RemotePageChild { return ""; } + + RPMGetTorStrings() { + return Cu.cloneInto(TorStrings.onionServices, this.contentWindow); + } } diff --git a/browser/base/content/aboutNetError.js b/browser/base/content/aboutNetError.js index fd12295b05fd..4e40e53da199 100644 --- a/browser/base/content/aboutNetError.js +++ b/browser/base/content/aboutNetError.js @@ -3,6 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ /* eslint-env mozilla/frame-script */ +/* import-globals-from ../../components/onionservices/content/netError/onionNetError.js */ const formatter = new Intl.DateTimeFormat("default"); @@ -280,7 +281,10 @@ function initPage() { errDesc = document.getElementById("ed_generic"); } - setErrorPageStrings(err); + const isOnionError = err.startsWith("onionServices."); + if (!isOnionError) { + setErrorPageStrings(err); + } var sd = document.getElementById("errorShortDescText"); if (sd) { @@ -433,6 +437,10 @@ function initPage() { span.textContent = document.location.hostname; } } + + if (isOnionError) { + OnionServicesAboutNetError.initPage(document); + } } function setupErrorUI() { diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml index 75c95cc17011..4f21e508be0b 100644 --- a/browser/base/content/aboutNetError.xhtml +++ b/browser/base/content/aboutNetError.xhtml @@ -215,6 +215,7 @@ </div> </div> </body> + <script src="chrome://browser/content/onionservices/netError/onionNetError.js"/> <script src="chrome://browser/content/aboutNetErrorCodes.js"/> <script src="chrome://browser/content/aboutNetError.js"/> </html> diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 5235b0670fa8..2fb471e9c15d 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -226,6 +226,11 @@ XPCOMUtils.defineLazyScriptGetter( ["SecurityLevelButton"], "chrome://browser/content/securitylevel/securityLevel.js" ); +XPCOMUtils.defineLazyScriptGetter( + this, + ["OnionAuthPrompt"], + "chrome://browser/content/onionservices/authPrompt.js" +); XPCOMUtils.defineLazyScriptGetter( this, "gEditItemOverlay", @@ -1865,6 +1870,9 @@ var gBrowserInit = { // Init the SecuritySettingsButton SecurityLevelButton.init(); + // Init the OnionAuthPrompt + OnionAuthPrompt.init(); + // Certain kinds of automigration rely on this notification to complete // their tasks BEFORE the browser window is shown. SessionStore uses it to // restore tabs into windows AFTER important parts like gMultiProcessBrowser @@ -2470,6 +2478,8 @@ var gBrowserInit = { SecurityLevelButton.uninit(); + OnionAuthPrompt.uninit(); + gAccessibilityServiceIndicator.uninit(); AccessibilityRefreshBlocker.uninit(); diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index b065ffc5f13f..7ebf56ca5ed1 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -33,6 +33,7 @@ <?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?> <?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> <?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/onionservices.css" type="text/css"?> # All DTD information is stored in a separate file so that it can be shared by # hiddenWindowMac.xhtml. @@ -654,6 +655,7 @@ #include ../../components/downloads/content/downloadsPanel.inc.xhtml #include ../../../devtools/startup/enableDevToolsPopup.inc.xhtml #include ../../components/securitylevel/content/securityLevelPanel.inc.xhtml +#include ../../components/onionservices/content/authPopup.inc.xhtml #include browser-allTabsMenu.inc.xhtml <hbox id="downloads-animation-container"> @@ -1839,6 +1841,7 @@ data-l10n-id="urlbar-indexed-db-notification-anchor"/> <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button" data-l10n-id="urlbar-password-notification-anchor"/> +#include ../../components/onionservices/content/authNotificationIcon.inc.xhtml <stack id="plugins-notification-icon" class="notification-anchor-icon" role="button" align="center" data-l10n-id="urlbar-plugins-notification-anchor"> <image class="plugin-icon" /> <image id="plugin-icon-badge" /> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index 1a01d4a2ded9..79fd7f39243d 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -19,6 +19,9 @@ ChromeUtils.defineModuleGetter( "BrowserUtils", "resource://gre/modules/BrowserUtils.jsm" ); +var { OnionAuthUtil } = ChromeUtils.import( + "chrome://browser/content/onionservices/authUtil.jsm" +); // BrowserChildGlobal var global = this; @@ -73,5 +76,7 @@ if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { Services.obs.notifyObservers(this, "tab-content-frameloader-created"); +OnionAuthUtil.addCancelMessageListener(this, docShell); + // This is a temporary hack to prevent regressions (bug 1471327). void content; diff --git a/browser/components/moz.build b/browser/components/moz.build index 09e209dc9c3b..b660be047b14 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -41,6 +41,7 @@ DIRS += [ 'fxmonitor', 'migration', 'newtab', + 'onionservices', 'originattributes', 'pioneer', 'places', diff --git a/browser/components/onionservices/content/authNotificationIcon.inc.xhtml b/browser/components/onionservices/content/authNotificationIcon.inc.xhtml new file mode 100644 index 000000000000..91274d612739 --- /dev/null +++ b/browser/components/onionservices/content/authNotificationIcon.inc.xhtml @@ -0,0 +1,6 @@ +# Copyright (c) 2020, The Tor Project, Inc. + +<image id="tor-clientauth-notification-icon" + class="notification-anchor-icon tor-clientauth-icon" + role="button" + tooltiptext="&torbutton.onionServices.authPrompt.tooltip;"/> diff --git a/browser/components/onionservices/content/authPopup.inc.xhtml b/browser/components/onionservices/content/authPopup.inc.xhtml new file mode 100644 index 000000000000..bd0ec3aa0b00 --- /dev/null +++ b/browser/components/onionservices/content/authPopup.inc.xhtml @@ -0,0 +1,16 @@ +# Copyright (c) 2020, The Tor Project, Inc. + +<popupnotification id="tor-clientauth-notification" hidden="true"> + <popupnotificationcontent orient="vertical"> + <description id="tor-clientauth-notification-desc"/> + <label id="tor-clientauth-notification-learnmore" + class="text-link popup-notification-learnmore-link" + is="text-link"/> + <html:div> + <html:input id="tor-clientauth-notification-key" type="password"/> + <html:div id="tor-clientauth-warning"/> + <checkbox id="tor-clientauth-persistkey-checkbox" + label="&torbutton.onionServices.authPrompt.persistCheckboxLabel;"/> + </html:div> + </popupnotificationcontent> +</popupnotification> diff --git a/browser/components/onionservices/content/authPreferences.css b/browser/components/onionservices/content/authPreferences.css new file mode 100644 index 000000000000..b3fb79b26ddc --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.css @@ -0,0 +1,20 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ + +#torOnionServiceKeys-overview-container { + margin-right: 30px; +} + +#onionservices-savedkeys-tree treechildren::-moz-tree-cell-text { + font-size: 80%; +} + +#onionservices-savedkeys-errorContainer { + margin-top: 4px; + min-height: 3em; +} + +#onionservices-savedkeys-errorIcon { + margin-right: 4px; + list-style-image: url("chrome://browser/skin/warning.svg"); + visibility: hidden; +} diff --git a/browser/components/onionservices/content/authPreferences.inc.xhtml b/browser/components/onionservices/content/authPreferences.inc.xhtml new file mode 100644 index 000000000000..f69c9dde66a2 --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.inc.xhtml @@ -0,0 +1,19 @@ +# Copyright (c) 2020, The Tor Project, Inc. + +<groupbox id="torOnionServiceKeys" orient="vertical" + data-category="panePrivacy" hidden="true"> + <label><html:h2 id="torOnionServiceKeys-header"/></label> + <hbox> + <description id="torOnionServiceKeys-overview-container" flex="1"> + <html:span id="torOnionServiceKeys-overview" + class="tail-with-learn-more"/> + <label id="torOnionServiceKeys-learnMore" class="learnMore text-link" + is="text-link"/> + </description> + <vbox align="end"> + <button id="torOnionServiceKeys-savedKeys" + is="highlightable-button" + class="accessory-button"/> + </vbox> + </hbox> +</groupbox> diff --git a/browser/components/onionservices/content/authPreferences.js b/browser/components/onionservices/content/authPreferences.js new file mode 100644 index 000000000000..52f8272020cc --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.js @@ -0,0 +1,66 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +ChromeUtils.defineModuleGetter( + this, + "TorStrings", + "resource:///modules/TorStrings.jsm" +); + +/* + Onion Services Client Authentication Preferences Code + + Code to handle init and update of onion services authentication section + in about:preferences#privacy +*/ + +const OnionServicesAuthPreferences = { + selector: { + groupBox: "#torOnionServiceKeys", + header: "#torOnionServiceKeys-header", + overview: "#torOnionServiceKeys-overview", + learnMore: "#torOnionServiceKeys-learnMore", + savedKeysButton: "#torOnionServiceKeys-savedKeys", + }, + + init() { + // populate XUL with localized strings + this._populateXUL(); + }, + + _populateXUL() { + const groupbox = document.querySelector(this.selector.groupBox); + + let elem = groupbox.querySelector(this.selector.header); + elem.textContent = TorStrings.onionServices.authPreferences.header; + + elem = groupbox.querySelector(this.selector.overview); + elem.textContent = TorStrings.onionServices.authPreferences.overview; + + elem = groupbox.querySelector(this.selector.learnMore); + elem.setAttribute("value", TorStrings.onionServices.learnMore); + elem.setAttribute("href", TorStrings.onionServices.learnMoreURL); + + elem = groupbox.querySelector(this.selector.savedKeysButton); + elem.setAttribute( + "label", + TorStrings.onionServices.authPreferences.savedKeys + ); + elem.addEventListener("command", () => + OnionServicesAuthPreferences.onViewSavedKeys() + ); + }, + + onViewSavedKeys() { + gSubDialog.open( + "chrome://browser/content/onionservices/savedKeysDialog.xhtml" + ); + }, +}; // OnionServicesAuthPreferences + +Object.defineProperty(this, "OnionServicesAuthPreferences", { + value: OnionServicesAuthPreferences, + enumerable: true, + writable: false, +}); diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js new file mode 100644 index 000000000000..d4a59ac46487 --- /dev/null +++ b/browser/components/onionservices/content/authPrompt.js @@ -0,0 +1,316 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +XPCOMUtils.defineLazyModuleGetters(this, { + OnionAuthUtil: "chrome://browser/content/onionservices/authUtil.jsm", + CommonUtils: "resource://services-common/utils.js", + TorStrings: "resource:///modules/TorStrings.jsm", +}); + +const OnionAuthPrompt = (function() { + // OnionServicesAuthPrompt objects run within the main/chrome process. + // aReason is the topic passed within the observer notification that is + // causing this auth prompt to be displayed. + function OnionServicesAuthPrompt(aBrowser, aFailedURI, aReason, aOnionName) { + this._browser = aBrowser; + this._failedURI = aFailedURI; + this._reasonForPrompt = aReason; + this._onionName = aOnionName; + } + + OnionServicesAuthPrompt.prototype = { + show(aWarningMessage) { + let mainAction = { + label: TorStrings.onionServices.authPrompt.done, + accessKey: TorStrings.onionServices.authPrompt.doneAccessKey, + leaveOpen: true, // Callback is responsible for closing the notification. + callback: this._onDone.bind(this), + }; + + let dialogBundle = Services.strings.createBundle( + "chrome://global/locale/dialog.properties"); + + let cancelAccessKey = dialogBundle.GetStringFromName("accesskey-cancel"); + if (!cancelAccessKey) + cancelAccessKey = "c"; // required by PopupNotifications.show() + + let cancelAction = { + label: dialogBundle.GetStringFromName("button-cancel"), + accessKey: cancelAccessKey, + callback: this._onCancel.bind(this), + }; + + let _this = this; + let options = { + autofocus: true, + hideClose: true, + persistent: true, + removeOnDismissal: false, + eventCallback(aTopic) { + if (aTopic === "showing") { + _this._onPromptShowing(aWarningMessage); + } else if (aTopic === "shown") { + _this._onPromptShown(); + } else if (aTopic === "removed") { + _this._onPromptRemoved(); + } + } + }; + + this._prompt = PopupNotifications.show(this._browser, + OnionAuthUtil.domid.notification, "", + OnionAuthUtil.domid.anchor, + mainAction, [cancelAction], options); + }, + + _onPromptShowing(aWarningMessage) { + let xulDoc = this._browser.ownerDocument; + let descElem = xulDoc.getElementById(OnionAuthUtil.domid.description); + if (descElem) { + // Handle replacement of the onion name within the localized + // string ourselves so we can show the onion name as bold text. + // We do this by splitting the localized string and creating + // several HTML <span> elements. + while (descElem.firstChild) + descElem.removeChild(descElem.firstChild); + + let fmtString = TorStrings.onionServices.authPrompt.description; + let prefix = ""; + let suffix = ""; + const kToReplace = "%S"; + let idx = fmtString.indexOf(kToReplace); + if (idx < 0) { + prefix = fmtString; + } else { + prefix = fmtString.substring(0, idx); + suffix = fmtString.substring(idx + kToReplace.length); + } + + const kHTMLNS = "http://www.w3.org/1999/xhtml"; + let span = xulDoc.createElementNS(kHTMLNS, "span"); + span.textContent = prefix; + descElem.appendChild(span); + span = xulDoc.createElementNS(kHTMLNS, "span"); + span.id = OnionAuthUtil.domid.onionNameSpan; + span.textContent = this._onionName; + descElem.appendChild(span); + span = xulDoc.createElementNS(kHTMLNS, "span"); + span.textContent = suffix; + descElem.appendChild(span); + } + + // Set "Learn More" label and href. + let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.domid.learnMore); + if (learnMoreElem) { + learnMoreElem.setAttribute("value", TorStrings.onionServices.learnMore); + learnMoreElem.setAttribute("href", TorStrings.onionServices.learnMoreURL); + } + + this._showWarning(aWarningMessage); + let checkboxElem = this._getCheckboxElement(); + if (checkboxElem) { + checkboxElem.checked = false; + } + }, + + _onPromptShown() { + let keyElem = this._getKeyElement(); + if (keyElem) { + keyElem.setAttribute("placeholder", + TorStrings.onionServices.authPrompt.keyPlaceholder); + this._boundOnKeyFieldKeyPress = this._onKeyFieldKeyPress.bind(this); + this._boundOnKeyFieldInput = this._onKeyFieldInput.bind(this); + keyElem.addEventListener("keypress", this._boundOnKeyFieldKeyPress); + keyElem.addEventListener("input", this._boundOnKeyFieldInput); + keyElem.focus(); + } + }, + + _onPromptRemoved() { + if (this._boundOnKeyFieldKeyPress) { + let keyElem = this._getKeyElement(); + if (keyElem) { + keyElem.value = ""; + keyElem.removeEventListener("keypress", + this._boundOnKeyFieldKeyPress); + this._boundOnKeyFieldKeyPress = undefined; + keyElem.removeEventListener("input", this._boundOnKeyFieldInput); + this._boundOnKeyFieldInput = undefined; + } + } + }, + + _onKeyFieldKeyPress(aEvent) { + if (aEvent.keyCode == aEvent.DOM_VK_RETURN) { + this._onDone(); + } else if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE) { + this._prompt.remove(); + this._onCancel(); + } + }, + + _onKeyFieldInput(aEvent) { + this._showWarning(undefined); // Remove the warning. + }, + + _onDone() { + let keyElem = this._getKeyElement(); + if (!keyElem) + return; + + let base64key = this._keyToBase64(keyElem.value); + if (!base64key) { + this._showWarning(TorStrings.onionServices.authPrompt.invalidKey); + return; + } + + this._prompt.remove(); + + // Use Torbutton's controller module to add the private key to Tor. + let controllerFailureMsg = + TorStrings.onionServices.authPrompt.failedToSetKey; + try { + let { controller } = + Cu.import("resource://torbutton/modules/tor-control-port.js", {}); + let torController = controller(aError => { + this.show(controllerFailureMsg); + }); + let onionAddr = this._onionName.toLowerCase().replace(/\.onion$/, ""); + let checkboxElem = this._getCheckboxElement(); + let isPermanent = (checkboxElem && checkboxElem.checked); + torController.onionAuthAdd(onionAddr, base64key, isPermanent) + .then(aResponse => { + // Success! Reload the page. + this._browser.sendMessageToActor( + "Browser:Reload", + {}, + "BrowserTab" + ); + }) + .catch(aError => { + if (aError.torMessage) + this.show(aError.torMessage); + else + this.show(controllerFailureMsg); + }); + } catch (e) { + this.show(controllerFailureMsg); + } + }, + + _onCancel() { + // Arrange for an error page to be displayed. + this._browser.messageManager.sendAsyncMessage( + OnionAuthUtil.message.authPromptCanceled, + {failedURI: this._failedURI.spec, + reasonForPrompt: this._reasonForPrompt}); + }, + + _getKeyElement() { + let xulDoc = this._browser.ownerDocument; + return xulDoc.getElementById(OnionAuthUtil.domid.keyElement); + }, + + _getCheckboxElement() { + let xulDoc = this._browser.ownerDocument; + return xulDoc.getElementById(OnionAuthUtil.domid.checkboxElement); + }, + + _showWarning(aWarningMessage) { + let xulDoc = this._browser.ownerDocument; + let warningElem = + xulDoc.getElementById(OnionAuthUtil.domid.warningElement); + let keyElem = this._getKeyElement(); + if (warningElem) { + if (aWarningMessage) { + warningElem.textContent = aWarningMessage; + warningElem.removeAttribute("hidden"); + if (keyElem) + keyElem.className = "invalid"; + } else { + warningElem.setAttribute("hidden", "true"); + if (keyElem) + keyElem.className = ""; + } + } + }, + + // Returns undefined if the key is the wrong length or format. + _keyToBase64(aKeyString) { + if (!aKeyString) + return undefined; + + let base64key; + if (aKeyString.length == 52) { + // The key is probably base32-encoded. Attempt to decode. + // Although base32 specifies uppercase letters, we accept lowercase + // as well because users may type in lowercase or copy a key out of + // a tor onion-auth file (which uses lowercase). + let rawKey; + try { + rawKey = CommonUtils.decodeBase32(aKeyString.toUpperCase()); + } catch (e) {} + + if (rawKey) try { + base64key = btoa(rawKey); + } catch (e) {} + } else if ((aKeyString.length == 44) && + /^[a-zA-Z0-9+/]*=*$/.test(aKeyString)) { + // The key appears to be a correctly formatted base64 value. If not, + // tor will return an error when we try to add the key via the + // control port. + base64key = aKeyString; + } + + return base64key; + }, + }; + + let retval = { + init() { + Services.obs.addObserver(this, OnionAuthUtil.topic.clientAuthMissing); + Services.obs.addObserver(this, OnionAuthUtil.topic.clientAuthIncorrect); + }, + + uninit() { + Services.obs.removeObserver(this, OnionAuthUtil.topic.clientAuthMissing); + Services.obs.removeObserver(this, OnionAuthUtil.topic.clientAuthIncorrect); + }, + + // aSubject is the DOM Window or browser where the prompt should be shown. + // aData contains the .onion name. + observe(aSubject, aTopic, aData) { + if ((aTopic != OnionAuthUtil.topic.clientAuthMissing) && + (aTopic != OnionAuthUtil.topic.clientAuthIncorrect)) { + return; + } + + let browser; + if (aSubject instanceof Ci.nsIDOMWindow) { + let contentWindow = aSubject.QueryInterface(Ci.nsIDOMWindow); + browser = contentWindow.docShell.chromeEventHandler; + } else { + browser = aSubject.QueryInterface(Ci.nsIBrowser); + } + + if (!gBrowser.browsers.some(aBrowser => aBrowser == browser)) { + return; // This window does not contain the subject browser; ignore. + } + + let failedURI = browser.currentURI; + let authPrompt = new OnionServicesAuthPrompt(browser, failedURI, + aTopic, aData); + authPrompt.show(undefined); + } + }; + + return retval; +})(); /* OnionAuthPrompt */ + + +Object.defineProperty(this, "OnionAuthPrompt", { + value: OnionAuthPrompt, + enumerable: true, + writable: false +}); diff --git a/browser/components/onionservices/content/authUtil.jsm b/browser/components/onionservices/content/authUtil.jsm new file mode 100644 index 000000000000..c9d83774da1f --- /dev/null +++ b/browser/components/onionservices/content/authUtil.jsm @@ -0,0 +1,47 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +var EXPORTED_SYMBOLS = [ + "OnionAuthUtil", +]; + +var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); + +const OnionAuthUtil = { + topic: { + clientAuthMissing: "tor-onion-services-clientauth-missing", + clientAuthIncorrect: "tor-onion-services-clientauth-incorrect", + }, + message: { + authPromptCanceled: "Tor:OnionServicesAuthPromptCanceled", + }, + domid: { + anchor: "tor-clientauth-notification-icon", + notification: "tor-clientauth", + description: "tor-clientauth-notification-desc", + learnMore: "tor-clientauth-notification-learnmore", + onionNameSpan: "tor-clientauth-notification-onionname", + keyElement: "tor-clientauth-notification-key", + warningElement: "tor-clientauth-warning", + checkboxElement: "tor-clientauth-persistkey-checkbox", + }, + + addCancelMessageListener(aTabContent, aDocShell) { + aTabContent.addMessageListener(this.message.authPromptCanceled, + (aMessage) => { + // Upon cancellation of the client authentication prompt, display + // the appropriate error page. When calling the docShell + // displayLoadError() function, we pass undefined for the failed + // channel so that displayLoadError() can determine that it should + // not display the client authentication prompt a second time. + let failedURI = Services.io.newURI(aMessage.data.failedURI); + let reasonForPrompt = aMessage.data.reasonForPrompt; + let errorCode = + (reasonForPrompt === this.topic.clientAuthMissing) ? + Cr.NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH : + Cr.NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH; + aDocShell.displayLoadError(errorCode, failedURI, undefined, undefined); + }); + }, +}; diff --git a/browser/components/onionservices/content/netError/browser.svg b/browser/components/onionservices/content/netError/browser.svg new file mode 100644 index 000000000000..b4c433b37bbb --- /dev/null +++ b/browser/components/onionservices/content/netError/browser.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="72" height="65" viewBox="0 0 72 65"> + <path fill="context-fill" fill-opacity="context-fill-opacity" d="M0.0 0.0C0.0 0.0 0.0 65.0 0.0 65.0C0.0 65.0 72.0 65.0 72.0 65.0C72.0 65.0 72.0 0.0 72.0 0.0C72.0 0.0 52.9019692 0.0 52.9019692 0.0C52.9019692 0.0 0.0 0.0 0.0 0.0C0.0 0.0 0.0 0.0 0.0 0.0M65.0 58.0C65.0 58.0 6.0 58.0 6.0 58.0C6.0 58.0 6.0 25.0 6.0 25.0C6.0 25.0 65.0 25.0 65.0 25.0C65.0 25.0 65.0 58.0 65.0 58.0C65.0 58.0 65.0 58.0 65.0 58.0M6.0 10.0C6.0 10.0 10.0 10.0 10.0 10.0C10.0 10.0 10.0 14.0 10.0 14.0C10.0 14.0 6.0 14.0 6.0 14.0C6.0 14.0 6.0 10.0 6.0 10.0C6.0 10.0 6.0 10.0 6.0 10.0M14.0 10.0C14.0 10.0 18.0 10.0 18.0 10.0C18.0 10.0 18.0 14.0 18.0 14.0C18.0 14.0 14.0 14.0 14.0 14.0C14.0 14.0 14.0 10.0 14.0 10.0C14.0 10.0 14.0 10.0 14.0 10.0M22.0 10.0C22.0 10.0 26.0 10.0 26.0 10.0C26.0 10.0 26.0 14.0 26.0 14.0C26.0 14.0 22.0 14.0 22.0 14.0C22.0 14.0 22.0 10.0 22.0 10.0C22.0 10.0 22.0 10.0 22.0 10.0" /> +</svg> diff --git a/browser/components/onionservices/content/netError/network.svg b/browser/components/onionservices/content/netError/network.svg new file mode 100644 index 000000000000..808c53dedd09 --- /dev/null +++ b/browser/components/onionservices/content/netError/network.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="72" height="54" viewBox="0 0 72 54"> + <path fill="context-fill" fill-opacity="context-fill-opacity" d="M14.0487805 54.0C6.28990244 54.0 0.0 47.3306322 0.0 39.1034585C0.0 32.0105634 4.68716488 26.0867675 10.9481707 24.585103C10.6902 23.574652 10.5365854 22.5107596 10.5365854 21.4138156C10.5365854 14.7292347 15.6471278 9.3103384 21.9512195 9.3103384C24.8076351 9.3103384 27.4126741 10.4393194 29.4146341 12.2780088C32.1344254 5.0777841 38.77452 0.0 46.5365854 0.0C56.7201249 0.0 64.9756098 8.7536733 64.9756098 19.5517479C64.9756098 20.7691677 64.8471688 21.9453428 64.6463415 23.1013144C69.0576849 26.0679606 72.0 31.2693674 72.0 37.2413909C72.0 46.5256603 64.9510244 54.0 56.195122 54.0C56.195122 54.0 14.0487805 54.0 14.0487805 54.0C14.0487805 54.0 14.0487805 54.0 14.0487805 54.0" /> +</svg> diff --git a/browser/components/onionservices/content/netError/onionNetError.css b/browser/components/onionservices/content/netError/onionNetError.css new file mode 100644 index 000000000000..58117ab93223 --- /dev/null +++ b/browser/components/onionservices/content/netError/onionNetError.css @@ -0,0 +1,65 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ + +:root { + --grey-70: #38383d; +} + +#onionErrorDiagramContainer { + margin: 60px auto; + width: 460px; /* 3 columns @ 140px plus 2 column gaps @ 20px */ + display: grid; + grid-row-gap: 15px; + grid-column-gap: 20px; + grid-template-columns: 1fr 1fr 1fr; +} + +#onionErrorDiagramContainer > div { + margin: auto; + position: relative; /* needed to allow overlay of the ok or error icon */ +} + +.onionErrorImage { + width: 72px; + height: 72px; + background-position: center; + background-repeat: no-repeat; + -moz-context-properties: fill; + fill: var(--grey-70); +} + +#onionErrorBrowserImage { + background-image: url("browser.svg"); +} + +#onionErrorNetworkImage { + background-image: url("network.svg"); +} + +#onionErrorOnionSiteImage { + background-image: url("onionsite.svg"); +} + +/* rules to support overlay of the ok or error icon */ +.onionErrorImage[status]::after { + content: " "; + position: absolute; + left: -18px; + top: 18px; + width: 36px; + height: 36px; + -moz-context-properties: fill; + fill: var(--in-content-page-background); + background-color: var(--grey-70); + background-repeat: no-repeat; + background-position: center; + border: 3px solid var(--in-content-page-background); + border-radius: 50%; +} + +.onionErrorImage[status="ok"]::after { + background-image: url("chrome://global/skin/icons/check.svg"); +} + +.onionErrorImage[status="error"]::after { + background-image: url("chrome://browser/skin/stop.svg"); +} diff --git a/browser/components/onionservices/content/netError/onionNetError.js b/browser/components/onionservices/content/netError/onionNetError.js new file mode 100644 index 000000000000..8fabb3f38eb7 --- /dev/null +++ b/browser/components/onionservices/content/netError/onionNetError.js @@ -0,0 +1,244 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +/* eslint-env mozilla/frame-script */ + +var OnionServicesAboutNetError = { + _selector: { + header: ".title-text", + longDesc: "#errorLongDesc", + learnMoreContainer: "#learnMoreContainer", + learnMoreLink: "#learnMoreLink", + contentContainer: "#errorLongContent", + tryAgainButtonContainer: "#netErrorButtonContainer", + }, + _status: { + ok: "ok", + error: "error", + }, + + _diagramInfoMap: undefined, + + // Public functions (called from outside this file). + // + // This initPage() function may need to be updated if the structure of + // browser/base/content/aboutNetError.xhtml changes. Specifically, it + // references the following elements: + // query string parameter e + // class title-text + // id errorLongDesc + // id learnMoreContainer + // id learnMoreLink + // id errorLongContent + initPage(aDoc) { + const searchParams = new URLSearchParams(aDoc.documentURI.split("?")[1]); + const err = searchParams.get("e"); + + const errPrefix = "onionServices."; + const errName = err.substring(errPrefix.length); + + this._strings = RPMGetTorStrings(); + + const stringsObj = this._strings[errName]; + if (!stringsObj) { + return; + } + + this._insertStylesheet(aDoc); + + const pageTitle = stringsObj.pageTitle; + const header = stringsObj.header; + const longDescription = stringsObj.longDescription; // optional + const learnMoreURL = stringsObj.learnMoreURL; + + if (pageTitle) { + aDoc.title = pageTitle; + } + + if (header) { + const headerElem = aDoc.querySelector(this._selector.header); + if (headerElem) { + headerElem.textContent = header; + } + } + + const ld = aDoc.querySelector(this._selector.longDesc); + if (ld) { + if (longDescription) { + const hexErr = this._hexErrorFromName(errName); + ld.textContent = longDescription.replace("%S", hexErr); + } else { + // This onion service error does not have a long description. Since + // it is set to a generic error string by the code in + // browser/base/content/aboutNetError.js, hide it here. + ld.style.display = "none"; + } + } + + if (learnMoreURL) { + const lmContainer = aDoc.querySelector(this._selector.learnMoreContainer); + if (lmContainer) { + lmContainer.style.display = "block"; + } + const lmLink = lmContainer.querySelector(this._selector.learnMoreLink); + if (lmLink) { + lmLink.setAttribute("href", learnMoreURL); + } + } + + // Remove the "Try Again" button if the user made a typo in the .onion + // address since it is not useful in that case. + if (errName === "badAddress") { + const tryAgainButton = aDoc.querySelector( + this._selector.tryAgainButtonContainer + ); + if (tryAgainButton) { + tryAgainButton.style.display = "none"; + } + } + + this._insertDiagram(aDoc, errName); + }, // initPage() + + _insertStylesheet(aDoc) { + const url = + "chrome://browser/content/onionservices/netError/onionNetError.css"; + let linkElem = aDoc.createElement("link"); + linkElem.rel = "stylesheet"; + linkElem.href = url; + linkElem.type = "text/css"; + aDoc.head.appendChild(linkElem); + }, + + _insertDiagram(aDoc, aErrorName) { + // The onion error diagram consists of a grid of div elements. + // The first row contains three images (Browser, Network, Onionsite) and + // the second row contains labels for the images that are in the first row. + // The _diagramInfoMap describes for each type of onion service error + // whether a small ok or error status icon is overlaid on top of the main + // Browser/Network/Onionsite images. + if (!this._diagramInfoMap) { + this._diagramInfoMap = new Map(); + this._diagramInfoMap.set("descNotFound", { + browser: this._status.ok, + network: this._status.ok, + onionSite: this._status.error, + }); + this._diagramInfoMap.set("descInvalid", { + browser: this._status.ok, + network: this._status.error, + }); + this._diagramInfoMap.set("introFailed", { + browser: this._status.ok, + network: this._status.error, + }); + this._diagramInfoMap.set("rendezvousFailed", { + browser: this._status.ok, + network: this._status.error, + }); + this._diagramInfoMap.set("clientAuthMissing", { + browser: this._status.error, + }); + this._diagramInfoMap.set("clientAuthIncorrect", { + browser: this._status.error, + }); + this._diagramInfoMap.set("badAddress", { + browser: this._status.error, + }); + this._diagramInfoMap.set("introTimedOut", { + browser: this._status.ok, + network: this._status.error, + }); + } + + const diagramInfo = this._diagramInfoMap.get(aErrorName); + + const container = this._createDiv(aDoc, "onionErrorDiagramContainer"); + const imageClass = "onionErrorImage"; + + const browserImage = this._createDiv( + aDoc, + "onionErrorBrowserImage", + imageClass, + container + ); + if (diagramInfo && diagramInfo.browser) { + browserImage.setAttribute("status", diagramInfo.browser); + } + + const networkImage = this._createDiv( + aDoc, + "onionErrorNetworkImage", + imageClass, + container + ); + if (diagramInfo && diagramInfo.network) { + networkImage.setAttribute("status", diagramInfo.network); + } + + const onionSiteImage = this._createDiv( + aDoc, + "onionErrorOnionSiteImage", + imageClass, + container + ); + if (diagramInfo && diagramInfo.onionSite) { + onionSiteImage.setAttribute("status", diagramInfo.onionSite); + } + + let labelDiv = this._createDiv(aDoc, undefined, undefined, container); + labelDiv.textContent = this._strings.errorPage.browser; + labelDiv = this._createDiv(aDoc, undefined, undefined, container); + labelDiv.textContent = this._strings.errorPage.network; + labelDiv = this._createDiv(aDoc, undefined, undefined, container); + labelDiv.textContent = this._strings.errorPage.onionSite; + + const contentContainer = aDoc.querySelector( + this._selector.contentContainer + ); + if (contentContainer) { + contentContainer.insertBefore(container, contentContainer.firstChild); + } + }, // _insertDiagram() + + _createDiv(aDoc, aID, aClass, aParentElem) { + const div = aDoc.createElement("div"); + if (aID) { + div.id = aID; + } + if (aClass) { + div.setAttribute("class", aClass); + } + if (aParentElem) { + aParentElem.appendChild(div); + } + + return div; + }, + + _hexErrorFromName(aErrorName) { + // We do not have access to the original Tor SOCKS error code here, so + // perform a reverse mapping from the error name. + switch (aErrorName) { + case "descNotFound": + return "0xF0"; + case "descInvalid": + return "0xF1"; + case "introFailed": + return "0xF2"; + case "rendezvousFailed": + return "0xF3"; + case "clientAuthMissing": + return "0xF4"; + case "clientAuthIncorrect": + return "0xF5"; + case "badAddress": + return "0xF6"; + case "introTimedOut": + return "0xF7"; + } + + return ""; + }, +}; diff --git a/browser/components/onionservices/content/netError/onionsite.svg b/browser/components/onionservices/content/netError/onionsite.svg new file mode 100644 index 000000000000..1f2777e6acc7 --- /dev/null +++ b/browser/components/onionservices/content/netError/onionsite.svg @@ -0,0 +1,7 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="70" height="63" viewBox="0 0 70 63"> + <g fill="context-fill" fill-opacity="context-fill-opacity"> + <path d="M64.0 2.0C64.0 2.0 4.0 2.0 4.0 2.0C2.8954305 2.0 2.0 2.81148389 2.0 3.8125C2.0 3.8125 2.0 58.1875 2.0 58.1875C2.0 59.1885161 2.8954305 60.0 4.0 60.0C4.0 60.0 36.0 60.0 36.0 60.0C36.0 60.0 36.0 56.375 36.0 56.375C36.0 56.375 6.0 56.375 6.0 56.375C6.0 56.375 6.0 41.875 6.0 41.875C6.0 41.875 38.0 41.875 38.0 41.875C38.0 41.875 38.0 38.25 38.0 38.25C38.0 38.25 6.0 38.25 6.0 38.25C6.0 38.25 6.0 23.75 6.0 23.75C6.0 23.75 62.0 23.75 62.0 23.75C62.0 23.75 62.0 36.4375 62.0 36.4375C62.0 36.4375 66.0 36.4375 66.0 36.4375C66.0 36.4375 66.0 3.8125 66.0 3.8125C66.0 2.81148389 65.1045695 2.0 64.0 2.0C64.0 2.0 64.0 2.0 64.0 2.0M62.0 20.125C62.0 20.125 6.0 20.125 6.0 20.125C6.0 20.125 6.0 5.625 6.0 5.625C6.0 5.625 62.0 5.625 62.0 5.625C62.0 5.625 62.0 20.125 62.0 20.125C62.0 20.125 62.0 20.125 62.0 20.125" /> + <path d="M24.0 47.0C24.0 47.0 24.0 51.0 24.0 51.0C24.0 51.0 20.0 51.0 20.0 51.0C20.0 51.0 20.0 47.0 20.0 47.0C20.0 47.0 24.0 47.0 24.0 47.0C24.0 47.0 24.0 47.0 24.0 47.0M16.0 47.0C16.0 47.0 16.0 51.0 16.0 51.0C16.0 51.0 12.0 51.0 12.0 51.0C12.0 51.0 12.0 47.0 12.0 47.0C12.0 47.0 16.0 47.0 16.0 47.0C16.0 47.0 16.0 47.0 16.0 47.0M56.0 29.0C56.0 29.0 56.0 33.0 56.0 33.0C56.0 33.0 52.0 33.0 52.0 33.0C52.0 33.0 52.0 29.0 52.0 29.0C52.0 29.0 56.0 29.0 56.0 29.0C56.0 29.0 56.0 29.0 56.0 29.0M48.0 29.0C48.0 29.0 48.0 33.0 48.0 33.0C48.0 33.0 12.0 33.0 12.0 33.0C12.0 33.0 12.0 29.0 12.0 29.0C12.0 29.0 48.0 29.0 48.0 29.0C48.0 29.0 48.0 29.0 48.0 29.0M22.0 11.0C22.0 11.0 22.0 15.0 22.0 15.0C22.0 15.0 10.0 15.0 10.0 15.0C10.0 15.0 10.0 11.0 10.0 11.0C10.0 11.0 22.0 11.0 22.0 11.0C22.0 11.0 22.0 11.0 22.0 11.0M70.0 0.0C70.0 0.0 70.0 36.5 70.0 36.5C70.0 36.5 65.0 36.5 65.0 36.5C65.0 36.5 65.0 4.5 65.0 4.5C65.0 4.5 5.0 4.5 5.0 4.5C5.0 4.5 5.0 58.5 5.0 58.5C5.0 58.5 36.0 58.5 36.0 58.5C36.0 58 .5 36.0 63.0 36.0 63.0C36.0 63.0 0.0 63.0 0.0 63.0C0.0 63.0 0.0 0.0 0.0 0.0C0.0 0.0 70.0 0.0 70.0 0.0C70.0 0.0 70.0 0.0 70.0 0.0M32.0 47.0C32.0 47.0 32.0 51.0 32.0 51.0C32.0 51.0 28.0 51.0 28.0 51.0C28.0 51.0 28.0 47.0 28.0 47.0C28.0 47.0 32.0 47.0 32.0 47.0C32.0 47.0 32.0 47.0 32.0 47.0M54.0 11.0C54.0 11.0 54.0 15.0 54.0 15.0C54.0 15.0 50.0 15.0 50.0 15.0C50.0 15.0 50.0 11.0 50.0 11.0C50.0 11.0 54.0 11.0 54.0 11.0C54.0 11.0 54.0 11.0 54.0 11.0M46.0 11.0C46.0 11.0 46.0 15.0 46.0 15.0C46.0 15.0 42.0 15.0 42.0 15.0C42.0 15.0 42.0 11.0 42.0 11.0C42.0 11.0 46.0 11.0 46.0 11.0C46.0 11.0 46.0 11.0 46.0 11.0M38.0 11.0C38.0 11.0 38.0 15.0 38.0 15.0C38.0 15.0 34.0 15.0 34.0 15.0C34.0 15.0 34.0 11.0 34.0 11.0C34.0 11.0 38.0 11.0 38.0 11.0C38.0 11.0 38.0 11.0 38.0 11.0M30.0 11.0C30.0 11.0 30.0 15.0 30.0 15.0C30.0 15.0 26.0 15.0 26.0 15.0C26.0 15.0 26.0 11.0 26.0 11.0C26.0 11.0 30.0 11.0 30.0 11.0C30.0 11.0 30.0 11.0 30.0 11.0" /> + <path d="M61.0 46.0C61.0 46.0 59.0 46.0 59.0 46.0C59.0 46.0 59.0 40.0 59.0 40.0C59.0 38.8954305 58.1045695 38.0 57.0 38.0C57.0 38.0 49.0 38.0 49.0 38.0C47.8954305 38.0 47.0 38.8954305 47.0 40.0C47.0 40.0 47.0 46.0 47.0 46.0C47.0 46.0 45.0 46.0 45.0 46.0C43.8954305 46.0 43.0 46.8954305 43.0 48.0C43.0 48.0 43.0 60.0 43.0 60.0C43.0 61.1045695 43.8954305 62.0 45.0 62.0C45.0 62.0 61.0 62.0 61.0 62.0C62.1045695 62.0 63.0 61.1045695 63.0 60.0C63.0 60.0 63.0 48.0 63.0 48.0C63.0 46.8954305 62.1045695 46.0 61.0 46.0C61.0 46.0 61.0 46.0 61.0 46.0M51.0 42.0C51.0 42.0 55.0 42.0 55.0 42.0C55.0 42.0 55.0 46.0 55.0 46.0C55.0 46.0 51.0 46.0 51.0 46.0C51.0 46.0 51.0 42.0 51.0 42.0C51.0 42.0 51.0 42.0 51.0 42.0M59.0 58.0C59.0 58.0 47.0 58.0 47.0 58.0C47.0 58.0 47.0 50.0 47.0 50.0C47.0 50.0 59.0 50.0 59.0 50.0C59.0 50.0 59.0 58.0 59.0 58.0C59.0 58.0 59.0 58.0 59.0 58.0" /> + </g> +</svg> diff --git a/browser/components/onionservices/content/onionservices.css b/browser/components/onionservices/content/onionservices.css new file mode 100644 index 000000000000..e2621ec8266d --- /dev/null +++ b/browser/components/onionservices/content/onionservices.css @@ -0,0 +1,69 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ + +@namespace html url("http://www.w3.org/1999/xhtml"); + +html|*#tor-clientauth-notification-onionname { + font-weight: bold; +} + +html|*#tor-clientauth-notification-key { + box-sizing: border-box; + width: 100%; + margin-top: 15px; + padding: 6px; +} + +/* Start of rules adapted from + * browser/components/newtab/css/activity-stream-mac.css (linux and windows + * use the same rules). + */ +html|*#tor-clientauth-notification-key.invalid { + border: 1px solid #D70022; + box-shadow: 0 0 0 1px #D70022, 0 0 0 4px rgba(215, 0, 34, 0.3); +} + +html|*#tor-clientauth-warning { + display: inline-block; + animation: fade-up-tt 450ms; + background: #D70022; + border-radius: 2px; + color: #FFF; + inset-inline-start: 3px; + padding: 5px 12px; + position: relative; + top: 6px; + z-index: 1; +} + +html|*#tor-clientauth-warning[hidden] { + display: none; +} + +html|*#tor-clientauth-warning::before { + background: #D70022; + bottom: -8px; + content: '.'; + height: 16px; + inset-inline-start: 12px; + position: absolute; + text-indent: -999px; + top: -7px; + transform: rotate(45deg); + white-space: nowrap; + width: 16px; + z-index: -1; +} + +@keyframes fade-up-tt { + 0% { + opacity: 0; + transform: translateY(15px); + } + 100% { + opacity: 1; + transform: translateY(0); + } +} +/* End of rules adapted from + * browser/components/newtab/css/activity-stream-mac.css + */ diff --git a/browser/components/onionservices/content/savedKeysDialog.js b/browser/components/onionservices/content/savedKeysDialog.js new file mode 100644 index 000000000000..b1376bbabe85 --- /dev/null +++ b/browser/components/onionservices/content/savedKeysDialog.js @@ -0,0 +1,259 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +ChromeUtils.defineModuleGetter( + this, + "TorStrings", + "resource:///modules/TorStrings.jsm" +); + +ChromeUtils.defineModuleGetter( + this, + "controller", + "resource://torbutton/modules/tor-control-port.js" +); + +var gOnionServicesSavedKeysDialog = { + selector: { + dialog: "#onionservices-savedkeys-dialog", + intro: "#onionservices-savedkeys-intro", + tree: "#onionservices-savedkeys-tree", + onionSiteCol: "#onionservices-savedkeys-siteCol", + onionKeyCol: "#onionservices-savedkeys-keyCol", + errorIcon: "#onionservices-savedkeys-errorIcon", + errorMessage: "#onionservices-savedkeys-errorMessage", + removeButton: "#onionservices-savedkeys-remove", + removeAllButton: "#onionservices-savedkeys-removeall", + }, + + _tree: undefined, + _isBusy: false, // true when loading data, deleting a key, etc. + + // Public functions (called from outside this file). + async deleteSelectedKeys() { + this._setBusyState(true); + + const indexesToDelete = []; + const count = this._tree.view.selection.getRangeCount(); + for (let i = 0; i < count; ++i) { + const minObj = {}; + const maxObj = {}; + this._tree.view.selection.getRangeAt(i, minObj, maxObj); + for (let idx = minObj.value; idx <= maxObj.value; ++idx) { + indexesToDelete.push(idx); + } + } + + if (indexesToDelete.length > 0) { + const controllerFailureMsg = + TorStrings.onionServices.authPreferences.failedToRemoveKey; + try { + const torController = controller(aError => { + this._showError(controllerFailureMsg); + }); + + // Remove in reverse index order to avoid issues caused by index changes. + for (let i = indexesToDelete.length - 1; i >= 0; --i) { + await this._deleteOneKey(torController, indexesToDelete[i]); + } + } catch (e) { + if (e.torMessage) { + this._showError(e.torMessage); + } else { + this._showError(controllerFailureMsg); + } + } + } + + this._setBusyState(false); + }, + + async deleteAllKeys() { + this._tree.view.selection.selectAll(); + await this.deleteSelectedKeys(); + }, + + updateButtonsState() { + const haveSelection = this._tree.view.selection.getRangeCount() > 0; + const dialog = document.querySelector(this.selector.dialog); + const removeSelectedBtn = dialog.querySelector(this.selector.removeButton); + removeSelectedBtn.disabled = this._isBusy || !haveSelection; + const removeAllBtn = dialog.querySelector(this.selector.removeAllButton); + removeAllBtn.disabled = this._isBusy || this.rowCount === 0; + }, + + // Private functions. + _onLoad() { + document.mozSubdialogReady = this._init(); + }, + + async _init() { + await this._populateXUL(); + + window.addEventListener("keypress", this._onWindowKeyPress.bind(this)); + + // We don't use await here because we want _loadSavedKeys() to run + // in the background and not block loading of this dialog. + this._loadSavedKeys(); + }, + + async _populateXUL() { + const dialog = document.querySelector(this.selector.dialog); + const authPrefStrings = TorStrings.onionServices.authPreferences; + dialog.setAttribute("title", authPrefStrings.dialogTitle); + + let elem = dialog.querySelector(this.selector.intro); + elem.textContent = authPrefStrings.dialogIntro; + + elem = dialog.querySelector(this.selector.onionSiteCol); + elem.setAttribute("label", authPrefStrings.onionSite); + + elem = dialog.querySelector(this.selector.onionKeyCol); + elem.setAttribute("label", authPrefStrings.onionKey); + + elem = dialog.querySelector(this.selector.removeButton); + elem.setAttribute("label", authPrefStrings.remove); + + elem = dialog.querySelector(this.selector.removeAllButton); + elem.setAttribute("label", authPrefStrings.removeAll); + + this._tree = dialog.querySelector(this.selector.tree); + }, + + async _loadSavedKeys() { + const controllerFailureMsg = + TorStrings.onionServices.authPreferences.failedToGetKeys; + this._setBusyState(true); + + try { + this._tree.view = this; + + const torController = controller(aError => { + this._showError(controllerFailureMsg); + }); + + const keyInfoList = await torController.onionAuthViewKeys(); + if (keyInfoList) { + // Filter out temporary keys. + this._keyInfoList = keyInfoList.filter(aKeyInfo => { + if (!aKeyInfo.Flags) { + return false; + } + + const flags = aKeyInfo.Flags.split(","); + return flags.includes("Permanent"); + }); + + // Sort by the .onion address. + this._keyInfoList.sort((aObj1, aObj2) => { + const hsAddr1 = aObj1.hsAddress.toLowerCase(); + const hsAddr2 = aObj2.hsAddress.toLowerCase(); + if (hsAddr1 < hsAddr2) { + return -1; + } + return hsAddr1 > hsAddr2 ? 1 : 0; + }); + } + + // Render the tree content. + this._tree.rowCountChanged(0, this.rowCount); + } catch (e) { + if (e.torMessage) { + this._showError(e.torMessage); + } else { + this._showError(controllerFailureMsg); + } + } + + this._setBusyState(false); + }, + + // This method may throw; callers should catch errors. + async _deleteOneKey(aTorController, aIndex) { + const keyInfoObj = this._keyInfoList[aIndex]; + await aTorController.onionAuthRemove(keyInfoObj.hsAddress); + this._tree.view.selection.clearRange(aIndex, aIndex); + this._keyInfoList.splice(aIndex, 1); + this._tree.rowCountChanged(aIndex + 1, -1); + }, + + _setBusyState(aIsBusy) { + this._isBusy = aIsBusy; + this.updateButtonsState(); + }, + + _onWindowKeyPress(event) { + if (event.keyCode === KeyEvent.DOM_VK_ESCAPE) { + window.close(); + } else if (event.keyCode === KeyEvent.DOM_VK_DELETE) { + this.deleteSelectedKeys(); + } + }, + + _showError(aMessage) { + const dialog = document.querySelector(this.selector.dialog); + const errorIcon = dialog.querySelector(this.selector.errorIcon); + errorIcon.style.visibility = aMessage ? "visible" : "hidden"; + const errorDesc = dialog.querySelector(this.selector.errorMessage); + errorDesc.textContent = aMessage ? aMessage : ""; + }, + + // XUL tree widget view implementation. + get rowCount() { + return this._keyInfoList ? this._keyInfoList.length : 0; + }, + + getCellText(aRow, aCol) { + let val = ""; + if (this._keyInfoList && aRow < this._keyInfoList.length) { + const keyInfo = this._keyInfoList[aRow]; + if (aCol.id.endsWith("-siteCol")) { + val = keyInfo.hsAddress; + } else if (aCol.id.endsWith("-keyCol")) { + val = keyInfo.typeAndKey; + // Omit keyType because it is always "x25519". + const idx = val.indexOf(":"); + if (idx > 0) { + val = val.substring(idx + 1); + } + } + } + + return val; + }, + + isSeparator(index) { + return false; + }, + + isSorted() { + return false; + }, + + isContainer(index) { + return false; + }, + + setTree(tree) {}, + + getImageSrc(row, column) {}, + + getCellValue(row, column) {}, + + cycleHeader(column) {}, + + getRowProperties(row) { + return ""; + }, + + getColumnProperties(column) { + return ""; + }, + + getCellProperties(row, column) { + return ""; + }, +}; + +window.addEventListener("load", () => gOnionServicesSavedKeysDialog._onLoad()); diff --git a/browser/components/onionservices/content/savedKeysDialog.xhtml b/browser/components/onionservices/content/savedKeysDialog.xhtml new file mode 100644 index 000000000000..3db9bb05ea82 --- /dev/null +++ b/browser/components/onionservices/content/savedKeysDialog.xhtml @@ -0,0 +1,42 @@ +<?xml version="1.0"?> + + +<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css" type="text/css"?> + +<window id="onionservices-savedkeys-dialog" + windowtype="OnionServices:SavedKeys" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + style="width: 45em;"> + + <script src="chrome://browser/content/onionservices/savedKeysDialog.js"/> + + <vbox id="onionservices-savedkeys" class="contentPane" flex="1"> + <label id="onionservices-savedkeys-intro" + control="onionservices-savedkeys-tree"/> + <separator class="thin"/> + <tree id="onionservices-savedkeys-tree" flex="1" hidecolumnpicker="true" + width="750" + style="height: 20em;" + onselect="gOnionServicesSavedKeysDialog.updateButtonsState();"> + <treecols> + <treecol id="onionservices-savedkeys-siteCol" flex="1" persist="width"/> + <splitter class="tree-splitter"/> + <treecol id="onionservices-savedkeys-keyCol" flex="1" persist="width"/> + </treecols> + <treechildren/> + </tree> + <hbox id="onionservices-savedkeys-errorContainer" align="baseline" flex="1"> + <image id="onionservices-savedkeys-errorIcon"/> + <description id="onionservices-savedkeys-errorMessage" flex="1"/> + </hbox> + <separator class="thin"/> + <hbox id="onionservices-savedkeys-buttons"> + <button id="onionservices-savedkeys-remove" disabled="true" + oncommand="gOnionServicesSavedKeysDialog.deleteSelectedKeys();"/> + <button id="onionservices-savedkeys-removeall" + oncommand="gOnionServicesSavedKeysDialog.deleteAllKeys();"/> + </hbox> + </vbox> +</window> diff --git a/browser/components/onionservices/jar.mn b/browser/components/onionservices/jar.mn new file mode 100644 index 000000000000..9d6ce88d1841 --- /dev/null +++ b/browser/components/onionservices/jar.mn @@ -0,0 +1,9 @@ +browser.jar: + content/browser/onionservices/authPreferences.css (content/authPreferences.css) + content/browser/onionservices/authPreferences.js (content/authPreferences.js) + content/browser/onionservices/authPrompt.js (content/authPrompt.js) + content/browser/onionservices/authUtil.jsm (content/authUtil.jsm) + content/browser/onionservices/netError/ (content/netError/*) + content/browser/onionservices/onionservices.css (content/onionservices.css) + content/browser/onionservices/savedKeysDialog.js (content/savedKeysDialog.js) + content/browser/onionservices/savedKeysDialog.xhtml (content/savedKeysDialog.xhtml) diff --git a/browser/components/onionservices/moz.build b/browser/components/onionservices/moz.build new file mode 100644 index 000000000000..7e103239c8d6 --- /dev/null +++ b/browser/components/onionservices/moz.build @@ -0,0 +1 @@ +JAR_MANIFESTS += ['jar.mn'] diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml index 514eba207ca3..2997149dbb05 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -12,6 +12,7 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/search.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/containers.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/privacy.css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css"?> <?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml index d2a1eeba830e..c6ddcacd4e99 100644 --- a/browser/components/preferences/privacy.inc.xhtml +++ b/browser/components/preferences/privacy.inc.xhtml @@ -499,6 +499,8 @@ <label id="fips-desc" hidden="true" data-l10n-id="forms-master-pw-fips-desc"></label> </groupbox> +#include ../onionservices/content/authPreferences.inc.xhtml +  <groupbox id="formAutofillGroupBox" diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js index a7cfa47ae4e8..96449906ec79 100644 --- a/browser/components/preferences/privacy.js +++ b/browser/components/preferences/privacy.js @@ -80,6 +80,12 @@ XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", function() { } }); +XPCOMUtils.defineLazyScriptGetter( + this, + ["OnionServicesAuthPreferences"], + "chrome://browser/content/onionservices/authPreferences.js" +); + // TODO: module import via ChromeUtils.defineModuleGetter XPCOMUtils.defineLazyScriptGetter( this, @@ -505,6 +511,7 @@ var gPrivacyPane = { this.trackingProtectionReadPrefs(); this.networkCookieBehaviorReadPrefs(); this._initTrackingProtectionExtensionControl(); + OnionServicesAuthPreferences.init(); this._initSecurityLevel(); Services.telemetry.setEventRecordingEnabled("pwmgr", true); diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index 83e2a6623cc7..785a929256fc 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -120,6 +120,9 @@ list-style-image: url(chrome://browser/skin/notification-icons/indexedDB.svg); } +/* Reuse Firefox's login (key) icon for the Tor onion services auth. prompt */ +.popup-notification-icon[popupid="tor-clientauth"], +.tor-clientauth-icon, .popup-notification-icon[popupid="password"], .login-icon { list-style-image: url(chrome://browser/skin/login.svg); diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 1c361875ec4c..1ef5ee496399 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -3497,6 +3497,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, } } else { // Errors requiring simple formatting + bool isOnionAuthError = false; switch (aError) { case NS_ERROR_MALFORMED_URI: // URI is malformed @@ -3579,10 +3580,44 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, // HTTP/2 or HTTP/3 stack detected a protocol error error = "networkProtocolError"; break; - + case NS_ERROR_TOR_ONION_SVC_NOT_FOUND: + error = "onionServices.descNotFound"; + break; + case NS_ERROR_TOR_ONION_SVC_IS_INVALID: + error = "onionServices.descInvalid"; + break; + case NS_ERROR_TOR_ONION_SVC_INTRO_FAILED: + error = "onionServices.introFailed"; + break; + case NS_ERROR_TOR_ONION_SVC_REND_FAILED: + error = "onionServices.rendezvousFailed"; + break; + case NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH: + error = "onionServices.clientAuthMissing"; + isOnionAuthError = true; + break; + case NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH: + error = "onionServices.clientAuthIncorrect"; + isOnionAuthError = true; + break; + case NS_ERROR_TOR_ONION_SVC_BAD_ADDRESS: + error = "onionServices.badAddress"; + break; + case NS_ERROR_TOR_ONION_SVC_INTRO_TIMEDOUT: + error = "onionServices.introTimedOut"; + break; default: break; } + + // The presence of aFailedChannel indicates that we arrived here due to a + // failed connection attempt. Note that we will arrive here a second time + // if the user cancels the Tor client auth prompt, but in that case we + // will not have a failed channel and therefore we will not prompt again. + if (isOnionAuthError && aFailedChannel) { + // Display about:blank while the Tor client auth prompt is open. + errorPage.AssignLiteral("blank"); + } } // If the HTTPS-Only Mode upgraded this request and the upgrade might have @@ -3665,6 +3700,20 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, nsAutoString str; rv = stringBundle->FormatStringFromName(errorDescriptionID, formatStrs, str); + if (NS_FAILED(rv)) { + // As a fallback, check torbutton.properties for the error string. + const char bundleURL[] = "chrome://torbutton/locale/torbutton.properties"; + nsCOMPtr<nsIStringBundleService> stringBundleService = + mozilla::services::GetStringBundleService(); + if (stringBundleService) { + nsCOMPtr<nsIStringBundle> tbStringBundle; + if (NS_SUCCEEDED(stringBundleService->CreateBundle( + bundleURL, getter_AddRefs(tbStringBundle)))) { + rv = tbStringBundle->FormatStringFromName(errorDescriptionID, + formatStrs, str); + } + } + } NS_ENSURE_SUCCESS(rv, rv); messageStr.Assign(str); } @@ -6108,6 +6157,7 @@ nsresult nsDocShell::FilterStatusForErrorPage( aStatus == NS_ERROR_FILE_ACCESS_DENIED || aStatus == NS_ERROR_CORRUPTED_CONTENT || aStatus == NS_ERROR_INVALID_CONTENT_ENCODING || + NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_TOR || NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_SECURITY) { // Errors to be shown for any frame return aStatus; @@ -7824,6 +7874,35 @@ nsresult nsDocShell::CreateContentViewer(const nsACString& aContentType, FireOnLocationChange(this, aRequest, mCurrentURI, locationFlags); } + // Arrange to show a Tor onion service client authentication prompt if + // appropriate. + if ((mLoadType == LOAD_ERROR_PAGE) && failedChannel) { + nsresult status = NS_OK; + if (NS_SUCCEEDED(failedChannel->GetStatus(&status)) && + ((status == NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH) || + (status == NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH))) { + nsAutoCString onionHost; + failedURI->GetHost(onionHost); + const char* topic = (status == NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH) + ? "tor-onion-services-clientauth-missing" + : "tor-onion-services-clientauth-incorrect"; + if (XRE_IsContentProcess()) { + nsCOMPtr<nsIBrowserChild> browserChild = GetBrowserChild(); + if (browserChild) { + static_cast<BrowserChild*>(browserChild.get()) + ->SendShowOnionServicesAuthPrompt(onionHost, nsCString(topic)); + } + } else { + nsCOMPtr<nsPIDOMWindowOuter> browserWin = GetWindow(); + nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService(); + if (browserWin && obsSvc) { + obsSvc->NotifyObservers(browserWin, topic, + NS_ConvertUTF8toUTF16(onionHost).get()); + } + } + } + } + return NS_OK; } diff --git a/dom/ipc/BrowserParent.cpp b/dom/ipc/BrowserParent.cpp index 04935175f029..caedda626553 100644 --- a/dom/ipc/BrowserParent.cpp +++ b/dom/ipc/BrowserParent.cpp @@ -3908,6 +3908,27 @@ mozilla::ipc::IPCResult BrowserParent::RecvShowCanvasPermissionPrompt( return IPC_OK(); } +mozilla::ipc::IPCResult BrowserParent::RecvShowOnionServicesAuthPrompt( + const nsCString& aOnionName, const nsCString& aTopic) { + nsCOMPtr<nsIBrowser> browser = + mFrameElement ? mFrameElement->AsBrowser() : nullptr; + if (!browser) { + // If the tab is being closed, the browser may not be available. + // In this case we can ignore the request. + return IPC_OK(); + } + nsCOMPtr<nsIObserverService> os = services::GetObserverService(); + if (!os) { + return IPC_FAIL_NO_REASON(this); + } + nsresult rv = os->NotifyObservers(browser, aTopic.get(), + NS_ConvertUTF8toUTF16(aOnionName).get()); + if (NS_FAILED(rv)) { + return IPC_FAIL_NO_REASON(this); + } + return IPC_OK(); +} + mozilla::ipc::IPCResult BrowserParent::RecvVisitURI(nsIURI* aURI, nsIURI* aLastVisitedURI, const uint32_t& aFlags) { diff --git a/dom/ipc/BrowserParent.h b/dom/ipc/BrowserParent.h index 63a776755e26..87dba47d43a0 100644 --- a/dom/ipc/BrowserParent.h +++ b/dom/ipc/BrowserParent.h @@ -761,6 +761,9 @@ class BrowserParent final : public PBrowserParent, mozilla::ipc::IPCResult RecvShowCanvasPermissionPrompt( const nsCString& aOrigin, const bool& aHideDoorHanger); + mozilla::ipc::IPCResult RecvShowOnionServicesAuthPrompt( + const nsCString& aOnionName, const nsCString& aTopic); + mozilla::ipc::IPCResult RecvSetSystemFont(const nsCString& aFontName); mozilla::ipc::IPCResult RecvGetSystemFont(nsCString* aFontName); diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index bf9fefa00c9c..eb50dafd4406 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -596,6 +596,15 @@ parent: bool aNeedCollectSHistory, uint32_t aFlushId, bool aIsFinal, uint32_t aEpoch); + /** + * This function is used to notify the parent that it should display a + * onion services client authentication prompt. + * + * @param aOnionHost The hostname of the .onion that needs authentication. + * @param aTopic The reason for the prompt. + */ + async ShowOnionServicesAuthPrompt(nsCString aOnionHost, nsCString aTopic); + child: async NativeSynthesisResponse(uint64_t aObserverId, nsCString aResponse); async FlushTabState(uint32_t aFlushId, bool aIsFinal); diff --git a/js/xpconnect/src/xpc.msg b/js/xpconnect/src/xpc.msg index d884c6a85999..31e5e75ba35c 100644 --- a/js/xpconnect/src/xpc.msg +++ b/js/xpconnect/src/xpc.msg @@ -253,5 +253,15 @@ XPC_MSG_DEF(NS_ERROR_FINGERPRINTING_URI , "The URI is fingerprinti XPC_MSG_DEF(NS_ERROR_CRYPTOMINING_URI , "The URI is cryptomining") XPC_MSG_DEF(NS_ERROR_SOCIALTRACKING_URI , "The URI is social tracking") +/* Codes related to Tor */ +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_NOT_FOUND , "Tor onion service descriptor cannot be found") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_IS_INVALID , "Tor onion service descriptor is invalid") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_INTRO_FAILED , "Tor onion service introduction failed") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_REND_FAILED , "Tor onion service rendezvous failed") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH, "Tor onion service missing client authorization") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH , "Tor onion service wrong client authorization") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_BAD_ADDRESS , "Tor onion service bad address") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_INTRO_TIMEDOUT , "Tor onion service introduction timed out") + /* Profile manager error codes */ XPC_MSG_DEF(NS_ERROR_DATABASE_CHANGED , "Flushing the profiles to disk would have overwritten changes made elsewhere.") diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp index dcf2a33b25f3..97716cf90522 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -215,6 +215,12 @@ nsresult ErrorAccordingToNSPR(PRErrorCode errorCode) { default: if (psm::IsNSSErrorCode(errorCode)) { rv = psm::GetXPCOMFromNSSError(errorCode); + } else { + // If we received a Tor extended error code via SOCKS, pass it through. + nsresult res = nsresult(errorCode); + if (NS_ERROR_GET_MODULE(res) == NS_ERROR_MODULE_TOR) { + rv = res; + } } break; diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp index c8b42d142a53..5e16e186a37c 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -1007,6 +1007,55 @@ PRStatus nsSOCKSSocketInfo::ReadV5ConnectResponseTop() { "08, Address type not supported.")); c = PR_BAD_ADDRESS_ERROR; break; + case 0xF0: // Tor SOCKS5_HS_NOT_FOUND + LOGERROR( + ("socks5: connect failed: F0," + " Tor onion service descriptor can not be found.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_NOT_FOUND); + break; + case 0xF1: // Tor SOCKS5_HS_IS_INVALID + LOGERROR( + ("socks5: connect failed: F1," + " Tor onion service descriptor is invalid.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_IS_INVALID); + break; + case 0xF2: // Tor SOCKS5_HS_INTRO_FAILED + LOGERROR( + ("socks5: connect failed: F2," + " Tor onion service introduction failed.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_INTRO_FAILED); + break; + case 0xF3: // Tor SOCKS5_HS_REND_FAILED + LOGERROR( + ("socks5: connect failed: F3," + " Tor onion service rendezvous failed.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_REND_FAILED); + break; + case 0xF4: // Tor SOCKS5_HS_MISSING_CLIENT_AUTH + LOGERROR( + ("socks5: connect failed: F4," + " Tor onion service missing client authorization.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH); + break; + case 0xF5: // Tor SOCKS5_HS_BAD_CLIENT_AUTH + LOGERROR( + ("socks5: connect failed: F5," + " Tor onion service wrong client authorization.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH); + break; + case 0xF6: // Tor SOCKS5_HS_BAD_ADDRESS + LOGERROR( + ("socks5: connect failed: F6," + " Tor onion service bad address.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_BAD_ADDRESS); + break; + case 0xF7: // Tor SOCKS5_HS_INTRO_TIMEDOUT + LOGERROR( + ("socks5: connect failed: F7," + " Tor onion service introduction timed out.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_INTRO_TIMEDOUT); + break; + default: LOGERROR(("socks5: connect failed.")); break; diff --git a/toolkit/modules/PopupNotifications.jsm b/toolkit/modules/PopupNotifications.jsm index 2fc54a589969..68f687698cfa 100644 --- a/toolkit/modules/PopupNotifications.jsm +++ b/toolkit/modules/PopupNotifications.jsm @@ -406,6 +406,8 @@ PopupNotifications.prototype = { * will be dismissed instead of removed after running the callback. * - [optional] disabled (boolean): If this is true, the button * will be disabled. + * - [optional] leaveOpen (boolean): If this is true, the notification + * will not be removed after running the callback. * - [optional] disableHighlight (boolean): If this is true, the button * will not apply the default highlight style. * If null, the notification will have a default "OK" action button @@ -1890,6 +1892,10 @@ PopupNotifications.prototype = { this._dismiss(); return; } + + if (action.leaveOpen) { + return; + } } this._remove(notification); diff --git a/toolkit/modules/RemotePageAccessManager.jsm b/toolkit/modules/RemotePageAccessManager.jsm index e2e82aaaf6fa..10b200e5def2 100644 --- a/toolkit/modules/RemotePageAccessManager.jsm +++ b/toolkit/modules/RemotePageAccessManager.jsm @@ -104,6 +104,7 @@ let RemotePageAccessManager = { RPMPrefIsLocked: ["security.tls.version.min"], RPMAddToHistogram: ["*"], RPMGetHttpResponseHeader: ["*"], + RPMGetTorStrings: ["*"], }, "about:newinstall": { RPMGetUpdateChannel: ["*"], diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/frame-script.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/frame-script.js index dd5c5fdbe1b0..464e0f654262 100644 --- a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/frame-script.js +++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/frame-script.js @@ -38,5 +38,6 @@ module.exports = { RPMAddToHistogram: false, RPMRemoveMessageListener: false, RPMGetHttpResponseHeader: false, + RPMGetTorStrings: false, }, }; diff --git a/xpcom/base/ErrorList.py b/xpcom/base/ErrorList.py index 5451127bcffe..2086aeee3ba4 100755 --- a/xpcom/base/ErrorList.py +++ b/xpcom/base/ErrorList.py @@ -85,6 +85,7 @@ modules["URL_CLASSIFIER"] = Mod(42) # ErrorResult gets its own module to reduce the chance of someone accidentally # defining an error code matching one of the ErrorResult ones. modules["ERRORRESULT"] = Mod(43) +modules["TOR"] = Mod(44) # NS_ERROR_MODULE_GENERAL should be used by modules that do not # care if return code values overlap. Callers of methods that @@ -1179,6 +1180,27 @@ with modules["ERRORRESULT"]: errors["NS_ERROR_INTERNAL_ERRORRESULT_RANGEERROR"] = FAILURE(5) +# ======================================================================= +# 44: Tor-specific error codes. +# ======================================================================= +with modules["TOR"]: + # Tor onion service descriptor can not be found. + errors["NS_ERROR_TOR_ONION_SVC_NOT_FOUND"] = FAILURE(1) + # Tor onion service descriptor is invalid. + errors["NS_ERROR_TOR_ONION_SVC_IS_INVALID"] = FAILURE(2) + # Tor onion service introduction failed. + errors["NS_ERROR_TOR_ONION_SVC_INTRO_FAILED"] = FAILURE(3) + # Tor onion service rendezvous failed. + errors["NS_ERROR_TOR_ONION_SVC_REND_FAILED"] = FAILURE(4) + # Tor onion service missing client authorization. + errors["NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH"] = FAILURE(5) + # Tor onion service wrong client authorization. + errors["NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH"] = FAILURE(6) + # Tor onion service bad address. + errors["NS_ERROR_TOR_ONION_SVC_BAD_ADDRESS"] = FAILURE(7) + # Tor onion service introduction timed out. + errors["NS_ERROR_TOR_ONION_SVC_INTRO_TIMEDOUT"] = FAILURE(8) + # ======================================================================= # 51: NS_ERROR_MODULE_GENERAL # =======================================================================

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 24796 - Comment out excess permissions from GeckoView
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 2153bb89cfe5c5d9a723b0ad27259527b17cacf8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Apr 11 17:52:59 2018 +0000 Bug 24796 - Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. --- .../android/geckoview/src/main/AndroidManifest.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml index 87ad6dc28047..4c8ab2a9d996 100644 --- a/mobile/android/geckoview/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview/src/main/AndroidManifest.xml @@ -6,20 +6,32 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.geckoview"> + +  + <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> + +  + <uses-feature android:name="android.hardware.touchscreen" android:required="false"/> + +  +  +  <uses-feature

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 955d7440d2c8febc823f0ff1a61e9ff6e076bc01 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Fri Jun 12 02:07:45 2015 -0400 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review --- .../main/java/org/mozilla/gecko/GeckoAppShell.java | 68 +++++++++++----------- .../java/org/mozilla/gecko/util/BitmapUtils.java | 7 --- .../java/org/mozilla/gecko/util/ProxySelector.java | 25 +++++++- 3 files changed, 59 insertions(+), 41 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java index 995b23316c32..b9ca73bee2eb 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java @@ -1764,39 +1764,41 @@ public class GeckoAppShell { @WrapForJNI private static URLConnection getConnection(final String url) { - try { - String spec; - if (url.startsWith("android://")) { - spec = url.substring(10); - } else { - spec = url.substring(8); - } - - // Check if we are loading a package icon. - try { - if (spec.startsWith("icon/")) { - String[] splits = spec.split("/"); - if (splits.length != 2) { - return null; - } - final String pkg = splits[1]; - final PackageManager pm = getApplicationContext().getPackageManager(); - final Drawable d = pm.getApplicationIcon(pkg); - final Bitmap bitmap = BitmapUtils.getBitmapFromDrawable(d); - return new BitmapConnection(bitmap); - } - } catch (Exception ex) { - Log.e(LOGTAG, "error", ex); - } - - // if the colon got stripped, put it back - int colon = spec.indexOf(':'); - if (colon == -1 || colon > spec.indexOf('/')) { - spec = spec.replaceFirst("/", ":/"); - } - } catch (Exception ex) { - return null; - } + // Bug 31144 - Prevent potential proxy-bypass + + //try { + // String spec; + // if (url.startsWith("android://")) { + // spec = url.substring(10); + // } else { + // spec = url.substring(8); + // } + + // // Check if we are loading a package icon. + // try { + // if (spec.startsWith("icon/")) { + // String[] splits = spec.split("/"); + // if (splits.length != 2) { + // return null; + // } + // final String pkg = splits[1]; + // final PackageManager pm = getApplicationContext().getPackageManager(); + // final Drawable d = pm.getApplicationIcon(pkg); + // final Bitmap bitmap = BitmapUtils.getBitmapFromDrawable(d); + // return new BitmapConnection(bitmap); + // } + // } catch (Exception ex) { + // Log.e(LOGTAG, "error", ex); + // } + + // // if the colon got stripped, put it back + // int colon = spec.indexOf(':'); + // if (colon == -1 || colon > spec.indexOf('/')) { + // spec = spec.replaceFirst("/", ":/"); + // } + //} catch (Exception ex) { + // return null; + //} return null; } diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java index 73a69a3abd66..f795dacffb47 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java @@ -101,13 +101,6 @@ public final class BitmapUtils { public static Bitmap decodeUrl(final URL url) { InputStream stream = null; - try { - stream = url.openStream(); - } catch (IOException e) { - Log.w(LOGTAG, "decodeUrl: IOException downloading " + url); - return null; - } - if (stream == null) { Log.w(LOGTAG, "decodeUrl: stream not found downloading " + url); return null; diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java index 3940d3c84249..9515975f680a 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java @@ -29,6 +29,10 @@ import java.net.URLConnection; import java.util.List; public class ProxySelector { + private static final String TOR_PROXY_ADDRESS = "127.0.0.1"; + private static final int TOR_SOCKS_PROXY_PORT = 9150; + private static final int TOR_HTTP_PROXY_PORT = 8218; + public static URLConnection openConnectionWithProxy(final URI uri) throws IOException { java.net.ProxySelector ps = java.net.ProxySelector.getDefault(); Proxy proxy = Proxy.NO_PROXY; @@ -39,7 +43,26 @@ public class ProxySelector { } } - return uri.toURL().openConnection(proxy); + /* Ignore the proxy we found from the VM, only use Tor. We can probably + * safely use the logic in this class in the future. */ + return uri.toURL().openConnection(getProxy()); + } + + public static Proxy getProxy() { + // TODO make configurable + return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(TOR_PROXY_ADDRESS, TOR_SOCKS_PROXY_PORT)); + } + + public static String getProxyHostAddress() { + return TOR_PROXY_ADDRESS; + } + + public static int getSocksProxyPort() { + return TOR_SOCKS_PROXY_PORT; + } + + public static int getHttpProxyPort() { + return TOR_HTTP_PROXY_PORT; } public ProxySelector() {

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit e309ed25ea4dad81a18419b7f842a45a29f970a5 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Sep 4 12:34:35 2020 +0200 Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop This loads HTTPS Everywhere as a builtin addon from a hardcoded resource:// URI in desktop. It also ensures that the non-builtin HTTPS Everywhere addon is always uninstalled on browser startup. The reason of making this desktop-only is that there are some issues when installing a builtin extension from geckoview side, making the extension not available on first startup. So, at least for now we handle the Fenix case separately. See #40118 for a followup for investigating these. --- browser/components/BrowserGlue.jsm | 37 ++++++++++++++++++++++ .../mozapps/extensions/internal/XPIProvider.jsm | 13 ++++++++ 2 files changed, 50 insertions(+) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 755fcb16cad7..e46c9d873edf 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -62,6 +62,13 @@ XPCOMUtils.defineLazyServiceGetter( "nsIPushService" ); +XPCOMUtils.defineLazyServiceGetters(this, { + resProto: [ + "@mozilla.org/network/protocol;1?name=resource", + "nsISubstitutingProtocolHandler", + ], +}); + const PREF_PDFJS_ISDEFAULT_CACHE_STATE = "pdfjs.enabledCache.state"; /** @@ -722,6 +729,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { DoHController: "resource:///modules/DoHController.jsm", DownloadsViewableInternally: "resource:///modules/DownloadsViewableInternally.jsm", + ExtensionData: "resource://gre/modules/Extension.jsm", ExtensionsUI: "resource:///modules/ExtensionsUI.jsm", FirefoxMonitor: "resource:///modules/FirefoxMonitor.jsm", FxAccounts: "resource://gre/modules/FxAccounts.jsm", @@ -1321,6 +1329,35 @@ BrowserGlue.prototype = { "resource:///modules/themes/alpenglow/" ); + // Install https-everywhere builtin addon if needed. + (async () => { + const HTTPS_EVERYWHERE_ID = "https-everywhere-eff(a)eff.org"; + const HTTPS_EVERYWHERE_BUILTIN_URL = + "resource://torbutton/content/extensions/https-everywhere/"; + // This does something similar as GeckoViewWebExtension.jsm: it tries + // to load the manifest to retrieve the version of the builtin and + // compares it to the currently installed one to see whether we need + // to install or not. Here we delegate that to + // AddonManager.maybeInstallBuiltinAddon. + try { + const resolvedURI = Services.io.newURI( + resProto.resolveURI(Services.io.newURI(HTTPS_EVERYWHERE_BUILTIN_URL)) + ); + const extensionData = new ExtensionData(resolvedURI); + const manifest = await extensionData.loadManifest(); + + await AddonManager.maybeInstallBuiltinAddon( + HTTPS_EVERYWHERE_ID, + manifest.version, + HTTPS_EVERYWHERE_BUILTIN_URL + ); + } catch (e) { + const log = Log.repository.getLogger("HttpsEverywhereBuiltinLoader"); + log.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter())); + log.error("Could not install https-everywhere extension", e); + } + })(); + if (AppConstants.MOZ_NORMANDY) { Normandy.init(); } diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index ad8922dadebf..9c122b16b9f8 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1491,6 +1491,19 @@ var XPIStates = { continue; } + // Uninstall HTTPS Everywhere if it is installed in the user profile. + if ( + id === "https-everywhere-eff(a)eff.org" && + loc.name === KEY_APP_PROFILE + ) { + logger.debug( + "Uninstalling the HTTPS Everywhere extension from user profile." + ); + loc.installer.uninstallAddon(id); + changed = true; + continue; + } + let xpiState = loc.get(id); if (!xpiState) { // If the location is not supported for sideloading, skip new

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 612118641c994565a923703ce5268455a38560d1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 14 11:15:07 2020 -0400 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. --- browser/components/aboutlogins/AboutLoginsParent.jsm | 2 ++ browser/components/aboutlogins/content/aboutLogins.css | 8 +++++++- browser/components/aboutlogins/content/aboutLogins.js | 6 ++++++ .../aboutlogins/content/components/fxaccounts-button.css | 5 +++++ .../components/aboutlogins/content/components/menu-button.css | 10 ++++++++++ 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm index d52981936597..bb0b9aeff1bd 100644 --- a/browser/components/aboutlogins/AboutLoginsParent.jsm +++ b/browser/components/aboutlogins/AboutLoginsParent.jsm @@ -63,6 +63,7 @@ const PASSWORD_SYNC_NOTIFICATION_ID = "enable-password-sync"; const HIDE_MOBILE_FOOTER_PREF = "signon.management.page.hideMobileFooter"; const SHOW_PASSWORD_SYNC_NOTIFICATION_PREF = "signon.management.page.showPasswordSyncNotification"; +const NOCERTDB_PREF = "security.nocertdb"; // about:logins will always use the privileged content process, // even if it is disabled for other consumers such as about:newtab. @@ -432,6 +433,7 @@ class AboutLoginsParent extends JSWindowActorParent { importVisible: Services.policies.isAllowed("profileImport") && AppConstants.platform != "linux", + canCreateLogins: !Services.prefs.getBoolPref(NOCERTDB_PREF, false), }); await AboutLogins._sendAllLoginRelatedObjects( diff --git a/browser/components/aboutlogins/content/aboutLogins.css b/browser/components/aboutlogins/content/aboutLogins.css index 7ed29bda8297..dca63da2e649 100644 --- a/browser/components/aboutlogins/content/aboutLogins.css +++ b/browser/components/aboutlogins/content/aboutLogins.css @@ -69,6 +69,11 @@ login-item { grid-area: login; } +/* Do not promote Mozilla Sync in Tor Browser. */ +login-intro { + display: none !important; +} + #branding-logo { flex-basis: var(--sidebar-width); flex-shrink: 0; @@ -83,7 +88,8 @@ login-item { } } -:root:not(.official-branding) #branding-logo { +/* Hide "Firefox LockWise" branding in Tor Browser. */ +#branding-logo { visibility: hidden; } diff --git a/browser/components/aboutlogins/content/aboutLogins.js b/browser/components/aboutlogins/content/aboutLogins.js index a08427b0ae09..1669fba678bd 100644 --- a/browser/components/aboutlogins/content/aboutLogins.js +++ b/browser/components/aboutlogins/content/aboutLogins.js @@ -19,6 +19,9 @@ const gElements = { get loginFooter() { return this.loginItem.shadowRoot.querySelector("login-footer"); }, + get createNewLoginButton() { + return this.loginList.shadowRoot.querySelector(".create-login-button"); + }, }; let numberOfLogins = 0; @@ -100,6 +103,9 @@ window.addEventListener("AboutLoginsChromeToContent", event => { gElements.loginList.setSortDirection(event.detail.value.selectedSort); document.documentElement.classList.add("initialized"); gElements.loginList.classList.add("initialized"); + if (!event.detail.value.canCreateLogins) { + gElements.createNewLoginButton.disabled = true; + } break; } case "ShowLoginItemError": { diff --git a/browser/components/aboutlogins/content/components/fxaccounts-button.css b/browser/components/aboutlogins/content/components/fxaccounts-button.css index aefda548c84d..a02707980158 100644 --- a/browser/components/aboutlogins/content/components/fxaccounts-button.css +++ b/browser/components/aboutlogins/content/components/fxaccounts-button.css @@ -8,6 +8,11 @@ align-items: center; } +/* Do not promote Mozilla Sync in Tor Browser. */ +.logged-out-view { + display: none !important; +} + .fxaccounts-extra-text { /* Only show at most 3 lines of text to limit the text from overflowing the header. */ diff --git a/browser/components/aboutlogins/content/components/menu-button.css b/browser/components/aboutlogins/content/components/menu-button.css index f500edd5ae70..9cb663dc424c 100644 --- a/browser/components/aboutlogins/content/components/menu-button.css +++ b/browser/components/aboutlogins/content/components/menu-button.css @@ -89,3 +89,13 @@ .menuitem-mobile-android { background-image: url("chrome://browser/skin/logo-android.svg"); } + +/* + * Do not promote LockWise mobile apps in Tor Browser: hide the menu items + * and the separator line that precedes them. + */ +.menuitem-mobile-android, +.menuitem-mobile-ios, +button[data-event-name="AboutLoginsGetHelp"] + hr { + display: none !important; +}

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 32418: Allow updates to be disabled via an enterprise policy.
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit b058e7d3594f0d65b46cb2082b31792b0fc90bfe Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 17:07:09 2020 -0400 Bug 32418: Allow updates to be disabled via an enterprise policy. Restrict the Enterprise Policies mechanism to only consult a policies.json file (avoiding the Windows Registry and macOS's file system attributes). Add a few disabledByPolicy() checks to the update service to avoid extraneous (and potentially confusing) log messages when updates are disabled by policy. Sample content for distribution/policies.json: { "policies": { "DisableAppUpdate": true } } On Linux, avoid reading policies from /etc/firefox/policies/policies.json --- .../enterprisepolicies/EnterprisePoliciesParent.jsm | 14 ++++++++++++-- toolkit/components/enterprisepolicies/moz.build | 3 +++ toolkit/mozapps/update/UpdateService.jsm | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm index 8b0a5170cbdd..38e2c2b36a24 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm +++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm @@ -4,6 +4,10 @@ var EXPORTED_SYMBOLS = ["EnterprisePoliciesManager"]; +// To ensure that policies intended for Firefox or another browser will not +// be used, Tor Browser only looks for policies in ${InstallDir}/distribution +#define AVOID_SYSTEM_POLICIES MOZ_PROXY_BYPASS_PROTECTION + const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); @@ -13,9 +17,11 @@ const { AppConstants } = ChromeUtils.import( ); XPCOMUtils.defineLazyModuleGetters(this, { +#ifndef AVOID_SYSTEM_POLICIES WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm", macOSPoliciesParser: "resource://gre/modules/policies/macOSPoliciesParser.jsm", +#endif Policies: "resource:///modules/policies/Policies.jsm", JsonSchemaValidator: "resource://gre/modules/components-utils/JsonSchemaValidator.jsm", @@ -137,6 +143,7 @@ EnterprisePoliciesManager.prototype = { _chooseProvider() { let provider = null; +#ifndef AVOID_SYSTEM_POLICIES if (AppConstants.platform == "win") { provider = new WindowsGPOPoliciesProvider(); } else if (AppConstants.platform == "macosx") { @@ -145,6 +152,7 @@ EnterprisePoliciesManager.prototype = { if (provider && provider.hasPolicies) { return provider; } +#endif provider = new JSONPoliciesProvider(); if (provider.hasPolicies) { @@ -495,7 +503,7 @@ class JSONPoliciesProvider { _getConfigurationFile() { let configFile = null; - +#ifndef AVOID_SYSTEM_POLICIES if (AppConstants.platform == "linux") { let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance( Ci.nsIFile @@ -508,7 +516,7 @@ class JSONPoliciesProvider { return systemConfigFile; } } - +#endif try { let perUserPath = Services.prefs.getBoolPref(PREF_PER_USER_DIR, false); if (perUserPath) { @@ -589,6 +597,7 @@ class JSONPoliciesProvider { } } +#ifndef AVOID_SYSTEM_POLICIES class WindowsGPOPoliciesProvider { constructor() { this._policies = null; @@ -654,3 +663,4 @@ class macOSPoliciesProvider { return this._failed; } } +#endif diff --git a/toolkit/components/enterprisepolicies/moz.build b/toolkit/components/enterprisepolicies/moz.build index 284089594b2f..b0485aade0e8 100644 --- a/toolkit/components/enterprisepolicies/moz.build +++ b/toolkit/components/enterprisepolicies/moz.build @@ -21,6 +21,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != "android": EXTRA_JS_MODULES += [ 'EnterprisePolicies.jsm', 'EnterprisePoliciesContent.jsm', + ] + + EXTRA_PP_JS_MODULES += [ 'EnterprisePoliciesParent.jsm', ] diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 3338f7f94d72..35f3b6bb3a26 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -2811,6 +2811,10 @@ UpdateService.prototype = { _checkForBackgroundUpdates: function AUS__checkForBackgroundUpdates( isNotify ) { + if (this.disabledByPolicy) { + return; + } + this._isNotify = isNotify; // Histogram IDs: @@ -3311,6 +3315,14 @@ UpdateService.prototype = { * See nsIUpdateService.idl */ get canApplyUpdates() { + if (this.disabledByPolicy) { + LOG( + "UpdateService.canApplyUpdates - unable to apply updates, " + + "the option has been disabled by the administrator." + ); + return false; + } + return getCanApplyUpdates() && hasUpdateMutex(); }, @@ -3318,6 +3330,14 @@ UpdateService.prototype = { * See nsIUpdateService.idl */ get canStageUpdates() { + if (this.disabledByPolicy) { + LOG( + "UpdateService.canStageUpdates - unable to stage updates, " + + "the option has been disabled by the administrator." + ); + return false; + } + return getCanStageUpdates(); },

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit b17829ec5fa8a1719a2443ba8a5c29fc1a8fae8e Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 2 17:23:33 2020 +0200 fixup! Bug 23247: Communicating security expectations for .onion Fixes 40172: Security UI not updated for non-https .onion pages --- mobile/android/modules/geckoview/GeckoViewProgress.jsm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mobile/android/modules/geckoview/GeckoViewProgress.jsm b/mobile/android/modules/geckoview/GeckoViewProgress.jsm index 9cfc7bf09b9c..475b7fc19a44 100644 --- a/mobile/android/modules/geckoview/GeckoViewProgress.jsm +++ b/mobile/android/modules/geckoview/GeckoViewProgress.jsm @@ -144,6 +144,10 @@ var IdentityHandler = { result.host = uri.host; } + if (!aBrowser.securityUI.secInfo) { + return result; + } + const cert = aBrowser.securityUI.secInfo.serverCert; result.certificate = aBrowser.securityUI.secInfo.serverCert.getBase64DERString();

1 0