December 2020 - tor-commits - lists.torproject.org

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

11 Dec '20

commit 2abb5248905331c041f3a013595e649b98a8c84f 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 ++++++++++++++++++++++ toolkit/components/extensions/Extension.jsm | 10 ++++-- .../mozapps/extensions/internal/XPIProvider.jsm | 13 ++++++++ 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 5b05cf48dd0f..f8cb7c664578 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -71,6 +71,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"; /** @@ -817,6 +824,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", @@ -1417,6 +1425,35 @@ BrowserGlue.prototype = { "resource://builtin-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/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm index 302bb32a3b2e..1942031a1f63 100644 --- a/toolkit/components/extensions/Extension.jsm +++ b/toolkit/components/extensions/Extension.jsm @@ -212,6 +212,7 @@ const LOGGER_ID_BASE = "addons.webextension."; const UUID_MAP_PREF = "extensions.webextensions.uuids"; const LEAVE_STORAGE_PREF = "extensions.webextensions.keepStorageOnUninstall"; const LEAVE_UUID_PREF = "extensions.webextensions.keepUuidOnUninstall"; +const PERSISTENT_EXTENSIONS = new Set(["https-everywhere-eff(a)eff.org"]); const COMMENT_REGEXP = new RegExp( String.raw` @@ -358,7 +359,8 @@ var ExtensionAddonObserver = { ); } - if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false)) { + if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) && + !PERSISTENT_EXTENSIONS.has(addon.id)) { // Clear browser.storage.local backends. AsyncShutdown.profileChangeTeardown.addBlocker( `Clear Extension Storage ${addon.id} (File Backend)`, @@ -406,7 +408,8 @@ var ExtensionAddonObserver = { ExtensionPermissions.removeAll(addon.id); - if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false)) { + if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false) && + !PERSISTENT_EXTENSIONS.has(addon.id)) { // Clear the entry in the UUID map UUIDMap.remove(addon.id); } @@ -2584,7 +2587,8 @@ class Extension extends ExtensionData { ); } else if ( this.startupReason === "ADDON_INSTALL" && - !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) + !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) && + !PERSISTENT_EXTENSIONS.has(this.id) ) { // If the extension has been just installed, set it as migrated, // because there will not be any data to migrate. diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index c0fd26e34b7c..8704867524dc 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1500,6 +1500,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-84.0-10.0-1] Bug 40125: Expose Security Level pref in GeckoView
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit 2f7dcf9487c7f8eb8c908f1f339e6f84879598f0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 14 02:52:28 2020 +0000 Bug 40125: Expose Security Level pref in GeckoView --- mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index 1c01a3f6731b..946446a97f30 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -633,6 +633,7 @@ package org.mozilla.geckoview { method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); + method public int getTorSecurityLevel(); method public boolean getUseMaxScreenDepth(); method public boolean getWebFontsEnabled(); method public boolean getWebManifestEnabled(); @@ -650,6 +651,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean); method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int); method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean); + method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int); method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean); field public static final int COLOR_SCHEME_DARK = 1; @@ -685,6 +687,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); + method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); method @NonNull public GeckoRuntimeSettings.Builder webFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder webManifest(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 97c33665fc18..662b34c476ae 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -446,6 +446,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { getSettings().mForceUserScalable.set(flag); return this; } + + /** + * Set security level. + * + * @param level A value determining the security level. Default is 0. + * @return This Builder instance. + */ + public @NonNull Builder torSecurityLevel(final int level) { + getSettings().mTorSecurityLevel.set(level); + return this; + } } private GeckoRuntime mRuntime; @@ -494,6 +505,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { "browser.ui.zoom.force-user-scalable", false); /* package */ final Pref<Boolean> mAutofillLogins = new Pref<Boolean>( "signon.autofillForms", true); + /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>( + "extensions.torbutton.security_slider", 4); /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM; @@ -1132,6 +1145,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; } + /** + * Gets the current security level. + * + * @return current security protection level + */ + public int getTorSecurityLevel() { + return mTorSecurityLevel.get(); + } + + /** + * Sets the Tor Security Level. + * + * @param level security protection level + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) { + mTorSecurityLevel.commit(level); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);

1 0

[tor-browser/tor-browser-84.0-10.0-1] Bug 40198: Expose privacy.spoof_english pref in GeckoView
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit 3ccea085dd87b723d65b9f130c55d26241c3e238 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun Oct 18 17:06:04 2020 +0200 Bug 40198: Expose privacy.spoof_english pref in GeckoView --- mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index 946446a97f30..2b394bca70b3 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -632,6 +632,7 @@ package org.mozilla.geckoview { method public boolean getRemoteDebuggingEnabled(); method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); + method public boolean getSpoofEnglish(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); method public int getTorSecurityLevel(); method public boolean getUseMaxScreenDepth(); @@ -651,6 +652,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean); method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int); method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean); + method @NonNull public GeckoRuntimeSettings setSpoofEnglish(boolean); method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int); method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean); @@ -686,6 +688,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder preferredColorScheme(int); method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); + method @NonNull public GeckoRuntimeSettings.Builder spoofEnglish(boolean); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index bb992733937e..e6493f8cddb3 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -457,6 +457,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { getSettings().mTorSecurityLevel.set(level); return this; } + + /** + * Sets whether we should spoof locale to English for webpages. + * + * @param flag True if we should spoof locale to English for webpages, false otherwise. + * @return This Builder instance. + */ + public @NonNull Builder spoofEnglish(final boolean flag) { + getSettings().mSpoofEnglish.set(flag ? 2 : 1); + return this; + } } private GeckoRuntime mRuntime; @@ -507,6 +518,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { "signon.autofillForms", true); /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>( "extensions.torbutton.security_slider", 4); + /* package */ final Pref<Integer> mSpoofEnglish = new Pref<>( + "privacy.spoof_english", 0); /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM; @@ -1171,6 +1184,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; } + /** + * Get whether we should spoof locale to English for webpages. + * + * @return Whether we should spoof locale to English for webpages. + */ + public boolean getSpoofEnglish() { + return mSpoofEnglish.get() == 2; + } + + /** + * Set whether we should spoof locale to English for webpages. + * + * @param flag A flag determining whether we should locale to English for webpages. + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setSpoofEnglish(final boolean flag) { + mSpoofEnglish.commit(flag ? 2 : 1); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);

1 0

[tor-browser/tor-browser-84.0-10.0-1] Bug 30605: Honor privacy.spoof_english in Android
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit 707b234fb43545a12064aae4eea8eba767b3e326 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 16 10:45:17 2020 +0200 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. --- mobile/android/components/geckoview/GeckoViewStartup.jsm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mobile/android/components/geckoview/GeckoViewStartup.jsm b/mobile/android/components/geckoview/GeckoViewStartup.jsm index 83558ff558a9..432d27f86f8a 100644 --- a/mobile/android/components/geckoview/GeckoViewStartup.jsm +++ b/mobile/android/components/geckoview/GeckoViewStartup.jsm @@ -18,6 +18,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { Preferences: "resource://gre/modules/Preferences.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Services: "resource://gre/modules/Services.jsm", + RFPHelper: "resource://gre/modules/RFPHelper.jsm", }); const { debug, warn } = GeckoViewUtils.initLogging("Startup"); @@ -251,6 +252,10 @@ class GeckoViewStartup { if (aData.requestedLocales) { Services.locale.requestedLocales = aData.requestedLocales; } + RFPHelper._handleSpoofEnglishChanged(); + if (Services.prefs.getIntPref("privacy.spoof_english", 0) === 2) { + break; + } const pls = Cc["@mozilla.org/pref-localizedstring;1"].createInstance( Ci.nsIPrefLocalizedString );

1 0

[tor-browser/tor-browser-84.0-10.0-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit 2a348d5a3859ee0b4cd2237f670109f37ee44601 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 9 12:55:35 2020 +0200 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots --- browser/app/profile/000-tor-browser.js | 3 +++ browser/components/BrowserGlue.jsm | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d7c7d366b24d..19991a801fcd 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -313,6 +313,9 @@ pref("security.enterprise_roots.enabled", false); // Don't ping Mozilla for MitM detection, see bug 32321 pref("security.certerrors.mitm.priming.enabled", false); +// Don't automatically enable enterprise roots, see bug 40166 +pref("security.certerrors.mitm.auto_enable_enterprise_roots", false); + // Disable the language pack signing check for now on macOS, see #31942 #ifdef XP_MACOSX pref("extensions.langpacks.signatures.required", false); diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index f8cb7c664578..0bbc0e54c740 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1401,6 +1401,20 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); + // Clear possibly auto enabled enterprise_roots prefs (see bug 40166) + if ( + !Services.prefs.getBoolPref( + "security.certerrors.mitm.auto_enable_enterprise_roots" + ) && + Services.prefs.getBoolPref( + "security.enterprise_roots.auto-enabled", + false + ) + ) { + Services.prefs.clearUserPref("security.enterprise_roots.enabled"); + Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled"); + } + if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) { PdfJs.checkIsDefault(this._isNewProfile); }

1 0

[tor-browser/tor-browser-84.0-10.0-1] Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit 1f18b3c9727e5a664da125594e4b56e5c03a4aca Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Oct 20 17:44:36 2020 +0200 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView --- .../mozilla/geckoview/GeckoRuntimeSettings.java | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 662b34c476ae..bb992733937e 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -758,19 +758,25 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { private String computeAcceptLanguages() { ArrayList<String> locales = new ArrayList<String>(); - // Explicitly-set app prefs come first: - if (mRequestedLocales != null) { - for (String locale : mRequestedLocales) { - locales.add(locale.toLowerCase()); - } - } - // OS prefs come second: - for (String locale : getDefaultLocales()) { - locale = locale.toLowerCase(); - if (!locales.contains(locale)) { + // In Desktop, these are defined in the `intl.accept_languages` localized property. + // At some point we should probably use the same values here, but for now we use a simple + // strategy which will hopefully result in reasonable acceptLanguage values. + if (mRequestedLocales != null && mRequestedLocales.length > 0) { + String locale = mRequestedLocales[0].toLowerCase(); + // No need to include `en-us` twice. + if (!locale.equals("en-us")) { locales.add(locale); + if (locale.contains("-")) { + String lang = locale.split("-")[0]; + // No need to include `en` twice. + if (!lang.equals("en")) { + locales.add(lang); + } + } } } + locales.add("en-us"); + locales.add("en"); return TextUtils.join(",", locales); }

1 0

[tor-browser/tor-browser-84.0-10.0-1] Bug 1677797 - Change autoconf to avoid using a hard-coded file descriptor. r=glandium, a=RyanVM
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit 3cc22031afe992da84d4367664a81d27a1310ee3 Author: Tom Ritter <tom(a)mozilla.com> Date: Tue Dec 8 22:04:09 2020 +0000 Bug 1677797 - Change autoconf to avoid using a hard-coded file descriptor. r=glandium, a=RyanVM In Bug 1671424 we changed the way we configure firefox and it broke the codeql database generation job. This job wraps the entire build process in a way similar to codeql --command="./mach build" Specifically, the previous way we executed the configure shell script made codeql disable itself because it was named configure (codeql disables itself during configuration.) codeql injects via LD_PRELOAD, and it opens a configuration file and a logging file (getting fd 3 and 4 respectively.) autoconf grabs file descriptor 4 and uses it a temporary redirection point either to a file or stdout. When it does so, it closes the original file descriptor 4 and points it at the new location, which also affects the codeql code, resulting in undesired logging output going into the configure script. Because this file descriptor trick is only used to avoid duplicating a few lines of code, I removed the trick and duplicated the code. Differential Revision: https://phabricator.services.mozilla.com/D98642 --- build/autoconf/autoconf.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh index e6b0819fab30..ceb8a25b00af 100644 --- a/build/autoconf/autoconf.sh +++ b/build/autoconf/autoconf.sh @@ -141,18 +141,17 @@ if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then fi if test $# -eq 0; then - exec 4> configure; chmod +x configure -else - exec 4>&1 + echo "This case should not be reached." + exit 1 fi -# Put the real line numbers into configure to make config.log more helpful. +# Put the real line numbers into the output to make config.log more helpful. $AWK ' /__oline__/ { printf "%d:", NR + 1 } { print } ' $tmpout | sed ' /__oline__/s/^$[0-9][0-9]*$:$.*$__oline__/\2\1/ -' >&4 +' rm -f $tmpout

1 0

[tor-browser/tor-browser-84.0-10.0-1] No bug - Tagging 6cf020352b4e350ab6b84253620652d55cdd0b60 with FIREFOX_84_0_BUILD1 a=release CLOSED TREE DONTBUILD
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit f7bbabc5cba81d2d4eafd8a5ad7cf34e69f45517 Author: Mozilla Releng Treescript <release+treescript(a)mozilla.org> Date: Mon Dec 7 23:44:21 2020 +0000 No bug - Tagging 6cf020352b4e350ab6b84253620652d55cdd0b60 with FIREFOX_84_0_BUILD1 a=release CLOSED TREE DONTBUILD --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e76e38b4b333..a47b8af4e267 100644 --- a/.hgtags +++ b/.hgtags @@ -2754,3 +2754,4 @@ c7bfe4342159c2040e909fa363fa9bfaa604d203 FIREFOX_84_0b5_RELEASE 32683280e54bc7b03d85a2e84073c0600bfe5bd4 FIREFOX_84_0b8_RELEASE 87ab4da1b9f786db1f5c6633357cbe2ee1ca562e FIREFOX_RELEASE_84_BASE a42ea3aab3e467141d56b5c299749ee842cd3c41 FIREFOX_RELEASE_83_END +6cf020352b4e350ab6b84253620652d55cdd0b60 FIREFOX_84_0_BUILD1

1 0

[tor-browser/tor-browser-84.0-10.0-1] Bug 1680528 - set several webrtc/mediacapturing test as passing on beta and release. r=drno a=test-only
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit f789719e4fb6150fd7f9d7410ad4075c0d8145a3 Author: Sebastian Hengst <archaeopteryx(a)coole-files.de> Date: Tue Dec 8 19:11:56 2020 +0000 Bug 1680528 - set several webrtc/mediacapturing test as passing on beta and release. r=drno a=test-only More details about the underlying issue in bug 1526207. Differential Revision: https://phabricator.services.mozilla.com/D98963 --- .../MediaRecorder-no-sink.https.html.ini | 6 +-- .../MediaRecorder-peerconnection.https.html.ini | 58 +++++++--------------- .../RTCPeerConnection-videoDetectorTest.html.ini | 3 +- .../RTCRtpSender-replaceTrack.https.html.ini | 2 +- 4 files changed, 25 insertions(+), 44 deletions(-) diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini index f1843e6dea9d..f1f7909e3471 100644 --- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini +++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini @@ -1,14 +1,14 @@ [MediaRecorder-no-sink.https.html] expected: if release_or_beta and (os == "android"): [OK, TIMEOUT] - if os == "android": TIMEOUT + if os == "android" and nightly_build: TIMEOUT [PeerConnection MediaRecorder records video from PeerConnection without sinks] expected: if release_or_beta and (os == "android"): [PASS, TIMEOUT] - if os == "android": TIMEOUT + if os == "android" and nightly_build: TIMEOUT [PeerConnection MediaRecorder records audio/video from PeerConnection without sinks] expected: if release_or_beta and (os == "android"): [PASS, NOTRUN] - if os == "android": NOTRUN + if os == "android" and nightly_build: NOTRUN diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini index 0011d0a232b1..b81eb9052c83 100644 --- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini +++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini @@ -1,106 +1,86 @@ [MediaRecorder-peerconnection.https.html] expected: - if (os == "android") and debug and not webrender: ["TIMEOUT", "CRASH", "ERROR"] - if (os == "android") and debug and webrender: ["TIMEOUT", "ERROR"] - if (os == "android") and not debug: ["TIMEOUT", "ERROR", "CRASH"] + if (os == "android") and nightly_build: ["TIMEOUT", "CRASH", "ERROR"] [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format \[passthrough\].] expected: - if (os == "android") and debug: ["TIMEOUT"] - if (os == "android") and not debug: ["TIMEOUT"] + if os == "android" and nightly_build: TIMEOUT [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format \[passthrough\].] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format \[passthrough\].] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format \[passthrough\].] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format \[passthrough\].] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format \[passthrough\].] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format video/webm;codecs=vp8.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format video/webm;codecs=vp8.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format video/webm;codecs=vp8.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format video/webm;codecs=vp8.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format video/webm;codecs=vp8.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format video/webm;codecs=vp8.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format video/webm;codecs=vp9.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format video/webm;codecs=vp9.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format video/webm;codecs=vp9.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format video/webm;codecs=vp9.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format video/webm;codecs=vp9.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format video/webm;codecs=vp9.] expected: - if (os == "android") and debug: ["NOTRUN"] - if (os == "android") and not debug: ["NOTRUN"] + if os == "android" and nightly_build: NOTRUN FAIL diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini index 2efe14f6c463..a96e0778ef09 100644 --- a/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini +++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini @@ -2,4 +2,5 @@ [Signal detector detects track change within reasonable time] bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526207 expected: - if os == "android": FAIL + if os == "android" and nightly_build: FAIL + diff --git a/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini b/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini index 07e9159a4dee..2cd971f29e31 100644 --- a/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini +++ b/testing/web-platform/meta/webrtc/RTCRtpSender-replaceTrack.https.html.ini @@ -2,4 +2,4 @@ [ReplaceTrack transmits the new track not the old track] bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526207 expected: - if (os == "android"): FAIL + if (os == "android") and nightly_build: FAIL

1 0

[tor-browser/tor-browser-84.0-10.0-1] Bug 1681251 - Return AUTF8String from GetDateTimePattern in mozIOSPreferences; r=zbraniecki, a=RyanVM
by sysrqb＠torproject.org 11 Dec '20

11 Dec '20

commit 63e3dc6e23e7075570600005cf5400b3cc41640e Author: Dan Minor <dminor(a)mozilla.com> Date: Wed Dec 9 03:16:23 2020 +0000 Bug 1681251 - Return AUTF8String from GetDateTimePattern in mozIOSPreferences; r=zbraniecki, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D99162 --- intl/locale/mozIOSPreferences.idl | 6 +++--- toolkit/components/mozintl/test/test_mozintl.js | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/intl/locale/mozIOSPreferences.idl b/intl/locale/mozIOSPreferences.idl index b18df3fbc654..f3e1c124408d 100644 --- a/intl/locale/mozIOSPreferences.idl +++ b/intl/locale/mozIOSPreferences.idl @@ -89,7 +89,7 @@ interface mozIOSPreferences : nsISupports * handle all scenarios, including with cases where we fail to retrieve * anything from the OS, here. */ - ACString getDateTimePattern(in long timeFormatStyle, - in long dateFormatStyle, - [optional] in ACString locale); + AUTF8String getDateTimePattern(in long timeFormatStyle, + in long dateFormatStyle, + [optional] in ACString locale); }; diff --git a/toolkit/components/mozintl/test/test_mozintl.js b/toolkit/components/mozintl/test/test_mozintl.js index ba1fb498e161..3f9e66b54fa1 100644 --- a/toolkit/components/mozintl/test/test_mozintl.js +++ b/toolkit/components/mozintl/test/test_mozintl.js @@ -8,6 +8,7 @@ function run_test() { test_methods_calling(); test_constructors(); test_rtf_formatBestUnit(); + test_datetimeformat(); ok(true); } @@ -162,3 +163,18 @@ function test_rtf_formatBestUnit() { testRTFBestUnit(anchor, "2098-01-02 18:30", "in 82 years"); } } + +function test_datetimeformat() { + Services.prefs.setStringPref( + "intl.date_time.pattern_override.date_long", + "yyyy年M月d日" + ); + + let formatted = new Services.intl.DateTimeFormat("ja", { + dateStyle: "long", + }).format(new Date("2020-12-08 21:00:05")); + + equal(formatted, "2020年12月8日"); + + Services.prefs.clearUserPref("intl.date_time.pattern_override.date_long"); +}

1 0