November 2023 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-115.5.0esr-13.5-1] fixup! Bug 40597: Implement TorSettings module
by richard (＠richard) 30 Nov '23

30 Nov '23

richard pushed to branch tor-browser-115.5.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 27e45bc9 by Pier Angelo Vendrame at 2023-11-30T12:14:32+00:00 fixup! Bug 40597: Implement TorSettings module Bug 40856: Add defaults to preference getters During testing sometimes we might delete some preferences related to TorSettings. Since this module did not have defaults to handle these cases, sometimes we risked of ending in broken situations. - - - - - 1 changed file: - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -327,11 +327,13 @@ export const TorSettings = (() => { /* Quickstart */ settings.quickstart.enabled = Services.prefs.getBoolPref( - TorSettingsPrefs.quickstart.enabled + TorSettingsPrefs.quickstart.enabled, + false ); /* Bridges */ settings.bridges.enabled = Services.prefs.getBoolPref( - TorSettingsPrefs.bridges.enabled + TorSettingsPrefs.bridges.enabled, + false ); settings.bridges.source = Services.prefs.getIntPref( TorSettingsPrefs.bridges.source, @@ -339,13 +341,17 @@ export const TorSettings = (() => { ); if (settings.bridges.source == TorBridgeSource.BuiltIn) { const builtinType = Services.prefs.getStringPref( - TorSettingsPrefs.bridges.builtin_type + TorSettingsPrefs.bridges.builtin_type, + "" ); settings.bridges.builtin_type = builtinType; settings.bridges.bridge_strings = getBuiltinBridgeStrings(builtinType); if (!settings.bridges.bridge_strings.length) { // in this case the user is using a builtin bridge that is no longer supported, // reset to settings to default values + console.warn( + `[TorSettings] Cannot find any bridge line for the configured bridge type ${builtinType}` + ); settings.bridges.source = TorBridgeSource.Invalid; settings.bridges.builtin_type = null; } @@ -363,23 +369,29 @@ export const TorSettings = (() => { } /* Proxy */ settings.proxy.enabled = Services.prefs.getBoolPref( - TorSettingsPrefs.proxy.enabled + TorSettingsPrefs.proxy.enabled, + false ); if (settings.proxy.enabled) { settings.proxy.type = Services.prefs.getIntPref( - TorSettingsPrefs.proxy.type + TorSettingsPrefs.proxy.type, + TorProxyType.Invalid ); settings.proxy.address = Services.prefs.getStringPref( - TorSettingsPrefs.proxy.address + TorSettingsPrefs.proxy.address, + "" ); settings.proxy.port = Services.prefs.getIntPref( - TorSettingsPrefs.proxy.port + TorSettingsPrefs.proxy.port, + 0 ); settings.proxy.username = Services.prefs.getStringPref( - TorSettingsPrefs.proxy.username + TorSettingsPrefs.proxy.username, + "" ); settings.proxy.password = Services.prefs.getStringPref( - TorSettingsPrefs.proxy.password + TorSettingsPrefs.proxy.password, + "" ); } else { settings.proxy.type = TorProxyType.Invalid; @@ -391,11 +403,13 @@ export const TorSettings = (() => { /* Firewall */ settings.firewall.enabled = Services.prefs.getBoolPref( - TorSettingsPrefs.firewall.enabled + TorSettingsPrefs.firewall.enabled, + false ); if (settings.firewall.enabled) { const portList = Services.prefs.getStringPref( - TorSettingsPrefs.firewall.allowed_ports + TorSettingsPrefs.firewall.allowed_ports, + "" ); settings.firewall.allowed_ports = parsePortList(portList); } else { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/27e45bc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/27e45bc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.5.0esr-13.5-1] Bug 42308: Create README for tor-browser.
by richard (＠richard) 30 Nov '23

30 Nov '23

richard pushed to branch tor-browser-115.5.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: a47e5505 by Henry Wilkes at 2023-11-30T11:05:52+00:00 Bug 42308: Create README for tor-browser. We drop the README.txt that comes from Mozilla Firefox and add README.md for tor-browser. - - - - - 2 changed files: - + README.md - − README.txt Changes: ===================================== README.md ===================================== @@ -0,0 +1,6 @@ +The tor-browser repository is based on Mozilla Firefox. + +See the following wiki links for more information: + ++ [Repository Overview](https://gitlab.torproject.org/tpo/applications/team/-/wikis/Devel… ++ [Contributing](https://gitlab.torproject.org/tpo/applications/team/-/wikis/D… ===================================== README.txt deleted ===================================== @@ -1,21 +0,0 @@ -An explanation of the Firefox Source Code Directory Structure and links to -project pages with documentation can be found at: - - https://firefox-source-docs.mozilla.org/contributing/directory_structure.ht… - -For information on how to build Firefox from the source code and create the patch see: - - https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.… - -If you have a question about developing Firefox, and can't find the solution -on https://firefox-source-docs.mozilla.org/, you can try asking your question on Matrix at chat.mozilla.org in `Introduction` (https://chat.mozilla.org/#/room/#introduction:mozilla.org) channel. - - -Nightly development builds can be downloaded from: - - https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/ - - or - - https://www.mozilla.org/firefox/channel/desktop/#nightly - -Keep in mind that nightly builds, which are used by Firefox developers for -testing, may be buggy. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a47e550… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a47e550… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.5.0esr-13.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 30 Nov '23

30 Nov '23

Pier Angelo Vendrame pushed to branch tor-browser-115.5.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 75ee8a08 by Pier Angelo Vendrame at 2023-11-28T17:06:52+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42299: Unbreak about:preferences#connection when invalid bridge lines are supplied We switched to a shared bridge line parser. It might throw if an invalid bridge line is passed, but we do not handle the exception in connectionPane.js. As a result, the page breaks. As a workaround, we can simply ignore the errors, but a better solution would warn the user about that. A bridge card rework is expected to happen in the 13.5 cycle, so I think we can defer a proper fix to that moment. (This should also be the UX of 11.5, 12.0 and 12.5). - - - - - 1 changed file: - browser/components/torpreferences/content/connectionPane.js Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -398,7 +398,7 @@ const gConnectionPane = (function () { bridgeSwitch.addEventListener("toggle", () => { TorSettings.bridges.enabled = bridgeSwitch.pressed; TorSettings.saveToPrefs(); - TorSettings.applySettings().then(result => { + TorSettings.applySettings().finally(() => { this._populateBridgeCards(); }); }); @@ -486,7 +486,12 @@ const gConnectionPane = (function () { }); const idString = TorStrings.settings.bridgeId; const id = card.querySelector(selectors.bridges.cardId); - const details = TorParsers.parseBridgeLine(bridgeString); + let details; + try { + details = TorParsers.parseBridgeLine(bridgeString); + } catch (e) { + console.error(`Detected invalid bridge line: ${bridgeString}`, e); + } if (details && details.id !== undefined) { card.setAttribute("data-bridge-id", details.id); } @@ -529,7 +534,7 @@ const gConnectionPane = (function () { bridgeSwitch.pressed && !!strings.length; TorSettings.bridges.bridge_strings = strings.join("\n"); TorSettings.saveToPrefs(); - TorSettings.applySettings().then(result => { + TorSettings.applySettings().finally(() => { this._populateBridgeCards(); }); }); @@ -1021,7 +1026,7 @@ const gConnectionPane = (function () { TorSettings.bridges.builtin_type = ""; } TorSettings.saveToPrefs(); - TorSettings.applySettings().then(result => { + TorSettings.applySettings().finally(() => { this._populateBridgeCards(); }); }, @@ -1036,8 +1041,12 @@ const gConnectionPane = (function () { async saveBridgeSettings(connect) { TorSettings.saveToPrefs(); // FIXME: This can throw if the user adds a bridge manually with invalid - // content. Should be addressed by tor-browser#40552. - await TorSettings.applySettings(); + // content. Should be addressed by tor-browser#41913. + try { + await TorSettings.applySettings(); + } catch (e) { + console.error("Applying settings failed", e); + } this._populateBridgeCards(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/75ee8a0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/75ee8a0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 17560: prevent disk leaks in $HOME/.local/share.
by ma1 (＠ma1) 29 Nov '23

29 Nov '23

ma1 pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: eb925334 by hackademix at 2023-11-29T23:53:35+01:00 Bug 17560: prevent disk leaks in $HOME/.local/share. - - - - - 2 changed files: - projects/browser/RelativeLink/start-browser - projects/browser/gtk3-settings.ini Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -257,6 +257,20 @@ fi HOME="${PWD}" export HOME +# Prevent disk leaks in $HOME/.local/share (tor-browser#17560) +local_dir="$HOME/.local/" +share_dir="$local_dir/share" +if [ -d "$share_dir" ]; then + ( srm -r "$share_dir" || + wipe -r "$share_dir" || + find "$share_dir" -type f -exec shred -u {} \; ; + rm -rf "$share_dir" + ) > /dev/null 2>&1 +else + mkdir -p "$local_dir" +fi +ln -fs /dev/null "$share_dir" + [% IF c("var/tor-browser") -%] SYSARCHITECTURE=$(getconf LONG_BIT) TORARCHITECTURE=$(expr "$(file TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') ===================================== projects/browser/gtk3-settings.ini ===================================== @@ -1,2 +1,4 @@ [Settings] gtk-primary-button-warps-slider = false +gtk-recent-files-max-age=0 +gtk-recent-files-limit=0 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.5.0esr-13.0-1] Bug 42288: Allow language spoofing in status messages.
by ma1 (＠ma1) 29 Nov '23

29 Nov '23

ma1 pushed to branch mullvad-browser-115.5.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 5f8f9984 by hackademix at 2023-11-29T23:43:01+01:00 Bug 42288: Allow language spoofing in status messages. - - - - - 8 changed files: - browser/installer/package-manifest.in - dom/locales/moz.build - dom/xslt/xslt/txMozillaXSLTProcessor.cpp - dom/xslt/xslt/txXSLTMsgsURL.h - intl/strres/nsIStringBundle.idl - intl/strres/nsStringBundle.cpp - mobile/android/installer/package-manifest.in - uriloader/base/nsDocLoader.cpp Changes: ===================================== browser/installer/package-manifest.in ===================================== @@ -319,6 +319,7 @@ @RESPATH@/res/locale/layout/HtmlForm.properties @RESPATH@/res/locale/layout/MediaDocument.properties @RESPATH@/res/locale/layout/xmlparser.properties +@RESPATH@/res/locale/xslt/xslt.properties @RESPATH@/res/locale/dom/dom.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ ===================================== dom/locales/moz.build ===================================== @@ -57,6 +57,10 @@ RESOURCE_FILES.locale.layout += [ "en-US/chrome/layout/xmlparser.properties", ] +RESOURCE_FILES.locale.xslt += [ + "en-US/chrome/xslt/xslt.properties", +] + RESOURCE_FILES.locale.dom += [ "en-US/chrome/dom/dom.properties", ] ===================================== dom/xslt/xslt/txMozillaXSLTProcessor.cpp ===================================== @@ -942,11 +942,17 @@ void txMozillaXSLTProcessor::reportError(nsresult aResult, mozilla::components::StringBundle::Service(); if (sbs) { nsString errorText; - sbs->FormatStatusMessage(aResult, u"", errorText); + bool spoofLocale = nsContentUtils::SpoofLocaleEnglish(); + if (spoofLocale && mSource) { + Document* sourceDoc = mSource->OwnerDoc(); + spoofLocale = !(sourceDoc && sourceDoc->AllowsL10n()); + } + sbs->FormatStatusMessage(aResult, u"", spoofLocale, errorText); nsAutoString errorMessage; nsCOMPtr<nsIStringBundle> bundle; - sbs->CreateBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + sbs->CreateBundle(spoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); if (bundle) { AutoTArray<nsString, 1> error = {errorText}; ===================================== dom/xslt/xslt/txXSLTMsgsURL.h ===================================== @@ -7,5 +7,6 @@ #define DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ #define XSLT_MSGS_URL "chrome://global/locale/xslt/xslt.properties" +#define XSLT_MSGS_URL_en_US "resource://gre/res/locale/xslt/xslt.properties" #endif // DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ ===================================== intl/strres/nsIStringBundle.idl ===================================== @@ -86,9 +86,13 @@ interface nsIStringBundleService : nsISupports * used in the string lookup process. * @param aStatusArg - The status message argument(s). Multiple arguments * can be separated by newline ('\n') characters. + * @param aSpoofLocale - If true (default is false), forces the en-US + locale on content-accessible messages (XSLT errors so far). * @return the formatted message */ - AString formatStatusMessage(in nsresult aStatus, in wstring aStatusArg); + AString formatStatusMessage(in nsresult aStatus, + in wstring aStatusArg, + [optional] in boolean aSpoofLocale); /** * flushes the string bundle cache - useful when the locale changes or ===================================== intl/strres/nsStringBundle.cpp ===================================== @@ -977,6 +977,7 @@ nsresult nsStringBundleService::FormatWithBundle( NS_IMETHODIMP nsStringBundleService::FormatStatusMessage(nsresult aStatus, const char16_t* aStatusArg, + bool aSpoofLocale, nsAString& result) { uint32_t i, argCount = 0; nsCOMPtr<nsIStringBundle> bundle; @@ -1012,7 +1013,8 @@ nsStringBundleService::FormatStatusMessage(nsresult aStatus, switch (NS_ERROR_GET_MODULE(aStatus)) { case NS_ERROR_MODULE_XSLT: - getStringBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + getStringBundle(aSpoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); break; case NS_ERROR_MODULE_NETWORK: getStringBundle(NECKO_MSGS_URL, getter_AddRefs(bundle)); ===================================== mobile/android/installer/package-manifest.in ===================================== @@ -181,6 +181,7 @@ @BINPATH@/res/locale/layout/HtmlForm.properties @BINPATH@/res/locale/layout/MediaDocument.properties @BINPATH@/res/locale/layout/xmlparser.properties +@BINPATH@/res/locale/xslt/xslt.properties @BINPATH@/res/locale/dom/dom.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS ===================================== uriloader/base/nsDocLoader.cpp ===================================== @@ -1230,7 +1230,7 @@ NS_IMETHODIMP nsDocLoader::OnStatus(nsIRequest* aRequest, nsresult aStatus, mozilla::components::StringBundle::Service(); if (!sbs) return NS_ERROR_FAILURE; nsAutoString msg; - nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, msg); + nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, false, msg); if (NS_FAILED(rv)) return rv; // Keep around the message. In case a request finishes, we need to make sure View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/5f8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/5f8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.5.0esr-13.0-1] Bug 42288: Allow language spoofing in status messages.
by ma1 (＠ma1) 29 Nov '23

29 Nov '23

ma1 pushed to branch base-browser-115.5.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 51a00b12 by hackademix at 2023-11-29T23:42:24+01:00 Bug 42288: Allow language spoofing in status messages. - - - - - 8 changed files: - browser/installer/package-manifest.in - dom/locales/moz.build - dom/xslt/xslt/txMozillaXSLTProcessor.cpp - dom/xslt/xslt/txXSLTMsgsURL.h - intl/strres/nsIStringBundle.idl - intl/strres/nsStringBundle.cpp - mobile/android/installer/package-manifest.in - uriloader/base/nsDocLoader.cpp Changes: ===================================== browser/installer/package-manifest.in ===================================== @@ -318,6 +318,7 @@ @RESPATH@/res/locale/layout/HtmlForm.properties @RESPATH@/res/locale/layout/MediaDocument.properties @RESPATH@/res/locale/layout/xmlparser.properties +@RESPATH@/res/locale/xslt/xslt.properties @RESPATH@/res/locale/dom/dom.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ ===================================== dom/locales/moz.build ===================================== @@ -57,6 +57,10 @@ RESOURCE_FILES.locale.layout += [ "en-US/chrome/layout/xmlparser.properties", ] +RESOURCE_FILES.locale.xslt += [ + "en-US/chrome/xslt/xslt.properties", +] + RESOURCE_FILES.locale.dom += [ "en-US/chrome/dom/dom.properties", ] ===================================== dom/xslt/xslt/txMozillaXSLTProcessor.cpp ===================================== @@ -942,11 +942,17 @@ void txMozillaXSLTProcessor::reportError(nsresult aResult, mozilla::components::StringBundle::Service(); if (sbs) { nsString errorText; - sbs->FormatStatusMessage(aResult, u"", errorText); + bool spoofLocale = nsContentUtils::SpoofLocaleEnglish(); + if (spoofLocale && mSource) { + Document* sourceDoc = mSource->OwnerDoc(); + spoofLocale = !(sourceDoc && sourceDoc->AllowsL10n()); + } + sbs->FormatStatusMessage(aResult, u"", spoofLocale, errorText); nsAutoString errorMessage; nsCOMPtr<nsIStringBundle> bundle; - sbs->CreateBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + sbs->CreateBundle(spoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); if (bundle) { AutoTArray<nsString, 1> error = {errorText}; ===================================== dom/xslt/xslt/txXSLTMsgsURL.h ===================================== @@ -7,5 +7,6 @@ #define DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ #define XSLT_MSGS_URL "chrome://global/locale/xslt/xslt.properties" +#define XSLT_MSGS_URL_en_US "resource://gre/res/locale/xslt/xslt.properties" #endif // DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ ===================================== intl/strres/nsIStringBundle.idl ===================================== @@ -86,9 +86,13 @@ interface nsIStringBundleService : nsISupports * used in the string lookup process. * @param aStatusArg - The status message argument(s). Multiple arguments * can be separated by newline ('\n') characters. + * @param aSpoofLocale - If true (default is false), forces the en-US + locale on content-accessible messages (XSLT errors so far). * @return the formatted message */ - AString formatStatusMessage(in nsresult aStatus, in wstring aStatusArg); + AString formatStatusMessage(in nsresult aStatus, + in wstring aStatusArg, + [optional] in boolean aSpoofLocale); /** * flushes the string bundle cache - useful when the locale changes or ===================================== intl/strres/nsStringBundle.cpp ===================================== @@ -977,6 +977,7 @@ nsresult nsStringBundleService::FormatWithBundle( NS_IMETHODIMP nsStringBundleService::FormatStatusMessage(nsresult aStatus, const char16_t* aStatusArg, + bool aSpoofLocale, nsAString& result) { uint32_t i, argCount = 0; nsCOMPtr<nsIStringBundle> bundle; @@ -1012,7 +1013,8 @@ nsStringBundleService::FormatStatusMessage(nsresult aStatus, switch (NS_ERROR_GET_MODULE(aStatus)) { case NS_ERROR_MODULE_XSLT: - getStringBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + getStringBundle(aSpoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); break; case NS_ERROR_MODULE_NETWORK: getStringBundle(NECKO_MSGS_URL, getter_AddRefs(bundle)); ===================================== mobile/android/installer/package-manifest.in ===================================== @@ -181,6 +181,7 @@ @BINPATH@/res/locale/layout/HtmlForm.properties @BINPATH@/res/locale/layout/MediaDocument.properties @BINPATH@/res/locale/layout/xmlparser.properties +@BINPATH@/res/locale/xslt/xslt.properties @BINPATH@/res/locale/dom/dom.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS ===================================== uriloader/base/nsDocLoader.cpp ===================================== @@ -1230,7 +1230,7 @@ NS_IMETHODIMP nsDocLoader::OnStatus(nsIRequest* aRequest, nsresult aStatus, mozilla::components::StringBundle::Service(); if (!sbs) return NS_ERROR_FAILURE; nsAutoString msg; - nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, msg); + nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, false, msg); if (NS_FAILED(rv)) return rv; // Keep around the message. In case a request finishes, we need to make sure View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/51a00b1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/51a00b1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.5.0esr-13.0-1] Bug 42288: Allow language spoofing in status messages.
by ma1 (＠ma1) 29 Nov '23

29 Nov '23

ma1 pushed to branch tor-browser-115.5.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: da97b52c by hackademix at 2023-11-29T23:41:14+01:00 Bug 42288: Allow language spoofing in status messages. - - - - - 8 changed files: - browser/installer/package-manifest.in - dom/locales/moz.build - dom/xslt/xslt/txMozillaXSLTProcessor.cpp - dom/xslt/xslt/txXSLTMsgsURL.h - intl/strres/nsIStringBundle.idl - intl/strres/nsStringBundle.cpp - mobile/android/installer/package-manifest.in - uriloader/base/nsDocLoader.cpp Changes: ===================================== browser/installer/package-manifest.in ===================================== @@ -321,6 +321,7 @@ @RESPATH@/res/locale/layout/HtmlForm.properties @RESPATH@/res/locale/layout/MediaDocument.properties @RESPATH@/res/locale/layout/xmlparser.properties +@RESPATH@/res/locale/xslt/xslt.properties @RESPATH@/res/locale/dom/dom.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ ===================================== dom/locales/moz.build ===================================== @@ -57,6 +57,10 @@ RESOURCE_FILES.locale.layout += [ "en-US/chrome/layout/xmlparser.properties", ] +RESOURCE_FILES.locale.xslt += [ + "en-US/chrome/xslt/xslt.properties", +] + RESOURCE_FILES.locale.dom += [ "en-US/chrome/dom/dom.properties", ] ===================================== dom/xslt/xslt/txMozillaXSLTProcessor.cpp ===================================== @@ -942,11 +942,17 @@ void txMozillaXSLTProcessor::reportError(nsresult aResult, mozilla::components::StringBundle::Service(); if (sbs) { nsString errorText; - sbs->FormatStatusMessage(aResult, u"", errorText); + bool spoofLocale = nsContentUtils::SpoofLocaleEnglish(); + if (spoofLocale && mSource) { + Document* sourceDoc = mSource->OwnerDoc(); + spoofLocale = !(sourceDoc && sourceDoc->AllowsL10n()); + } + sbs->FormatStatusMessage(aResult, u"", spoofLocale, errorText); nsAutoString errorMessage; nsCOMPtr<nsIStringBundle> bundle; - sbs->CreateBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + sbs->CreateBundle(spoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); if (bundle) { AutoTArray<nsString, 1> error = {errorText}; ===================================== dom/xslt/xslt/txXSLTMsgsURL.h ===================================== @@ -7,5 +7,6 @@ #define DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ #define XSLT_MSGS_URL "chrome://global/locale/xslt/xslt.properties" +#define XSLT_MSGS_URL_en_US "resource://gre/res/locale/xslt/xslt.properties" #endif // DOM_XSLT_XSLT_TXXSLTMSGSURL_H_ ===================================== intl/strres/nsIStringBundle.idl ===================================== @@ -86,9 +86,13 @@ interface nsIStringBundleService : nsISupports * used in the string lookup process. * @param aStatusArg - The status message argument(s). Multiple arguments * can be separated by newline ('\n') characters. + * @param aSpoofLocale - If true (default is false), forces the en-US + locale on content-accessible messages (XSLT errors so far). * @return the formatted message */ - AString formatStatusMessage(in nsresult aStatus, in wstring aStatusArg); + AString formatStatusMessage(in nsresult aStatus, + in wstring aStatusArg, + [optional] in boolean aSpoofLocale); /** * flushes the string bundle cache - useful when the locale changes or ===================================== intl/strres/nsStringBundle.cpp ===================================== @@ -977,6 +977,7 @@ nsresult nsStringBundleService::FormatWithBundle( NS_IMETHODIMP nsStringBundleService::FormatStatusMessage(nsresult aStatus, const char16_t* aStatusArg, + bool aSpoofLocale, nsAString& result) { uint32_t i, argCount = 0; nsCOMPtr<nsIStringBundle> bundle; @@ -1012,7 +1013,8 @@ nsStringBundleService::FormatStatusMessage(nsresult aStatus, switch (NS_ERROR_GET_MODULE(aStatus)) { case NS_ERROR_MODULE_XSLT: - getStringBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); + getStringBundle(aSpoofLocale ? XSLT_MSGS_URL_en_US : XSLT_MSGS_URL, + getter_AddRefs(bundle)); break; case NS_ERROR_MODULE_NETWORK: getStringBundle(NECKO_MSGS_URL, getter_AddRefs(bundle)); ===================================== mobile/android/installer/package-manifest.in ===================================== @@ -185,6 +185,7 @@ @BINPATH@/res/locale/layout/HtmlForm.properties @BINPATH@/res/locale/layout/MediaDocument.properties @BINPATH@/res/locale/layout/xmlparser.properties +@BINPATH@/res/locale/xslt/xslt.properties @BINPATH@/res/locale/dom/dom.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS ===================================== uriloader/base/nsDocLoader.cpp ===================================== @@ -1230,7 +1230,7 @@ NS_IMETHODIMP nsDocLoader::OnStatus(nsIRequest* aRequest, nsresult aStatus, mozilla::components::StringBundle::Service(); if (!sbs) return NS_ERROR_FAILURE; nsAutoString msg; - nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, msg); + nsresult rv = sbs->FormatStatusMessage(aStatus, aStatusArg, false, msg); if (NS_FAILED(rv)) return rv; // Keep around the message. In case a request finishes, we need to make sure View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/da97b52… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/da97b52… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41026: Use a relative target_dir in upload_sha256sums
by Pier Angelo Vendrame (＠pierov) 29 Nov '23

29 Nov '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 95fcf138 by Pier Angelo Vendrame at 2023-11-29T17:35:44+01:00 Bug 41026: Use a relative target_dir in upload_sha256sums ~/ is expanded by the shell issuing the command, so it results in the local home directory, not the remote one. However, since we are using a path that is relative to the home, we can simply use a relative one. - - - - - 1 changed file: - projects/release/upload_sha256sums Changes: ===================================== projects/release/upload_sha256sums ===================================== @@ -8,7 +8,7 @@ browser=[% c("var/browser_type") %] src_dir=[% shell_quote(path(dest_dir)) %]/$signed/$version -target_dir=~/public_html/builds/$browser/$channel/$version/ +target_dir=public_html/builds/$browser/$channel/$version/ echo "browser:$browser channel:$channel signed:$signed version:$version" @@ -31,4 +31,4 @@ fi ssh [% c("var/tpo_user") %](a)people.torproject.org "mkdir -p $target_dir" rsync sha256sums*.* [% c("var/tpo_user") %]@people.torproject.org:$target_dir -echo "Synced sha256sums to https://people.torproject.org/~[% c("var/tpo_user") %]/builds/$browser/$channel/$version/" \ No newline at end of file +echo "Synced sha256sums to https://people.torproject.org/~[% c("var/tpo_user") %]/builds/$browser/$channel/$version/" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 13.5a2
by richard (＠richard) 28 Nov '23

28 Nov '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 3e15b41f by Richard Pospesel at 2023-11-28T16:36:07+00:00 alpha: new version, 13.5a2 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/13.0a4-13.5a1-linux-i686-ALL.xml - − update_3/alpha/13.0a4-13.5a1-linux-x86_64-ALL.xml - − update_3/alpha/13.0a4-13.5a1-macos-ALL.xml - − update_3/alpha/13.0a4-13.5a1-windows-i686-ALL.xml - − update_3/alpha/13.0a4-13.5a1-windows-x86_64-ALL.xml - − update_3/alpha/13.0a5-13.5a1-linux-i686-ALL.xml - − update_3/alpha/13.0a5-13.5a1-linux-x86_64-ALL.xml - − update_3/alpha/13.0a5-13.5a1-macos-ALL.xml - − update_3/alpha/13.0a5-13.5a1-windows-i686-ALL.xml - − update_3/alpha/13.0a5-13.5a1-windows-x86_64-ALL.xml - + update_3/alpha/13.0a5-13.5a2-linux-i686-ALL.xml - + update_3/alpha/13.0a5-13.5a2-linux-x86_64-ALL.xml - + update_3/alpha/13.0a5-13.5a2-macos-ALL.xml - + update_3/alpha/13.0a5-13.5a2-windows-i686-ALL.xml - + update_3/alpha/13.0a5-13.5a2-windows-x86_64-ALL.xml - − update_3/alpha/13.0a6-13.5a1-linux-i686-ALL.xml - − update_3/alpha/13.0a6-13.5a1-linux-x86_64-ALL.xml - − update_3/alpha/13.0a6-13.5a1-macos-ALL.xml - − update_3/alpha/13.0a6-13.5a1-windows-i686-ALL.xml - − update_3/alpha/13.0a6-13.5a1-windows-x86_64-ALL.xml - + update_3/alpha/13.0a6-13.5a2-linux-i686-ALL.xml - + update_3/alpha/13.0a6-13.5a2-linux-x86_64-ALL.xml - + update_3/alpha/13.0a6-13.5a2-macos-ALL.xml - + update_3/alpha/13.0a6-13.5a2-windows-i686-ALL.xml - + update_3/alpha/13.0a6-13.5a2-windows-x86_64-ALL.xml - + update_3/alpha/13.5a1-13.5a2-linux-i686-ALL.xml - + update_3/alpha/13.5a1-13.5a2-linux-x86_64-ALL.xml - + update_3/alpha/13.5a1-13.5a2-macos-ALL.xml - + update_3/alpha/13.5a1-13.5a2-windows-i686-ALL.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41016: Switch from bullseye to bookworm on macOS+Windows.
by Pier Angelo Vendrame (＠pierov) 28 Nov '23

28 Nov '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f36acd4f by Pier Angelo Vendrame at 2023-11-28T12:08:57+01:00 Bug 41016: Switch from bullseye to bookworm on macOS+Windows. Debian bookworm became the new stable in June 2023, so we should update our containers to use it. On macOS the update did not cause any issue, and just updating the suite name worked. On Windows, it caused some problems where we used the strip provided by the OS (only for tor, it seems), because the new version of strip seems to update the timestamps by default. We are delaying the process for Android because there are still a couple of projects that require Java 11, which is not available on bookworm. - - - - - 6054fe9c by Pier Angelo Vendrame at 2023-11-28T12:08:59+01:00 Bug 41015: Enable std::filesystem on libc++ on Windows We need to do some path manipulation in some Firefox code that is run before initializing XPCOM. So, the alternatives are either Path* functions from shlwapi, or std::filesystem, which is disabled in Firefox 115. Mozilla enabled it starting from 116, but we have been told it is okay to enable it also in 115, so we do it with this patch. - - - - - 6 changed files: - projects/manual/config - projects/mingw-w64-clang/build - projects/mmdebstrap-image/config - projects/mmdebstrap/config - projects/tor/build - rbm.conf Changes: ===================================== projects/manual/config ===================================== @@ -13,7 +13,7 @@ compress_tar: 'gz' var: container: - suite: bullseye + suite: bookworm arch: amd64 deps: - python3 ===================================== projects/mingw-w64-clang/build ===================================== @@ -175,7 +175,7 @@ EOF -DLIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG=TRUE \ -DLIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB=TRUE \ -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \ - -DLIBCXX_ENABLE_FILESYSTEM=OFF \ + -DLIBCXX_ENABLE_FILESYSTEM=ON \ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \ -DLIBCXX_CXX_ABI=libcxxabi \ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$builddir/clang-source/libcxxabi/include \ ===================================== projects/mmdebstrap-image/config ===================================== @@ -7,7 +7,7 @@ container: use_container: 1 var: - ubuntu_version: 22.04.2 + ubuntu_version: 22.04.3 pre: | #!/bin/sh @@ -50,9 +50,16 @@ targets: suite: bullseye arch: amd64 + bookworm-amd64: + var: + minimal_apt_version: 2.6.1 + container: + suite: bookworm + arch: amd64 + input_files: - project: mmdebstrap name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: 373f064df30519adc3344a08d774f437caabd1479d846fa2ca6fed727ea7a53d + sha256sum: ad33b7ae47b75c92c2e2fe21fd4612e15357e67679d8751d6ce892a475be24fe ===================================== projects/mmdebstrap/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-src-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 0.8.6 +version: 1.4.0 git_hash: '[% c("version") %]' git_url: https://gitlab.mister-muffin.de/josch/mmdebstrap.git gpg_keyring: mmdebstrap.gpg ===================================== projects/tor/build ===================================== @@ -97,8 +97,9 @@ cp $distdir/share/tor/geoip6 "$TORDATADIR" cd $distdir [% IF c("var/windows") %] - install -s $distdir/bin/tor.exe "$TORBINDIR" - install -s $distdir/bin/tor-gencert.exe "$TORBINDIR" + # With Debian bookworm strip changes the date time, llvm-strip doesn't do it. + install -s --strip-program=llvm-strip $distdir/bin/tor.exe "$TORBINDIR" + install -s --strip-program=llvm-strip $distdir/bin/tor-gencert.exe "$TORBINDIR" [% END %] [% IF c("var/linux") %] ===================================== rbm.conf ===================================== @@ -578,7 +578,7 @@ targets: windows: 1 platform: windows container: - suite: bullseye + suite: bookworm arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' @@ -661,7 +661,7 @@ targets: platform: macos osname: macos container: - suite: bullseye + suite: bookworm arch: amd64 compiler: 'macosx-toolchain' configure_opt: '--host=[% c("var/build_target") %] CC="[% c("var/build_target") %]-clang [% c("var/FLAGS") %]" CXX="[% c("var/build_target") %]-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0