- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40052: Bump NSIS to 3.06.1
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit 1e1d42ffe955803ac13dc1e95e7bae1a29a7dd7b Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 6 17:43:01 2020 +0000 Bug 40052: Bump NSIS to 3.06.1 It seems our timestamp related patch is not needed anymore as building the .exe files twice without it gives the exact same result. --- projects/nsis/build | 5 ----- projects/nsis/config | 5 ++--- projects/nsis/no-insert-timestamp.patch | 27 --------------------------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/projects/nsis/build b/projects/nsis/build index c6a6d3e..54287db 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -8,11 +8,6 @@ tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] cd /var/tmp/build/nsis-[% c('version') %]-src -# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it -# is used for both the host and cross-compiled parts, but this option is -# only valid for the Windows linker. Therefore we add it using a patch -# to the cross-compilation part only. -patch -p1 < $rootdir/no-insert-timestamp.patch [% IF c("var/windows-x86_64") %] # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp diff --git a/projects/nsis/config b/projects/nsis/config index ed9823d..36f29e2 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.05 +version: 3.06.1 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -16,8 +16,7 @@ input_files: - project: container-image - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' - sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9 - - filename: no-insert-timestamp.patch + sha256sum: 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0 - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: zlib diff --git a/projects/nsis/no-insert-timestamp.patch b/projects/nsis/no-insert-timestamp.patch deleted file mode 100644 index 8053b82..0000000 --- a/projects/nsis/no-insert-timestamp.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur nsis-3.03-src/SCons/Config/gnu nsis-3.03-src.n/SCons/Config/gnu ---- nsis-3.03-src/SCons/Config/gnu 2017-10-06 15:30:20.000000000 -0400 -+++ nsis-3.03-src.n/SCons/Config/gnu 2018-06-17 13:26:05.945495151 -0400 -@@ -102,6 +102,7 @@ - stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no standard libraries - stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align - stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file -+stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - stub_uenv = stub_env.Clone() - stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -@@ -142,6 +143,7 @@ - plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file - plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency - plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency -+plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - plugin_uenv = plugin_env.Clone() - plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -@@ -181,6 +183,7 @@ - - util_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables - util_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align -+util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - - conf = FlagsConfigure(util_env)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40052_v2'
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit dc1c7038f4d7cbb37b00bbbeb29667c069018a1f Merge: 3aef0b0 1e1d42f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 10 15:46:18 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40052_v2' projects/nsis/build | 5 ----- projects/nsis/config | 5 ++--- projects/nsis/no-insert-timestamp.patch | 27 --------------------------- 3 files changed, 2 insertions(+), 35 deletions(-)

1 0

[tor-browser-build/master] Bug 40072: Pick up the dependency changes due to fenix#40001
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit df7f1b01d6ac61df5ed5095243a4eaf9d3d94c63 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 4 19:14:10 2020 +0000 Bug 40072: Pick up the dependency changes due to fenix#40001 --- projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/fenix/config b/projects/fenix/config index 33d4e44..034714f 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: 3 + gradle_dependencies_version: 4 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 4957902..bf237cb 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -565,6 +565,8 @@ fbd052d2d4cd16f707547c468621c6b7fb842c7ec8866d012ecbc6178de1f394 | https://jcent 6f59f847f37a7a052243e97a3b24d6e834833fca3a48d6980f96f7779fe5ff98 | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-agent/1.9.7/byte-buddy… 93d9d380779cd1768c52b4bcee82cbfaedef9a4a30de87ae06b441e1634fd38c | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-parent/1.10.9/byte-bud… 259079927014348a555c0969dbae9339c3cc33895a05ffec8e0a25dd50c82278 | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-parent/1.9.7/byte-budd… +ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… +3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.aar 0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.jar aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.pom @@ -868,9 +870,11 @@ d445923ab7dfbb93d086b070b64f07495b0a1804b9ce1f51815d6034c31f781a | https://jcent 9ebcfff0b872eaeeae47b2a9f9653c4e40041193a7c16e6a774f73d79aca8b57 | https://jcenter.bintray.com/org/robolectric/utils/4.3.1/utils-4.3.1.pom 9d7bf2557947d44d6f3ed76ec5231e8b72e33eb61c65ac9e149ad307b0eb936c | https://jcenter.bintray.com/org/robolectric/utils-reflector/4.3.1/utils-ref… a04c2bdefec0b5b492de86365e49537df6d39b04f3823619c94ba2b8937d8670 | https://jcenter.bintray.com/org/robolectric/utils-reflector/4.3.1/utils-ref… -baf3c7fe15fefeaf9e5b000d94547379dc48370f22a8797e239c127e7d7756ec | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.jar -d7a15266d22fadc1c81bbc3b62637801d116e484eb6c831217dc36c537be48d2 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.pom -36367d127a586d502b60bf54db2d7397ec94573620eff523873ec12a12e54839 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.24/slf4j-parent-1.7.… +fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.… +bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.… +18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar +7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom +18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.… c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/4/oss-parent-4.pom b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40072'
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit 3aef0b0a63aaab19d2318b17a6973874e06cd842 Merge: 7e49b0e df7f1b0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 10 15:15:51 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40072' projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-81.0b2-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 10 Sep '20

10 Sep '20

commit 9501a57eaf676c68da9b0997f5cc08c849b5b796 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 9 13:00:47 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e29c788b720..bac98ce06540 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -286,8 +286,6 @@ 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-78.2.0esr-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 10 Sep '20

10 Sep '20

commit c386fb3312237fd6c0d123ba9aaad662f8740e56 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 9 13:00:47 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e29c788b720..bac98ce06540 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -286,8 +286,6 @@ 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.0b2-10.0-1] Revert "Bug 14970: Don't block our unsigned extensions"
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit 6a00c5b729e0d0389f00d39ec89332ab4c76d59b 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 4ac021546f00..a890f9f7edd3 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2271,11 +2271,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 9204aa657b83..5459d0fff050 100644 --- a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js +++ b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js @@ -225,15 +225,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 3396d43116d2..4e172f89694a 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -3953,7 +3953,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-81.0b2-10.0-1] Revert "Bug 40090: Disable v3 add-on blocklist for now"
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit c84cf4abed3d920f9c9a05d48424a69ca1fae395 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 09:31:49 2020 +0000 Revert "Bug 40090: Disable v3 add-on blocklist for now" This reverts commit ee9af3088c44bba3280f76642efb50705155b902. --- browser/app/profile/firefox.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index fec95d4611e2..6a4a2a0d1de9 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -42,9 +42,9 @@ pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firef pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firef…"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition…"); -// No bloomfilters for the addons blocklist for now, but JSON only. -pref("extensions.blocklist.useMLBF", false); -pref("extensions.blocklist.useMLBF.stashes", false); +// Use bloomfilters for the addons blocklist, instead of JSON only. +pref("extensions.blocklist.useMLBF", true); +pref("extensions.blocklist.useMLBF.stashes", true); // The URL for the privacy policy related to recommended extensions. pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_med…");

1 0

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

09 Sep '20

commit 1f04136618e3826f4aa4a3fae5facd10cfcd73f9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 09:53:01 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 72cbb6d501aa..33fed7848596 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 72cbb6d501aa798a676da9331e686581ee4038cf +Subproject commit 33fed7848596b3da7d0e66309f94fdbdc21d253e

1 0

[tor-browser/tor-browser-81.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 27f6cf08e80c0a0d063dd012a5d7cddf43157f44 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 a890f9f7edd3..1e54bf2957af 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.0b2-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 9c3779909ba3aa4301341bdcb2ad535ee613c47d 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 cc75a21dd51a..603988997405 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -73,19 +73,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 2dd1e3077823..1adfef8fd96e 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; @@ -135,12 +120,10 @@ archivefiles="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 @@ -154,59 +137,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-80.0b2-10.0-1] Revert "Bug 40090: Disable v3 add-on blocklist for now"
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit a5881e5892e8a84ab22e32ef015497c2991802e2 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 09:31:49 2020 +0000 Revert "Bug 40090: Disable v3 add-on blocklist for now" This reverts commit ee9af3088c44bba3280f76642efb50705155b902. --- browser/app/profile/firefox.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 80652220eb05..6017d524bc8c 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -42,9 +42,9 @@ pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firef pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firef…"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition…"); -// No bloomfilters for the addons blocklist for now, but JSON only. -pref("extensions.blocklist.useMLBF", false); -pref("extensions.blocklist.useMLBF.stashes", false); +// Use bloomfilters for the addons blocklist, instead of JSON only. +pref("extensions.blocklist.useMLBF", true); +pref("extensions.blocklist.useMLBF.stashes", true); // The URL for the privacy policy related to recommended extensions. pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_med…");

1 0

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

09 Sep '20

commit 99fba6816379ea793494a1cc35763986e3f93d35 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 09:53:01 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 3dc1c58d6c49..33fed7848596 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 3dc1c58d6c494eeb5514ad84831b76661667ba2c +Subproject commit 33fed7848596b3da7d0e66309f94fdbdc21d253e

1 0

[tor-browser/tor-browser-80.0b2-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 dca5a985f0eca6f3e6addb94c0760fcf5c60d01e 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 cc75a21dd51a..603988997405 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -73,19 +73,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 2dd1e3077823..1adfef8fd96e 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; @@ -135,12 +120,10 @@ archivefiles="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 @@ -154,59 +137,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-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

[torbutton/master] Bug 40007: Move SecurityPrefs initialization to the StartupObserver component.
by gk＠torproject.org 09 Sep '20

09 Sep '20

commit d8e068679001c3c3fe0d08d8ad1c9193e7fa95df Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 1 13:26:08 2020 +0200 Bug 40007: Move SecurityPrefs initialization to the StartupObserver component. With this change this will be properly initialized both in desktop and mobile, and we will not need additional tor-browser changes to load torbutton.js for GeckoView. --- chrome/content/torbutton.js | 3 --- components/startup-observer.js | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index a9d4ccd1..d795f642 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -28,7 +28,6 @@ let { torbutton_log, torbutton_get_property_string, } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); -let SecurityPrefs = ChromeUtils.import("resource://torbutton/modules/security-prefs.js", {}); let { configureControlPortModule } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; @@ -238,8 +237,6 @@ function torbutton_is_mobile() { torbutton_init = function() { torbutton_log(3, 'called init()'); - SecurityPrefs.initialize(); - if (m_tb_wasinited) { return; } diff --git a/components/startup-observer.js b/components/startup-observer.js index 368d05f9..f9697987 100644 --- a/components/startup-observer.js +++ b/components/startup-observer.js @@ -26,6 +26,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { }); let NoScriptControl = ChromeUtils.import("resource://torbutton/modules/noscript-control.js", {}); +let SecurityPrefs = ChromeUtils.import("resource://torbutton/modules/security-prefs.js", {}); // Module specific constants const kMODULE_NAME = "Startup"; @@ -192,9 +193,11 @@ StartupObserver.prototype = { // but only for hackish reasons. this._prefs.setBoolPref("extensions.torbutton.startup", true); - // We need to listen for NoScript before it starts. + // We need to listen for NoScript before it starts. NoScriptControl.initialize(); + SecurityPrefs.initialize(); + this.setProxySettings(); }

1 0