September 2020 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-80.0b2-10.0-1] Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit c24c919f3957c462c73e25f6c8e16e487152f9ec 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 f77f3958d4d4..1780bbe956c7 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"; /** @@ -720,6 +727,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { Corroborate: "resource://gre/modules/Corroborate.jsm", Discovery: "resource:///modules/Discovery.jsm", DoHController: "resource:///modules/DoHController.jsm", + ExtensionData: "resource://gre/modules/Extension.jsm", ExtensionsUI: "resource:///modules/ExtensionsUI.jsm", FirefoxMonitor: "resource:///modules/FirefoxMonitor.jsm", FxAccounts: "resource://gre/modules/FxAccounts.jsm", @@ -1310,6 +1318,35 @@ BrowserGlue.prototype = { "resource:///modules/themes/dark/" ); + // 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-80.0b2-10.0-1] Revert "Bug 14970: Don't block our unsigned extensions"
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit d7bb5bbea7b9ee1b7a987fa63e996732a554cf90 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Sep 4 13:48:37 2020 +0200 Revert "Bug 14970: Don't block our unsigned extensions" This reverts commit c1e58594c9cf2d226279727e0148ebd59ed98c12. --- browser/components/BrowserGlue.jsm | 6 +----- toolkit/mozapps/extensions/content/aboutaddonsCommon.js | 6 ------ toolkit/mozapps/extensions/internal/XPIDatabase.jsm | 5 ----- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 1 - 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 21408e0413e9..f77f3958d4d4 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2256,11 +2256,7 @@ BrowserGlue.prototype = { ); AddonManager.getAddonsByIDs(disabledAddons).then(addons => { for (let addon of addons) { - // We don't need a false notification that our extensions are - // disabled. Even if they lack Mozilla's blessing they are enabled - // nevertheless. - if ((addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) && - (addon.id !== "https-everywhere-eff(a)eff.org")) { + if (addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) { this._notifyUnsignedAddonsDisabled(); break; } diff --git a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js index a566979bc8c8..9b218c3dae2c 100644 --- a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js +++ b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js @@ -214,15 +214,9 @@ var gBrowser = { }, }; -// This function is the central check point to decide whether to show a warning -// about unsigned extensions or not. We want those warnings but only for -// extensions we don't distribute. function isCorrectlySigned(addon) { // Add-ons without an "isCorrectlySigned" property are correctly signed as // they aren't the correct type for signing. - if (addon.id == "https-everywhere-eff(a)eff.org") { - return true; - } return addon.isCorrectlySigned !== false; } diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm index c8407541c2df..0b9bfa34b138 100644 --- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm +++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm @@ -2211,11 +2211,6 @@ this.XPIDatabase = { * True if the add-on should not be appDisabled */ isUsableAddon(aAddon) { - // Ensure that we allow https-everywhere - if (aAddon.id == "https-everywhere-eff(a)eff.org") { - return true; - } - if (this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) { logger.warn(`Add-on ${aAddon.id} is not correctly signed.`); if (Services.prefs.getBoolPref(PREF_XPI_SIGNATURES_DEV_ROOT, false)) { diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index 4e16f7e7b2da..a7801077531f 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -3917,7 +3917,6 @@ var XPIInstall = { if ( XPIDatabase.mustSign(addon.type) && - addon.id !== "https-everywhere-eff(a)eff.org" && addon.signedState <= AddonManager.SIGNEDSTATE_MISSING ) { throw new Error(

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit 164730b4d8f11ee32f799e0d777fbdb7ebeb75bb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 09:37:53 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 8ed0f04ce76f..33fed7848596 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 8ed0f04ce76f0ed311975082c739823ecbbbaf80 +Subproject commit 33fed7848596b3da7d0e66309f94fdbdc21d253e

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Revert "Bug 14970: Don't block our unsigned extensions"
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit 8c35e9719ea7dc1d983250558df0732cb78888bf Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Sep 4 13:48:37 2020 +0200 Revert "Bug 14970: Don't block our unsigned extensions" This reverts commit c1e58594c9cf2d226279727e0148ebd59ed98c12. --- browser/components/BrowserGlue.jsm | 6 +----- toolkit/mozapps/extensions/content/aboutaddonsCommon.js | 6 ------ toolkit/mozapps/extensions/internal/XPIDatabase.jsm | 5 ----- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 1 - 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 0d7de1dc7d4f..ec38d0ca8b33 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2196,11 +2196,7 @@ BrowserGlue.prototype = { ); AddonManager.getAddonsByIDs(disabledAddons).then(addons => { for (let addon of addons) { - // We don't need a false notification that our extensions are - // disabled. Even if they lack Mozilla's blessing they are enabled - // nevertheless. - if ((addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) && - (addon.id !== "https-everywhere-eff(a)eff.org")) { + if (addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) { this._notifyUnsignedAddonsDisabled(); break; } diff --git a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js index a566979bc8c8..9b218c3dae2c 100644 --- a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js +++ b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js @@ -214,15 +214,9 @@ var gBrowser = { }, }; -// This function is the central check point to decide whether to show a warning -// about unsigned extensions or not. We want those warnings but only for -// extensions we don't distribute. function isCorrectlySigned(addon) { // Add-ons without an "isCorrectlySigned" property are correctly signed as // they aren't the correct type for signing. - if (addon.id == "https-everywhere-eff(a)eff.org") { - return true; - } return addon.isCorrectlySigned !== false; } diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm index fb9ef83066bf..4d1c469418c5 100644 --- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm +++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm @@ -2207,11 +2207,6 @@ this.XPIDatabase = { * True if the add-on should not be appDisabled */ isUsableAddon(aAddon) { - // Ensure that we allow https-everywhere - if (aAddon.id == "https-everywhere-eff(a)eff.org") { - return true; - } - if (this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) { logger.warn(`Add-on ${aAddon.id} is not correctly signed.`); if (Services.prefs.getBoolPref(PREF_XPI_SIGNATURES_DEV_ROOT, false)) { diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index 5269e2755e58..71034a3e73a7 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -3834,7 +3834,6 @@ var XPIInstall = { if ( XPIDatabase.mustSign(addon.type) && - addon.id !== "https-everywhere-eff(a)eff.org" && addon.signedState <= AddonManager.SIGNEDSTATE_MISSING ) { throw new Error(

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit 56cae1cf95d18c741ac3e71986e224a4a635a754 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 18:55:02 2020 +0200 fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop --- browser/components/BrowserGlue.jsm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 901d18a6b414..057a2121533c 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1343,9 +1343,10 @@ BrowserGlue.prototype = { 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 + // 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(

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit ecadb5d3fe53bdc13f2d582ff0f0673c37ad8e9c Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Sep 4 17:53:04 2020 +0200 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. --- tools/update-packaging/make_full_update.sh | 13 ---- tools/update-packaging/make_incremental_update.sh | 74 +---------------------- 2 files changed, 2 insertions(+), 85 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index e41d7870a9a2..fcf143339a1c 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -71,19 +71,6 @@ fi list_files files list_symlinks symlinks symlink_targets -# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, -# we should remove the following lines (which remove entire directories -# which, if present, contain old, unpacked copies of HTTPS Everywhere): -# Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it -# exists. The extension ID got changed with the version bump to 5.1.0. -ext_path='TorBrowser/Data/Browser/profile.default/extensions' -if [ -d "$ext_dir" ]; then - directories_to_remove="$ext_path/https-everywhere(a)eff.org $ext_path/https-everywhere-eff(a)eff.org" -else - directories_to_remove="" -fi -# END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal - popd # Add the type of update to the beginning of the update manifests. diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 816384147dee..5ff620a667d5 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -68,21 +68,6 @@ check_for_forced_update() { ## "true" *giggle* return 0; fi - -# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, -# we should remove the following lines: - # If the file in the skip list ends with /*, do a prefix match. - # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org/* - # to be used to force all HTTPS Everywhere files to be updated. - f_suffix=${f##*/} - if [[ $f_suffix = "*" ]]; then - f_prefix="${f%\/\*}"; - if [[ $forced_file_chk == $f_prefix* ]]; then - ## 0 means "true" - return 0; - fi - fi -# END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal done ## 'false'... because this is bash. Oh yay! return 1; @@ -134,12 +119,10 @@ archivefiles="updatev2.manifest updatev3.manifest" # TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, # we should remove the following lines: -# If the NoScript or HTTPS Everywhere extensions have changed between -# releases, add them to the "force updates" list. +# If the NoScript extension has changed between +# releases, add it to the "force updates" list. ext_path='TorBrowser/Data/Browser/profile.default/extensions' if [ -d "$newdir/$ext_path" ]; then - https_everywhere_dir='https-everywhere-eff(a)eff.org' - https_everywhere_xpi='https-everywhere-eff(a)eff.org.xpi' noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' # NoScript is a packed extension, so we simply compare the old and the new @@ -153,59 +136,6 @@ if [ -d "$newdir/$ext_path" ]; then elif [ $rc -eq 1 ]; then requested_forced_updates="$requested_forced_updates $noscript_path" fi - - # As of HTTPS Everywhere 5.1.0, the extension ID gained "-eff". - # As of HTTPS Everywhere 5.2.2, the extension is packed (i.e., it remains - # an .xpi after it is installed in the browser profile). - force_https_update=0 - remove_unpacked_https_e_dirs=0 - unpacked_https_e_install_rdf="$ext_path/$https_everywhere_dir/install.rdf" - packed_https_e_path="$ext_path/$https_everywhere_xpi" - if [ -d "$newdir/$ext_path/$https_everywhere_dir" ]; then - # The new HTTPS-E extension is unpacked, and presumably the old one is - # too. We need to determine if any of the unpacked files have changed. - # Since that is messy, we simply compare the old install.rdf file to the - # new one. - diff "$olddir/$unpacked_https_e_install_rdf" \ - "$newdir/$unpacked_https_e_install_rdf" > /dev/null - rc=$? - if [ $rc -gt 1 -a -e "$olddir/$unpacked_https_e_install_rdf" ]; then - notice "Unexpected exit $rc from $unpacked_https_e_install_rdf diff command" - exit 2 - elif [ $rc -ge 1 ]; then - force_https_update=1 - remove_unpacked_https_e_dirs=1 - # In case we still ship an unpacked HTTPS-E extension but the user has - # updated to a packed one, arrange for the packed one to be removed. - extra_files_to_remove="$extra_files_to_remove $packed_https_e_path" - fi - elif [ -d "$olddir/$ext_path/$https_everywhere_dir" ]; then - # The old HTTPS-E extension is unpacked but the new one is packed. - force_https_update=1 - remove_unpacked_https_e_dirs=1 - else - # Both the old and new HTTPS-E extensions are packed. In this case we can - # simply compare the .xpi files to determine if the extension has changed. - diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null - rc=$? - if [ $rc -gt 1 ]; then - notice "Unexpected exit $rc from $packed_https_e_path diff command" - exit 2 - elif [ $rc -eq 1 ]; then - force_https_update=1 - fi - fi - - if [ $force_https_update -ne 0 ]; then - requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere_dir/* $packed_https_e_path" - if [ "$remove_unpacked_https_e_dirs" -ne 0 ]; then - # The old version was unpacked, so remove the entire directory to ensure - # that the replace is "clean." Also, make sure we delete the pre 5.1.0 - # HTTPS Everywhere as well in case it exists (the extension ID got - # changed with the version bump to 5.1.0). - directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere_dir" - fi - fi fi # END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit a71b2382c0405e9c707b790de570672ec885750e Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 18:52:34 2020 +0200 fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index d199ac48ecae..dc5362bce3d8 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1491,9 +1491,14 @@ var XPIStates = { continue; } - // Uninstall non-builtin https-everywhere-eff extension. - if (id === "https-everywhere-eff(a)eff.org" && !loc.isBuiltin) { - logger.debug("Uninstalling the HTTPS Everywhere extension."); + // 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;

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit 0062275ca3ac484d8005fa057a5a02eb76b42517 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. --- browser/components/BrowserGlue.jsm | 36 ++++++++++++++++++++++ .../mozapps/extensions/internal/XPIProvider.jsm | 8 +++++ 2 files changed, 44 insertions(+) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index ec38d0ca8b33..901d18a6b414 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -56,6 +56,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"; /** @@ -675,6 +682,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { "resource://gre/modules/ContextualIdentityService.jsm", Corroborate: "resource://gre/modules/Corroborate.jsm", Discovery: "resource:///modules/Discovery.jsm", + ExtensionData: "resource://gre/modules/Extension.jsm", ExtensionsUI: "resource:///modules/ExtensionsUI.jsm", FirefoxMonitor: "resource:///modules/FirefoxMonitor.jsm", FxAccounts: "resource://gre/modules/FxAccounts.jsm", @@ -1330,6 +1338,34 @@ BrowserGlue.prototype = { "resource:///modules/themes/dark/" ); + // 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 794c206fb453..d199ac48ecae 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1491,6 +1491,14 @@ var XPIStates = { continue; } + // Uninstall non-builtin https-everywhere-eff extension. + if (id === "https-everywhere-eff(a)eff.org" && !loc.isBuiltin) { + logger.debug("Uninstalling the HTTPS Everywhere extension."); + 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-build/master] Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit 7e49b0e534b6880aa4241c66f670e17d739b645a Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 00:45:49 2020 +0200 Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere --- projects/tor-browser/build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 2763ce4..33a3f42 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -45,7 +45,6 @@ mkdir -p "$TBDIR/$EXTSPATH" unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip MARTOOLS=$rootdir/mar-tools -mv [% c('input_files_by_name/https-everywhere') %] "$TBDIR/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi" mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] @@ -74,6 +73,18 @@ RBM_TB_EOF [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz + +# Make unpacked HTTPS Everywhere available in resource://torbutton/content/extensions/https-everywhere/ as TB expects +TMP_HTTPS_EVERYWHERE_PATH=$rootdir/tmp_https_everywhere/ +mkdir $TMP_HTTPS_EVERYWHERE_PATH +pushd $TMP_HTTPS_EVERYWHERE_PATH +mkdir -p chrome/torbutton/content/extensions/https-everywhere/ +unzip $rootdir/[% c('input_files_by_name/https-everywhere') %] -d chrome/torbutton/content/extensions/https-everywhere/ +find . -exec [% c("var/touch") %] {} \; +zip -Xr "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/omni.ja" chrome/ +popd +rm -rf $TMP_HTTPS_EVERYWHERE_PATH + tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files_by_name/tor') %]/tor.tar.gz [% IF c("var/namecoin") %] # Extract Electrum-NMC

1 0

[torbutton/master] Translations update
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit 33fed7848596b3da7d0e66309f94fdbdc21d253e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 08:13:41 2020 +0000 Translations update --- chrome/locale/fr/aboutDialog.dtd | 2 +- chrome/locale/fr/torbutton.properties | 2 +- chrome/locale/zh-CN/torbutton.properties | 2 +- chrome/locale/zh-TW/aboutTor.dtd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/locale/fr/aboutDialog.dtd b/chrome/locale/fr/aboutDialog.dtd index 6630cd94..ede97d06 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 "Voulez-vous aider ?"> +<!ENTITY help.start "Souhaitez-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 e22e0366..bc04d816 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\nVoulez-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\nSouhaitez-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 diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index 4fdb1b88..59f1cd2c 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -140,5 +140,5 @@ onionLocation.onionAvailable=可用的 .onion onionLocation.learnMore=详细了解…… onionLocation.always=始终 onionLocation.askEverytime=每次询问 -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.prioritizeOnionsDescription=请优先使用 .onion站点。 onionLocation.onionServicesTitle=洋葱服务 diff --git a/chrome/locale/zh-TW/aboutTor.dtd b/chrome/locale/zh-TW/aboutTor.dtd index 7ec4f35a..79e06ab4 100644 --- a/chrome/locale/zh-TW/aboutTor.dtd +++ b/chrome/locale/zh-TW/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "由於有像您這樣的人的捐款，Tor 可以免費使用。"> <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">

1 0