- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 41099: Prepare Tor Browser Stable 13.0.14 (updated)
by Pier Angelo Vendrame (＠pierov) 15 Apr '24

15 Apr '24

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: a57006e3 by Pier Angelo Vendrame at 2024-04-15T18:44:40+02:00 Bug 41099: Prepare Tor Browser Stable 13.0.14 (updated) Include the fix to #40992/#41122 and updated the changelogs. - - - - - 2 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -4,20 +4,25 @@ Tor Browser 13.0.14 - April 16 2024 * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] * Bug 42335: Do not localize the order of locales for app lang [tor-browser] * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] - * Bug 42472: Timezone May leak from XSLT Date function [tor-browser] + * Bug 42472: Timezone may leak from XSLT Date function [tor-browser] * Bug 42508: Rebase Tor Browser stable onto 115.10.0esr [tor-browser] * Windows + macOS + Linux * Updated Firefox to 115.10.0esr + * Bug 42172: browser.startup.homepage and TOR_DEFAULT_HOMEPAGE are ignored for the new window opened by New Identity [tor-browser] * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] * Bug 42468: App languages not sorted correctly in stable [tor-browser] - * Android - * Updated GeckoView to 115.10.0esr * Linux * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + * Android + * Updated GeckoView to 115.10.0esr + * Bug 42509: Backport Android security fixes from Firefox 125 [tor-browser] * Build System * All Platforms * Updated Go to 1.21.8 * Bug 41107: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo for new type of URL [tor-browser-build] + * Bug 41122: Add release date to rbm.conf [tor-browser-build] + * Android + * Bug 40992: Updated torbrowser_version number is not enough to change firefox-android versionCode number [tor-browser-build] Tor Browser 13.5a6 - March 28 2024 * All Platforms ===================================== rbm.conf ===================================== @@ -80,7 +80,7 @@ var: - '13.0.12' - '[% IF c("var/tor-browser") %]13.0.11[% END %]' - '[% IF c("var/mullvad-browser") %]13.0.10[% END %]' - browser_release_date: '2024/03/28 01:02:03' + browser_release_date: '2024/04/16 15:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by richard (＠richard) 15 Apr '24

15 Apr '24

richard pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: a5b9b03b by Henry Wilkes at 2024-04-15T17:15:04+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42496: Fix the refresh captcha button's command. - - - - - 2 changed files: - browser/components/torpreferences/content/requestBridgeDialog.js - browser/components/torpreferences/content/requestBridgeDialog.xhtml Changes: ===================================== browser/components/torpreferences/content/requestBridgeDialog.js ===================================== @@ -71,6 +71,9 @@ const gRequestBridgeDialog = { selectors.refreshCaptchaButton ); this._captchaRefreshButton.disabled = true; + this._captchaRefreshButton.addEventListener("command", () => { + this.onRefreshCaptcha(); + }); this._incorrectCaptchaHbox = this._dialog.querySelector( selectors.incorrectCaptchaHbox ===================================== browser/components/torpreferences/content/requestBridgeDialog.xhtml ===================================== @@ -31,7 +31,6 @@ <button id="torPreferences-requestBridge-refreshCaptchaButton" image="chrome://global/skin/icons/reload.svg" - oncommand="requestBridgeDialog.onRefreshCaptcha();" /> </hbox> <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center"> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a5b9b03… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a5b9b03… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.10.0esr-13.5-1] fixup! MB 188: Customize Gitlab Issue and Merge templates
by richard (＠richard) 15 Apr '24

15 Apr '24

richard pushed to branch mullvad-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 1d3f7ac2 by Richard Pospesel at 2024-04-15T17:13:12+00:00 fixup! MB 188: Customize Gitlab Issue and Merge templates emergency security issue for mullvad browser - - - - - 1 changed file: - .gitlab/issue_templates/Emergency Security Issue.md Changes: ===================================== .gitlab/issue_templates/Emergency Security Issue.md ===================================== @@ -18,9 +18,7 @@ ### Type of Issue: What are we dealing with? - [ ] Security (sandbox escape, remote code execution, etc) -- [ ] Proxy Bypass (traffic contents becoming MITM'able) -- [ ] De-Anonymization (otherwise identifying which website a user is visiting) -- [ ] Cross-Site Linkability (correlating sessions across circuits and websites) +- [ ] Cross-Site Linkability (correlating sessions across websites) - [ ] Disk Leak (persisting session information to disk) - [ ] Other (please explain) @@ -36,16 +34,11 @@ - [ ] **richard** : signing, release - [ ] **thorin** : fingerprinting - [ ] Other Engineering Teams - - [ ] Networking (**ahf**, **dgoulet**) - - [ ] Anti-Censorship (**meskio**, **cohosh**) - [ ] UX (**donuts**) - [ ] TPA (**anarcat**, **lavamind**) - [ ] External Tor Partners - - [ ] Mozilla - - [ ] Mullvad - - [ ] Brave - - [ ] Guardian Project (Orbot, Onion Browser) - - [ ] Tails + - [ ] Mozilla (**tjr**) + - [ ] Mullvad (**ruihildt**) - [ ] Other (please list) ### Urgency: When do we need to act? @@ -72,6 +65,7 @@ Sometimes fixes have side-effects: users lose their data, roadmaps need to be ad - [ ] Start an initial email thread with the following people: - [ ] **bella** + - [ ] **ruihildt**, **support(a)mullvadvpn.net** - [ ] Relevant Applications Developers - [ ] **(Optional)** **micah** - if there are considerations or asks outside the Applications Team @@ -84,6 +78,7 @@ Sometimes fixes have side-effects: users lose their data, roadmaps need to be ad /cc @ma1 /cc @micah /cc @richard +/cc @ruihildt /confidential View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1d3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1d3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41122: Update stable release prep templates
by boklm (＠boklm) 15 Apr '24

15 Apr '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8d829699 by Nicolas Vigier at 2024-04-15T17:44:25+02:00 Bug 41122: Update stable release prep templates The patch for #41122 was backported to `maint-13.0`, so we need to update the stable release prep gitlab issue templates. - - - - - 2 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -39,6 +39,7 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)` + - [ ] `var/browser_release_date` : update to build date - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -38,6 +38,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` + - [ ] `var/browser_release_date` : update to build date - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] 20 commits: fixup! Bug 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 15 Apr '24

15 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 3865ebab by Pier Angelo Vendrame at 2024-04-15T17:59:33+02:00 fixup! Bug 40597: Implement TorSettings module Move TorSettings and TorLauncherUtil to lazy imnports. Also removed XPCOMUtils in favor of ChromeUtils. - - - - - d53805c2 by Pier Angelo Vendrame at 2024-04-15T17:59:36+02:00 fixup! Temporary changes to about:torconnect for Android. - - - - - 7720009e by Pier Angelo Vendrame at 2024-04-15T17:59:36+02:00 fixup! Bug 40933: Add tor-launcher functionality Rename TorControlPort.sys.mjs's `TorError` to a less generic `TorProtocolError`. - - - - - bb516579 by Pier Angelo Vendrame at 2024-04-15T17:59:37+02:00 dropme! Bug 42247: Android helpers for the TorProvider Revert the changes to TorProvider*.sys.mjs to move them to the correct commit. - - - - - 76623561 by Dan Ballard at 2024-04-15T17:59:37+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41187: Add support for tor logs in android integration - - - - - 8d41f191 by Pier Angelo Vendrame at 2024-04-15T17:59:37+02:00 fixup! Bug 40933: Add tor-launcher functionality Do not localize errors in TorProcess, but keep it only as a pure backend file. Moreover, the localized errors would be only shown in the console. Instead, report an error code to let them bubble up to the TorProviderBuilder, where we show them in the "Restart Tor" prompt. - - - - - 05bda694 by Pier Angelo Vendrame at 2024-04-15T17:59:38+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Formatted comments. - - - - - d783693d by Pier Angelo Vendrame at 2024-04-15T17:59:38+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42479: Remove localization from the backend files. Also, use an Error object when the bootstrap fail, in preparation to the removal of TorBootstrapRequest. - - - - - 7dc831bf by Pier Angelo Vendrame at 2024-04-15T17:59:38+02:00 fixup! Add TorStrings module for localization Load some torlauncher strings to show in about:torconnect in TorStrings.sys.mjs. We could move them to torConnect.properties, but maybe we are still in time for moving all of them to Fluent, so I preferred reducing the number of migrations. Also, remove unused strings from torlauncher.properties. - - - - - 04fbc3dc by Pier Angelo Vendrame at 2024-04-15T17:59:39+02:00 fixup! Bug 40597: Implement TorSettings module Bug 42479: Improve TorConnect error handling. To do so, also remove localized error messages. Use error codes, and let the frontend use the localized messages. - - - - - 00c53294 by Pier Angelo Vendrame at 2024-04-15T17:59:39+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 42479: Improve TorConnect error handling. Consume the new error codes and transform them into localized error messages. - - - - - 13ca87b4 by Pier Angelo Vendrame at 2024-04-15T17:59:39+02:00 fixup! Bug 42247: Android helpers for the TorProvider Bug 42479: Improve TorConnect error handling. Pass the new TorConnect error codes to Android. - - - - - 1e2083d7 by Pier Angelo Vendrame at 2024-04-15T17:59:40+02:00 fixup! Bug 40933: Add tor-launcher functionality This partially reverts commit 34f7e83335cde6653d897717741c9c8d41f858b7. It removes the errorCode logic, and throws non-localized error messages. Also, it removes the no-longer used getFormattedLocalizedString. - - - - - 05516a28 by Pier Angelo Vendrame at 2024-04-15T17:59:40+02:00 fixup! Bug 40933: Add tor-launcher functionality Changed a few calls to #stop since this method now expects an Erro object. Do not redefine topics, import them from TorProviderBuilder.sys.mjs. Use lazy imports for our code. - - - - - 01d7d557 by Pier Angelo Vendrame at 2024-04-15T17:59:40+02:00 fixup! Bug 40597: Implement TorSettings module Various fixes to address tor-browser!968. - - - - - 02df5609 by Pier Angelo Vendrame at 2024-04-15T17:59:41+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Various fixes to address tor-browser!968. - - - - - 76ee8c58 by Pier Angelo Vendrame at 2024-04-15T17:59:41+02:00 fixup! Bug 42247: Android helpers for the TorProvider TorConnectTopics.BootstrapError is now just Error, and it passes directly the Error object. - - - - - 686fb7e7 by henry at 2024-04-15T17:59:41+02:00 fixup! Add TorStrings module for localization Drop unused strings. - - - - - ec7b6520 by henry at 2024-04-15T17:59:42+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Fix the offline error handler. - - - - - e162a17a by henry at 2024-04-15T17:59:42+02:00 fixup! Bug 40597: Implement TorSettings module Remove an outdated comment. - - - - - 12 changed files: - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java - toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs - toolkit/components/tor-launcher/TorControlPort.sys.mjs - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorProcess.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/components/torconnect/TorConnectParent.sys.mjs - toolkit/components/torconnect/content/aboutTorConnect.js - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorConnect.sys.mjs - toolkit/modules/TorStrings.sys.mjs - toolkit/torbutton/chrome/locale/en-US/torlauncher.properties Changes: ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java ===================================== @@ -42,10 +42,10 @@ public class TorIntegrationAndroid implements BundleEventListener { private static final String EVENT_TOR_STOP = "GeckoView:Tor:StopTor"; private static final String EVENT_MEEK_START = "GeckoView:Tor:StartMeek"; private static final String EVENT_MEEK_STOP = "GeckoView:Tor:StopMeek"; - private static final String EVENT_BOOTSTRAP_STATE_CHANGED = "GeckoView:Tor:BootstrapStateChanged"; + private static final String EVENT_CONNECT_STATE_CHANGED = "GeckoView:Tor:ConnectStateChanged"; + private static final String EVENT_CONNECT_ERROR = "GeckoView:Tor:ConnectError"; private static final String EVENT_BOOTSTRAP_PROGRESS = "GeckoView:Tor:BootstrapProgress"; private static final String EVENT_BOOTSTRAP_COMPLETE = "GeckoView:Tor:BootstrapComplete"; - private static final String EVENT_BOOTSTRAP_ERROR = "GeckoView:Tor:BootstrapError"; private static final String EVENT_TOR_LOGS = "GeckoView:Tor:Logs"; private static final String EVENT_SETTINGS_READY = "GeckoView:Tor:SettingsReady"; private static final String EVENT_SETTINGS_CHANGED = "GeckoView:Tor:SettingsChanged"; @@ -115,10 +115,10 @@ public class TorIntegrationAndroid implements BundleEventListener { EVENT_MEEK_STOP, EVENT_SETTINGS_READY, EVENT_SETTINGS_CHANGED, - EVENT_BOOTSTRAP_STATE_CHANGED, + EVENT_CONNECT_STATE_CHANGED, + EVENT_CONNECT_ERROR, EVENT_BOOTSTRAP_PROGRESS, EVENT_BOOTSTRAP_COMPLETE, - EVENT_BOOTSTRAP_ERROR, EVENT_TOR_LOGS, EVENT_SETTINGS_OPEN); } @@ -148,28 +148,29 @@ public class TorIntegrationAndroid implements BundleEventListener { } else { Log.w(TAG, "Ignoring a settings changed event that did not have the new settings."); } - } else if (EVENT_BOOTSTRAP_STATE_CHANGED.equals(event)) { + } else if (EVENT_CONNECT_STATE_CHANGED.equals(event)) { String state = message.getString("state"); for (BootstrapStateChangeListener listener: mBootstrapStateListeners) { listener.onBootstrapStateChange(state); } + } else if (EVENT_CONNECT_ERROR.equals(event)) { + String code = message.getString("code"); + String msg = message.getString("message"); + String phase = message.getString("phase"); + String reason = message.getString("reason"); + for (BootstrapStateChangeListener listener: mBootstrapStateListeners) { + listener.onBootstrapError(code, msg, phase, reason); + } } else if (EVENT_BOOTSTRAP_PROGRESS.equals(event)) { double progress = message.getDouble("progress"); - String status = message.getString("status"); boolean hasWarnings = message.getBoolean("hasWarnings"); for (BootstrapStateChangeListener listener: mBootstrapStateListeners) { - listener.onBootstrapProgress(progress, status, hasWarnings); + listener.onBootstrapProgress(progress, hasWarnings); } } else if (EVENT_BOOTSTRAP_COMPLETE.equals(event)) { for (BootstrapStateChangeListener listener: mBootstrapStateListeners) { listener.onBootstrapComplete(); } - } else if (EVENT_BOOTSTRAP_ERROR.equals(event)) { - String msg = message.getString("message"); - String details = message.getString("details"); - for (BootstrapStateChangeListener listener: mBootstrapStateListeners) { - listener.onBootstrapError(msg, details); - } } else if (EVENT_TOR_LOGS.equals(event)) { String msg = message.getString("message"); String type = message.getString("logType"); @@ -575,9 +576,9 @@ public class TorIntegrationAndroid implements BundleEventListener { public interface BootstrapStateChangeListener { void onBootstrapStateChange(String state); - void onBootstrapProgress(double progress, String status, boolean hasWarnings); + void onBootstrapProgress(double progress, boolean hasWarnings); void onBootstrapComplete(); - void onBootstrapError(String message, String details); + void onBootstrapError(String code, String message, String phase, String reason); void onSettingsRequested(); } ===================================== toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs ===================================== @@ -1,17 +1,15 @@ import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs"; -import { TorProviderBuilder } from "resource://gre/modules/TorProviderBuilder.sys.mjs"; -import { TorLauncherUtil } from "resource://gre/modules/TorLauncherUtil.sys.mjs"; - -/* tor-launcher observer topics */ -export const TorTopics = Object.freeze({ - BootstrapStatus: "TorBootstrapStatus", - BootstrapError: "TorBootstrapError", - LogHasWarnOrErr: "TorLogHasWarnOrErr", +const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", + TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs", }); // modeled after XMLHttpRequest // nicely encapsulates the observer register/unregister logic +// TODO: Remove this class, and move its logic inside the TorProvider. export class TorBootstrapRequest { // number of ms to wait before we abandon the bootstrap attempt // a value of 0 implies we never wait @@ -20,7 +18,7 @@ export class TorBootstrapRequest { // callbacks for bootstrap process status updates onbootstrapstatus = (progress, status) => {}; onbootstrapcomplete = () => {}; - onbootstraperror = (message, details) => {}; + onbootstraperror = error => {}; // internal resolve() method for bootstrap #bootstrapPromiseResolve = null; @@ -30,10 +28,10 @@ export class TorBootstrapRequest { observe(subject, topic, data) { const obj = subject?.wrappedJSObject; switch (topic) { - case TorTopics.BootstrapStatus: { + case lazy.TorProviderTopics.BootstrapStatus: { const progress = obj.PROGRESS; - const status = TorLauncherUtil.getLocalizedBootstrapStatus(obj, "TAG"); if (this.onbootstrapstatus) { + const status = obj.TAG; this.onbootstrapstatus(progress, status); } if (progress === 100) { @@ -47,9 +45,11 @@ export class TorBootstrapRequest { break; } - case TorTopics.BootstrapError: { + case lazy.TorProviderTopics.BootstrapError: { console.info("TorBootstrapRequest: observerd TorBootstrapError", obj); - this.#stop(obj?.message, obj?.details); + const error = new Error(obj.summary); + Object.assign(error, obj); + this.#stop(error); break; } } @@ -65,17 +65,17 @@ export class TorBootstrapRequest { this.#bootstrapPromiseResolve = resolve; // register ourselves to listen for bootstrap events - Services.obs.addObserver(this, TorTopics.BootstrapStatus); - Services.obs.addObserver(this, TorTopics.BootstrapError); + Services.obs.addObserver(this, lazy.TorProviderTopics.BootstrapStatus); + Services.obs.addObserver(this, lazy.TorProviderTopics.BootstrapError); // optionally cancel bootstrap after a given timeout if (this.timeout > 0) { - this.#timeoutID = setTimeout(async () => { + this.#timeoutID = setTimeout(() => { this.#timeoutID = null; - // TODO: Translate, if really used - await this.#stop( - "Tor Bootstrap process timed out", - `Bootstrap attempt abandoned after waiting ${this.timeout} ms` + this.#stop( + new Error( + `Bootstrap attempt abandoned after waiting ${this.timeout} ms` + ) ); }, this.timeout); } @@ -83,15 +83,15 @@ export class TorBootstrapRequest { // Wait for bootstrapping to begin and maybe handle error. // Notice that we do not resolve the promise here in case of success, but // we do it from the BootstrapStatus observer. - TorProviderBuilder.build() + lazy.TorProviderBuilder.build() .then(provider => provider.connect()) .catch(err => { - this.#stop(err.message, err.torMessage); + this.#stop(err); }); }).finally(() => { // and remove ourselves once bootstrap is resolved - Services.obs.removeObserver(this, TorTopics.BootstrapStatus); - Services.obs.removeObserver(this, TorTopics.BootstrapError); + Services.obs.removeObserver(this, lazy.TorProviderTopics.BootstrapStatus); + Services.obs.removeObserver(this, lazy.TorProviderTopics.BootstrapError); this.#bootstrapPromise = null; }); @@ -103,7 +103,7 @@ export class TorBootstrapRequest { } // Internal implementation. Do not use directly, but call cancel, instead. - async #stop(message, details) { + async #stop(error) { // first stop our bootstrap timeout before handling the error if (this.#timeoutID !== null) { clearTimeout(this.#timeoutID); @@ -112,7 +112,7 @@ export class TorBootstrapRequest { let provider; try { - provider = await TorProviderBuilder.build(); + provider = await lazy.TorProviderBuilder.build(); } catch { // This was probably the error that lead to stop in the first place. // No need to continue propagating it. @@ -121,14 +121,13 @@ export class TorBootstrapRequest { await provider?.stopBootstrap(); } catch (e) { console.error("Failed to stop the bootstrap.", e); - if (!message) { - message = e.message; - details = ""; + if (!error) { + error = e; } } - if (this.onbootstraperror && message) { - this.onbootstraperror(message, details); + if (this.onbootstraperror && error) { + this.onbootstraperror(error); } this.#bootstrapPromiseResolve(false); ===================================== toolkit/components/tor-launcher/TorControlPort.sys.mjs ===================================== @@ -311,10 +311,10 @@ class AsyncSocket { * @param {string} message The message to handle */ -class TorError extends Error { +class TorProtocolError extends Error { constructor(command, reply) { super(`${command} -> ${reply}`); - this.name = "TorError"; + this.name = "TorProtocolError"; const info = reply.match(/(?<code>\d{3})(?:\s(?<message>.+))?/); this.torStatusCode = info.groups.code; if (info.groups.message) { @@ -591,7 +591,7 @@ export class TorController { async #sendCommandSimple(command) { const reply = await this.#sendCommand(command); if (!/^250 OK\s*$/i.test(reply)) { - throw new TorError(command, reply); + throw new TorProtocolError(command, reply); } } @@ -672,7 +672,7 @@ export class TorController { reply.match(/^250-([^=]+)=(.*)$/m) || reply.match(/^250\+([^=]+)=\r?\n(.*?)\r?\n^\.\r?\n^250 OK\s*$/ms); if (!match || match[1] !== key) { - throw new TorError(cmd, reply); + throw new TorProtocolError(cmd, reply); } return match[2]; } @@ -784,7 +784,7 @@ export class TorController { TorParsers.unescapeString(m[1]) ); if (!values.length) { - throw new TorError(cmd, reply); + throw new TorProtocolError(cmd, reply); } return values; } @@ -896,7 +896,7 @@ export class TorController { const message = await this.#sendCommand(cmd); // Either `250-CLIENT`, or `250 OK` if no keys are available. if (!message.startsWith("250")) { - throw new TorError(cmd, message); + throw new TorProtocolError(cmd, message); } const re = /^250-CLIENT\s+(?<HSAddress>[A-Za-z2-7]+)\s+(?<KeyType>[^:]+):(?<PrivateKeyBlob>\S+)(?:\s(?<other>.+))?$/gim; @@ -936,7 +936,7 @@ export class TorController { const reply = await this.#sendCommand(cmd); const status = reply.substring(0, 3); if (status !== "250" && status !== "251" && status !== "252") { - throw new TorError(cmd, reply); + throw new TorProtocolError(cmd, reply); } } @@ -952,7 +952,7 @@ export class TorController { const reply = await this.#sendCommand(cmd); const status = reply.substring(0, 3); if (status !== "250" && status !== "251") { - throw new TorError(cmd, reply); + throw new TorProtocolError(cmd, reply); } } @@ -1085,6 +1085,7 @@ export class TorController { ); } const status = { + // Type is actually StatusSeverity in the specifications. TYPE: match[1], ...this.#getKeyValues(match[2]), }; ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -417,70 +417,6 @@ export const TorLauncherUtil = Object.freeze({ return aStringName; }, - // "torlauncher." is prepended to aStringName. - getFormattedLocalizedString(aStringName, aArray, aLen) { - if (!aStringName || !aArray) { - return aStringName; - } - try { - const key = kPropNamePrefix + aStringName; - return this._stringBundle.formatStringFromName(key, aArray, aLen); - } catch (e) {} - return aStringName; - }, - - getLocalizedBootstrapStatus(aStatusObj, aKeyword) { - if (!aStatusObj || !aKeyword) { - return ""; - } - - let result; - let fallbackStr; - if (aStatusObj[aKeyword]) { - let val = aStatusObj[aKeyword].toLowerCase(); - let key; - if (aKeyword === "TAG") { - // The bootstrap status tags in tagMap below are used by Tor - // versions prior to 0.4.0.x. We map each one to the tag that will - // produce the localized string that is the best fit. - const tagMap = { - conn_dir: "conn", - handshake_dir: "onehop_create", - conn_or: "enough_dirinfo", - handshake_or: "ap_conn", - }; - if (val in tagMap) { - val = tagMap[val]; - } - - key = "bootstrapStatus." + val; - fallbackStr = aStatusObj.SUMMARY; - } else if (aKeyword === "REASON") { - if (val === "connectreset") { - val = "connectrefused"; - } - - key = "bootstrapWarning." + val; - fallbackStr = aStatusObj.WARNING; - } - - result = TorLauncherUtil.getLocalizedString(key); - if (result === key) { - result = undefined; - } - } - - if (!result) { - result = fallbackStr; - } - - if (aKeyword === "REASON" && aStatusObj.HOSTADDR) { - result += " - " + aStatusObj.HOSTADDR; - } - - return result ? result : ""; - }, - /** * Determine what kind of SOCKS port has been requested for this session or * the browser has been configured for. ===================================== toolkit/components/tor-launcher/TorProcess.sys.mjs ===================================== @@ -193,54 +193,54 @@ export class TorProcess { #makeArgs() { this.#exeFile = lazy.TorLauncherUtil.getTorFile("tor", false); + if (!this.#exeFile) { + throw new Error("Could not find the tor binary."); + } const torrcFile = lazy.TorLauncherUtil.getTorFile("torrc", true); + if (!torrcFile) { + // FIXME: Is this still a fatal error? + throw new Error("Could not find the torrc."); + } // Get the Tor data directory first so it is created before we try to // construct paths to files that will be inside it. this.#dataDir = lazy.TorLauncherUtil.getTorFile("tordatadir", true); + if (!this.#dataDir) { + throw new Error("Could not find the tor data directory."); + } const onionAuthDir = lazy.TorLauncherUtil.getTorFile( "toronionauthdir", true ); - let detailsKey; - if (!this.#exeFile) { - detailsKey = "tor_missing"; - } else if (!torrcFile) { - detailsKey = "torrc_missing"; - } else if (!this.#dataDir) { - detailsKey = "datadir_missing"; - } else if (!onionAuthDir) { - detailsKey = "onionauthdir_missing"; - } - if (detailsKey) { - const details = lazy.TorLauncherUtil.getLocalizedString(detailsKey); - const key = "unable_to_start_tor"; - const err = lazy.TorLauncherUtil.getFormattedLocalizedString( - key, - [details], - 1 - ); - throw new Error(err); + if (!onionAuthDir) { + throw new Error("Could not find the tor onion authentication directory."); } + this.#args = []; + this.#args.push("-f", torrcFile.path); + this.#args.push("DataDirectory", this.#dataDir.path); + this.#args.push("ClientOnionAuthDir", onionAuthDir.path); + + // TODO: Create this starting from pt_config.json (tor-browser#42357). const torrcDefaultsFile = lazy.TorLauncherUtil.getTorFile( "torrc-defaults", false ); - // The geoip and geoip6 files are in the same directory as torrc-defaults. - const geoipFile = torrcDefaultsFile.clone(); - geoipFile.leafName = "geoip"; - const geoip6File = torrcDefaultsFile.clone(); - geoip6File.leafName = "geoip6"; - - this.#args = []; if (torrcDefaultsFile) { this.#args.push("--defaults-torrc", torrcDefaultsFile.path); + // The geoip and geoip6 files are in the same directory as torrc-defaults. + // TODO: Change TorFile to return the generic path to these files to make + // them independent from the torrc-defaults. + const geoipFile = torrcDefaultsFile.clone(); + geoipFile.leafName = "geoip"; + this.#args.push("GeoIPFile", geoipFile.path); + const geoip6File = torrcDefaultsFile.clone(); + geoip6File.leafName = "geoip6"; + this.#args.push("GeoIPv6File", geoip6File.path); + } else { + logger.warn( + "torrc-defaults was not found, some functionalities will be disabled." + ); } - this.#args.push("-f", torrcFile.path); - this.#args.push("DataDirectory", this.#dataDir.path); - this.#args.push("ClientOnionAuthDir", onionAuthDir.path); - this.#args.push("GeoIPFile", geoipFile.path); - this.#args.push("GeoIPv6File", geoip6File.path); } /** ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -911,6 +911,7 @@ export class TorProvider { * @param {object} status The status object */ onBootstrapStatus(status) { + logger.debug("Received bootstrap status update", status); this.#processBootstrapStatus(status, true); } @@ -939,6 +940,7 @@ export class TorProvider { this.#isBootstrapDone = false; + // Can TYPE ever be ERR for STATUS_CLIENT? if ( isNotification && statusObj.TYPE === "WARN" && @@ -959,20 +961,7 @@ export class TorProvider { } catch (e) { logger.warn(`Cannot set ${Preferences.PromptAtStartup}`, e); } - // TODO: Move l10n to the above layers? - const phase = TorLauncherUtil.getLocalizedBootstrapStatus(statusObj, "TAG"); - const reason = TorLauncherUtil.getLocalizedBootstrapStatus( - statusObj, - "REASON" - ); - const details = TorLauncherUtil.getFormattedLocalizedString( - "tor_bootstrap_failed_details", - [phase, reason], - 2 - ); - logger.error( - `Tor bootstrap error: [${statusObj.TAG}/${statusObj.REASON}] ${details}` - ); + logger.error("Tor bootstrap error", statusObj); if ( statusObj.TAG !== this.#lastWarning.phase || @@ -981,11 +970,19 @@ export class TorProvider { this.#lastWarning.phase = statusObj.TAG; this.#lastWarning.reason = statusObj.REASON; - const message = TorLauncherUtil.getLocalizedString( - "tor_bootstrap_failed" - ); + // FIXME: currently, this is observed only by TorBoostrapRequest. + // We should remove that class, and use an async method to do the + // bootstrap here. + // At that point, the lastWarning mechanism will probably not be necessary + // anymore, since the first error eligible for notification will as a + // matter of fact cancel the bootstrap. Services.obs.notifyObservers( - { message, details }, + { + phase: statusObj.TAG, + reason: statusObj.REASON, + summary: statusObj.SUMMARY, + warning: statusObj.WARNING, + }, TorProviderTopics.BootstrapError ); } ===================================== toolkit/components/torconnect/TorConnectParent.sys.mjs ===================================== @@ -37,10 +37,9 @@ export class TorConnectParent extends JSWindowActorParent { State: TorConnect.state, StateChanged: false, PreviousState: TorConnectState.Initial, - ErrorMessage: TorConnect.errorMessage, + ErrorCode: TorConnect.errorCode, ErrorDetails: TorConnect.errorDetails, BootstrapProgress: TorConnect.bootstrapProgress, - BootstrapStatus: TorConnect.bootstrapStatus, InternetStatus: TorConnect.internetStatus, DetectedLocation: TorConnect.detectedLocation, ShowViewLog: TorConnect.logHasWarningOrError, @@ -59,36 +58,36 @@ export class TorConnectParent extends JSWindowActorParent { this.state.QuickStartEnabled = false; } - // JSWindowActiveParent derived objects cannot observe directly, so create a member - // object to do our observing for us + // JSWindowActiveParent derived objects cannot observe directly, so create a + // member object to do our observing for us. // - // This object converts the various lifecycle events from the TorConnect module, and - // maintains a state object which we pass down to our about:torconnect page, which uses - // the state object to update its UI + // This object converts the various lifecycle events from the TorConnect + // module, and maintains a state object which we pass down to our + // about:torconnect page, which uses the state object to update its UI. this.torConnectObserver = { observe(aSubject, aTopic, aData) { let obj = aSubject?.wrappedJSObject; - // update our state struct based on received torconnect topics and forward on - // to aboutTorConnect.js + // Update our state struct based on received torconnect topics and + // forward on to aboutTorConnect.js. self.state.StateChanged = false; switch (aTopic) { case TorConnectTopics.StateChange: { self.state.PreviousState = self.state.State; self.state.State = obj.state; self.state.StateChanged = true; - - // clear any previous error information if we are bootstrapping + // Clear any previous error information if we are bootstrapping. if (self.state.State === TorConnectState.Bootstrapping) { - self.state.ErrorMessage = null; + self.state.ErrorCode = null; self.state.ErrorDetails = null; } + self.state.BootstrapProgress = TorConnect.bootstrapProgress; + self.state.ShowViewLog = TorConnect.logHasWarningOrError; self.state.HasEverFailed = TorConnect.hasEverFailed; break; } case TorConnectTopics.BootstrapProgress: { self.state.BootstrapProgress = obj.progress; - self.state.BootstrapStatus = obj.status; self.state.ShowViewLog = obj.hasWarnings; break; } @@ -96,9 +95,9 @@ export class TorConnectParent extends JSWindowActorParent { // noop break; } - case TorConnectTopics.BootstrapError: { - self.state.ErrorMessage = obj.message; - self.state.ErrorDetails = obj.details; + case TorConnectTopics.Error: { + self.state.ErrorCode = obj.code; + self.state.ErrorDetails = obj; self.state.InternetStatus = TorConnect.internetStatus; self.state.DetectedLocation = TorConnect.detectedLocation; self.state.ShowViewLog = true; @@ -134,7 +133,7 @@ export class TorConnectParent extends JSWindowActorParent { }, }; - // observe all of the torconnect:.* topics + // Observe all of the torconnect:.* topics. for (const key in TorConnectTopics) { const topic = TorConnectTopics[key]; Services.obs.addObserver(this.torConnectObserver, topic); @@ -158,7 +157,7 @@ export class TorConnectParent extends JSWindowActorParent { } willDestroy() { - // stop observing all of our torconnect:.* topics + // Stop observing all of our torconnect:.* topics. for (const key in TorConnectTopics) { const topic = TorConnectTopics[key]; Services.obs.removeObserver(this.torConnectObserver, topic); @@ -213,7 +212,8 @@ export class TorConnectParent extends JSWindowActorParent { Services.obs.notifyObservers(message.data, BroadcastTopic); break; case "torconnect:get-init-args": - // called on AboutTorConnect.init(), pass down all state data it needs to init + // Called on AboutTorConnect.init(), pass down all state data it needs + // to init. // pretend this is a state transition on init // so we always get fresh UI ===================================== toolkit/components/torconnect/content/aboutTorConnect.js ===================================== @@ -347,6 +347,59 @@ class AboutTorConnect { this.elements.breadcrumbContainer.classList.add("hidden"); } + getLocalizedStatus(status) { + const aliases = { + conn_dir: "conn", + handshake_dir: "onehop_create", + conn_or: "enough_dirinfo", + handshake_or: "ap_conn", + }; + if (status in aliases) { + status = aliases[status]; + } + return TorStrings.torConnect.bootstrapStatus[status] ?? status; + } + + getMaybeLocalizedError(state) { + if (!state?.ErrorCode) { + return ""; + } + switch (state.ErrorCode) { + case "Offline": + return TorStrings.torConnect.offline; + case "BootstrapError": { + const details = state.ErrorDetails?.cause; + if (!details?.phase || !details?.reason) { + return TorStrings.torConnect.torBootstrapFailed; + } + let status = this.getLocalizedStatus(details.phase); + const reason = + TorStrings.torConnect.bootstrapWarning[details.reason] ?? + details.reason; + return TorStrings.torConnect.bootstrapFailedDetails + .replace("%1$S", status) + .replace("%2$S", reason); + } + case "CannotDetermineCountry": + return TorStrings.torConnect.cannotDetermineCountry; + case "NoSettingsForCountry": + return TorStrings.torConnect.noSettingsForCountry; + case "AllSettingsFailed": + return TorStrings.torConnect.autoBootstrappingAllFailed; + case "ExternaError": + // A standard JS error, or something for which we do probably do not + // have a translation. Returning the original message is the best we can + // do. + return state.ErrorDetails.message; + default: + console.warn( + `Unknown error code: ${state.ErrorCode}`, + state.ErrorDetails + ); + return state.ErrorDetails?.message ?? state.ErrorCode; + } + } + /* These methods update the UI based on the current TorConnect state */ @@ -505,10 +558,10 @@ class AboutTorConnect { } } - showOffline(error) { + showOffline(state) { this.setTitle(TorStrings.torConnect.noInternet, "offline"); this.setLongText(TorStrings.torConnect.noInternetDescription); - this.setProgress(error, false); + this.setProgress(this.getMaybeLocalizedError(state), false); this.setBreadcrumbsStatus( BreadcrumbStatus.Default, BreadcrumbStatus.Active, @@ -524,7 +577,7 @@ class AboutTorConnect { showConnectionAssistant(state) { this.setTitle(TorStrings.torConnect.couldNotConnect, "assist"); this.showConfigureConnectionLink(TorStrings.torConnect.assistDescription); - this.setProgress(state?.ErrorDetails, false); + this.setProgress(this.getMaybeLocalizedError(state), false); this.setBreadcrumbsStatus( BreadcrumbStatus.Default, BreadcrumbStatus.Active, @@ -544,7 +597,7 @@ class AboutTorConnect { this.showConfigureConnectionLink( TorStrings.torConnect.errorLocationDescription ); - this.setProgress(state.ErrorMessage, false); + this.setProgress(TorStrings.torConnect.cannotDetermineCountry, false); this.setBreadcrumbsStatus( BreadcrumbStatus.Default, BreadcrumbStatus.Active, @@ -564,7 +617,7 @@ class AboutTorConnect { this.showConfigureConnectionLink( TorStrings.torConnect.isLocationCorrectDescription ); - this.setProgress(state.ErrorMessage, false); + this.setProgress(this.getMaybeLocalizedError(state), false); this.setBreadcrumbsStatus( BreadcrumbStatus.Default, BreadcrumbStatus.Default, @@ -582,7 +635,7 @@ class AboutTorConnect { showFinalError(state) { this.setTitle(TorStrings.torConnect.finalError, "final"); this.setLongText(TorStrings.torConnect.finalErrorDescription); - this.setProgress(state ? state.ErrorDetails : "", false); + this.setProgress(this.getMaybeLocalizedError(state), false); this.setBreadcrumbsStatus( BreadcrumbStatus.Default, BreadcrumbStatus.Default, @@ -666,7 +719,7 @@ class AboutTorConnect { } initElements(direction) { - const isAndroid = navigator.userAgent.indexOf("Android") !== -1; + const isAndroid = navigator.userAgent.includes("Android"); document.body.classList.toggle("android", isAndroid); document.documentElement.setAttribute("dir", direction); ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -29,10 +29,10 @@ const logger = new ConsoleAPI({ const EmittedEvents = Object.freeze({ settingsReady: "GeckoView:Tor:SettingsReady", settingsChanged: "GeckoView:Tor:SettingsChanged", - bootstrapStateChanged: "GeckoView:Tor:BootstrapStateChanged", + connectStateChanged: "GeckoView:Tor:ConnectStateChanged", + connectError: "GeckoView:Tor:ConnectError", bootstrapProgress: "GeckoView:Tor:BootstrapProgress", bootstrapComplete: "GeckoView:Tor:BootstrapComplete", - bootstrapError: "GeckoView:Tor:BootstrapError", torLogs: "GeckoView:Tor:Logs", }); @@ -98,15 +98,14 @@ class TorAndroidIntegrationImpl { break; case lazy.TorConnectTopics.StateChange: lazy.EventDispatcher.instance.sendRequest({ - type: EmittedEvents.bootstrapStateChanged, + type: EmittedEvents.connectStateChanged, state: subj.wrappedJSObject.state ?? "", }); break; case lazy.TorConnectTopics.BootstrapProgress: lazy.EventDispatcher.instance.sendRequest({ type: EmittedEvents.bootstrapProgress, - progress: subj.wrappedJSObject.progress ?? "", - status: subj.wrappedJSObject.status ?? 0, + progress: subj.wrappedJSObject.progress ?? 0, hasWarnings: subj.wrappedJSObject.hasWarnings ?? false, }); break; @@ -115,11 +114,13 @@ class TorAndroidIntegrationImpl { type: EmittedEvents.bootstrapComplete, }); break; - case lazy.TorConnectTopics.BootstrapError: + case lazy.TorConnectTopics.Error: lazy.EventDispatcher.instance.sendRequest({ - type: EmittedEvents.bootstrapError, + type: EmittedEvents.connectError, + code: subj.wrappedJSObject.code ?? "", message: subj.wrappedJSObject.message ?? "", - details: subj.wrappedJSObject.details ?? "", + phase: subj.wrappedJSObject.cause?.phase ?? "", + reason: subj.wrappedJSObject.cause?.reason ?? "", }); break; case lazy.TorProviderTopics.TorLog: ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs"; const lazy = {}; @@ -13,6 +12,9 @@ ChromeUtils.defineESModuleGetters(lazy, { MoatRPC: "resource://gre/modules/Moat.sys.mjs", TorBootstrapRequest: "resource://gre/modules/TorBootstrapRequest.sys.mjs", TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", + TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs", + TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs", + TorSettings: "resource://gre/modules/TorSettings.sys.mjs", }); // TODO: Should we move this to the about:torconnect actor? @@ -22,16 +24,6 @@ ChromeUtils.defineModuleGetter( "resource:///modules/BrowserWindowTracker.jsm" ); -import { TorLauncherUtil } from "resource://gre/modules/TorLauncherUtil.sys.mjs"; -import { TorSettings } from "resource://gre/modules/TorSettings.sys.mjs"; - -import { TorStrings } from "resource://gre/modules/TorStrings.sys.mjs"; - -const TorTopics = Object.freeze({ - LogHasWarnOrErr: "TorLogHasWarnOrErr", - ProcessExited: "TorProcessExited", -}); - /* Relevant prefs used by tor-launcher */ const TorLauncherPrefs = Object.freeze({ prompt_at_startup: "extensions.torlauncher.prompt_at_startup", @@ -60,7 +52,23 @@ export const TorConnectState = Object.freeze({ Disabled: "Disabled", }); -XPCOMUtils.defineLazyGetter( +export class TorConnectError extends Error { + static Offline = "Offline"; + static BootstrapError = "BootstrapError"; + static CannotDetermineCountry = "CannotDetermineCountry"; + static NoSettingsForCountry = "NoSettingsForCountry"; + static AllSettingsFailed = "AllSettingsFailed"; + static ExternalError = "ExternalError"; + + constructor(code, cause) { + super(cause?.message ?? `TorConnectError: ${code}`, cause ? { cause } : {}); + this.name = "TorConnectError"; + this.code = code; + } +} +Object.freeze(TorConnectError); + +ChromeUtils.defineLazyGetter( lazy, "logger", () => @@ -122,7 +130,7 @@ export const TorConnectTopics = Object.freeze({ StateChange: "torconnect:state-change", BootstrapProgress: "torconnect:bootstrap-progress", BootstrapComplete: "torconnect:bootstrap-complete", - BootstrapError: "torconnect:bootstrap-error", + Error: "torconnect:error", }); // The StateCallback is the base class to implement the various states. @@ -173,7 +181,7 @@ class StateCallback { `${this.#state}'s run threw, transitioning to the Error state.`, err ); - this.changeState(TorConnectState.Error, err?.message, err?.details); + this.changeState(TorConnectState.Error, err); } } @@ -263,14 +271,13 @@ class ConfiguringState extends StateCallback { } run() { - // The configuring state does not do anything. + TorConnect._bootstrapProgress = 0; } } class BootstrappingState extends StateCallback { #bootstrap = null; - #bootstrapError = ""; - #bootstrapErrorDetails = ""; + #bootstrapError = null; #internetTest = null; #cancelled = false; @@ -291,13 +298,13 @@ class BootstrappingState extends StateCallback { this.#bootstrap = new lazy.TorBootstrapRequest(); this.#bootstrap.onbootstrapstatus = (progress, status) => { - TorConnect._updateBootstrapStatus(progress, status); + TorConnect._updateBootstrapProgress(progress, status); }; this.#bootstrap.onbootstrapcomplete = () => { this.#internetTest.cancel(); this.changeState(TorConnectState.Bootstrapped); }; - this.#bootstrap.onbootstraperror = (message, details) => { + this.#bootstrap.onbootstraperror = error => { if (this.#cancelled) { // We ignore this error since it occurred after cancelling (by the // user). We assume the error is just a side effect of the cancelling. @@ -305,13 +312,12 @@ class BootstrappingState extends StateCallback { // "Building circuits: Establishing a Tor circuit failed". // TODO: Maybe move this logic deeper in the process to know when to // filter out such errors triggered by cancelling. - lazy.logger.warn(`Post-cancel error => ${message}; ${details}`); + lazy.logger.warn("Post-cancel error.", error); return; } // We have to wait for the Internet test to finish before sending the // bootstrap error - this.#bootstrapError = message; - this.#bootstrapErrorDetails = details; + this.#bootstrapError = error; this.#maybeTransitionToError(); }; @@ -352,22 +358,23 @@ class BootstrappingState extends StateCallback { // Do not transition to the offline error until we are sure that also the // bootstrap failed, in case Moat is down but the bootstrap can proceed // anyway. - if (this.#bootstrapError === "") { + if (!this.#bootstrapError) { return; } if (this.#internetTest.status === InternetStatus.Offline) { this.changeState( TorConnectState.Error, - TorStrings.torConnect.offline, - "" + new TorConnectError(TorConnectError.Offline) ); } else { // Give priority to the bootstrap error, in case the Internet test fails TorConnect._hasBootstrapEverFailed = true; this.changeState( TorConnectState.Error, - this.#bootstrapError, - this.#bootstrapErrorDetails + new TorConnectError( + TorConnectError.BootstrapError, + this.#bootstrapError + ) ); } } @@ -393,10 +400,12 @@ class BootstrappingState extends StateCallback { TorConnect._detectedLocation = codes[Math.floor(Math.random() * codes.length)]; } + const err = new Error("Censorship simulation"); + err.phase = "conn"; + err.reason = "noroute"; this.changeState( TorConnectState.Error, - "Bootstrap failed (for debugging purposes)", - "Error: Censorship simulation" + new TorConnectError(TorConnectError.BootstrapError, err) ); return true; } @@ -461,8 +470,7 @@ class AutoBootstrappingState extends StateCallback { if (!this.transitioning) { this.changeState( TorConnectState.Error, - "Error: censorship simulation", - "" + new TorConnectError(TorConnectError.AllSettingsFailed) ); } return true; @@ -475,8 +483,7 @@ class AutoBootstrappingState extends StateCallback { if (!this.transitioning) { this.changeState( TorConnectState.Error, - "Error: Severe Censorship simulation", - "" + new TorConnectError(TorConnectError.CannotDetermineCountry) ); } return true; @@ -507,7 +514,7 @@ class AutoBootstrappingState extends StateCallback { // them. const maybeSettings = await Promise.race([ this.#moat.circumvention_settings( - [...TorSettings.builtinBridgeTypes, "vanilla"], + [...lazy.TorSettings.builtinBridgeTypes, "vanilla"], countryCode ), // This might set maybeSettings to undefined. @@ -523,7 +530,7 @@ class AutoBootstrappingState extends StateCallback { // Keep consistency with the other call. this.#settings = await Promise.race([ this.#moat.circumvention_defaults([ - ...TorSettings.builtinBridgeTypes, + ...lazy.TorSettings.builtinBridgeTypes, "vanilla", ]), // This might set this.#settings to undefined. @@ -532,22 +539,12 @@ class AutoBootstrappingState extends StateCallback { } if (!this.#settings?.length && !this.transitioning) { - // Both localized and fallback have, we can just throw to transition to - // the error state (but only if we aren't already transitioning). - // TODO: Let the UI layer localize the strings. - if (!TorConnect._detectedLocation) { // unable to determine country - this.#throwError( - TorStrings.torConnect.autoBootstrappingFailed, - TorStrings.torConnect.cannotDetermineCountry - ); + throw new TorConnectError(TorConnectError.CannotDetermineCountry); } else { // no settings available for country - this.#throwError( - TorStrings.torConnect.autoBootstrappingFailed, - TorStrings.torConnect.noSettingsForCountry - ); + throw new TorConnectError(TorConnectError.NoSettingsForCountry); } } } @@ -585,17 +582,17 @@ class AutoBootstrappingState extends StateCallback { // We need to merge with old settings, in case the user is using a proxy // or is behind a firewall. await provider.writeSettings({ - ...TorSettings.getSettings(), + ...lazy.TorSettings.getSettings(), ...currentSetting, }); // Build out our bootstrap request. const bootstrap = new lazy.TorBootstrapRequest(); bootstrap.onbootstrapstatus = (progress, status) => { - TorConnect._updateBootstrapStatus(progress, status); + TorConnect._updateBootstrapProgress(progress, status); }; - bootstrap.onbootstraperror = (message, details) => { - lazy.logger.error(`Auto-Bootstrap error => ${message}; ${details}`); + bootstrap.onbootstraperror = error => { + lazy.logger.error("Auto-Bootstrap error", error); }; // Begin the bootstrap. @@ -620,14 +617,14 @@ class AutoBootstrappingState extends StateCallback { } if (success) { // Persist the current settings to preferences. - TorSettings.setSettings(currentSetting); - TorSettings.saveToPrefs(); + lazy.TorSettings.setSettings(currentSetting); + lazy.TorSettings.saveToPrefs(); // Do not await `applySettings`. Otherwise this opens up a window of // time where the user can still "Cancel" the bootstrap. // We are calling `applySettings` just to be on the safe side, but the // settings we are passing now should be exactly the same we already // passed earlier. - TorSettings.applySettings().catch(e => + lazy.TorSettings.applySettings().catch(e => lazy.logger.error("TorSettings.applySettings threw unexpectedly.", e) ); this.changeState(TorConnectState.Bootstrapped); @@ -638,19 +635,10 @@ class AutoBootstrappingState extends StateCallback { // Only explicitly change state here if something else has not transitioned // us. if (!this.transitioning) { - this.#throwError( - TorStrings.torConnect.autoBootstrappingFailed, - TorStrings.torConnect.autoBootstrappingAllFailed - ); + throw new TorConnectError(TorConnectError.AllSettingsFailed); } } - #throwError(message, details) { - let err = new Error(message); - err.details = details; - throw err; - } - transitionRequested() { this.#transitionResolve(); } @@ -662,7 +650,7 @@ class AutoBootstrappingState extends StateCallback { if (this.#changedSettings && nextState !== TorConnectState.Bootstrapped) { try { - await TorSettings.applySettings(); + await lazy.TorSettings.applySettings(); } catch (e) { // We cannot do much if the original settings were bad or // if the connection closed, so just report it in the @@ -698,17 +686,15 @@ class ErrorState extends StateCallback { ErrorState.#hasEverHappened = true; } - run(errorMessage, errorDetails) { - TorConnect._errorMessage = errorMessage; - TorConnect._errorDetails = errorDetails; - lazy.logger.error( - `Entering error state (${errorMessage}, ${errorDetails})` - ); + run(error) { + if (!(error instanceof TorConnectError)) { + error = new TorConnectError(TorConnectError.ExternalError, error); + } + TorConnect._errorCode = error.code; + TorConnect._errorDetails = error; + lazy.logger.error(`Entering error state (${error.code})`, error); - Services.obs.notifyObservers( - { message: errorMessage, details: errorDetails }, - TorConnectTopics.BootstrapError - ); + Services.obs.notifyObservers(error, TorConnectTopics.Error); this.changeState(TorConnectState.Configuring); } @@ -835,7 +821,6 @@ class InternetTest { export const TorConnect = { _stateHandler: new InitialState(), _bootstrapProgress: 0, - _bootstrapStatus: null, _internetStatus: InternetStatus.Unknown, // list of country codes Moat has settings for _countryCodes: [], @@ -851,7 +836,7 @@ export const TorConnect = { })() ), _detectedLocation: "", - _errorMessage: null, + _errorCode: null, _errorDetails: null, _logHasWarningOrError: false, _hasBootstrapEverFailed: false, @@ -925,17 +910,15 @@ export const TorConnect = { this._stateHandler.begin(...args); }, - _updateBootstrapStatus(progress, status) { + _updateBootstrapProgress(progress, status) { this._bootstrapProgress = progress; - this._bootstrapStatus = status; lazy.logger.info( - `Bootstrapping ${this._bootstrapProgress}% complete (${this._bootstrapStatus})` + `Bootstrapping ${this._bootstrapProgress}% complete (${status})` ); Services.obs.notifyObservers( { progress: TorConnect._bootstrapProgress, - status: TorConnect._bootstrapStatus, hasWarnings: TorConnect._logHasWarningOrError, }, TorConnectTopics.BootstrapProgress @@ -964,11 +947,13 @@ export const TorConnect = { // So, we prefer initializing TorConnect as soon as possible, so that // the UI will be able to detect it is in the Initializing state and act // consequently. - TorSettings.initializedPromise.then(() => this._settingsInitialized()); + lazy.TorSettings.initializedPromise.then(() => + this._settingsInitialized() + ); // register the Tor topics we always care about - observeTopic(TorTopics.ProcessExited); - observeTopic(TorTopics.LogHasWarnOrErr); + observeTopic(lazy.TorProviderTopics.ProcessExited); + observeTopic(lazy.TorProviderTopics.HasWarnOrErr); } }, @@ -976,11 +961,11 @@ export const TorConnect = { lazy.logger.debug(`Observed ${topic}`); switch (topic) { - case TorTopics.LogHasWarnOrErr: { + case lazy.TorProviderTopics.HasWarnOrErr: { this._logHasWarningOrError = true; break; } - case TorTopics.ProcessExited: { + case lazy.TorProviderTopics.ProcessExited: { // Treat a failure as a possibly broken configuration. // So, prevent quickstart at the next start. Services.prefs.setBoolPref(TorLauncherPrefs.prompt_at_startup, true); @@ -1048,7 +1033,7 @@ export const TorConnect = { // FIXME: This is called before the TorProvider is ready. // As a matter of fact, at the moment it is equivalent to the following // line, but this might become a problem in the future. - return TorLauncherUtil.shouldStartAndOwnTor; + return lazy.TorLauncherUtil.shouldStartAndOwnTor; }, get shouldShowTorConnect() { @@ -1089,7 +1074,7 @@ export const TorConnect = { get shouldQuickStart() { // quickstart must be enabled return ( - TorSettings.quickstart.enabled && + lazy.TorSettings.quickstart.enabled && // and the previous bootstrap attempt must have succeeded !Services.prefs.getBoolPref(TorLauncherPrefs.prompt_at_startup, true) ); @@ -1103,10 +1088,6 @@ export const TorConnect = { return this._bootstrapProgress; }, - get bootstrapStatus() { - return this._bootstrapStatus; - }, - get internetStatus() { return this._internetStatus; }, @@ -1123,8 +1104,8 @@ export const TorConnect = { return this._detectedLocation; }, - get errorMessage() { - return this._errorMessage; + get errorCode() { + return this._errorCode; }, get errorDetails() { @@ -1195,7 +1176,7 @@ export const TorConnect = { Further external commands and helper methods */ openTorPreferences() { - if (TorLauncherUtil.isAndroid) { + if (lazy.TorLauncherUtil.isAndroid) { lazy.EventDispatcher.instance.sendRequest({ type: "GeckoView:Tor:OpenSettings", }); ===================================== toolkit/modules/TorStrings.sys.mjs ===================================== @@ -51,11 +51,11 @@ class TorPropertyStringBundle { return `$(${key})`; } - getStrings(strings) { + getStrings(strings, additionalPrefix = "") { return Object.fromEntries( Object.entries(strings).map(([key, fallback]) => [ key, - this.getString(key, fallback), + this.getString(additionalPrefix + key, fallback), ]) ); } @@ -143,7 +143,7 @@ const Loader = { frequentLocations: "Frequently selected locations", otherLocations: "Other locations", - // TorConnect.jsm error messages + // TorConnect error messages offline: "Internet not reachable", autoBootstrappingFailed: "Automatic configuration failed", autoBootstrappingAllFailed: "None of the configurations we tried worked", @@ -158,11 +158,67 @@ const Loader = { titlebarStatusConnected: "Connected", }; + // Some strings were used through TorLauncherUtils. + // However, we need to use them in about:torconnect, which cannot access + // privileged code. + const bootstrapStatus = { + starting: "Starting", + conn_pt: "Connecting to bridge", + conn_done_pt: "Connected to bridge", + conn_proxy: "Connecting to proxy", + conn_done_proxy: "Connected to proxy", + conn: "Connecting to a Tor relay", + conn_done: "Connected to a Tor relay", + handshake: "Negotiating with a Tor relay", + handshake_done: "Finished negotiating with a Tor relay", + onehop_create: "Establishing an encrypted directory connection", + requesting_status: "Retrieving network status", + loading_status: "Loading network status", + loading_keys: "Loading authority certificates", + requesting_descriptors: "Requesting relay information", + loading_descriptors: "Loading relay information", + enough_dirinfo: "Finished loading relay information", + ap_conn_pt: "Building circuits: Connecting to bridge", + ap_conn_done_pt: "Building circuits: Connected to bridge", + ap_conn_proxy: "Building circuits: Connecting to proxy", + ap_conn_done_proxy: "Building circuits: Connected to proxy", + ap_conn: "Building circuits: Connecting to a Tor relay", + ap_conn_done: "Building circuits: Connected to a Tor relay", + ap_handshake: "Building circuits: Negotiating with a Tor relay", + ap_handshake_done: + "Building circuits: Finished negotiating with a Tor relay", + circuit_create: "Building circuits: Establishing a Tor circuit", + done: "Connected to the Tor network!", + }; + const bootstrapWarning = { + done: "done", + connectrefused: "connection refused", + misc: "miscellaneous", + resourcelimit: "insufficient resources", + identity: "identity mismatch", + timeout: "connection timeout", + noroute: "no route to host", + ioerror: "read/write error", + pt_missing: "missing pluggable transport", + }; + const tsb = new TorPropertyStringBundle( "chrome://torbutton/locale/torConnect.properties", "torConnect." ); - return tsb.getStrings(strings); + const tlsb = new TorPropertyStringBundle( + "chrome://torbutton/locale/torlauncher.properties", + "torlauncher." + ); + return { + ...tsb.getStrings(strings), + bootstrapFailedDetails: tlsb.getString( + "tor_bootstrap_failed_details", + "%1$S failed (%2$S)." + ), + bootstrapStatus: tlsb.getStrings(bootstrapStatus, "bootstrapStatus."), + bootstrapWarning: tlsb.getStrings(bootstrapWarning, "bootstrapWarning."), + }; }, /* ===================================== toolkit/torbutton/chrome/locale/en-US/torlauncher.properties ===================================== @@ -4,20 +4,15 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. torlauncher.error_title=Tor Launcher - torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, Tor Browser will not be able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.restart_tor=Restart Tor -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. + +# Translation note: %1$S is a bootstrap phase from torlauncher.bootstrapStatus, +# %2$S is the error from torlauncher.bootstrapWarning +torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.bootstrapStatus.starting=Starting torlauncher.bootstrapStatus.conn_pt=Connecting to bridge View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/89a5a7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/89a5a7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] 2 commits: fixup! Enable the connect assist experiments on alpha
by Pier Angelo Vendrame (＠pierov) 15 Apr '24

15 Apr '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 4a8875f4 by Pier Angelo Vendrame at 2024-04-09T20:09:45+02:00 fixup! Enable the connect assist experiments on alpha Bug 42479: Improve TorConnect error handling Updated the prototype of onBootstrapError. - - - - - c2db7c96 by Pier Angelo Vendrame at 2024-04-11T10:58:42+02:00 fixup! Add Tor integration and UI Bug 42479: Improve TorConnect error handling Updated the prototype of onBootstrapError. - - - - - 3 changed files: - fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -1383,12 +1383,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn } override fun onBootstrapStateChange(state: String) = Unit - override fun onBootstrapProgress(progress: Double, status: String, hasWarnings: Boolean) = Unit + override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) = Unit override fun onBootstrapComplete() { components.useCases.tabsUseCases.removeAllTabs() navHost.navController.navigate(NavGraphDirections.actionStartupHome()) } - override fun onBootstrapError(message: String, details: String) = Unit + override fun onBootstrapError(code: String?, message: String?, phase: String?, reason: String?) = Unit override fun onSettingsRequested() { navHost.navController.navigate(NavGraphDirections.actionGlobalSettingsFragment()) } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -14,7 +14,9 @@ interface TorEvents { } class TorError( var message: String, - var details: String + var details: String, + var phase: String, + var reason: String, ) { } interface TorLogs { ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -301,8 +301,8 @@ class TorControllerGV( } // TorEventsBootstrapStateChangeListener - override fun onBootstrapProgress(progress: Double, status: String?, hasWarnings: Boolean) { - Log.d(TAG, "onBootstrapProgress($progress, $status, $hasWarnings)") + override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) { + Log.d(TAG, "onBootstrapProgress($progress, $hasWarnings)") if (progress == 100.0) { lastKnownStatus = TorConnectState.Bootstrapped wasTorBootstrapped = true @@ -312,7 +312,7 @@ class TorControllerGV( onTorConnecting() } - onTorStatusUpdate(status, lastKnownStatus.toTorStatus().status, progress) + onTorStatusUpdate("", lastKnownStatus.toTorStatus().status, progress) } // TorEventsBootstrapStateChangeListener @@ -322,8 +322,8 @@ class TorControllerGV( } // TorEventsBootstrapStateChangeListener - override fun onBootstrapError(message: String?, details: String?) { - lastKnownError = TorError(message ?: "", details ?: "") + override fun onBootstrapError(code: String?, message: String?, phase: String?, reason: String?) { + lastKnownError = TorError(code ?: "", message ?: "", phase ?: "", reason ?: "") onBootstrapStateChange(TorConnectState.Error.state) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/7e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/7e… 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 41122: Add var/browser_release_date
by boklm (＠boklm) 15 Apr '24

15 Apr '24

boklm pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: ebea2eb3 by Nicolas Vigier at 2024-04-15T17:17:44+02:00 Bug 41122: Add var/browser_release_date Add a release date, and use it for MOZ_BUILD_DATE, and as timestamp on files in projects/browser. For nightly we use a release date based on the version number. - - - - - 2 changed files: - projects/browser/config - rbm.conf Changes: ===================================== projects/browser/config ===================================== @@ -1,6 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("var/torbrowser_version") %]' filename: '[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +timestamp: '[% c("var/browser_release_date_timestamp") %]' container: use_container: 1 ===================================== rbm.conf ===================================== @@ -80,6 +80,8 @@ var: - '13.0.12' - '[% IF c("var/tor-browser") %]13.0.11[% END %]' - '[% IF c("var/mullvad-browser") %]13.0.10[% END %]' + browser_release_date: '2024/03/28 01:02:03' + browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' @@ -204,7 +206,8 @@ var: [% END -%] DOCSDIR_project: '[% project %]' - set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var_p/MOZ_BUILD_DATE") %]' + set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var/MOZ_BUILD_DATE") %]' + MOZ_BUILD_DATE: '[% USE date; date.format(c("var/browser_release_date"), "%Y%m%d%H%M%S") %]' # var/essential_deps is the same as var/deps, except that we never # redefine it in projects config. This is for the packages we want to @@ -246,6 +249,14 @@ targets: GET c("var_p/nightly_torbrowser_version"); END; -%] + browser_release_date: | + [% + IF (matches = c("var/torbrowser_version").match('^tbb-nightly\.(\d\d\d\d)\.(\d\d)\.(\d\d)$')); + GET matches.0 _ "/" _ matches.1 _ "/" _ matches.2 _ " 01:01:01"; + ELSE; + GET "2000/01/01 01:01:01"; + END + -%] max_torbrowser_incremental_from: 2 build_infos_json: 1 @@ -725,31 +736,5 @@ gpg_allow_expired_keys: 1 } return [@res]; }, - MOZ_BUILD_DATE => sub { - use POSIX qw(strftime); - my ($project, $options) = @_; - my $nightly = project_config($project, 'var/nightly', $options); - my $testbuild = project_config($project, 'var/testbuild', $options); - - if ($nightly && !$testbuild) { - my $torbrowser_version = project_config($project, 'var/torbrowser_version', $options); - return sprintf("%d%02d%02d000001", $1, $2, $3) - if $torbrowser_version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/; - return strftime("%Y%m%d000001", gmtime); - } - - my $timestamp = project_config($project, 'timestamp', $options); - if (!$nightly) { - my $torbrowser_version = project_config($project, 'var/torbrowser_version', $options); - my @n = reverse split /[\.\D]/, $torbrowser_version; - my $i = 1; - unshift @n, 0 if @n < 3; - for my $n (@n) { - $timestamp += $n * $i; - $i = $i * 10; - } - } - return strftime "%Y%m%d%H%M%S", gmtime($timestamp); - }, }, ) 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/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Bug 41803: Add some developer tools for working on tor-browser.
by ma1 (＠ma1) 15 Apr '24

15 Apr '24

ma1 pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 89a5a7fd by hackademix at 2024-04-15T11:52:47+02:00 fixup! Bug 41803: Add some developer tools for working on tor-browser. Bug 42516: Make tb-dev worktree-compatible - - - - - 1 changed file: - tools/torbrowser/tb-dev Changes: ===================================== tools/torbrowser/tb-dev ===================================== @@ -57,10 +57,12 @@ def get_local_root(): global local_root if local_root is None: try: + # Make sure we have a matching remote in this git repository. Should raise Exception if we don't. + get_upstream_name() git_root = git_get(["rev-parse", "--show-toplevel"])[0] - except subprocess.CalledProcessError: + except Exception: git_root = None - if git_root is None or os.path.basename(git_root) != "tor-browser": + if git_root is None: local_root = "" else: local_root = git_root View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/89a5a7f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/89a5a7f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41122: Add var/browser_release_date
by boklm (＠boklm) 12 Apr '24

12 Apr '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b1ae0065 by Nicolas Vigier at 2024-04-12T21:11:31+02:00 Bug 41122: Add var/browser_release_date Add a release date, and use it for MOZ_BUILD_DATE, and as timestamp on files in projects/browser. For nightly we use a release date based on the version number. - - - - - 4 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md - projects/browser/config - rbm.conf Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -39,6 +39,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)` + - [ ] `var/browser_release_date` : update to build date - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -38,6 +38,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` + - [ ] `var/browser_release_date` : update to build date - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail ===================================== projects/browser/config ===================================== @@ -1,6 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("var/torbrowser_version") %]' filename: '[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +timestamp: '[% c("var/browser_release_date_timestamp") %]' container: use_container: 1 ===================================== rbm.conf ===================================== @@ -79,6 +79,8 @@ var: - '13.5a5' - '13.5a4' - '13.5a3' + browser_release_date: '2024/03/28 01:02:03' + browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' @@ -206,7 +208,8 @@ var: [% END -%] DOCSDIR_project: '[% project %]' - set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var_p/MOZ_BUILD_DATE") %]' + set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var/MOZ_BUILD_DATE") %]' + MOZ_BUILD_DATE: '[% USE date; date.format(c("var/browser_release_date"), "%Y%m%d%H%M%S") %]' # var/essential_deps is the same as var/deps, except that we never # redefine it in projects config. This is for the packages we want to @@ -248,6 +251,14 @@ targets: GET c("var_p/nightly_torbrowser_version"); END; -%] + browser_release_date: | + [% + IF (matches = c("var/torbrowser_version").match('^tbb-nightly\.(\d\d\d\d)\.(\d\d)\.(\d\d)$')); + GET matches.0 _ "/" _ matches.1 _ "/" _ matches.2 _ " 01:01:01"; + ELSE; + GET "2000/01/01 01:01:01"; + END + -%] max_torbrowser_incremental_from: 2 build_infos_json: 1 @@ -727,31 +738,5 @@ gpg_allow_expired_keys: 1 } return [@res]; }, - MOZ_BUILD_DATE => sub { - use POSIX qw(strftime); - my ($project, $options) = @_; - my $nightly = project_config($project, 'var/nightly', $options); - my $testbuild = project_config($project, 'var/testbuild', $options); - - if ($nightly && !$testbuild) { - my $torbrowser_version = project_config($project, 'var/torbrowser_version', $options); - return sprintf("%d%02d%02d000001", $1, $2, $3) - if $torbrowser_version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/; - return strftime("%Y%m%d000001", gmtime); - } - - my $timestamp = project_config($project, 'timestamp', $options); - if (!$nightly) { - my $torbrowser_version = project_config($project, 'var/torbrowser_version', $options); - my @n = reverse split /[\.\D]/, $torbrowser_version; - my $i = 1; - unshift @n, 0 if @n < 3; - for my $n (@n) { - $timestamp += $n * $i; - $i = $i * 10; - } - } - return strftime "%Y%m%d%H%M%S", gmtime($timestamp); - }, }, ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] release: new version, 13.0.14
by richard (＠richard) 11 Apr '24

11 Apr '24

richard pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: bf3de224 by Richard Pospesel at 2024-04-11T17:12:40+00:00 release: new version, 13.0.14 - - - - - 29 changed files: - update_1/release/.htaccess - − update_1/release/13.0.10-13.0.13-linux-x86_64-ALL.xml - − update_1/release/13.0.10-13.0.13-macos-ALL.xml - − update_1/release/13.0.10-13.0.13-windows-x86_64-ALL.xml - + update_1/release/13.0.10-13.0.14-linux-x86_64-ALL.xml - + update_1/release/13.0.10-13.0.14-macos-ALL.xml - + update_1/release/13.0.10-13.0.14-windows-x86_64-ALL.xml - − update_1/release/13.0.12-13.0.13-linux-x86_64-ALL.xml - − update_1/release/13.0.12-13.0.13-macos-ALL.xml - − update_1/release/13.0.12-13.0.13-windows-x86_64-ALL.xml - + update_1/release/13.0.12-13.0.14-linux-x86_64-ALL.xml - + update_1/release/13.0.12-13.0.14-macos-ALL.xml - + update_1/release/13.0.12-13.0.14-windows-x86_64-ALL.xml - + update_1/release/13.0.13-13.0.14-linux-x86_64-ALL.xml - + update_1/release/13.0.13-13.0.14-macos-ALL.xml - + update_1/release/13.0.13-13.0.14-windows-x86_64-ALL.xml - − update_1/release/13.0.13-linux-x86_64-ALL.xml - − update_1/release/13.0.13-macos-ALL.xml - − update_1/release/13.0.13-windows-x86_64-ALL.xml - + update_1/release/13.0.14-linux-x86_64-ALL.xml - + update_1/release/13.0.14-macos-ALL.xml - + update_1/release/13.0.14-windows-x86_64-ALL.xml - − update_1/release/13.0.9-13.0.13-linux-x86_64-ALL.xml - − update_1/release/13.0.9-13.0.13-macos-ALL.xml - − update_1/release/13.0.9-13.0.13-windows-x86_64-ALL.xml - update_1/release/download-linux-x86_64.json - update_1/release/download-macos.json - update_1/release/download-windows-x86_64.json - update_1/release/downloads.json Changes: ===================================== update_1/release/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/13.0.13/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0.10/ALL 13.0.10-13.0.13-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0.12/ALL 13.0.12-13.0.13-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.0.9/ALL 13.0.9-13.0.13-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.0.13-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 13.0.13-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0.10/ALL 13.0.10-13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0.12/ALL 13.0.12-13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.0.9/ALL 13.0.9-13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0.10/ALL 13.0.10-13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0.12/ALL 13.0.12-13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.0.9/ALL 13.0.9-13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.0.13-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 13.0.13-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.10/ALL 13.0.10-13.0.13-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.12/ALL 13.0.12-13.0.13-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.9/ALL 13.0.9-13.0.13-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.0.13-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.0.13-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/13.0.14/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.0.10/ALL 13.0.10-13.0.14-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.0.12/ALL 13.0.12-13.0.14-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.0.13/ALL 13.0.13-13.0.14-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.0.14-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.0.14-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.0.10/ALL 13.0.10-13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.0.12/ALL 13.0.12-13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.0.13/ALL 13.0.13-13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.0.10/ALL 13.0.10-13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.0.12/ALL 13.0.12-13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.0.13/ALL 13.0.13-13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.0.14-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.0.14-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.10/ALL 13.0.10-13.0.14-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.12/ALL 13.0.12-13.0.14-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.0.13/ALL 13.0.13-13.0.14-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.0.14-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.0.14-windows-x86_64-ALL.xml [last] ===================================== update_1/release/13.0.10-13.0.13-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64-13.0.1…" hashFunction="SHA512" hashValue="04cad7d72b90b41fcca52e05cb4c5904d6516669a32772c498e0b0bb2803ce10e1458ff76d4acfd5a3d9146d8673b258a74c45ca978eb09ea7dcf37c1c2e5238" size="107414411" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64--13.0.…" hashFunction="SHA512" hashValue="44124453ad5e941790fa865442479ec425373e148a23e7a0f90b494d9e32e623d99c91fbbe942bb3633016663347593962ce7c2a51a5a69eee30433302f42d19" size="7912308" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.10-13.0.13-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos-13.0.13_ALL.m…" hashFunction="SHA512" hashValue="7afaca7077a1f968705fcf1094d16a1b441befcbd2de342654ca78d6ba7cc631622493afd3e71984839283aa37abc66c92021dfee8ecdfd345019a549a220ffb" size="115471199" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos--13.0.10-13.0…" hashFunction="SHA512" hashValue="9fa955c4ac58cb215cfb783284dca39fbbaab7dcebf9f58ca7e4884ffeb03c102abf97c07c7b7adf60c5d69180529afb48f1a9ca5237d42cb3866c7131a6d687" size="12184147" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.10-13.0.13-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64-13.0…" hashFunction="SHA512" hashValue="c6aea6ab8c33c4c58bd3a5783db1c7ed4682706e09a239b6ac61b6e28f783ae785891b88374caecbeb49dd388853f090e09a0ff84540de69dcccc065fa6abdbe" size="89393168" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64--13.…" hashFunction="SHA512" hashValue="879e5c052f493485631911ae8b95dcd259c376a43d25ea5e502e2bf3db6e4e66162704d73d0597e85a1433c04fc1d464d64dd4da30b91ce9d77729729d0e931c" size="8623995" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.10-13.0.14-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64-13.0.1…" hashFunction="SHA512" hashValue="40fda8d5eb0ddd6b5e516e686ba88f7ea57fb7b7c70868ca11f19b198911eb83acab8057f7cd2b107be46e5ab60dac8ac3e8df7f10f37d7309767830defb2f42" size="107492923" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64--13.0.…" hashFunction="SHA512" hashValue="ebeaebec06f3cf9f075524b43167b2d5ea69d8e3137763212a2ed3b96ee91d46e08edb62ac6ad3c075e477446fe3a7dcff956bbd1eba14c6879bfc29c1e10a3d" size="9369512" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.10-13.0.14-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos-13.0.14_ALL.m…" hashFunction="SHA512" hashValue="444609f144bbcc48b7226465078772e8d78d96fda177453aada2f75cb14edc9481dd13948f7313d953ce1ebb858f56884b938cddb7b9252de67db961c9bfc434" size="115543851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos--13.0.10-13.0…" hashFunction="SHA512" hashValue="2e82745bc649b6000fe13c2d0f72df555d7f1c0a00a14b7abdada8c56381b690ac54f0cb02b53438d18f9cc2621bbf186da33580dbb53b74109d8f25d6c721d3" size="14070463" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.10-13.0.14-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64-13.0…" hashFunction="SHA512" hashValue="bc0c7b7a2054a16f96832f44b9bd35ebb8486d08aebb7fc749f0bb24006830aa566d887bb253e6b297bfeb6ff442b56b18adb773309ba887fa3e12a1b9f25362" size="89463392" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64--13.…" hashFunction="SHA512" hashValue="1d3924edf03ceab4963b97bc1df3ff94ecf784f517870b5e777a4a746332b73724621a0239c577a026f1c88a5256746219203c34c266cc77c3b2af0558a3fd44" size="9905751" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.12-13.0.13-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64-13.0.1…" hashFunction="SHA512" hashValue="04cad7d72b90b41fcca52e05cb4c5904d6516669a32772c498e0b0bb2803ce10e1458ff76d4acfd5a3d9146d8673b258a74c45ca978eb09ea7dcf37c1c2e5238" size="107414411" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64--13.0.…" hashFunction="SHA512" hashValue="e23005d579adbfd1b3cd6b2ee19b7c5c861afa19169d8c6a9249b2ce71c676eac7f7abfa6c1f0d643f7c6372e1ed364657543c88de2bb570938e23629310c85e" size="186481" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.12-13.0.13-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos-13.0.13_ALL.m…" hashFunction="SHA512" hashValue="7afaca7077a1f968705fcf1094d16a1b441befcbd2de342654ca78d6ba7cc631622493afd3e71984839283aa37abc66c92021dfee8ecdfd345019a549a220ffb" size="115471199" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos--13.0.12-13.0…" hashFunction="SHA512" hashValue="9c446838df3df621eb3d282f1d6ed5313eaf228f004ecada89b99e67075217556bf6cbd78f709a2f527719cbcfa394cd9266388ef782d6a1a2b69863380ebe8a" size="208530" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.12-13.0.13-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64-13.0…" hashFunction="SHA512" hashValue="c6aea6ab8c33c4c58bd3a5783db1c7ed4682706e09a239b6ac61b6e28f783ae785891b88374caecbeb49dd388853f090e09a0ff84540de69dcccc065fa6abdbe" size="89393168" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64--13.…" hashFunction="SHA512" hashValue="0e958f81c03c334f01ec24727d8b7b203cccd36bc7ef11c97b1792e7b8c2296eb5f148c28bc3ba334b51012dcdb5d2830d7195fa6265e065dfbde1505549be52" size="189676" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.12-13.0.14-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64-13.0.1…" hashFunction="SHA512" hashValue="40fda8d5eb0ddd6b5e516e686ba88f7ea57fb7b7c70868ca11f19b198911eb83acab8057f7cd2b107be46e5ab60dac8ac3e8df7f10f37d7309767830defb2f42" size="107492923" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64--13.0.…" hashFunction="SHA512" hashValue="926f32fc4c3eb64935364f20a18cae93a8e928227c81826e2e280c97e3a2aed0342883298c20733b4f5fdf9aa2c0a6c4e73a6768b0e5b639cf624a949ec1f2e6" size="7893763" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.12-13.0.14-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos-13.0.14_ALL.m…" hashFunction="SHA512" hashValue="444609f144bbcc48b7226465078772e8d78d96fda177453aada2f75cb14edc9481dd13948f7313d953ce1ebb858f56884b938cddb7b9252de67db961c9bfc434" size="115543851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos--13.0.12-13.0…" hashFunction="SHA512" hashValue="607c56a15fbbb39a22c9f62ec928d7a2239537fe56a441394403ed8cfd86b7b1cd9722e4932a74fd45ffbdc54bfd9b119481fb8fb24cf0d6603b6f5f8f0ca46f" size="12156659" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.12-13.0.14-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64-13.0…" hashFunction="SHA512" hashValue="bc0c7b7a2054a16f96832f44b9bd35ebb8486d08aebb7fc749f0bb24006830aa566d887bb253e6b297bfeb6ff442b56b18adb773309ba887fa3e12a1b9f25362" size="89463392" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64--13.…" hashFunction="SHA512" hashValue="a2baf03471f3da3478fdcb031c5d3405b687a06e01704dc278e6c27b5e21d0c60c9a441b1f0d2e727585c5fe7cfbfe138f488333644ea248b2cb0426a54b6fb9" size="8547030" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.13-13.0.14-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64-13.0.1…" hashFunction="SHA512" hashValue="40fda8d5eb0ddd6b5e516e686ba88f7ea57fb7b7c70868ca11f19b198911eb83acab8057f7cd2b107be46e5ab60dac8ac3e8df7f10f37d7309767830defb2f42" size="107492923" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64--13.0.…" hashFunction="SHA512" hashValue="dfb8a3923a430e331a72d43fc1379a67cf996aeb1a05212e98192838cd2f8fe3988a8e058539da56838f1027583c6d619a7463e818dcdfc2b4a1b8fb473ab717" size="7843771" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.13-13.0.14-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos-13.0.14_ALL.m…" hashFunction="SHA512" hashValue="444609f144bbcc48b7226465078772e8d78d96fda177453aada2f75cb14edc9481dd13948f7313d953ce1ebb858f56884b938cddb7b9252de67db961c9bfc434" size="115543851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos--13.0.13-13.0…" hashFunction="SHA512" hashValue="4165cfdcb22dd1238758f3bb2121ec69706d9e05ad02475f2d640a4616e38b24f927132f80ab816ce1681120843acde24ffbafc60d717e96755e72aa9fa8af83" size="12090823" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.13-13.0.14-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64-13.0…" hashFunction="SHA512" hashValue="bc0c7b7a2054a16f96832f44b9bd35ebb8486d08aebb7fc749f0bb24006830aa566d887bb253e6b297bfeb6ff442b56b18adb773309ba887fa3e12a1b9f25362" size="89463392" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64--13.…" hashFunction="SHA512" hashValue="37386c86850adc40423ec5bb57341b3c0054316e58ecbb8066369174d8e89a301317746ee05d76b8db019cc9f17317537730f54146ee3ebe1e708ad3af8387ee" size="8495958" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.13-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64-13.0.1…" hashFunction="SHA512" hashValue="04cad7d72b90b41fcca52e05cb4c5904d6516669a32772c498e0b0bb2803ce10e1458ff76d4acfd5a3d9146d8673b258a74c45ca978eb09ea7dcf37c1c2e5238" size="107414411" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.13-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos-13.0.13_ALL.m…" hashFunction="SHA512" hashValue="7afaca7077a1f968705fcf1094d16a1b441befcbd2de342654ca78d6ba7cc631622493afd3e71984839283aa37abc66c92021dfee8ecdfd345019a549a220ffb" size="115471199" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.13-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64-13.0…" hashFunction="SHA512" hashValue="c6aea6ab8c33c4c58bd3a5783db1c7ed4682706e09a239b6ac61b6e28f783ae785891b88374caecbeb49dd388853f090e09a0ff84540de69dcccc065fa6abdbe" size="89393168" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.14-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64-13.0.1…" hashFunction="SHA512" hashValue="40fda8d5eb0ddd6b5e516e686ba88f7ea57fb7b7c70868ca11f19b198911eb83acab8057f7cd2b107be46e5ab60dac8ac3e8df7f10f37d7309767830defb2f42" size="107492923" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.14-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos-13.0.14_ALL.m…" hashFunction="SHA512" hashValue="444609f144bbcc48b7226465078772e8d78d96fda177453aada2f75cb14edc9481dd13948f7313d953ce1ebb858f56884b938cddb7b9252de67db961c9bfc434" size="115543851" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.14-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.0.14" appVersion="13.0.14" platformVersion="115.10.0" buildID="20240408204645" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.14" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64-13.0…" hashFunction="SHA512" hashValue="bc0c7b7a2054a16f96832f44b9bd35ebb8486d08aebb7fc749f0bb24006830aa566d887bb253e6b297bfeb6ff442b56b18adb773309ba887fa3e12a1b9f25362" size="89463392" type="complete"></patch></update></updates> ===================================== update_1/release/13.0.9-13.0.13-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64-13.0.1…" hashFunction="SHA512" hashValue="04cad7d72b90b41fcca52e05cb4c5904d6516669a32772c498e0b0bb2803ce10e1458ff76d4acfd5a3d9146d8673b258a74c45ca978eb09ea7dcf37c1c2e5238" size="107414411" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64--13.0.…" hashFunction="SHA512" hashValue="913d31600e2b0d20645927fe0549da5881859dc5990942780e3423df7265fabf343b40037a2b488d55fdaeb49f911d3212f61970affd55e43e8f441a489a65c9" size="8819028" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.9-13.0.13-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos-13.0.13_ALL.m…" hashFunction="SHA512" hashValue="7afaca7077a1f968705fcf1094d16a1b441befcbd2de342654ca78d6ba7cc631622493afd3e71984839283aa37abc66c92021dfee8ecdfd345019a549a220ffb" size="115471199" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos--13.0.9-13.0.…" hashFunction="SHA512" hashValue="aab41c685738d2288a7f5e33d83c7ef669460e981a6e9a454e81b8b0b5eef77a01babcb17cb7a071591edfae0a55357de79e5e54df4a07c51383f04e49a1d562" size="13403343" type="partial"></patch></update></updates> ===================================== update_1/release/13.0.9-13.0.13-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.0.13" appVersion="13.0.13" platformVersion="115.9.1" buildID="20240322132912" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.0.13" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64-13.0…" hashFunction="SHA512" hashValue="c6aea6ab8c33c4c58bd3a5783db1c7ed4682706e09a239b6ac61b6e28f783ae785891b88374caecbeb49dd388853f090e09a0ff84540de69dcccc065fa6abdbe" size="89393168" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64--13.…" hashFunction="SHA512" hashValue="6683305d0c690acd1ee2c5e5c10b430b9b2e93f4905a4cf51f883cf92096291f8373a836a283cdb6fbf60258556052c7308b35b63197e958ae83b7e0212231fa" size="9548715" type="partial"></patch></update></updates> ===================================== update_1/release/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64-13.0.1…","git_tag":"mb-13.0.13-build1","sig":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64-13.0.1…","version":"13.0.13"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64-13.0.1…","git_tag":"mb-13.0.14-build1","sig":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64-13.0.1…","version":"13.0.14"} \ No newline at end of file ===================================== update_1/release/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos-13.0.13.dmg","git_tag":"mb-13.0.13-build1","sig":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos-13.0.13.dmg.a…","version":"13.0.13"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos-13.0.14.dmg","git_tag":"mb-13.0.14-build1","sig":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos-13.0.14.dmg.a…","version":"13.0.14"} \ No newline at end of file ===================================== update_1/release/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64-port…","git_tag":"mb-13.0.13-build1","sig":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64-port…","version":"13.0.13"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64-port…","git_tag":"mb-13.0.14-build1","sig":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64-port…","version":"13.0.14"} \ No newline at end of file ===================================== update_1/release/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64-13.0.1…","sig":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-linux-x86_64-13.0.1…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos-13.0.13.dmg","sig":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-macos-13.0.13.dmg.a…"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64-port…","sig":"https://cdn.mullvad.net/browser/13.0.13/mullvad-browser-windows-x86_64-port…"}}},"tag":"mb-13.0.13-build1","version":"13.0.13"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64-13.0.1…","sig":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-linux-x86_64-13.0.1…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos-13.0.14.dmg","sig":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-macos-13.0.14.dmg.a…"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64-port…","sig":"https://cdn.mullvad.net/browser/13.0.14/mullvad-browser-windows-x86_64-port…"}}},"tag":"mb-13.0.14-build1","version":"13.0.14"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.0.14-build1
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed new tag mb-13.0.14-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… 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 41099, 41100: Prepare Tor and Mullvad Browser Stable 13.0.14
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 47af4318 by Pier Angelo Vendrame at 2024-04-11T15:37:19+02:00 Bug 41099, 41100: Prepare Tor and Mullvad Browser Stable 13.0.14 - - - - - 10 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/tor/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,51 @@ +Mullvad Browser 13.0.14 - April 16 2024 + * All Platforms + * Updated Firefox to 115.10.0esr + * Updated uBlock Origin to 1.57.2 + * Bug 271: After update, don't open the release page on Github. Instead link it in the startpage, like in Tor Browser [mullvad-browser] + * Bug 283: New identity complains about about:mullvad-browser [mullvad-browser] + * Bug 285: Rebase Mullvad Browser stable onto 115.10.0esr [mullvad-browser] + * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] + * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] + * Bug 42335: Do not localize the order of locales for app lang [tor-browser] + * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] + * Bug 42468: App languages not sorted correctly in stable [tor-browser] + * Bug 42472: Timezone May leak from XSLT Date function [tor-browser] + * Linux + * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + +Mullvad Browser 13.5a6 - March 28 2024 + * All Platforms + * Updated Firefox to 115.9.0esr + * Updated mullvad-browser-extension to 0.9.0 + * Bug 234: Make User-Agent request header match RFP's navigator.userAgent [mullvad-browser] + * Bug 271: After update, don't open the release page on Github. Instead link it in the startpage, like in Tor Browser [mullvad-browser] + * Bug 274: Rebase Mullvad Browser alpha onto Firefox 115.9.0esr [mullvad-browser] + * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] + * Bug 41916: Letterboxing preferences UI [tor-browser] + * Bug 41918: Add option to reuse last window size when letterboxing is enabled [tor-browser] + * Bug 42211: Fluent migration: new identity [tor-browser] + * Bug 42214: Fluent migration: security level [tor-browser] + * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] + * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] + * Bug 42443: Shrink the window to match letterboxing size when the emtpy area is doble-clicked [tor-browser] + * Bug 42472: Timezone May leak from XSLT Date function [tor-browser] + * Bug 42473: ESR 115.9.1 fixes [tor-browser] + * Windows + * Bug 80: Make 'Mullvad your default browser' does not work on Windows [mullvad-browser] + * Bug 42377: Hidden fonts are automatically added to the allow list [tor-browser] + * Bug 41089: Add filetype association to the installer of Mullvad Browser [tor-browser-build] + * Linux + * Bug 42438: Adapt the data import wizard to use the original $HOME on Linux [tor-browser] + * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + * Build System + * All Platforms + * Bug 41088: Remove use of projects/browser/run_scripts [tor-browser-build] + * Bug 41102: src archive does not match likely due to mismatched xz-utils version [tor-browser-build] + * Bug 40073: We should remove ./ when using 7-zip for zip files [rbm] + * Windows + * Bug 41097: authenticode-timestamping.sh fails to run again because tmp-timestamp already exists [tor-browser-build] + Mullvad Browser 13.0.13 - March 22 2024 * Windows + macOS + Linux * Updated Firefox to 115.9.1esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,76 @@ +Tor Browser 13.0.14 - April 16 2024 + * All Platforms + * Updated Tor to 0.4.8.11 + * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] + * Bug 42335: Do not localize the order of locales for app lang [tor-browser] + * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] + * Bug 42472: Timezone May leak from XSLT Date function [tor-browser] + * Bug 42508: Rebase Tor Browser stable onto 115.10.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.10.0esr + * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] + * Bug 42468: App languages not sorted correctly in stable [tor-browser] + * Android + * Updated GeckoView to 115.10.0esr + * Linux + * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + * Build System + * All Platforms + * Updated Go to 1.21.8 + * Bug 41107: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo for new type of URL [tor-browser-build] + +Tor Browser 13.5a6 - March 28 2024 + * All Platforms + * Bug 41114: Fix no-async-promise-executor on TorConnect [tor-browser] + * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] + * Bug 42336: Review the relationship between TorSettings and the TorProvider [tor-browser] + * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] + * Bug 42435: Update moat domain fronting configuration [tor-browser] + * Bug 42437: Drop "torbrowser.version" preference [tor-browser] + * Bug 42444: Remove the "Prioritize .onion sites when known" option [tor-browser] + * Bug 42449: Rebase Tor Browser alpha onto Firefox 115.9.0esr [tor-browser] + * Bug 42459: Add startpage onion service to list of search providers [tor-browser] + * Bug 42466: Drop the "Onion Logo" from trademark statement [tor-browser] + * Bug 42472: Timezone May leak from XSLT Date function [tor-browser] + * Bug 42473: ESR 115.9.1 fixes [tor-browser] + * Bug 42481: Modularize SecurityLevel [tor-browser] + * Bug 41105: Bump version of snowflake to v2.9.2 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.9.0esr + * Bug 41916: Letterboxing preferences UI [tor-browser] + * Bug 41918: Add option to reuse last window size when letterboxing is enabled [tor-browser] + * Bug 42203: Fluent migration: about dialog [tor-browser] + * Bug 42209: Fluent migration: tor circuit [tor-browser] + * Bug 42211: Fluent migration: new identity [tor-browser] + * Bug 42214: Fluent migration: security level [tor-browser] + * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] + * Bug 42443: Shrink the window to match letterboxing size when the emtpy area is doble-clicked [tor-browser] + * Bug 42446: Improve accessible descriptions in built-in dialog [tor-browser] + * Bug 42458: Update the "Submit Feedback" link in "About Tor Browser" [tor-browser] + * Windows + * Bug 42377: Hidden fonts are automatically added to the allow list [tor-browser] + * Linux + * Bug 42438: Adapt the data import wizard to use the original $HOME on Linux [tor-browser] + * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + * Android + * Updated GeckoView to 115.9.0esr + * Bug 41187: Improve Android's bridge settings UI [tor-browser] + * Bug 42427: Do not ship bridges as prefences anymore [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.21.8 + * Bug 41102: src archive does not match likely due to mismatched xz-utils version [tor-browser-build] + * Bug 41107: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo for new type of URL [tor-browser-build] + * Bug 40073: We should remove ./ when using 7-zip for zip files [rbm] + * Windows + macOS + Linux + * Bug 42305: (Semi-)Automatically merge translation resources across tor browser releases (desktop) [tor-browser] + * Bug 41088: Remove use of projects/browser/run_scripts [tor-browser-build] + * Windows + * Bug 41097: authenticode-timestamping.sh fails to run again because tmp-timestamp already exists [tor-browser-build] + * Android + * Bug 40502: Do not recommend addons on Tor Browser [tor-browser] + * Bug 41082: Package tor expert bundle on android as .aar that firefox-android can use in lieu of tor-android-service with geckoview bootstrap [tor-browser-build] + Tor Browser 13.0.13 - March 22 2024 * Windows + macOS + Linux * Updated Firefox to 115.9.1esr ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,18 +17,19 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 1159924, + "average_daily_users": 1147622, "categories": { "firefox": [ "web-development", "appearance", - "other" + "other", + "accessibility" ] }, "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5698881, + "id": 5716486, "compatibility": { "firefox": { "min": "78.0", @@ -39,7 +40,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56988…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/57164…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -50,22 +51,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- Optimized Adopted Style Sheets changes handling.\n- Fixed watching for style/link element position changes.\n- Fixed processing large style elements loaded by chunks.\n- Fixed enabling the extension with a hotkey after it was disabled automatically.\n- Fixed sliders in mobile UI.\n- Users' fixes for websites." + "en-US": "- Fixed performance issue when detecting @layer and @supports rules.\n- Improved border colors with CSS variables.\n- Leave iframes unchanged when dark theme is detected on a web page.\n- Users' fixes for websites." }, - "reviewed": "2024-03-05T08:23:41Z", - "version": "4.9.78", + "reviewed": "2024-04-09T08:44:59Z", + "version": "4.9.82", "files": [ { - "id": 4243182, - "created": "2024-02-29T10:00:39Z", - "hash": "sha256:21e08b3f26e9b54257d30f6b2fb2d966d41ace54d2d79ccec55e55517084c7ce", + "id": 4260787, + "created": "2024-04-05T20:41:43Z", + "hash": "sha256:df2e0c5498c08caa8452cd21f627d6dce0b2251047602ab2417c2e1dd7350697", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 727208, + "size": 735921, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4243182/darkreader-4.9.78…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4260787/darkreader-4.9.82…", "permissions": [ "alarms", "contextMenus", @@ -143,7 +144,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-03-05T08:23:41Z", + "last_updated": "2024-04-09T08:44:59Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -218,10 +219,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5365, - "bayesian_average": 4.535401175675945, - "count": 5491, - "text_count": 1733 + "average": 4.5317, + "bayesian_average": 4.530596215637371, + "count": 5563, + "text_count": 1752 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -318,7 +319,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 23726 + "weekly_downloads": 24103 }, "notes": null }, @@ -334,7 +335,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 267400, + "average_daily_users": 262844, "categories": { "firefox": [ "privacy-security" @@ -343,18 +344,18 @@ "contributions_url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=decentraleyes…", "created": "2014-06-10T05:46:02Z", "current_version": { - "id": 5613891, + "id": 5711487, "compatibility": { "firefox": { - "min": "56.0a1", + "min": "78.0", "max": "*" }, "android": { - "min": "56.0a1", + "min": "113.0", "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/decentraleyes/versions/56…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/decentraleyes/versions/57…", "is_strict_compatibility_enabled": false, "license": { "id": 3338, @@ -365,22 +366,22 @@ "url": "http://www.mozilla.org/MPL/2.0/" }, "release_notes": { - "en-US": "<i>Enhancements:</i>\n\n- Improved object property evaluation logic.\n\n<i>Other changes:</i>\n\n- Applied various performance optimizations and stability improvements.\n- Updated resource audit tool dependencies." + "en-US": "<i>Enhancements:</i>\n\n- Added additional resources to the staging environment.\n\n<i>Other changes:</i>\n\n- Implemented mobile extension signing-related changes.\n- Improved and extended the resource audit tool." }, - "reviewed": "2023-08-30T12:55:12Z", - "version": "2.0.18", + "reviewed": "2024-03-28T20:50:08Z", + "version": "2.0.19", "files": [ { - "id": 4158232, - "created": "2023-08-24T20:38:03Z", - "hash": "sha256:f8f031ef91c02a1cb1a6552acd02b8f488693400656b4047d68f03ba0a1078d9", + "id": 4255788, + "created": "2024-03-26T20:59:58Z", + "hash": "sha256:105d65bf8189d527251647d0452715c5725af6065fba67cd08187190aae4a98f", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 6951879, + "size": 7180376, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4158232/decentraleyes-2.0…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4255788/decentraleyes-2.0…", "permissions": [ "*://*/*", "privacy", @@ -470,7 +471,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-08-30T12:55:12Z", + "last_updated": "2024-03-28T20:50:08Z", "name": { "ar": "Decentraleyes", "bg": "Decentraleyes", @@ -547,10 +548,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7982, - "bayesian_average": 4.793635080149146, - "count": 1412, - "text_count": 254 + "average": 4.7961, + "bayesian_average": 4.7914809918911105, + "count": 1422, + "text_count": 258 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -635,7 +636,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3038 + "weekly_downloads": 3094 }, "notes": null }, @@ -651,7 +652,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1235058, + "average_daily_users": 1210586, "categories": { "firefox": [ "privacy-security" @@ -1170,9 +1171,9 @@ "category": "recommended" }, "ratings": { - "average": 4.7979, - "bayesian_average": 4.795218830409015, - "count": 2405, + "average": 4.7997, + "bayesian_average": 4.796985292621238, + "count": 2421, "text_count": 457 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", @@ -1197,7 +1198,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 19773 + "weekly_downloads": 19565 }, "notes": null }, @@ -1213,7 +1214,7 @@ "picture_url": null } ], - "average_daily_users": 7806685, + "average_daily_users": 7698492, "categories": { "firefox": [ "privacy-security" @@ -1222,7 +1223,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5693353, + "id": 5717409, "compatibility": { "firefox": { "min": "78.0", @@ -1233,7 +1234,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/56…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/57…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1244,22 +1245,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d2b406aad3a1689d93242d…" rel=\"nofollow\">1.56.0</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/39dfcbf564824557b9576b…" rel=\"nofollow\">Mind that multiple <code>uritransform</code> may apply to a single request</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a81992f7ab9a23a438d94b…" rel=\"nofollow\">Fix incorrect built-in filtering expression in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e88d43f67c0962312b76d6…" rel=\"nofollow\">Fix improper invalidation of valid <code>uritransform</code> exception filters</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/0f3549a7d85e6616619d00…" rel=\"nofollow\">Improve <code>prevent-addEventListener</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/378d2611f7de534428615a…" rel=\"nofollow\">Fix Chartbeat flicker control <code>div</code>'s</a> (by @ryanbr)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/bbf6c43dcdb62ea74fd182…" rel=\"nofollow\">Fix potential exfiltration of browsing history by a rogue list author through <code>permissions=</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/93a9a64cf8ec890f9a478c…" rel=\"nofollow\">Ignore event handler-related attributes in <code>set-attr</code> scriptlet</a> (suggested by @distinctmondaylilac)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4ed2b2948421552ce1c170…" rel=\"nofollow\">Fix potential exfiltration of browsing history by a rogue list author through <code>csp=</code></a> (reported by @distinctmondaylilac)</li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/0fc7f9c779a1eb0dde44e6…" rel=\"nofollow\">Output scriptlet logging information to the logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/0dc5f09464b305050627d6…" rel=\"nofollow\">Fix decompiling of scriptlet parameters</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5a4d736ff47d1505619f0b…" rel=\"nofollow\">Add support for <code>extraMatch</code> in <code>trusted-click-element</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/439735e662e837889e0dbe…" rel=\"nofollow\">Remove minimum height constraint from \"My filters\" pane</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ef423b580af2dea4a9a044…" rel=\"nofollow\">Unregister all scriptlets when disabling uBO on a specific site</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e06c923bfb016c184026f7…" rel=\"nofollow\">Allow <code>uritransform</code> to process the hash part of a URL</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3e0f743a60bf78bced8580…" rel=\"nofollow\">Remember presentation state of \"My rules\" pane</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/819053ea32148fd9ad7c6c…" rel=\"nofollow\">Fix improperly assembled <code>!#include</code> sublists</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/9506d56abc46f95d7412b9…" rel=\"nofollow\">Mark procedural filters with pseudo-elements selector as invalid</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/9b18234e17c6871170acd1…" rel=\"nofollow\">Prevent access to picker when \"My filters\" is not enabled</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f990e686b6eacbbd0bd43a…" rel=\"nofollow\">Provide visual feedback when applying changes in \"Filter lists\" pane</a></li><li>[...]</li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/738859f7b07778caaaa182…" rel=\"nofollow\">Commits history since last version</a>" + "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/65a30f1a59ac2ef295f469…" rel=\"nofollow\">1.57.2</a>.\n\nThis is an emergency release to fix an issue causing differential updates to fail. The issue primarily affected Firefox because of uBO's use of indexedDB prior to 1.57.0. The issue did not affect full update of filter lists even though the asset viewer would show old versions of those lists (internally uBO compiles lists and would still correctly compile from lists fetched by full updater).\n\n<b>Fixes / changes</b>\n\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/92c6c66077821bbbc4fd82…" rel=\"nofollow\">Fix stray lists in redesigned cache storage</a>\n\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ad79f1669e12cf4cb05689…" rel=\"nofollow\">Commits history since last version</a>" }, - "reviewed": "2024-02-20T18:51:52Z", - "version": "1.56.0", + "reviewed": "2024-04-10T09:01:57Z", + "version": "1.57.2", "files": [ { - "id": 4237670, - "created": "2024-02-17T14:54:31Z", - "hash": "sha256:f5fbeeac511ca4e10a74723413727fda8e6f9236c726d16eb54ade1fbe7be5be", + "id": 4261710, + "created": "2024-04-08T13:51:42Z", + "hash": "sha256:9928e79a52cecf7cfa231fdb0699c7d7a427660d94eb10d711ed5a2f10d2eb89", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3819727, + "size": 3861786, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.5…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4261710/ublock_origin-1.5…", "permissions": [ "alarms", "dns", @@ -1379,7 +1380,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-03-11T17:35:25Z", + "last_updated": "2024-04-10T15:40:26Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1524,10 +1525,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7893, - "bayesian_average": 4.78892933338675, - "count": 17378, - "text_count": 4532 + "average": 4.7889, + "bayesian_average": 4.788525377738124, + "count": 17520, + "text_count": 4569 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1590,7 +1591,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 159165 + "weekly_downloads": 153133 }, "notes": null }, @@ -1606,7 +1607,7 @@ "picture_url": null } ], - "average_daily_users": 178990, + "average_daily_users": 180160, "categories": { "firefox": [ "photos-music-videos", @@ -1702,10 +1703,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4476, - "bayesian_average": 4.442740710153104, - "count": 1211, - "text_count": 466 + "average": 4.4484, + "bayesian_average": 4.443495738230568, + "count": 1222, + "text_count": 475 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1727,7 +1728,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 350 + "weekly_downloads": 348 }, "notes": null }, @@ -1743,7 +1744,7 @@ "picture_url": null } ], - "average_daily_users": 78537, + "average_daily_users": 75277, "categories": { "firefox": [ "privacy-security", @@ -1853,10 +1854,10 @@ ], "promoted": null, "ratings": { - "average": 4.3753, - "bayesian_average": 4.3611016639271964, - "count": 405, - "text_count": 114 + "average": 4.3768, + "bayesian_average": 4.3623663717329295, + "count": 406, + "text_count": 115 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, @@ -1878,7 +1879,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1672 + "weekly_downloads": 1271 }, "notes": null }, @@ -1894,7 +1895,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 308991, + "average_daily_users": 309538, "categories": { "firefox": [ "search-tools", @@ -2111,10 +2112,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6435, - "bayesian_average": 4.639139586780839, - "count": 1422, - "text_count": 276 + "average": 4.6324, + "bayesian_average": 4.628055038190222, + "count": 1450, + "text_count": 284 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2137,7 +2138,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 5686 + "weekly_downloads": 5610 }, "notes": null }, @@ -2160,7 +2161,7 @@ "picture_url": null } ], - "average_daily_users": 125273, + "average_daily_users": 125835, "categories": { "firefox": [ "search-tools", @@ -2441,10 +2442,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3752, - "bayesian_average": 4.37089257689689, - "count": 1338, - "text_count": 378 + "average": 4.378, + "bayesian_average": 4.373626111950373, + "count": 1344, + "text_count": 381 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2464,7 +2465,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 22 + "weekly_downloads": 29 }, "notes": null }, @@ -2480,12 +2481,11 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 309704, + "average_daily_users": 300871, "categories": { "firefox": [ - "web-development", "privacy-security", - "other" + "alerts-updates" ] }, "contributions_url": "https://www.paypal.com/donate/?hosted_button_id=9ERKTU5MBH4EW&utm_content=p…", @@ -2550,20 +2550,20 @@ "default_locale": "en-US", "description": { "da": "Dette værktøj, vinder af \"2006 PC World World Class Award\", giver ekstra beskyttelse til din Firefox.\nDen lader kun JavaScript, Java og andet kørbart indhold køre fra betroede domæner du har valgt, fx din home-banking hjemmeside, og forsvarer \"tillids-grænserne\" mod cross-site scripting angreb (XXS).\nEn sådan forebyggende metode forhindrer udnyttelse af sikkerhedshuller (kendte som ukendte!) uden tab af funktionalitet...\nEksperterne er enige: Firefox er faktisk mere sikker med NoScript ;-)", - "de": "<b>WICHTIG</b>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Eine Anleitung in die Grundlagen von <b>NoScript 10</b></a>\n\nIst die neue Oberfläche von NoScript 10 immer noch ungewohnt?\nSehen Sie sich diese <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">von Nutzern erstellte NoScript 10 Einführung</a> und diesen <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">Vergleich zwischen NoScript 10 \"Quantum\" und NoScript 5 \"Classic\"</a> an.\n\nAls Gewinner des \"PC World World Class Award\" und ausgeliefert als Teil des Tor Browsers bietet Ihnen NoScript den besten verfügbaren Schutz im Internet.\n\nMit NoScript können Sie JavaScript, Flash, Java und andere ausführbare Inhalte bloß auf vertrauenswürdigen Domains Ihrer Wahl zulassen, z.B. beim Online-Banking. Somit verhindern Sie aus der Ferne ausnutzbare Schwachstellen inklusive Spectre und Meltdown.\n\nIhre vertrauenswürdigen Bereiche werden dank der einmaligen ClearClick Technologie gegen seitenübergreifende Scripting-Attacken (XSS), Cross-Zone DNS Rebinding / CSRF Attacken (Router Hacking), und Clickjacking-Versuche geschützt.\n\nDieser präventive Ansatz verhindert das Ausnutzen von (bekannten und unbekannten!) Sicherheitslücken ohne Verlust an Funktionalität, wo Sie diese benötigen.\nExperten sind sich einig: Firefox wird wirklich noch sicherer mithilfe von NoScript ;-)\n\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>", + "de": "<b>WICHTIG</b>\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Eine Anleitung in die Grundlagen von <b>NoScript 10</b></a>\n\nIst die neue Oberfläche von NoScript 10 immer noch ungewohnt?\nSehen Sie sich diese <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">von Nutzern erstellte NoScript 10 Einführung</a> und diesen <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…">Vergleich zwischen NoScript 10 \"Quantum\" und NoScript 5 \"Classic\"</a> an.\n\nAls Gewinner des \"PC World World Class Award\" und ausgeliefert als Teil des Tor Browsers bietet Ihnen NoScript den besten verfügbaren Schutz im Internet.\n\nMit NoScript können Sie JavaScript, Flash, Java und andere ausführbare Inhalte bloß auf vertrauenswürdigen Domains Ihrer Wahl zulassen, z.B. beim Online-Banking. Somit verhindern Sie aus der Ferne ausnutzbare Schwachstellen inklusive Spectre und Meltdown.\n\nIhre vertrauenswürdigen Bereiche werden dank der einmaligen ClearClick Technologie gegen seitenübergreifende Scripting-Attacken (XSS), Cross-Zone DNS Rebinding / CSRF Attacken (Router Hacking), und Clickjacking-Versuche geschützt.\n\nDieser präventive Ansatz verhindert das Ausnutzen von (bekannten und unbekannten!) Sicherheitslücken ohne Verlust an Funktionalität, wo Sie diese benötigen.\nExperten sind sich einig: Firefox wird wirklich noch sicherer mithilfe von NoScript ;-)\n\n\nFAQ: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\nForum: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>", "el": "Αυτό το πρόσθετο που κέρδισε το βραβείο «2006 World Class Award» του περιοδικού PC World, παρέχει πρόσθετη προστασία στον Firefox.\nΕπιτρέπει την εκτέλεση JavaScript, Java και άλλου εκτελέσιμου περιεχομένου, μόνο για έμπιστους τομείς δικτύου της επιλογής σας (π.χ. την δικτυακή υπηρεσία τραπεζικών συναλλαγών σας) και τους προστατεύει από τον κίνδυνο επιθέσεων cross-site scripting (XSS) .\nΑυτή η προσέγγιση προκαταβολικού μπλοκαρίσματος δεν επιτρέπει την εκμετάλλευση κενών ασφαλείας (ήδη γνωστών αλλά και άγνωστων ακόμα!) χωρίς να επηρεάζει την λειτουργικότητα...\nΟι ειδικοί συμφωνούν: Ο Firefox είναι πραγματικά ασφαλέστερος με το NoScript! ;-)", - "en-US": "Winner of the \"PC World - World Class Award\" and bundled with the Tor Browser, NoScript gives you the best available protection on the web. It allows JavaScript, Flash, and other executable content to run only from trusted domains of your choice (e.g. your banking site), thus mitigating remotely exploitable vulnerabilities, such as Spectre and Meltdown.\n\nIt protects your \"trust boundaries\" against cross-site scripting attacks (XSS), cross-zone DNS rebinding / CSRF attacks (router hacking), and Clickjacking attempts, thanks to its unique ClearClick technology.\n\nSuch a preemptive approach prevents exploitation of security vulnerabilities (known and unknown!) with no loss of functionality where you need it. Experts do agree: Firefox is really safer with NoScript ;-)\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>\n\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">A Basic <b>NoScript 10 Guide</b></a>\n\nStill confused by NoScript 10's new UI?\nCheck this <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">user-contributed NoScript 10 primer</a>.\nand this <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (or \"Legacy\") comparison</a>.", + "en-US": "Winner of the \"PC World - World Class Award\" and bundled with the Tor Browser, NoScript gives you the best available protection on the web. It allows JavaScript, Flash, and other executable content to run only from trusted domains of your choice (e.g. your banking site), thus mitigating remotely exploitable vulnerabilities, such as Spectre and Meltdown.\n\nIt protects your \"trust boundaries\" against cross-site scripting attacks (XSS), cross-zone DNS rebinding / CSRF attacks (router hacking), and Clickjacking attempts, thanks to its unique ClearClick technology.\n\nSuch a preemptive approach prevents exploitation of security vulnerabilities (known and unknown!) with no loss of functionality where you need it. \nExperts do agree: Firefox is really safer with NoScript!\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>\n\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">A Basic <b>NoScript 10 Guide</b></a>\n\nStill confused by NoScript 10's new UI?\nCheck this <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">user-contributed NoScript 10 primer</a>.\nand this <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (or \"Legacy\") comparison</a>.", "es": "Protección extra para su Firefox: NoScript sólo permite JavaScript, Java y otros plugins en los sitios web de confianza que Ud. elija (como la web de su banco). Este planteamiento preventivo basado en una lista blanca evita que se puedan explotar vulnerabilidades (conocidas o incluso desconocidas) sin pérdida de funcionalidad... Los expertos lo confirmarán: Firefox es realmente más seguro con NoScript :-)", - "fr": "<b>IMPORTANT</b>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Un Guide élémentaire pour <b>NoScript 10</b> (en anglais)</a>\n\nConfus avec la nouvelle interface graphique de NoScript 10 ?\nConsultez cette <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">introduction à NoScript 10, contribution d’un utilisateur</a> (en anglais)\net cette <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">comparaison entre NoScript 10 « Quantum » et NoScript 5 « Classic » (ou « Legacy »)</a> (en anglais).\n\nLauréat du « World Class Award » décerné par PC World et fourni avec le navigateur Tor, NoScript vous offre la meilleure protection disponible pour le Web.\n\nIl autorise le contenu actif JavaScript, Flash, Java et autres à ne s’exécuter que sur les domaines de confiance de votre choix, par exemple le site de votre banque, réduisant le risque d’exploitation à distance de vulnérabilités comme Spectre et Meltdown.\n\nIl protège vos zones de confiance contre les attaques par cross-site scripting (XSS), DNS rebinding / attaque CSRF (Cross Site Request Forgery) (piratage de routeur) et les tentatives de détournement de clic (Clickjacking) grâce à sa propre technologie ClearClick.\n\nCette approche préventive empêche l’exploitation des failles de sécurité (connues mais aussi inconnues) sans perte de fonctionnalités là où vous en avez besoin. Les experts en conviendront : Firefox est réellement plus sûr avec NoScript ;-)\n\nFAQ : <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a> (en anglais)\nForum : <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a> (en anglais)", - "it": "<b>IMPORTANTE</b>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Guida di base a <b>NoScript 10</b></a>\n\nAncora confuso dalla nuova interfaccia di NoScript 10?\nLeggi qui <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">i contributi degli utenti di NoScript 10</a>.\ne <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\"> una comparazione tra NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (o \"Legacy\")</a>.\n\nVincitore del premio \"PC World World Class Award\" ed incorporato nel browser Tor, NoScript ti offre la migliore protezione possibile per il web.\n\nAttiva JavaScript, Flash, Java e altri eseguibili solo sui domini fidati scelti da te, ad esempio il sito della tua banca, riducendo le possibili conseguenze di vulnerabilità, inclusi Spectre e Meltdown.\n\nProtegge la tua rete dagli attacchi cross-site scripting (XSS), cross-zone DNS rebinding / attacchi CSRF (intrusione nel router) e tentativi di Clickjacking, grazie alla sua tecnologia unica ClearClick. \n\nCon un approccio proattivo previene lo sfruttamento di vulnerabilità di sicurezza (conosciute e ancora sconosciute!) senza perdere le funzionalità necessarie.\nGli esperti sono d'accordo: Firefox è veramente più sicuro con NoScript ;-)\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>", - "nl": "<b>BELANGRIJK</b>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Een basale <b>Handleiding voor NoScript 10</b></a>\n\nNog steeds in verwarring door de nieuwe UI van NoScript 10?\nBekijk deze <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">door gebruikers aangeleverde beknopte handleiding voor NoScript 10</a>\nen deze <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">vergelijking tussen NoScript 10 ‘Quantum’ en NoScript 5 ‘Classic’ (of ‘Verouderd’)</a>.\n\nAls winnaar van de ‘PC World World Class Award’ en gebundeld met de Tor-browser biedt NoScript de best beschikbare bescherming op het web.\n\nHet zorgt ervoor dat JavaScript, Flash, Java en andere uitvoerbare inhoud alleen wordt uitgevoerd vanaf vertrouwde domeinen van uw keuze, zoals uw website voor thuisbankieren, zodat op afstand te misbruiken kwetsbaarheden, waaronder Spectre en Meltdown, worden verminderd.\n\nHet beschermt uw ‘vertrouwensgrenzen’ tegen cross-site-scripting-aanvallen (XSS), cross-zone-DNS-rebinding / CSRF-aanvallen (routerhacking) en Clickjacking-pogingen, dankzij de unieke ClearClick-technologie ervan. \n\nEen dergelijke preventieve benadering voorkomt exploitatie van beveiligingskwetsbaarheden (bekende en zelfs onbekende!) zonder verlies van functionaliteit waar dat nodig is.\nExperts zijn het ermee eens: Firefox is echt veiliger met NoScript ;-)\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>", + "fr": "<b>IMPORTANT</b>\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Un Guide élémentaire pour <b>NoScript 10</b> (en anglais)</a>\n\nConfus avec la nouvelle interface graphique de NoScript 10 ?\nConsultez cette <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">introduction à NoScript 10, contribution d’un utilisateur</a> (en anglais)\net cette <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…">comparaison entre NoScript 10 « Quantum » et NoScript 5 « Classic » (ou « Legacy »)</a> (en anglais).\n\nLauréat du « World Class Award » décerné par PC World et fourni avec le navigateur Tor, NoScript vous offre la meilleure protection disponible pour le Web.\n\nIl autorise le contenu actif JavaScript, Flash, Java et autres à ne s’exécuter que sur les domaines de confiance de votre choix, par exemple le site de votre banque, réduisant le risque d’exploitation à distance de vulnérabilités comme Spectre et Meltdown.\n\nIl protège vos zones de confiance contre les attaques par cross-site scripting (XSS), DNS rebinding / attaque CSRF (Cross Site Request Forgery) (piratage de routeur) et les tentatives de détournement de clic (Clickjacking) grâce à sa propre technologie ClearClick.\n\nCette approche préventive empêche l’exploitation des failles de sécurité (connues mais aussi inconnues) sans perte de fonctionnalités là où vous en avez besoin. Les experts en conviendront : Firefox est réellement plus sûr avec NoScript ;-)\n\nFAQ : <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a> (en anglais)\nForum : <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a> (en anglais)", + "it": "<b>IMPORTANTE</b>\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Guida di base a <b>NoScript 10</b></a>\n\nAncora confuso dalla nuova interfaccia di NoScript 10?\nLeggi qui <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">i contributi degli utenti di NoScript 10</a>.\ne <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…"> una comparazione tra NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (o \"Legacy\")</a>.\n\nVincitore del premio \"PC World World Class Award\" ed incorporato nel browser Tor, NoScript ti offre la migliore protezione possibile per il web.\n\nAttiva JavaScript, Flash, Java e altri eseguibili solo sui domini fidati scelti da te, ad esempio il sito della tua banca, riducendo le possibili conseguenze di vulnerabilità, inclusi Spectre e Meltdown.\n\nProtegge la tua rete dagli attacchi cross-site scripting (XSS), cross-zone DNS rebinding / attacchi CSRF (intrusione nel router) e tentativi di Clickjacking, grazie alla sua tecnologia unica ClearClick. \n\nCon un approccio proattivo previene lo sfruttamento di vulnerabilità di sicurezza (conosciute e ancora sconosciute!) senza perdere le funzionalità necessarie.\nGli esperti sono d'accordo: Firefox è veramente più sicuro con NoScript ;-)\n\nFAQ: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\nForum: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>", + "nl": "<b>BELANGRIJK</b>\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Een basale <b>Handleiding voor NoScript 10</b></a>\n\nNog steeds in verwarring door de nieuwe UI van NoScript 10?\nBekijk deze <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">door gebruikers aangeleverde beknopte handleiding voor NoScript 10</a>\nen deze <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…">vergelijking tussen NoScript 10 ‘Quantum’ en NoScript 5 ‘Classic’ (of ‘Verouderd’)</a>.\n\nAls winnaar van de ‘PC World World Class Award’ en gebundeld met de Tor-browser biedt NoScript de best beschikbare bescherming op het web.\n\nHet zorgt ervoor dat JavaScript, Flash, Java en andere uitvoerbare inhoud alleen wordt uitgevoerd vanaf vertrouwde domeinen van uw keuze, zoals uw website voor thuisbankieren, zodat op afstand te misbruiken kwetsbaarheden, waaronder Spectre en Meltdown, worden verminderd.\n\nHet beschermt uw ‘vertrouwensgrenzen’ tegen cross-site-scripting-aanvallen (XSS), cross-zone-DNS-rebinding / CSRF-aanvallen (routerhacking) en Clickjacking-pogingen, dankzij de unieke ClearClick-technologie ervan. \n\nEen dergelijke preventieve benadering voorkomt exploitatie van beveiligingskwetsbaarheden (bekende en zelfs onbekende!) zonder verlies van functionaliteit waar dat nodig is.\nExperts zijn het ermee eens: Firefox is echt veiliger met NoScript ;-)\n\nFAQ: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\nForum: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>", "pl": "Zwycięzca \"2006 PC World World Class Award\". Narzędzie to stanowi dodatkowe\nzabezpieczenie dla wszystkich przeglądarek Mozilli. NoScript pozwala\nwykonywać skrypty JavaScript i aplety Java tylko przez zaufane domeny\nwybrane przez użytkownika np. witryny banków internetowych oraz zabezpiecza\nprzed atakami typu \"cross-site scripting\" (XSS). Takie prewencyjne podejście\nzabezpiecza przed wykorzystaniem luk bezpieczeństwa - znanych i nieznanych -\nbez utraty funkcjonalności.\n\nEksperci są zgodni: Firefox z NoScript jest naprawdę bezpieczniejszy!", - "pt-BR": "IMPORTANTE\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Um <b>guia básico do NoScript 10</b></a>\n\nAinda confuso com a nova interface gráfica do NoScript 10?\nConsulte esta <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">cartilha do NoScript 10 de contribuições de usuários</a>.\ne esta <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">comparação entre NoScript 10 \"Quantum\" e NoScript 5 \"Classic\" (ou \"Legado\")</a>.\n\nVencedor do \"PC World World Class Award\" e incorporado ao Navegador Tor, o NoScript lhe oferece a melhor proteção disponível na web.\n\nEle permite que JavaScript, Flash, Java e outros conteúdos executáveis funcionem apenas em domínios de sua confiança, por exemplo no site do seu banco, mitigando vulnerabilidades de exploração remota, incluindo Spectre e Meltdown.\n\nProtege suas \"fronteiras seguras\" contra ataques 'cross-site scripting' (XSS), ataques 'cross-zone DNS rebinding / CSRF' (invasão de roteador) e tentativas de Clickjacking, graças à sua inigualável tecnologia ClearClick. \n\nTal abordagem preemptiva previne exploração de vulnerabilidades de segurança (conhecidas e até mesmo desconhecidas!) sem perda de funcionalidade onde você precisa.\nEspecialistas concordam: o Firefox é realmente mais seguro com o NoScript ;-)\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nFórum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>", + "pt-BR": "IMPORTANTE\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Um <b>guia básico do NoScript 10</b></a>\n\nAinda confuso com a nova interface gráfica do NoScript 10?\nConsulte esta <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">cartilha do NoScript 10 de contribuições de usuários</a>.\ne esta <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…">comparação entre NoScript 10 \"Quantum\" e NoScript 5 \"Classic\" (ou \"Legado\")</a>.\n\nVencedor do \"PC World World Class Award\" e incorporado ao Navegador Tor, o NoScript lhe oferece a melhor proteção disponível na web.\n\nEle permite que JavaScript, Flash, Java e outros conteúdos executáveis funcionem apenas em domínios de sua confiança, por exemplo no site do seu banco, mitigando vulnerabilidades de exploração remota, incluindo Spectre e Meltdown.\n\nProtege suas \"fronteiras seguras\" contra ataques 'cross-site scripting' (XSS), ataques 'cross-zone DNS rebinding / CSRF' (invasão de roteador) e tentativas de Clickjacking, graças à sua inigualável tecnologia ClearClick. \n\nTal abordagem preemptiva previne exploração de vulnerabilidades de segurança (conhecidas e até mesmo desconhecidas!) sem perda de funcionalidade onde você precisa.\nEspecialistas concordam: o Firefox é realmente mais seguro com o NoScript ;-)\n\nFAQ: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\nFórum: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>", "ru": "Победитель \"2006 PC World World Class Award», этот инструмент обеспечивает дополнительную защиту для Вашего Firefox.\nОно позволяет запуск JavaScript, Java и другого активного содержимого только для доверенных доменов по Вашему выбору, например, Ваш личный банковский веб-сайт. Обеспечивает безопасность Вашей работы в \"зоне доверия\", защищает от атак с использованием межузловых сценариев (XSS), кросс-зоны DNS подменой / CSRF-атак (хакерских маршрутизаторов), и атаки ClickJacking, благодаря своей уникальной технологии ClearClick. Он также реализует DoNotTrack защиту по умолчанию, см. <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/bd4266094d321e473190ea…" rel=\"nofollow\">http://snipurl.com/nsdntrack</a>.\nТакой упреждающий подход предотвращает использование уязвимостей (известных и даже неизвестных!) Без потери функциональности.\nЭксперты едины во мнении: Firefox действительно безопаснее с NoScript ;-)", "sk": "Víťaz ceny \"2006 PC World World Class Award\". Tento nástroj poskytuje špeciálnu ochranu Firefoxu.\nPovoľuje spúšťanie JavaScriptu, Javy a ďalšieho spustiteľného obsahu len na dôveryhodných doménach podľa vášho výberu, napr. na webovej stránke bankingu.\nTakýto preventívny prístup chráni pred zneužitím bezpečnostných dier (známych aj neznámych) bez straty funkčnosti.\nOdborníci by súhlasili: Firefox je s rozšírením NoScript naozaj bezpečnejší ;-)", "vi": "Đã chiến thắng trong \"Giải thưởng Cấp độ Thế giới PC World 2006\", công cụ này cung cấp lớp phòng vệ phụ thêm cho Firefox của bạn.\nNoScript chỉ cho phép JavaScript, Java (và các phần bổ trợ khác) trên những tên miền tin cậy mà bạn chọn (vd., trang web ngân hàng của bạn), canh gác \"vùng biên giới tin cậy\" của bạn chống lại các âm mưu tấn công cross-site scripting (XSS) và Clickjacking, nhờ công nghệ ClearClick của nó.\nPhương thức ngăn chặn trước dựa trên sổ trắng này ngăn chặn việc khai thác các lỗ hổng bảo mật (đã biết hay thậm chí chưa biết!) mà không làm mất đi chức năng...\nCác chuyên gia đều đồng ý rằng: Firefox thật sự an toàn hơn với NoScript :-)", "zh-TW": "這個工具是 2006 PC World 世界級大獎贏家，讓你的 Firefox 更加安全！\n\n使用此套件後，僅有你信任的網站（例如你的銀行）才能執行腳本、Java 與其他動態內容。建立「信任範圍」以抵擋跨網站腳本攻擊（XSS）。\n\n未雨綢繆、使用此套件避開安全漏洞（連未知的漏洞也照擋不誤），而不損失正常功能…\n\n連專家都同意、Firefox 有了 NoScript 後更加安全了 ;-)", - "zh-CN": "重要\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">一篇基础的<b>NoScript 10 指南</b></a>\n\n仍被 NoScript 10 的新 UI 所困惑？\n看看这篇<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">用户贡献的 NoScript 10 入门</a>。\n还有这篇<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\"> NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (or \"Legacy\") comparison</a>。\n\n作为“PC World World Class Award”大奖的获得者并内置于 Tor 浏览器，NoScript 将为您提供最佳的网络保护。\n\n它只允许在您选择的信任域上执行 JavaScript、Flash、Java 和其他可执行内容，例如您的家庭银行网站，能够缓解包括 Spectre 和 Meltdown 等远程可利用漏洞。\n\n多亏了其独特的 ClearClick 技术，它可以保护您的“信任边界”不受跨站点脚本攻击（XSS），跨区 DNS 重新绑定/ CSRF 攻击（路由器黑客）和点击劫持（Clickjacking）尝试。\n\n这种先发制人的机制在不损失任何功能的前提下，防止利用安全漏洞（已知甚至未知的！）进行攻击。\n专家们一致同意：拥有 NoScript 的 Firefox 更安全 :-)\n\n常见问题解答：<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\n论坛：<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>" + "zh-CN": "重要\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">一篇基础的<b>NoScript 10 指南</b></a>\n\n仍被 NoScript 10 的新 UI 所困惑？\n看看这篇<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">用户贡献的 NoScript 10 入门</a>。\n还有这篇<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…"> NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (or \"Legacy\") comparison</a>。\n\n作为“PC World World Class Award”大奖的获得者并内置于 Tor 浏览器，NoScript 将为您提供最佳的网络保护。\n\n它只允许在您选择的信任域上执行 JavaScript、Flash、Java 和其他可执行内容，例如您的家庭银行网站，能够缓解包括 Spectre 和 Meltdown 等远程可利用漏洞。\n\n多亏了其独特的 ClearClick 技术，它可以保护您的“信任边界”不受跨站点脚本攻击（XSS），跨区 DNS 重新绑定/ CSRF 攻击（路由器黑客）和点击劫持（Clickjacking）尝试。\n\n这种先发制人的机制在不损失任何功能的前提下，防止利用安全漏洞（已知甚至未知的！）进行攻击。\n专家们一致同意：拥有 NoScript 的 Firefox 更安全 :-)\n\n常见问题解答：<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\n论坛：<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>" }, "developer_comments": { "en-US": "Security issues affecting Firefox or the Tor Browser which can be fixed by a NoScript update are guaranteed to be addressed within 24 hours. This sometimes requires many updates to be issued in a short timespan, and when this happens you may notice NoScript UI's asking to \"<em>reload this page in order to operate properly</em>\". This is normal on \"live\" updates, and it just means the UI is out of sync with the page content, but there's no need to worry as <strong>all the restrictions to scripts and active content are still in place</strong>.", @@ -2619,12 +2619,12 @@ 960, 727 ], - "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267408.png?modified…", + "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267408.png?modified…", "thumbnail_size": [ 528, 400 ], - "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267408.jpg?modifi…" + "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267408.jpg?modifi…" }, { "id": 267511, @@ -2635,12 +2635,12 @@ 717, 542 ], - "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267511.png?modified…", + "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267511.png?modified…", "thumbnail_size": [ 529, 400 ], - "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267511.jpg?modifi…" + "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267511.jpg?modifi…" }, { "id": 267512, @@ -2651,12 +2651,12 @@ 717, 542 ], - "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267512.png?modified…", + "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267512.png?modified…", "thumbnail_size": [ 529, 400 ], - "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267512.jpg?modifi…" + "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267512.jpg?modifi…" } ], "promoted": { @@ -2667,10 +2667,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3973, - "bayesian_average": 4.394644655920732, - "count": 2187, - "text_count": 841 + "average": 4.3989, + "bayesian_average": 4.3962123489941085, + "count": 2201, + "text_count": 842 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2714,7 +2714,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7679 + "weekly_downloads": 7056 }, "notes": null }, @@ -2730,7 +2730,7 @@ "picture_url": null } ], - "average_daily_users": 163565, + "average_daily_users": 162447, "categories": { "firefox": [ "photos-music-videos", @@ -2839,10 +2839,10 @@ "category": "recommended" }, "ratings": { - "average": 3.8716, - "bayesian_average": 3.867573249528433, - "count": 1231, - "text_count": 446 + "average": 3.8642, + "bayesian_average": 3.8601313266049937, + "count": 1237, + "text_count": 448 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2861,7 +2861,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 2672 + "weekly_downloads": 2040 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -99,9 +99,9 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.… name: noscript sha256sum: 05b98840b05ef2acbac333543e4b7c3d40fee2ce5fb4e29260b05e2ff6fe24cd - - URL: https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.5… + - URL: https://addons.mozilla.org/firefox/downloads/file/4261710/ublock_origin-1.5… name: ublock-origin - sha256sum: f5fbeeac511ca4e10a74723413727fda8e6f9236c726d16eb54ade1fbe7be5be + sha256sum: 9928e79a52cecf7cfa231fdb0699c7d7a427660d94eb10d711ed5a2f10d2eb89 enable: '[% c("var/mullvad-browser") %]' - URL: https://cdn.mullvad.net/browser-extension/0.9.0/mullvad-browser-extension-0… name: mullvad-extension ===================================== projects/firefox/config ===================================== @@ -14,7 +14,7 @@ container: use_container: 1 var: - firefox_platform_version: 115.9.1 + firefox_platform_version: 115.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.0' browser_branch: '[% c("var/browser_series") %]-1' ===================================== projects/geckoview/config ===================================== @@ -14,9 +14,9 @@ container: use_container: 1 var: - geckoview_version: 115.9.0esr + geckoview_version: 115.10.0esr browser_branch: 13.0-1 - browser_build: 3 + browser_build: 1 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '[% IF c("var/use_go_1_20") %]1.20.14[% ELSE %]1.21.8[% END %]' +version: '[% IF c("var/use_go_1_20") %]1.20.14[% ELSE %]1.21.9[% END %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -121,7 +121,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 + sha256sum: 58f0c5ced45a0012bce2ff7a9df03e128abcc8818ebabe5027bb92bafe20e421 enable: '[% !c("var/use_go_1_20") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' name: go ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.10 +version: 0.4.8.11 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 8e04ca3c5f440ed8f16b2069ae9565e4b044ec29 + git_hash: d31e6b16c372e2eb235c4f2b0eae0b573a5515ba targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: bf2fac60a6c41aa67b8147f22a638d498ac2dcdd + git_hash: d37455a56f966b4f87f5f326b534a91f71fd5c88 targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: c5d462fc3513f23fc74193c7a5c31027fc07672d + git_hash: aa60141af05cd3cabf2479de52da46d436822d61 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,13 +73,13 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.0.13' + torbrowser_version: '13.0.14' torbrowser_build: 'build1' torbrowser_incremental_from: + - '13.0.13' - '13.0.12' - '[% IF c("var/tor-browser") %]13.0.11[% END %]' - - '13.0.10' - - '[% IF c("var/mullvad-browser") %]13.0.9[% END %]' + - '[% IF c("var/mullvad-browser") %]13.0.10[% END %]' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.10.0esr-13.5-1] Revert "Bug 23104: Add a default line height compensation"
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 792ec04b by Pier Angelo Vendrame at 2024-04-11T15:18:16+02:00 Revert "Bug 23104: Add a default line height compensation" Bug 40919: Drop line-height protection introduced in #23104. The main purpose of this patch was to hide the operating system. However, we don't hide it anymore, so it is not necessary and we do not have any proof of other benefits e.g., that it hides the OS minor version. This reverts commit 15172f2895e0691b57f12c24e99c9b84ee9395ff. - - - - - 3 changed files: - layout/generic/ReflowInput.cpp - layout/generic/test/mochitest.ini - − layout/generic/test/test_tor_bug23104.html Changes: ===================================== layout/generic/ReflowInput.cpp ===================================== @@ -34,7 +34,6 @@ #include "nsTableCellFrame.h" #include "nsTableFrame.h" #include "StickyScrollContainer.h" -#include "nsContentUtils.h" using namespace mozilla; using namespace mozilla::css; @@ -2724,12 +2723,12 @@ void ReflowInput::CalculateBlockSideMargins() { // This is necessary because without this compensation, normal line height might // look too tight. constexpr float kNormalLineHeightFactor = 1.2f; -static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics, bool aRFP) { +static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) { MOZ_ASSERT(aFontMetrics, "no font metrics"); nscoord externalLeading = aFontMetrics->ExternalLeading(); nscoord internalLeading = aFontMetrics->InternalLeading(); nscoord emHeight = aFontMetrics->EmHeight(); - if ((!internalLeading && !externalLeading) || aRFP) { + if (!internalLeading && !externalLeading) { return NSToCoordRound(emHeight * kNormalLineHeightFactor); } return emHeight + internalLeading + externalLeading; @@ -2769,9 +2768,7 @@ static inline nscoord ComputeLineHeight(const StyleLineHeight& aLh, RefPtr<nsFontMetrics> fm = nsLayoutUtils::GetMetricsFor( aPresContext, aIsVertical, &aRelativeToFont, size, /* aUseUserFontSet = */ true); - return GetNormalLineHeight( - fm, aPresContext->Document()->ShouldResistFingerprinting( - RFPTarget::Unknown)); + return GetNormalLineHeight(fm); } // If we don't have a pres context, use a 1.2em fallback. size.ScaleBy(kNormalLineHeightFactor); ===================================== layout/generic/test/mochitest.ini ===================================== @@ -164,4 +164,3 @@ support-files = [test_scroll_on_display_contents.html] support-files = !/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js [test_bug1803209.html] -[test_tor_bug23104.html] ===================================== layout/generic/test/test_tor_bug23104.html deleted ===================================== @@ -1,50 +0,0 @@ -<!DOCTYPE HTML> -<meta charset="UTF-8"> -<html> -<head> - <title>Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="application/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <style type="text/css"> - span { - background-color: #000; - color: #fff; - font-size: 16.5px; - } - </style> -</head> -<body> -<span id="test1">Test1</span> -<span id="test2">كلمة</span> -<span id="test3">ação</span> -<script> - -let setPref = async function (key, value) { - await SpecialPowers.pushPrefEnv({"set": [[key, value]]}); -} - -function getStyle(el, styleprop) { - el = document.getElementById(el); - return document.defaultView.getComputedStyle(el, null).getPropertyValue(styleprop); -} - -function validateElement(elementName, isFingerprintResistent) { - var fontSize = getStyle(elementName, 'font-size'); - var lineHeight = getStyle(elementName, 'line-height'); - var validationCb = isFingerprintResistent ? is : isnot; - validationCb(parseFloat(lineHeight), Math.round(parseFloat(fontSize)) * 1.2, 'Line Height validation'); -} - -add_task(async function() { - await setPref("layout.css.line-height.normal-as-resolved-value.enabled", false); - for (let resistFingerprintingValue of [true, false]) { - await setPref("privacy.resistFingerprinting", resistFingerprintingValue); - for (let elementId of ['test1', 'test2', 'test3']) { - validateElement(elementId, resistFingerprintingValue); - } - } -}); - -</script> -</body> -</html> View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/792… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/792… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.10.0esr-13.5-1] Revert "Bug 23104: Add a default line height compensation"
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch base-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: d1853152 by Pier Angelo Vendrame at 2024-04-11T15:17:31+02:00 Revert "Bug 23104: Add a default line height compensation" Bug 40919: Drop line-height protection introduced in #23104. The main purpose of this patch was to hide the operating system. However, we don't hide it anymore, so it is not necessary and we do not have any proof of other benefits e.g., that it hides the OS minor version. This reverts commit 15172f2895e0691b57f12c24e99c9b84ee9395ff. - - - - - 3 changed files: - layout/generic/ReflowInput.cpp - layout/generic/test/mochitest.ini - − layout/generic/test/test_tor_bug23104.html Changes: ===================================== layout/generic/ReflowInput.cpp ===================================== @@ -34,7 +34,6 @@ #include "nsTableCellFrame.h" #include "nsTableFrame.h" #include "StickyScrollContainer.h" -#include "nsContentUtils.h" using namespace mozilla; using namespace mozilla::css; @@ -2724,12 +2723,12 @@ void ReflowInput::CalculateBlockSideMargins() { // This is necessary because without this compensation, normal line height might // look too tight. constexpr float kNormalLineHeightFactor = 1.2f; -static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics, bool aRFP) { +static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) { MOZ_ASSERT(aFontMetrics, "no font metrics"); nscoord externalLeading = aFontMetrics->ExternalLeading(); nscoord internalLeading = aFontMetrics->InternalLeading(); nscoord emHeight = aFontMetrics->EmHeight(); - if ((!internalLeading && !externalLeading) || aRFP) { + if (!internalLeading && !externalLeading) { return NSToCoordRound(emHeight * kNormalLineHeightFactor); } return emHeight + internalLeading + externalLeading; @@ -2769,9 +2768,7 @@ static inline nscoord ComputeLineHeight(const StyleLineHeight& aLh, RefPtr<nsFontMetrics> fm = nsLayoutUtils::GetMetricsFor( aPresContext, aIsVertical, &aRelativeToFont, size, /* aUseUserFontSet = */ true); - return GetNormalLineHeight( - fm, aPresContext->Document()->ShouldResistFingerprinting( - RFPTarget::Unknown)); + return GetNormalLineHeight(fm); } // If we don't have a pres context, use a 1.2em fallback. size.ScaleBy(kNormalLineHeightFactor); ===================================== layout/generic/test/mochitest.ini ===================================== @@ -164,4 +164,3 @@ support-files = [test_scroll_on_display_contents.html] support-files = !/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js [test_bug1803209.html] -[test_tor_bug23104.html] ===================================== layout/generic/test/test_tor_bug23104.html deleted ===================================== @@ -1,50 +0,0 @@ -<!DOCTYPE HTML> -<meta charset="UTF-8"> -<html> -<head> - <title>Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="application/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <style type="text/css"> - span { - background-color: #000; - color: #fff; - font-size: 16.5px; - } - </style> -</head> -<body> -<span id="test1">Test1</span> -<span id="test2">كلمة</span> -<span id="test3">ação</span> -<script> - -let setPref = async function (key, value) { - await SpecialPowers.pushPrefEnv({"set": [[key, value]]}); -} - -function getStyle(el, styleprop) { - el = document.getElementById(el); - return document.defaultView.getComputedStyle(el, null).getPropertyValue(styleprop); -} - -function validateElement(elementName, isFingerprintResistent) { - var fontSize = getStyle(elementName, 'font-size'); - var lineHeight = getStyle(elementName, 'line-height'); - var validationCb = isFingerprintResistent ? is : isnot; - validationCb(parseFloat(lineHeight), Math.round(parseFloat(fontSize)) * 1.2, 'Line Height validation'); -} - -add_task(async function() { - await setPref("layout.css.line-height.normal-as-resolved-value.enabled", false); - for (let resistFingerprintingValue of [true, false]) { - await setPref("privacy.resistFingerprinting", resistFingerprintingValue); - for (let elementId of ['test1', 'test2', 'test3']) { - validateElement(elementId, resistFingerprintingValue); - } - } -}); - -</script> -</body> -</html> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d185315… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d185315… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] Revert "Bug 23104: Add a default line height compensation"
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 19a92f8c by Pier Angelo Vendrame at 2024-04-11T12:15:38+02:00 Revert "Bug 23104: Add a default line height compensation" Bug 40919: Drop line-height protection introduced in #23104. The main purpose of this patch was to hide the operating system. However, we don't hide it anymore, so it is not necessary and we do not have any proof of other benefits e.g., that it hides the OS minor version. This reverts commit 15172f2895e0691b57f12c24e99c9b84ee9395ff. - - - - - 3 changed files: - layout/generic/ReflowInput.cpp - layout/generic/test/mochitest.ini - − layout/generic/test/test_tor_bug23104.html Changes: ===================================== layout/generic/ReflowInput.cpp ===================================== @@ -34,7 +34,6 @@ #include "nsTableCellFrame.h" #include "nsTableFrame.h" #include "StickyScrollContainer.h" -#include "nsContentUtils.h" using namespace mozilla; using namespace mozilla::css; @@ -2724,12 +2723,12 @@ void ReflowInput::CalculateBlockSideMargins() { // This is necessary because without this compensation, normal line height might // look too tight. constexpr float kNormalLineHeightFactor = 1.2f; -static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics, bool aRFP) { +static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) { MOZ_ASSERT(aFontMetrics, "no font metrics"); nscoord externalLeading = aFontMetrics->ExternalLeading(); nscoord internalLeading = aFontMetrics->InternalLeading(); nscoord emHeight = aFontMetrics->EmHeight(); - if ((!internalLeading && !externalLeading) || aRFP) { + if (!internalLeading && !externalLeading) { return NSToCoordRound(emHeight * kNormalLineHeightFactor); } return emHeight + internalLeading + externalLeading; @@ -2769,9 +2768,7 @@ static inline nscoord ComputeLineHeight(const StyleLineHeight& aLh, RefPtr<nsFontMetrics> fm = nsLayoutUtils::GetMetricsFor( aPresContext, aIsVertical, &aRelativeToFont, size, /* aUseUserFontSet = */ true); - return GetNormalLineHeight( - fm, aPresContext->Document()->ShouldResistFingerprinting( - RFPTarget::Unknown)); + return GetNormalLineHeight(fm); } // If we don't have a pres context, use a 1.2em fallback. size.ScaleBy(kNormalLineHeightFactor); ===================================== layout/generic/test/mochitest.ini ===================================== @@ -164,4 +164,3 @@ support-files = [test_scroll_on_display_contents.html] support-files = !/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js [test_bug1803209.html] -[test_tor_bug23104.html] ===================================== layout/generic/test/test_tor_bug23104.html deleted ===================================== @@ -1,50 +0,0 @@ -<!DOCTYPE HTML> -<meta charset="UTF-8"> -<html> -<head> - <title>Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="application/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <style type="text/css"> - span { - background-color: #000; - color: #fff; - font-size: 16.5px; - } - </style> -</head> -<body> -<span id="test1">Test1</span> -<span id="test2">كلمة</span> -<span id="test3">ação</span> -<script> - -let setPref = async function (key, value) { - await SpecialPowers.pushPrefEnv({"set": [[key, value]]}); -} - -function getStyle(el, styleprop) { - el = document.getElementById(el); - return document.defaultView.getComputedStyle(el, null).getPropertyValue(styleprop); -} - -function validateElement(elementName, isFingerprintResistent) { - var fontSize = getStyle(elementName, 'font-size'); - var lineHeight = getStyle(elementName, 'line-height'); - var validationCb = isFingerprintResistent ? is : isnot; - validationCb(parseFloat(lineHeight), Math.round(parseFloat(fontSize)) * 1.2, 'Line Height validation'); -} - -add_task(async function() { - await setPref("layout.css.line-height.normal-as-resolved-value.enabled", false); - for (let resistFingerprintingValue of [true, false]) { - await setPref("privacy.resistFingerprinting", resistFingerprintingValue); - for (let elementId of ['test1', 'test2', 'test3']) { - validateElement(elementId, resistFingerprintingValue); - } - } -}); - -</script> -</body> -</html> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/19a92f8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/19a92f8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 86ea0a08 by Dan Ballard at 2024-04-11T10:44:18+02:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser fix typo in new geckoview build scripts - - - - - 1 changed file: - tools/geckoview/package-gradle.sh Changes: ===================================== tools/geckoview/package-gradle.sh ===================================== @@ -5,7 +5,7 @@ ARCH=$2 source android-env.sh -env ARCHS=$ARCH make fat-aar +env ARCHS=$ARCH make fataar cd $DEV_ROOT MOZCONFIG=mozconfig-android-$ARCH ./mach build binaries View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/86ea0a0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/86ea0a0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.10.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed new tag mullvad-browser-115.10.0esr-13.5-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.10.0esr-13.5-1] 21 commits: MB 38: Mullvad Browser configuration
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: afc7b487 by Pier Angelo Vendrame at 2024-04-11T10:20:09+02:00 MB 38: Mullvad Browser configuration - - - - - 7ee4eafa by Pier Angelo Vendrame at 2024-04-11T10:20:14+02:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - dbc5c863 by Pier Angelo Vendrame at 2024-04-11T10:20:14+02:00 fixup! MB 1: Mullvad Browser branding Bug 42490: Write the browser logo SVG also outside of omni.ja. - - - - - c4f43dc7 by Pier Angelo Vendrame at 2024-04-11T10:20:15+02:00 fixup! MB 1: Mullvad Browser branding Bug 42490: Write the browser logo SVG also outside of omni.ja. For Mullvad Browser, we have to add this also to the various moz.build that are inside each branding directory, because we do not call FirefoxBranding for them. - - - - - ad0f5d2e by Pier Angelo Vendrame at 2024-04-11T10:20:15+02:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 6cc921ac by Pier Angelo Vendrame at 2024-04-11T10:20:15+02:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 9fed5887 by Pier Angelo Vendrame at 2024-04-11T10:20:15+02:00 MB 37: Customization for the about dialog - - - - - f6b28169 by Henry Wilkes at 2024-04-11T10:20:15+02:00 MB 39: Add home page about:mullvad-browser - - - - - a886e04b by hackademix at 2024-04-11T10:20:16+02:00 MB 97: Remove UI cues to install new extensions. - - - - - b275970b by hackademix at 2024-04-11T10:20:16+02:00 MB 47: uBlock Origin customization - - - - - 8e3c5b75 by Pier Angelo Vendrame at 2024-04-11T10:20:16+02:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 91046e3c by Pier Angelo Vendrame at 2024-04-11T10:20:16+02:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 6820ae90 by Nicolas Vigier at 2024-04-11T10:20:16+02:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - 859be8fb by Pier Angelo Vendrame at 2024-04-11T10:20:17+02:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - 3146c247 by Pier Angelo Vendrame at 2024-04-11T10:20:17+02:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - d85c1b52 by hackademix at 2024-04-11T10:20:17+02:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - ffe57b82 by Richard Pospesel at 2024-04-11T10:20:17+02:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - 1c231b98 by rui hildt at 2024-04-11T10:20:17+02:00 MB 213: Customize the search engines list - - - - - 1cea288e by hackademix at 2024-04-11T10:20:18+02:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 23907fef by Pier Angelo Vendrame at 2024-04-11T10:20:18+02:00 MB 234: Disable OS spoofing in HTTP User-Agent. This commits makes it possible to disable OS spoofing in the HTTP User-Agent header, to see if matching header and JS property improve usability. - - - - - 4e56f637 by Pier Angelo Vendrame at 2024-04-11T10:20:18+02:00 MB 80: Enable Mullvad Browser as a default browser - - - - - 30 changed files: - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.js - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/9c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/9c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.10.0esr-13.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 9c339327 by Pier Angelo Vendrame at 2024-04-11T09:51:26+02:00 fixup! Firefox preference overrides. Bug 42315: Drop dom.enable_event_timing. It is already protected by RFP. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -395,8 +395,6 @@ pref("network.http.referer.XOriginTrimmingPolicy", 2); // Bug 17228: Force trim pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Bug 40463: Disable Windows SSO pref("network.http.windows-sso.enabled", false, locked); -// Bug 40383: Disable new PerformanceEventTiming -pref("dom.enable_event_timing", false); // Disable API for measuring text width and height. pref("dom.textMetrics.actualBoundingBox.enabled", false); pref("dom.textMetrics.baselines.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/9c3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/9c3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.10.0esr-13.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch base-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 9c339327 by Pier Angelo Vendrame at 2024-04-11T09:51:26+02:00 fixup! Firefox preference overrides. Bug 42315: Drop dom.enable_event_timing. It is already protected by RFP. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -395,8 +395,6 @@ pref("network.http.referer.XOriginTrimmingPolicy", 2); // Bug 17228: Force trim pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Bug 40463: Disable Windows SSO pref("network.http.windows-sso.enabled", false, locked); -// Bug 40383: Disable new PerformanceEventTiming -pref("dom.enable_event_timing", false); // Disable API for measuring text width and height. pref("dom.textMetrics.actualBoundingBox.enabled", false); pref("dom.textMetrics.baselines.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9c33932… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9c33932… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 7b0bb7a3 by Pier Angelo Vendrame at 2024-04-11T09:50:14+02:00 fixup! Firefox preference overrides. Bug 42315: Drop dom.enable_event_timing. It is already protected by RFP. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -395,8 +395,6 @@ pref("network.http.referer.XOriginTrimmingPolicy", 2); // Bug 17228: Force trim pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 // Bug 40463: Disable Windows SSO pref("network.http.windows-sso.enabled", false, locked); -// Bug 40383: Disable new PerformanceEventTiming -pref("dom.enable_event_timing", false); // Disable API for measuring text width and height. pref("dom.textMetrics.actualBoundingBox.enabled", false); pref("dom.textMetrics.baselines.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7b0bb7a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7b0bb7a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bump Firefox version to 115.10.0esr for nightly builds.
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4561d31c by Pier Angelo Vendrame at 2024-04-11T09:44:54+02:00 Bump Firefox version to 115.10.0esr for nightly builds. - - - - - 2 changed files: - projects/firefox/config - projects/geckoview/config Changes: ===================================== projects/firefox/config ===================================== @@ -14,11 +14,11 @@ container: use_container: 1 var: - firefox_platform_version: 115.9.0 + firefox_platform_version: 115.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 2 + browser_build: 1 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -14,9 +14,9 @@ container: use_container: 1 var: - geckoview_version: 115.9.0esr + geckoview_version: 115.10.0esr browser_branch: 13.5-1 - browser_build: 2 + browser_build: 1 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-115.10.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed new branch mullvad-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.10.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed new tag tor-browser-115.10.0esr-13.5-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.10.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed new tag base-browser-115.10.0esr-13.5-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.10.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed new branch base-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] 252 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by Pier Angelo Vendrame (＠pierov) 11 Apr '24

11 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 614fb584 by Eitan Isaacson at 2024-04-10T09:21:12+02:00 Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie Differential Revision: https://phabricator.services.mozilla.com/D179737 - - - - - 0bdd0f0a by Pier Angelo Vendrame at 2024-04-10T09:21:12+02:00 Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized Allow using NSS for checking MAR signatures also in platforms where OS-native APIs are used by default, i.e., macOS and Windows. Differential Revision: https://phabricator.services.mozilla.com/D177743 - - - - - 84f84338 by Pier Angelo Vendrame at 2024-04-10T09:21:13+02:00 Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D186456 - - - - - 26d91ae6 by Emilio Cobos Álvarez at 2024-04-10T09:21:13+02:00 Bug 1853731 - Use html:img for message-bar-icon. r=Gijs,dao,settings-reviewers,desktop-theme-reviewers,sfoster Differential Revision: https://phabricator.services.mozilla.com/D188521 - - - - - 65a43a6f by Pier Angelo Vendrame at 2024-04-10T09:21:13+02:00 Bug 1854117 - Sort the DLL blocklist flags. r=mossop,win-reviewers,gstoll Differential Revision: https://phabricator.services.mozilla.com/D188716 - - - - - f1948c76 by Eden Chuang at 2024-04-10T09:21:13+02:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - 397120f6 by edgul at 2024-04-10T09:21:13+02:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 0c53a85d by Kelsey Gilbert at 2024-04-10T09:21:14+02:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - bfab7bce by Mark Banner at 2024-04-10T09:21:14+02:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - 994e8132 by Pier Angelo Vendrame at 2024-04-10T09:21:14+02:00 Bug 1849186 - Add a preference not to expose the content title in the window title. r=Gijs,tabbrowser-reviewers,dao Differential Revision: https://phabricator.services.mozilla.com/D190496 - - - - - 88e1b52e by Bob Owen at 2024-04-10T09:21:14+02:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - 8db304fa by Malte Juergens at 2024-04-10T09:21:14+02:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - 7f1ef501 by Andreas Pehrson at 2024-04-10T09:21:15+02:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - d3548a4f by Pier Angelo Vendrame at 2024-04-10T09:21:15+02:00 Bug 1860020 - Remove the assertion on the value of toolkit.telemetry.enabled. r=KrisWright,chutten Bug 1444275 introduced an assertion on the parent process to check that the value of toolkit.telemetry.enabled is the expected one. However, this expected value could be different from the one set and locked e.g. in some forks. Therefore, the assertion prevented debug builds from working in these cases. Differential Revision: https://phabricator.services.mozilla.com/D195080 - - - - - a1d28a56 by Kagami Sascha Rosylight at 2024-04-10T09:21:15+02:00 Bug 1865238 - Use One UI Sans KR VF for Korean sans-serif font on Android r=jfkthame Per /etc/fonts.xml, there are now only two `<family lang="ko">` nodes there: * OneUISansKRVF series * SECCJK series (but no KR postfix anymore?) This patch uses One UI Sans KR VF as the replacement as this is newer and is a variable font (tested with https://codepen.io/SaschaNaz/pen/ExrdYXJ) Differential Revision: https://phabricator.services.mozilla.com/D195078 - - - - - af8708a0 by Tom Ritter at 2024-04-10T09:21:15+02:00 Bug 1873526: Refactor the restriction override list from a big if statement to a list r=KrisWright Differential Revision: https://phabricator.services.mozilla.com/D198081 - - - - - 226f795b by Pier Angelo Vendrame at 2024-04-10T09:21:15+02:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - 9cf53e50 by Pier Angelo Vendrame at 2024-04-10T09:21:16+02:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr Differential Revision: https://phabricator.services.mozilla.com/D198967 - - - - - 070bd794 by Pier Angelo Vendrame at 2024-04-10T09:21:16+02:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 0c4b64c1 by Tom Ritter at 2024-04-10T09:21:16+02:00 Bug 1885258: Hidden fonts should obey the allow list r=jfkthame Differential Revision: https://phabricator.services.mozilla.com/D204571 - - - - - 7ffb554f by Henry Wilkes at 2024-04-10T09:21:16+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 28cb45d8 by hackademix at 2024-04-10T09:21:16+02:00 Bug 42194: Fix blank net error page on failed DNS resolution with active proxy. - - - - - 3d38d820 by Henry Wilkes at 2024-04-10T09:21:17+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 99983cac by Pier Angelo Vendrame at 2024-04-10T09:21:17+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - 2bbd4f37 by Marco Simonelli at 2024-04-10T09:21:17+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - 40664b0f by Marco Simonelli at 2024-04-10T09:21:17+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 93ea383e by Marco Simonelli at 2024-04-10T09:21:17+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - b542a37e by Marco Simonelli at 2024-04-10T09:21:18+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - 8f7df635 by Marco Simonelli at 2024-04-10T09:21:18+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 2f042701 by Marco Simonelli at 2024-04-10T09:21:18+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 74dff761 by hackademix at 2024-04-10T09:21:18+02:00 Bug 41854: Allow overriding download spam protection. - - - - - 0893c15d by Gaba at 2024-04-10T09:21:19+02:00 Adding issue and merge request templates - - - - - 0e45986e by Richard Pospesel at 2024-04-10T09:21:19+02:00 fixup! Adding issue and merge request templates add an issue template to guide emergency bug fixes - - - - - 37dacfcc by Pier Angelo Vendrame at 2024-04-10T09:21:19+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - 50af7041 by NoisyCoil at 2024-04-10T09:21:19+02:00 fixup! Base Browser's .mozconfigs. Bug 42501: Move `--disable-eme` to OS- and architecture-specific mozconfigs. - - - - - 0e13bc8d by NoisyCoil at 2024-04-10T09:21:19+02:00 fixup! Base Browser's .mozconfigs. Bug 42491: Add mozconfig-linux-aarch64. - - - - - 539f8b8f by Pier Angelo Vendrame at 2024-04-10T09:21:20+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 7c3736a8 by Pier Angelo Vendrame at 2024-04-10T09:21:20+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - d95b71b4 by Dan Ballard at 2024-04-10T09:21:20+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 672b4af1 by Matthew Finkel at 2024-04-10T09:21:20+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 48efcba0 by Matthew Finkel at 2024-04-10T09:21:20+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 7ea994cf by Mike Perry at 2024-04-10T09:21:21+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 66d3acf2 by Alex Catarineu at 2024-04-10T09:21:21+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - ec0efe24 by Georg Koppen at 2024-04-10T09:21:21+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - a9cd3cc8 by Kathy Brade at 2024-04-10T09:21:21+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 069ce7b1 by Kathy Brade at 2024-04-10T09:21:21+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 3469d63c by Alex Catarineu at 2024-04-10T09:21:22+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 73456050 by Kathy Brade at 2024-04-10T09:21:22+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - caea6792 by Arthur Edelstein at 2024-04-10T09:21:22+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 83d79a91 by Alex Catarineu at 2024-04-10T09:21:22+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - fdc6ceb9 by cypherpunks1 at 2024-04-10T09:21:22+02:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 8a87997c by Pier Angelo Vendrame at 2024-04-10T09:21:23+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 6bba1912 by Georg Koppen at 2024-04-10T09:21:23+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 4bb0a615 by Alex Catarineu at 2024-04-10T09:21:23+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 980cff15 by cypherpunks1 at 2024-04-10T09:21:23+02:00 Bug 41568: Disable LaterRun - - - - - 279fa511 by cypherpunks1 at 2024-04-10T09:21:23+02:00 Bug 40717: Hide Windows SSO in settings - - - - - fa2ec4d8 by Pier Angelo Vendrame at 2024-04-10T09:21:24+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 201ef9a6 by cypherpunks1 at 2024-04-10T09:21:24+02:00 Bug 40175: Add origin attributes to about:reader top-level requests - - - - - c66b6680 by Richard Pospesel at 2024-04-10T09:21:24+02:00 Bug 41327: Disable UrlbarProviderInterventions - - - - - 6a5384d7 by Richard Pospesel at 2024-04-10T09:21:24+02:00 Bug 42037: Disable about:firefoxview page - - - - - 245b03a3 by Mike Perry at 2024-04-10T09:21:25+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - fff180b9 by Pier Angelo Vendrame at 2024-04-10T09:21:25+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - d7726e43 by Pier Angelo Vendrame at 2024-04-10T09:21:25+02:00 Bug 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 901066f8 by Alex Catarineu at 2024-04-10T09:21:25+02:00 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. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 9e3acc8d by Alex Catarineu at 2024-04-10T09:21:25+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 5ae048e1 by Alex Catarineu at 2024-04-10T09:21:26+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - fe148cf6 by Alex Catarineu at 2024-04-10T09:21:26+02:00 Bug 26345: Hide tracking protection UI - - - - - 196e4ea8 by Pier Angelo Vendrame at 2024-04-10T09:21:26+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - cd3adaf8 by Alex Catarineu at 2024-04-10T09:21:26+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 2cd4287c by Mike Perry at 2024-04-10T09:21:26+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 15172f28 by Igor Oliveira at 2024-04-10T09:21:27+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height. - - - - - e2fc6344 by Pier Angelo Vendrame at 2024-04-10T09:21:27+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 80c34f48 by Matthew Finkel at 2024-04-10T09:21:27+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 33d17934 by cypherpunks1 at 2024-04-10T09:21:27+02:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - d9281c15 by cypherpunks1 at 2024-04-10T09:21:27+02:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 33e72132 by hackademix at 2024-04-10T09:21:28+02:00 Bug 42288: Allow language spoofing in status messages. - - - - - 46ea506a by Richard Pospesel at 2024-04-10T09:21:28+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 0924d190 by Pier Angelo Vendrame at 2024-04-10T09:21:28+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 189032c8 by Henry Wilkes at 2024-04-10T09:21:28+02:00 fixup! Base Browser strings Bug 42211: Migrate new identity to Fluent. Also change some strings to sentence case in en-US. Also removed the hard-coded "Tor Browser", which is not appropriate in base-browser (e.g. for Mullvad Browser). - - - - - 18f4c846 by hackademix at 2024-04-10T09:21:28+02:00 fixup! Base Browser strings Bug 41916: Letterboxing preferences UI - - - - - a2776c20 by Henry Wilkes at 2024-04-10T09:30:39+02:00 fixup! Base Browser strings Bug 42214: Migrate security level strings to Fluent. Also change some strings to be sentence case in English. - - - - - c5473429 by Pier Angelo Vendrame at 2024-04-10T09:30:42+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - b41b5d9e by p13dz at 2024-04-10T09:30:42+02:00 Bug 40283: Workaround for the file upload bug - - - - - daaafb97 by Arthur Edelstein at 2024-04-10T09:30:43+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 57fff430 by cypherpunks1 at 2024-04-10T09:30:43+02:00 Bug 41740: Change the RFP value of devicePixelRatio to 2 - - - - - eb08b5ea by Pier Angelo Vendrame at 2024-04-10T09:30:43+02:00 Bug 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - ba62e953 by cypherpunks1 at 2024-04-10T09:30:43+02:00 Bug 41881: Don't persist custom network requests on private windows - - - - - b7e5a047 by hackademix at 2024-04-10T09:30:43+02:00 Bug 42019: Empty browser's clipboard on browser shutdown - - - - - 4638786e by hackademix at 2024-04-10T09:30:44+02:00 Bug 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - d98da315 by Pier Angelo Vendrame at 2024-04-10T09:30:44+02:00 Bug 42376: Pass the locale list when constructing l10n in datetimebox The datetime input is inconsistent with other inputs when using spoof English: its placeholder is not translated, unlike the default values and texts of all the other inputs. - - - - - e11cf4e7 by hackademix at 2024-04-10T09:30:44+02:00 Bug 42397: Change RFP-spoofed TZ to Atlantic/Reykjavik. - - - - - 0ee81025 by Pier Angelo Vendrame at 2024-04-10T09:30:44+02:00 Bug 42428: Make RFP spoof the timezone of document.lastModified. - - - - - 5a721929 by Pier Angelo Vendrame at 2024-04-10T09:30:44+02:00 Bug 42472: Spoof timezone in XSLT. - - - - - f23e0179 by hackademix at 2024-04-10T09:30:45+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - c80ad903 by hackademix at 2024-04-10T09:30:45+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 499b85f7 by hackademix at 2024-04-10T09:30:45+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 60788efc by hackademix at 2024-04-10T09:30:45+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 5fdd8ce0 by hackademix at 2024-04-10T15:43:00+02:00 Bug 32308: Use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - 4d247f85 by hackademix at 2024-04-10T15:43:40+02:00 fixup! Bug 32308: Use direct browser sizing for letterboxing. Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" - - - - - 28453174 by hackademix at 2024-04-10T15:44:15+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 93e9d099 by hackademix at 2024-04-10T15:44:58+02:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" - - - - - e956d50a by hackademix at 2024-04-10T15:45:35+02:00 Bug 41918: Option to reuse last window size when letterboxing is enabled. - - - - - 9240f920 by hackademix at 2024-04-10T15:45:39+02:00 Bug 41916: Letterboxing preferences UI - - - - - 20a7aa87 by hackademix at 2024-04-10T15:45:39+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 073ca7f9 by hackademix at 2024-04-10T15:47:35+02:00 Bug 42443: Shrink window to match letterboxing size when the emtpy area is clicked. - - - - - 3976e127 by Henry Wilkes at 2024-04-10T15:47:38+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 899b57cc by Kathy Brade at 2024-04-10T15:47:39+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 22e44f57 by Pier Angelo Vendrame at 2024-04-10T15:47:39+02:00 Bug 42061: Create an alpha update channel. - - - - - f593e34e by Nicolas Vigier at 2024-04-10T15:47:39+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 0e22840b by Pier Angelo Vendrame at 2024-04-10T15:47:39+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - fdcff5a1 by Pier Angelo Vendrame at 2024-04-10T15:47:40+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - e29a28e6 by Pier Angelo Vendrame at 2024-04-10T15:47:40+02:00 Bug 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 746e2dfc by Alex Catarineu at 2024-04-10T15:47:40+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - 772c3583 by Matthew Finkel at 2024-04-10T15:47:40+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 844ed015 by Henry Wilkes at 2024-04-10T15:47:40+02:00 Bug 41736: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - 961ad8ef by hackademix at 2024-04-10T15:47:41+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 702a6baf by Pier Angelo Vendrame at 2024-04-10T15:47:41+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 9f076003 by Henry Wilkes at 2024-04-10T15:47:41+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 42214: Migrate security level strings to Fluent. - - - - - 8699e582 by Henry Wilkes at 2024-04-10T15:47:41+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 42214: Drop the securityLevel.properties file. - - - - - c43b67a3 by Pier Angelo Vendrame at 2024-04-10T15:47:41+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 42481: Modularize SecurityLevel. - - - - - cf1f0c0a by Pier Angelo Vendrame at 2024-04-10T15:47:42+02:00 Bug 40926: Implemented the New Identity feature - - - - - b1b7d022 by Henry Wilkes at 2024-04-10T15:47:42+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42211: Migrate to Fluent. - - - - - e2269bc9 by hackademix at 2024-04-10T15:47:42+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 4cd4674d by Henry Wilkes at 2024-04-10T15:47:42+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - 6ebb304c by Pier Angelo Vendrame at 2024-04-10T15:47:42+02:00 Bug 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 3fa5d820 by Henry Wilkes at 2024-04-10T16:04:56+02: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. - - - - - 3b76dc9b by Richard Pospesel at 2024-04-10T16:04:57+02:00 Bug 41649: Create rebase and security backport gitlab issue templates - - - - - cb5cf958 by Henry Wilkes at 2024-04-10T16:04:57+02:00 Add CI for Tor Browser - - - - - 8a18c4dc by Richard Pospesel at 2024-04-10T16:04:57+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - cf715803 by Dan Ballard at 2024-04-10T16:04:57+02:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser add geckoview tools - - - - - b581348a by Henry Wilkes at 2024-04-10T16:04:58+02:00 Bug 41803: Add some developer tools for working on tor-browser. - - - - - aae50389 by Kathy Brade at 2024-04-10T16:04:58+02:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 550ab976 by Alex Catarineu at 2024-04-10T16:04:58+02:00 Add TorStrings module for localization - - - - - 9be7a8fe by Henry Wilkes at 2024-04-10T16:04:58+02:00 fixup! Add TorStrings module for localization Bug 42446: Drop old "Current bridge" string. - - - - - 250cd8b9 by Henry Wilkes at 2024-04-10T16:04:58+02:00 fixup! Add TorStrings module for localization Bug 42203: Migrate about dialog strings to Fluent. - - - - - 12c68633 by Henry Wilkes at 2024-04-10T16:04:59+02:00 fixup! Add TorStrings module for localization Bug 42209: Migrate tor circuit strings to Fluent. - - - - - 7fe7fd10 by Henry Wilkes at 2024-04-10T16:04:59+02:00 fixup! Add TorStrings module for localization Bug 42466: Remove "onion logo" from trademark statement and move it to brand.ftl. - - - - - 7dfa9d76 by Pier Angelo Vendrame at 2024-04-10T16:04:59+02:00 fixup! Add TorStrings module for localization Bug 42481: Modularize SecurityLevel. - - - - - 103247da by Henry Wilkes at 2024-04-10T16:04:59+02:00 fixup! Add TorStrings module for localization Bug 42489: Drop nserror strings. - - - - - 1a01c8c4 by Henry Wilkes at 2024-04-10T16:05:00+02:00 fixup! Add TorStrings module for localization Bug 42207: Migrate preferences strings to Fluent. - - - - - c87757f8 by Henry Wilkes at 2024-04-10T16:05:23+02:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - 9d76a7d2 by Henry Wilkes at 2024-04-10T16:05:25+02:00 fixup! Tor Browser strings Bug 42446: Add ending-punctuation to the "Current bridge" accessible name to separate it from the rest of the built-bridge description. - - - - - a57528a4 by Henry Wilkes at 2024-04-10T16:05:25+02:00 fixup! Tor Browser strings Bug 42203: Migrate about dialog strings to Fluent. Also renew the trademark description: + Use double-quotes rather than ASCII single quotes. + Capitalize "The" and include it as part of the trademark name and the corporation name. + Add a note to translators to not translate the trademark names. The previous translations often translated "Onion Logo" even though it is a trademark name. - - - - - bb9606e3 by Henry Wilkes at 2024-04-10T16:05:25+02:00 fixup! Tor Browser strings Bug 42209: Migrate tor circuit strings to Fluent. - - - - - 2b59540b by Henry Wilkes at 2024-04-10T16:05:25+02:00 fixup! Tor Browser strings Bug 42466: Change trademark statement to remove "onion logo", and move it to brand.ftl. - - - - - d12657ac by Henry Wilkes at 2024-04-10T16:05:26+02:00 fixup! Tor Browser strings Bug 42202: Migrate crypto safety strings to Fluent. - - - - - 2973a9cf by Henry Wilkes at 2024-04-10T16:05:26+02:00 fixup! Tor Browser strings Bug 42207: Migrate preferences strings to Fluent. - - - - - 05735a01 by Henry Wilkes at 2024-04-10T16:05:26+02:00 Tor Browser localization migration scripts. - - - - - dd9268c0 by Henry Wilkes at 2024-04-10T16:05:26+02:00 fixup! Tor Browser localization migration scripts. Bug 42203: Migrate about dialog strings to Fluent. We do not migrate the trademark description since the en-US string changed. - - - - - 0b53d576 by Henry Wilkes at 2024-04-10T16:05:26+02:00 fixup! Tor Browser localization migration scripts. Bug 42211: Migrate new identity strings to Fluent. - - - - - 6523fd10 by Henry Wilkes at 2024-04-10T16:05:27+02:00 fixup! Tor Browser localization migration scripts. Bug 42209: Migrate tor circuit strings to Fluent. - - - - - fd67014e by Henry Wilkes at 2024-04-10T16:05:27+02:00 fixup! Tor Browser localization migration scripts. Bug 42214: Migrate security level strings to Fluent. - - - - - 895d83de by Henry Wilkes at 2024-04-10T16:05:27+02:00 fixup! Tor Browser localization migration scripts. Bug 42202: Migrate crypto safety strings to Fluent. - - - - - 0e8033d0 by Henry Wilkes at 2024-04-10T16:05:27+02:00 fixup! Tor Browser localization migration scripts. Bug 42207: Migrate preferences to Fluent. - - - - - 477cee44 by Henry Wilkes at 2024-04-10T16:05:28+02:00 Bug 42305: Add script to combine translation files across versions. - - - - - 73d0c5be by Mike Perry at 2024-04-10T16:05:28+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one Bug 42088: New application icons (used in-app and on linux). Bug 42087: New application icons (windows). - - - - - 0f18a3c1 by Henry Wilkes at 2024-04-10T16:05:28+02:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 42203: Migrate about dialog strings to Fluent. - - - - - 63d5d571 by Henry Wilkes at 2024-04-10T16:05:28+02:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 42466: Use the existing #trademark element from mozilla for Tor Browser's trademark statement. - - - - - 69f18004 by Pier Angelo Vendrame at 2024-04-10T16:05:28+02:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 42490: Write the browser logo SVG also outside of omni.ja. - - - - - c2e3319b by hackademix at 2024-04-10T16:05:29+02:00 Bug 41917: Tor brand-specific styles. - - - - - d43940bd by sanketh at 2024-04-10T16:05:29+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - a9bd2e19 by Henry Wilkes at 2024-04-10T16:05:29+02:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 42202: Migrate crypto safety strings to Fluent. - - - - - b0d07c28 by Mike Perry at 2024-04-10T16:19:54+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - 7a4dc3b7 by NoisyCoil at 2024-04-10T16:20:33+02:00 fixup! TB3: Tor Browser's official .mozconfigs. - - - - - 76439c64 by Henry Wilkes at 2024-04-10T16:20:33+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - e93f75fa by Pier Angelo Vendrame at 2024-04-10T16:20:34+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - 8f0d7f4d by Richard Pospesel at 2024-04-10T16:20:34+02:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 42458: Update the "Submit Feedback" link in "About Tor Browser" - - - - - 10f74930 by Pier Angelo Vendrame at 2024-04-10T16:20:34+02:00 Bug 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - bf046f98 by Pier Angelo Vendrame at 2024-04-10T16:20:34+02:00 Bug 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - fd52ed77 by Henry Wilkes at 2024-04-10T16:20:34+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42489: Drop getLocalizedStringForError from TorLauncherUtil. - - - - - 759d827a by Dan Ballard at 2024-04-10T16:20:35+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41187: Add support for tor logs in android integration - - - - - b624dec0 by Pier Angelo Vendrame at 2024-04-10T16:20:35+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42510: Do not call SETCONF when we do not own the tor daemon. - - - - - 630f5357 by Cecylia Bocovich at 2024-04-10T16:20:35+02:00 Lox integration - - - - - a7489ac0 by Henry Wilkes at 2024-04-10T16:20:35+02:00 fixup! Lox integration Bug 42489: Add a logger for the Lox module. - - - - - 2d7fbfb4 by Henry Wilkes at 2024-04-10T16:20:35+02:00 fixup! Lox integration Bug 42489: Change "loxid" to "loxId". This follows the camel case convention. - - - - - cba570d2 by Henry Wilkes at 2024-04-10T16:20:36+02:00 fixup! Lox integration Bug 42489: Require a loxId argument for most methods. This ensures that a method only works on the credentials of the *expected* loxId, rather than the newest `TorSettings.bridges.lox_id` value which may change during a session. We also add `#activeLoxId` to stay in sync with `TorSettings.brigdes.lox_id`. We merge `clearInvites` into its updater. - - - - - 64b8d301 by Henry Wilkes at 2024-04-10T16:20:36+02:00 fixup! Lox integration Bug 42489: Make loading the stored preferences unconditional on the #credentials value. Also change the type of `#events` to always be an Array. - - - - - fb56536d by Henry Wilkes at 2024-04-10T16:20:36+02:00 fixup! Lox integration Bug 42489: Generated loxId is unlikely to clash with existing ones, but we add some free logic to guarantee this. - - - - - 677dab92 by Henry Wilkes at 2024-04-10T16:20:36+02:00 fixup! Lox integration Bug 42489: Return copies of Lox module internals to ensure they cannot be edited by a caller. - - - - - 8bc9824b by Henry Wilkes at 2024-04-10T16:20:37+02:00 fixup! Lox integration Bug 42489: Add notifications to the Lox module. We ensure changes to credentials pass through #changeCredentials to check whether we should send a notification. - - - - - a61b54ea by Henry Wilkes at 2024-04-10T16:20:37+02:00 fixup! Lox integration Bug 42489: Add #assertInitialized. - - - - - c376503f by Henry Wilkes at 2024-04-10T16:20:37+02:00 fixup! Lox integration Bug 42489: Change LoxError. Move the LoxErrors types into LoxError. Only set the type if it is specific. - - - - - a5090ba5 by Henry Wilkes at 2024-04-10T16:20:37+02:00 fixup! Lox integration Bug 42489: Change the Lox Authority URL. - - - - - e90abe84 by Henry Wilkes at 2024-04-10T16:20:37+02:00 fixup! Lox integration Bug 42489: Try and re fetch the pubKey, encTable and constants if they failed before. For example, if they fail via a domain front request, we should try again with `fetch` when we are bootstrapped. - - - - - d66eb707 by Henry Wilkes at 2024-04-10T16:20:38+02:00 fixup! Lox integration Bug 42489: Make sure trust level strings are converted to integers. - - - - - 0adfa214 by Henry Wilkes at 2024-04-10T16:20:38+02:00 fixup! Lox integration Bug 42489: Tidy #attemptUpgrade by returning early with a promise. - - - - - f71cd00b by Richard Pospesel at 2024-04-10T16:20:38+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - c9ccf353 by Pier Angelo Vendrame at 2024-04-10T16:20:38+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Use actual private members in InternetTest, and unify the test and testAsync methods. - - - - - fae57477 by Pier Angelo Vendrame at 2024-04-10T16:20:38+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. The purpose of this commit is just to make the review easier. It moves the various state callbacks in another part of the file (and gives them names, to refer to them). They are not linted/formatted on purpose, to allow checking that the changes are minimal with the `--color-moved` option. - - - - - 419ab9b0 by Pier Angelo Vendrame at 2024-04-10T16:20:39+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. The purpose of this commit is just to make the review easier. It lints the previous commit to make it closer to the next form it will take. To review this commit, you can lint TorConnect.sys.mjs and check you obtain the same result. - - - - - 23dc45d8 by Pier Angelo Vendrame at 2024-04-10T16:20:39+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Add a specialized class for every state. Removed TorConnectStateTransitions and store the valid transitions inside the new classes. - - - - - f4cdebff by Pier Angelo Vendrame at 2024-04-10T16:20:39+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Removes the context from StateCallback. Instead, we will always initialize new objects. - - - - - d6588258 by Pier Angelo Vendrame at 2024-04-10T16:20:39+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Fix no-async-promise-executor on TorConnect. Move the responsibility of starting the next state callback and broadcat the state change from the begin function to the transition function. This is what will actually empower us to remove the async promise executor, because they will not have to block the state change anymore. - - - - - 03dfc7b7 by Pier Angelo Vendrame at 2024-04-10T16:20:40+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Fix no-async-promise-executor on TorConnect. Now that callbacks have been lifted from the responsibility of blocking the transition, they do not have to explicitly resolve anymore. So, get rid of the various promises, and make the old callbacks regular methods of the corresponding classes. Also, updated the documentation. - - - - - 6b4f5fb4 by Pier Angelo Vendrame at 2024-04-10T16:20:40+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Add the changeState method to StateCallback, other minor changes. - - - - - 3cea1831 by Pier Angelo Vendrame at 2024-04-10T16:20:40+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Move some parts of BootstrappingState.run to methods on their own, to make it easier to understand this function. - - - - - bd9e375a by Pier Angelo Vendrame at 2024-04-10T16:20:40+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Various refactors to AutoBootstrappingState. - - - - - 70c140a2 by Pier Angelo Vendrame at 2024-04-10T16:20:40+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. TorConnect does not need to be defined in a function. - - - - - fbd27e6b by Pier Angelo Vendrame at 2024-04-10T16:20:41+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. First batch of changes requested in the review. - - - - - 630eb5f9 by Pier Angelo Vendrame at 2024-04-10T16:20:41+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. More changes on the InternetTest class. - - - - - 1d0b7b09 by Pier Angelo Vendrame at 2024-04-10T16:20:41+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Additional refactor to the AutoBootstrappingState: split the run in more methods, removed some layers of try-catch. - - - - - 60bb10be by Pier Angelo Vendrame at 2024-04-10T16:20:41+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Additional refactor to the AutoBootstrappingState: be consistent in initializing private members and document that in case of race some variables might be set to undefined. Also, do not store the bootstrap as a member, to avoid possible race conditions. - - - - - 70a9324d by Pier Angelo Vendrame at 2024-04-10T16:20:41+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. When simulating censorship, do not trigger an additional change of state if one is already happening. - - - - - 47453181 by Pier Angelo Vendrame at 2024-04-10T16:20:42+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Check if the current state is already transitioning, and refusing any additional transition request. - - - - - d7f3375f by Pier Angelo Vendrame at 2024-04-10T16:20:42+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Do not await TorSettings.applySettings after a successfull bootstrap. Instead, we use .catch and log any unexpected results. - - - - - 7f6ee356 by Pier Angelo Vendrame at 2024-04-10T16:20:42+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Ignore cancel requests when in non-bootstrapping states. - - - - - 15347e1b by Pier Angelo Vendrame at 2024-04-10T16:20:42+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41114: Refactor TorConnect. Pass only the new state's name to StateCallback.end. - - - - - 7cd25fc8 by Henry Wilkes at 2024-04-10T16:20:43+02:00 fixup! Bug 40597: Implement TorSettings module Bug 42489: Listen for notifications from Lox module. Also, do not save the bridge_strings to the preferences if they come from the Lox module. In DomainFrontedRequests distinguish between reachability errors, response errors and other errors in DomainFrontedRequest to improve Lox error messaging. - - - - - 6e9b4ef5 by Pier Angelo Vendrame at 2024-04-10T16:20:43+02:00 fixup! Bug 40597: Implement TorSettings module Bug 42511: Fixed a typo TorConnectState.DisabledState -> TorConnectState.Disabled - - - - - 6df71417 by Arthur Edelstein at 2024-04-10T16:20:43+02:00 Bug 3455: Add DomainIsolator, for isolating circuit by domain. Add an XPCOM component that registers a ProtocolProxyChannelFilter which sets the username/password for each web request according to url bar domain. Bug 9442: Add New Circuit button Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. Bug 19206: Clear out the domain isolator state on `New Identity`. Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes Bug 21745: Fix handling of catch-all circuit Bug 41741: Refactor the domain isolator and new circuit - - - - - 31c7a208 by Henry Wilkes at 2024-04-10T16:20:43+02:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. Bug 42209: Migrate tor circuit strings to Fluent. - - - - - bb5f709e by Henry Wilkes at 2024-04-10T16:20:43+02:00 Bug 41600: Add a tor circuit display panel. - - - - - f9a7bc83 by Henry Wilkes at 2024-04-10T16:20:44+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 42209: Migrate tor circuit strings to Fluent. - - - - - 242efaea by Pier Angelo Vendrame at 2024-04-10T16:20:44+02:00 Bug 42247: Android helpers for the TorProvider GeckoView is missing some API we use on desktop for the integration with the tor daemon, such as subprocess. Therefore, we need to implement them in Java and plumb the data back and forth between JS and Java. - - - - - 94b3879c by clairehurst at 2024-04-10T16:20:44+02:00 fixup! Bug 42247: Android helpers for the TorProvider Moved setSettings and TorLegacyAndroidSettings.setMigrated() into a new if block in onPostExecute() from doInBackground(). - - - - - f1396c61 by Dan Ballard at 2024-04-10T16:20:44+02:00 fixup! Bug 42247: Android helpers for the TorProvider Bug 41187: Add support for tor logs in android integration - - - - - bc790b88 by hackademix at 2024-04-10T16:20:44+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 54f65c22 by Amogh Pradeep at 2024-04-10T16:20:45+02:00 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review - - - - - 7736c8ab by Matthew Finkel at 2024-04-10T16:20:45+02:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 9ca62a18 by Kathy Brade at 2024-04-10T16:20:45+02:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - 45b0a3e8 by Pier Angelo Vendrame at 2024-04-10T16:20:45+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - b50f34ed by Richard Pospesel at 2024-04-10T16:20:46+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - 47c97eb2 by Henry Wilkes at 2024-04-10T16:20:46+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42446: Improve accessible description of built-in radio options. - - - - - 2293db39 by Henry Wilkes at 2024-04-10T16:20:46+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42489: Listen for notifications from Lox module, and pass in loxId to methods. - - - - - 820eb920 by Henry Wilkes at 2024-04-10T16:20:46+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42207: Migrate preferences strings to Fluent. - - - - - 162d8a51 by Richard Pospesel at 2024-04-10T16:20:46+02:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - 3887d2b0 by Pier Angelo Vendrame at 2024-04-10T16:20:47+02:00 Temporary changes to about:torconnect for Android. We are planning of tempoorarily using about:torconnect on Android, until the native UX is ready. - - - - - 48ee85b8 by Henry Wilkes at 2024-04-10T16:20:47+02:00 Bug 7494: Create local home page for TBB. Bug 41333: Update about:tor to new design. Including: + make the favicon match the branding icon. + make the location bar show a search icon. - - - - - 6fc891f2 by Pier Angelo Vendrame at 2024-04-10T16:20:47+02:00 fixup! Bug 7494: Create local home page for TBB. Bug 42490: Write the browser logo SVG also outside of omni.ja. Update the path to the Tor Browser logo. - - - - - 8c0cd207 by Arthur Edelstein at 2024-04-10T16:20:47+02:00 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. - - - - - 2dbd0167 by Pier Angelo Vendrame at 2024-04-10T16:20:47+02:00 Bug 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - e7ba3f9b by Kathy Brade at 2024-04-10T16:20:48+02:00 Bug 12647: Support symlinks in the updater. - - - - - cf539d93 by Kathy Brade at 2024-04-10T16:20:48+02:00 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - 94e80423 by Kathy Brade at 2024-04-10T16:20:48+02:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - ccf6c74a by Georg Koppen at 2024-04-10T16:20:48+02:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - 783e294a by Mike Perry at 2024-04-10T16:20:48+02:00 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. - - - - - 60856a6f by Dan Ballard at 2024-04-10T16:20:49+02:00 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 42459: Add Startpage Onion search provider - - - - - 1696f0f9 by Alex Catarineu at 2024-04-10T16:20:49+02:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - a3c4ddf3 by Henry Wilkes at 2024-04-10T16:20:49+02:00 Bug 41906: Hide DNS over HTTPS preferences. - - - - - 77553dc2 by Richard Pospesel at 2024-04-10T16:20:49+02:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - 7daba2e3 by Kathy Brade at 2024-04-10T16:20:49+02:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - 111f40f0 by Alex Catarineu at 2024-04-10T16:20:50+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - a2da50ca by Pier Angelo Vendrame at 2024-04-10T16:20:50+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 26dbc80f by Pier Angelo Vendrame at 2024-04-10T16:20:50+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - b600d0bb by Pier Angelo Vendrame at 2024-04-10T16:20:50+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - e8f7def4 by Henry Wilkes at 2024-04-10T16:20:51+02:00 Bug 42110: Add TorUIUtils module for common tor component methods. - - - - - 3a8424af by Dan Ballard at 2024-04-10T16:20:51+02:00 Bug 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 89c3ced4 by Henry Wilkes at 2024-04-10T16:20:51+02:00 Bug 41736: Customize toolbar for tor-browser. - - - - - 387680b1 by hackademix at 2024-04-10T16:20:51+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - fb0d1fa5 by Henry Wilkes at 2024-04-10T16:20:51+02:00 Customize moz-toggle for tor-browser. - - - - - aa92d1b3 by Richard Pospesel at 2024-04-10T16:20:52+02:00 Bug 41822: Unconditionally disable default browser UX in about:preferences - - - - - 7ed306ff by Cecylia Bocovich at 2024-04-10T16:20:52+02:00 Temporary commit: manually place generated wasm files These files are built reproducibly using tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… We're manually adding them here while working on the interface, but eventually these should be placed in the right location using tor-browser-build. - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab-ci.yml - + .gitlab/issue_templates/Backport Android Security Fixes.md - + .gitlab/issue_templates/Emergency Security Issue.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - + README.md - − README.txt - accessible/android/SessionAccessibility.cpp - accessible/android/SessionAccessibility.h - accessible/ipc/DocAccessibleParent.cpp - accessible/ipc/DocAccessibleParent.h - accessible/ipc/moz.build - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b6d0a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b6d0a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! Adding issue and merge request templates
by richard (＠richard) 10 Apr '24

10 Apr '24

richard pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 0cc8a01a by Richard Pospesel at 2024-04-10T18:09:38+00:00 fixup! Adding issue and merge request templates add an issue template to guide emergency bug fixes - - - - - 1 changed file: - + .gitlab/issue_templates/Emergency Security Issue.md Changes: ===================================== .gitlab/issue_templates/Emergency Security Issue.md ===================================== @@ -0,0 +1,90 @@ +**NOTE** This is an issue template to standardise our process for responding to and fixing critical security and privacy vulnerabilities, exploits, etc. + +## Information + +### Related Issue +- tor-browser#AAAAA +- mullvad-browser#BBBBB +- tor-browser-build#CCCCC + +#### Affected Platforms + +- [ ] Android +- [ ] Desktop + - [ ] Windows + - [ ] macOS + - [ ] Linux + +### Type of Issue: What are we dealing with? + +- [ ] Security (sandbox escape, remote code execution, etc) +- [ ] Proxy Bypass (traffic contents becoming MITM'able) +- [ ] De-Anonymization (otherwise identifying which website a user is visiting) +- [ ] Cross-Site Linkability (correlating sessions across circuits and websites) +- [ ] Disk Leak (persisting session information to disk) +- [ ] Other (please explain) + +### Involvement: Who needs to be consulted and or involved to fix this? + +- [ ] Applications Developers + - [ ] **boklm** : build, packaging, signing, release + - [ ] **clairehurst** : Android, macOS + - [ ] **dan** : Android, macOS + - [ ] **henry** : accessibility, frontend, localisation + - [ ] **ma1** : firefox internals + - [ ] **pierov** : updater, fonts, localisation, general + - [ ] **richard** : signing, release + - [ ] **thorin** : fingerprinting +- [ ] Other Engineering Teams + - [ ] Networking (**ahf**, **dgoulet**) + - [ ] Anti-Censorship (**meskio**, **cohosh**) + - [ ] UX (**donuts**) + - [ ] TPA (**anarcat**, **lavamind**) +- [ ] External Tor Partners + - [ ] Mozilla + - [ ] Mullvad + - [ ] Brave + - [ ] Guardian Project (Orbot, Onion Browser) + - [ ] Tails + - [ ] Other (please list) + +### Urgency: When do we need to act? + +- [ ] **ASAP** :rotating_light: Emergency release :rotating_light: +- [ ] Next scheduled stable +- [ ] Next scheduled alpha, then backport to stable +- [ ] Next major release +- [ ] Other (please explain) + +#### Justification + + + +### Side-Effects: Who will be affected by a fix for this? +Sometimes fixes have side-effects: users lose their data, roadmaps need to be adjusted, services have to be upgraded, etc. Please enumerate the known downstream consequences a fix to this issue will likely incur. +- [ ] End-Users (please list) +- [ ] Internal Partners (please list) +- [ ] External Partners (please list) + +## Todo: + +### Communications + +- [ ] Start an initial email thread with the following people: + - [ ] **bella** + - [ ] Relevant Applications Developers + - [ ] **(Optional)** **micah** + - if there are considerations or asks outside the Applications Team + - [ ] **(Optional)** Other Team Leads + - if there are considerations or asks outside the Applications Team + - [ ] **(Optional)** **gazebook** + - if there are consequences to the organisation or partners beyond a browser update, then a communication plan may be needed + +/cc @bella +/cc @ma1 +/cc @micah +/cc @richard + +/confidential + +Godspeed! :pray: View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/0cc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/0cc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41124: Fix copying .DS_Store in gatekeeper-bundling.sh
by boklm (＠boklm) 10 Apr '24

10 Apr '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 263c4936 by Nicolas Vigier at 2024-04-10T19:29:10+02:00 Bug 41124: Fix copying .DS_Store in gatekeeper-bundling.sh Fixing some issue introduced in 4e2b66e977873c46b3678c93ae9173f53503f81a. - - - - - 1 changed file: - tools/signing/gatekeeper-bundling.sh Changes: ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -69,6 +69,9 @@ export PATH="$PATH:$tmpdir/libdmg-hfsplus:$tmpdir/hfsplus-tools" cd $tmpdir/dmg +cp ${tbb_version_type}.DS_Store .DS_Store +rm *.DS_Store + tar -xf $macos_stapled_dir/"${proj_name}-${tbb_version}-notarized+stapled.tar.zst" cd .. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.10.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 10 Apr '24

10 Apr '24

Pier Angelo Vendrame pushed new branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] fixup! Adding issue and merge request templates
by richard (＠richard) 09 Apr '24

09 Apr '24

richard pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: adc4563c by Richard Pospesel at 2024-04-09T21:06:19+00:00 fixup! Adding issue and merge request templates add an issue template to guide emergency bug fixes - - - - - 1 changed file: - + .gitlab/issue_templates/Emergency Security Issue.md Changes: ===================================== .gitlab/issue_templates/Emergency Security Issue.md ===================================== @@ -0,0 +1,90 @@ +**NOTE** This is an issue template to standardise our process for responding to and fixing critical security and privacy vulnerabilities, exploits, etc. + +## Information + +### Related Issue +- tor-browser#AAAAA +- mullvad-browser#BBBBB +- tor-browser-build#CCCCC + +#### Affected Platforms + +- [ ] Android +- [ ] Desktop + - [ ] Windows + - [ ] macOS + - [ ] Linux + +### Type of Issue: What are we dealing with? + +- [ ] Security (sandbox escape, remote code execution, etc) +- [ ] Proxy Bypass (traffic contents becoming MITM'able) +- [ ] De-Anonymization (otherwise identifying which website a user is visiting) +- [ ] Cross-Site Linkability (correlating sessions across circuits and websites) +- [ ] Disk Leak (persisting session information to disk) +- [ ] Other (please explain) + +### Involvement: Who needs to be consulted and or involved to fix this? + +- [ ] Applications Developers + - [ ] **boklm** : build, packaging, signing, release + - [ ] **clairehurst** : Android, macOS + - [ ] **dan** : Android, macOS + - [ ] **henry** : accessibility, frontend, localisation + - [ ] **ma1** : firefox internals + - [ ] **pierov** : updater, fonts, localisation, general + - [ ] **richard** : signing, release + - [ ] **thorin** : fingerprinting +- [ ] Other Engineering Teams + - [ ] Networking (**ahf**, **dgoulet**) + - [ ] Anti-Censorship (**meskio**, **cohosh**) + - [ ] UX (**donuts**) + - [ ] TPA (**anarcat**, **lavamind**) +- [ ] External Tor Partners + - [ ] Mozilla + - [ ] Mullvad + - [ ] Brave + - [ ] Guardian Project (Orbot, Onion Browser) + - [ ] Tails + - [ ] Other (please list) + +### Urgency: When do we need to act? + +- [ ] **ASAP** :rotating_light: Emergency release :rotating_light: +- [ ] Next scheduled stable +- [ ] Next scheduled alpha, then backport to stable +- [ ] Next major release +- [ ] Other (please explain) + +#### Justification + + + +### Side-Effects: Who will be affected by a fix for this? +Sometimes fixes have side-effects: users lose their data, roadmaps need to be adjusted, services have to be upgraded, etc. Please enumerate the known downstream consequences a fix to this issue will likely incur. +- [ ] End-Users (please list) +- [ ] Internal Partners (please list) +- [ ] External Partners (please list) + +## Todo: + +### Communications + +- [ ] Start an initial email thread with the following people: + - [ ] **bella** + - [ ] Relevant Applications Developers + - [ ] **(Optional)** **micah** + - if there are considerations or asks outside the Applications Team + - [ ] **(Optional)** Other Team Leads + - if there are considerations or asks outside the Applications Team + - [ ] **(Optional)** **gazebook** + - if there are consequences to the organisation or partners beyond a browser update, then a communication plan may be needed + +/cc @bella +/cc @ma1 +/cc @micah +/cc @richard + +/confidential + +Godspeed! :pray: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adc4563… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adc4563… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Adding issue and merge request templates
by richard (＠richard) 09 Apr '24

09 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 00c2adf5 by Richard Pospesel at 2024-04-09T20:50:01+00:00 fixup! Adding issue and merge request templates add an issue template to guide emergency bug fixes - - - - - 1 changed file: - + .gitlab/issue_templates/Emergency Security Issue.md Changes: ===================================== .gitlab/issue_templates/Emergency Security Issue.md ===================================== @@ -0,0 +1,90 @@ +**NOTE** This is an issue template to standardise our process for responding to and fixing critical security and privacy vulnerabilities, exploits, etc. + +## Information + +### Related Issue +- tor-browser#AAAAA +- mullvad-browser#BBBBB +- tor-browser-build#CCCCC + +#### Affected Platforms + +- [ ] Android +- [ ] Desktop + - [ ] Windows + - [ ] macOS + - [ ] Linux + +### Type of Issue: What are we dealing with? + +- [ ] Security (sandbox escape, remote code execution, etc) +- [ ] Proxy Bypass (traffic contents becoming MITM'able) +- [ ] De-Anonymization (otherwise identifying which website a user is visiting) +- [ ] Cross-Site Linkability (correlating sessions across circuits and websites) +- [ ] Disk Leak (persisting session information to disk) +- [ ] Other (please explain) + +### Involvement: Who needs to be consulted and or involved to fix this? + +- [ ] Applications Developers + - [ ] **boklm** : build, packaging, signing, release + - [ ] **clairehurst** : Android, macOS + - [ ] **dan** : Android, macOS + - [ ] **henry** : accessibility, frontend, localisation + - [ ] **ma1** : firefox internals + - [ ] **pierov** : updater, fonts, localisation, general + - [ ] **richard** : signing, release + - [ ] **thorin** : fingerprinting +- [ ] Other Engineering Teams + - [ ] Networking (**ahf**, **dgoulet**) + - [ ] Anti-Censorship (**meskio**, **cohosh**) + - [ ] UX (**donuts**) + - [ ] TPA (**anarcat**, **lavamind**) +- [ ] External Tor Partners + - [ ] Mozilla + - [ ] Mullvad + - [ ] Brave + - [ ] Guardian Project (Orbot, Onion Browser) + - [ ] Tails + - [ ] Other (please list) + +### Urgency: When do we need to act? + +- [ ] **ASAP** :rotating_light: Emergency release :rotating_light: +- [ ] Next scheduled stable +- [ ] Next scheduled alpha, then backport to stable +- [ ] Next major release +- [ ] Other (please explain) + +#### Justification + + + +### Side-Effects: Who will be affected by a fix for this? +Sometimes fixes have side-effects: users lose their data, roadmaps need to be adjusted, services have to be upgraded, etc. Please enumerate the known downstream consequences a fix to this issue will likely incur. +- [ ] End-Users (please list) +- [ ] Internal Partners (please list) +- [ ] External Partners (please list) + +## Todo: + +### Communications + +- [ ] Start an initial email thread with the following people: + - [ ] **bella** + - [ ] Relevant Applications Developers + - [ ] **(Optional)** **micah** + - if there are considerations or asks outside the Applications Team + - [ ] **(Optional)** Other Team Leads + - if there are considerations or asks outside the Applications Team + - [ ] **(Optional)** **gazebook** + - if there are consequences to the organisation or partners beyond a browser update, then a communication plan may be needed + +/cc @bella +/cc @ma1 +/cc @micah +/cc @richard + +/confidential + +Godspeed! :pray: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/00c2adf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/00c2adf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 4 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by richard (＠richard) 09 Apr '24

09 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: d4a4b72b by Henry Wilkes at 2024-04-09T19:54:28+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42207: Migrate preferences strings to Fluent. - - - - - 6b080bf1 by Henry Wilkes at 2024-04-09T19:54:28+00:00 fixup! Tor Browser strings Bug 42207: Migrate preferences strings to Fluent. - - - - - 7ff82efa by Henry Wilkes at 2024-04-09T19:54:28+00:00 fixup! Add TorStrings module for localization Bug 42207: Migrate preferences strings to Fluent. - - - - - 446e78a5 by Henry Wilkes at 2024-04-09T19:54:28+00:00 fixup! Tor Browser localization migration scripts. Bug 42207: Migrate preferences to Fluent. - - - - - 19 changed files: - browser/components/torpreferences/content/bridgeQrDialog.js - browser/components/torpreferences/content/bridgeQrDialog.xhtml - browser/components/torpreferences/content/builtinBridgeDialog.js - browser/components/torpreferences/content/builtinBridgeDialog.xhtml - browser/components/torpreferences/content/connectionCategory.inc.xhtml - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml - browser/components/torpreferences/content/connectionSettingsDialog.js - browser/components/torpreferences/content/connectionSettingsDialog.xhtml - browser/components/torpreferences/content/provideBridgeDialog.js - browser/components/torpreferences/content/requestBridgeDialog.js - browser/components/torpreferences/content/requestBridgeDialog.xhtml - browser/components/torpreferences/content/torLogDialog.js - browser/components/torpreferences/content/torLogDialog.xhtml - browser/components/torpreferences/content/torPreferences.css - browser/locales/en-US/browser/tor-browser.ftl - toolkit/modules/TorStrings.sys.mjs - toolkit/torbutton/chrome/locale/en-US/settings.properties - + tools/torbrowser/l10n/migrations/bug-42207-settings.py Changes: ===================================== browser/components/torpreferences/content/bridgeQrDialog.js ===================================== @@ -4,19 +4,11 @@ const { QRCode } = ChromeUtils.importESModule( "resource://gre/modules/QRCode.sys.mjs" ); -const { TorStrings } = ChromeUtils.importESModule( - "resource://gre/modules/TorStrings.sys.mjs" -); - window.addEventListener( "DOMContentLoaded", () => { const bridgeString = window.arguments[0]; - document.documentElement.setAttribute( - "title", - TorStrings.settings.scanQrTitle - ); const target = document.getElementById("bridgeQr-target"); const style = window.getComputedStyle(target); // We are assuming that the style width and height have "px" units. ===================================== browser/components/torpreferences/content/bridgeQrDialog.xhtml ===================================== @@ -7,8 +7,13 @@ type="child" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" + data-l10n-id="bridge-qr-dialog-title" > <dialog id="bridgeQr-dialog" buttons="accept"> + <linkset> + <html:link rel="localization" href="browser/tor-browser.ftl" /> + </linkset> + <script src="chrome://browser/content/torpreferences/bridgeQrDialog.js" /> <html:div id="bridgeQr"> ===================================== browser/components/torpreferences/content/builtinBridgeDialog.js ===================================== @@ -1,9 +1,5 @@ "use strict"; -const { TorStrings } = ChromeUtils.importESModule( - "resource://gre/modules/TorStrings.sys.mjs" -); - const { TorSettings, TorBridgeSource } = ChromeUtils.importESModule( "resource://gre/modules/TorSettings.sys.mjs" ); @@ -16,34 +12,10 @@ const gBuiltinBridgeDialog = { init() { this._result = window.arguments[0]; - document.documentElement.setAttribute( - "title", - TorStrings.settings.builtinBridgeHeader - ); - - document.getElementById( - "torPreferences-builtinBridge-description" - ).textContent = TorStrings.settings.builtinBridgeDescription2; - this._radioGroup = document.getElementById( "torPreferences-builtinBridge-typeSelection" ); - const typeStrings = { - obfs4: { - label: TorStrings.settings.builtinBridgeObfs4Title, - descr: TorStrings.settings.builtinBridgeObfs4Description2, - }, - snowflake: { - label: TorStrings.settings.builtinBridgeSnowflake, - descr: TorStrings.settings.builtinBridgeSnowflakeDescription2, - }, - "meek-azure": { - label: TorStrings.settings.builtinBridgeMeekAzure, - descr: TorStrings.settings.builtinBridgeMeekAzureDescription2, - }, - }; - const currentBuiltinType = TorSettings.bridges.enabled && TorSettings.bridges.source == TorBridgeSource.BuiltIn @@ -56,16 +28,18 @@ const gBuiltinBridgeDialog = { const radio = optionEl.querySelector("radio"); const type = radio.value; optionEl.hidden = !TorSettings.builtinBridgeTypes.includes(type); - radio.label = typeStrings[type].label; + const descriptionEl = optionEl.querySelector( ".builtin-bridges-option-description" ); - descriptionEl.textContent = typeStrings[type].descr; + // Set an id to be used for the aria-describedby. + descriptionEl.id = `builtin-bridges-description-${type}`; const currentBadge = optionEl.querySelector(".bridge-status-badge"); if (type === currentBuiltinType) { const currentLabelEl = optionEl.querySelector( ".torPreferences-current-bridge-label" ); + currentLabelEl.id = `builtin-bridges-current-${type}`; // Described by both the current badge and the full description. // These will be concatenated together in the screen reader output. radio.setAttribute( @@ -77,6 +51,7 @@ const gBuiltinBridgeDialog = { } else { // No visible badge. radio.setAttribute("aria-describedby", descriptionEl.id); + currentBadge.classList.remove("bridge-status-current-built-in"); } } @@ -117,10 +92,8 @@ const gBuiltinBridgeDialog = { const connect = TorConnect.canBeginBootstrap; this._result.connect = connect; this._acceptButton.setAttribute( - "label", - connect - ? TorStrings.settings.bridgeButtonConnect - : TorStrings.settings.bridgeButtonAccept + "data-l10n-id", + connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-accept" ); }, ===================================== browser/components/torpreferences/content/builtinBridgeDialog.xhtml ===================================== @@ -7,26 +7,30 @@ type="child" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" + data-l10n-id="built-in-dialog-title" > <dialog id="torPreferences-builtinBridge-dialog" buttons="accept,cancel"> <linkset> + <html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="browser/tor-browser.ftl" /> </linkset> <script src="chrome://browser/content/torpreferences/builtinBridgeDialog.js" /> - <description id="torPreferences-builtinBridge-description"> </description> + <description data-l10n-id="built-in-dialog-introduction"></description> <radiogroup id="torPreferences-builtinBridge-typeSelection"> <vbox class="builtin-bridges-option"> <hbox>  - <radio value="obfs4" /> + <radio + value="obfs4" + data-l10n-id="built-in-dialog-obfs4-radio-option" + /> <html:span class="bridge-status-badge"> <html:div class="bridge-status-icon"></html:div> <html:span - id="obfs-bridges-current" class="torPreferences-current-bridge-label" data-l10n-id="built-in-dialog-current-bridge-label" > @@ -34,18 +38,20 @@ </html:span> </hbox> <html:div - id="obfs-bridges-description" class="indent builtin-bridges-option-description" + data-l10n-id="tor-bridges-built-in-obfs4-description" > </html:div> </vbox> <vbox class="builtin-bridges-option"> <hbox> - <radio value="snowflake" /> + <radio + value="snowflake" + data-l10n-id="built-in-dialog-snowflake-radio-option" + /> <html:span class="bridge-status-badge"> <html:div class="bridge-status-icon"></html:div> <html:span - id="snowflake-bridges-current" class="torPreferences-current-bridge-label" data-l10n-id="built-in-dialog-current-bridge-label" > @@ -53,18 +59,20 @@ </html:span> </hbox> <html:div - id="snowflake-bridges-description" class="indent builtin-bridges-option-description" + data-l10n-id="tor-bridges-built-in-snowflake-description" > </html:div> </vbox> <vbox class="builtin-bridges-option"> <hbox> - <radio value="meek-azure" /> + <radio + value="meek-azure" + data-l10n-id="built-in-dialog-meek-azure-radio-option" + /> <html:span class="bridge-status-badge"> <html:div class="bridge-status-icon"></html:div> <html:span - id="meek-bridges-current" class="torPreferences-current-bridge-label" data-l10n-id="built-in-dialog-current-bridge-label" > @@ -72,8 +80,8 @@ </html:span> </hbox> <html:div - id="meek-bridges-description" class="indent builtin-bridges-option-description" + data-l10n-id="tor-bridges-built-in-meek-azure-description" > </html:div> </vbox> ===================================== browser/components/torpreferences/content/connectionCategory.inc.xhtml ===================================== @@ -5,5 +5,5 @@ align="center" hidden="true"> <image class="category-icon"/> - <label id="torPreferences-labelCategory" class="category-name" flex="1" value="Connection"/> + <label class="category-name" flex="1" data-l10n-id="tor-connection-settings-heading"></label> </richlistitem> ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1088,18 +1088,17 @@ const gBuiltinBridgesArea = { * @type {Object<string,object>} */ _bridgeTypeStrings: { - // TODO: Change to Fluent ids. obfs4: { - name: TorStrings.settings.builtinBridgeObfs4Title, - description: TorStrings.settings.builtinBridgeObfs4Description2, + name: "tor-bridges-built-in-obfs4-name", + description: "tor-bridges-built-in-obfs4-description", }, snowflake: { - name: TorStrings.settings.builtinBridgeSnowflake, - description: TorStrings.settings.builtinBridgeSnowflakeDescription2, + name: "tor-bridges-built-in-snowflake-name", + description: "tor-bridges-built-in-snowflake-description", }, "meek-azure": { - name: TorStrings.settings.builtinBridgeMeekAzure, - description: TorStrings.settings.builtinBridgeMeekAzureDescription2, + name: "tor-bridges-built-in-meek-azure-name", + description: "tor-bridges-built-in-meek-azure-description", }, }, @@ -1151,15 +1150,11 @@ const gBuiltinBridgesArea = { const bridgeStrings = this._bridgeTypeStrings[bridgeType]; if (bridgeStrings) { - /* document.l10n.setAttributes(this._nameEl, bridgeStrings.name); document.l10n.setAttributes( this._descriptionEl, bridgeStrings.description ); - */ - this._nameEl.textContent = bridgeStrings.name; - this._descriptionEl.textContent = bridgeStrings.description; } else { // Unknown type, or no type. this._nameEl.removeAttribute("data-l10n-id"); @@ -2075,7 +2070,7 @@ const gBridgeSettings = { // "Remove all bridges"? document .getElementById("tor-bridges-options-remove-all-menu-item") - .addEventListener("click", () => { + .addEventListener("click", async () => { // TODO: Should we only have a warning when not built-in? const parentWindow = Services.wm.getMostRecentWindow("navigator:browser"); @@ -2085,13 +2080,20 @@ const gBridgeSettings = { Services.prompt.BUTTON_POS_0_DEFAULT + Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL; + const [titleString, bodyString, removeString] = + await document.l10n.formatValues([ + { id: "remove-all-bridges-warning-title" }, + { id: "remove-all-bridges-warning-description" }, + { id: "remove-all-bridges-warning-remove-button" }, + ]); + // TODO: Update the text, and remove old strings. const buttonIndex = Services.prompt.confirmEx( parentWindow, - TorStrings.settings.bridgeRemoveAllDialogTitle, - TorStrings.settings.bridgeRemoveAllDialogDescription, + titleString, + bodyString, flags, - TorStrings.settings.remove, + removeString, null, null, null, @@ -2289,36 +2291,13 @@ const gBridgeSettings = { const gConnectionPane = (function () { /* CSS selectors for all of the Tor Network DOM elements we need to access */ const selectors = { - category: { - title: "label#torPreferences-labelCategory", - }, - torPreferences: { - header: "h1#torPreferences-header", - description: "span#torPreferences-description", - learnMore: "label#torPreferences-learnMore", - }, - quickstart: { - header: "h2#torPreferences-quickstart-header", - description: "span#torPreferences-quickstart-description", - enableQuickstartCheckbox: "checkbox#torPreferences-quickstart-toggle", - }, bridges: { - header: "h1#torPreferences-bridges-header", - description: "span#torPreferences-bridges-description", - learnMore: "label#torPreferences-bridges-learnMore", locationGroup: "#torPreferences-bridges-locationGroup", locationLabel: "#torPreferences-bridges-locationLabel", location: "#torPreferences-bridges-location", locationEntries: "#torPreferences-bridges-locationEntries", chooseForMe: "#torPreferences-bridges-buttonChooseBridgeForMe", }, - advanced: { - header: "h1#torPreferences-advanced-header", - label: "#torPreferences-advanced-label", - button: "#torPreferences-advanced-button", - torLogsLabel: "label#torPreferences-torLogs", - torLogsButton: "button#torPreferences-buttonTorLogs", - }, }; /* selectors */ const retval = { @@ -2342,96 +2321,62 @@ const gConnectionPane = (function () { } }); - document - .querySelector(selectors.category.title) - .setAttribute("value", TorStrings.settings.categoryTitle); - - const prefpane = document.getElementById("mainPrefPane"); - - // Heading - prefpane.querySelector(selectors.torPreferences.header).innerText = - TorStrings.settings.categoryTitle; - prefpane.querySelector(selectors.torPreferences.description).textContent = - TorStrings.settings.torPreferencesDescription; - { - const learnMore = prefpane.querySelector( - selectors.torPreferences.learnMore - ); - learnMore.setAttribute("value", TorStrings.settings.learnMore); - learnMore.setAttribute( - "href", - TorStrings.settings.learnMoreTorBrowserURL - ); - if (TorStrings.settings.learnMoreTorBrowserURL.startsWith("about:")) { - learnMore.setAttribute("useoriginprincipal", "true"); - } - } - // Internet and Tor status const internetStatus = document.getElementById( "torPreferences-status-internet" ); - internetStatus.querySelector(".torPreferences-status-name").textContent = - TorStrings.settings.statusInternetLabel; const internetResult = internetStatus.querySelector( ".torPreferences-status-result" ); const internetTest = document.getElementById( "torPreferences-status-internet-test" ); - internetTest.setAttribute( - "label", - TorStrings.settings.statusInternetTest - ); - internetTest.addEventListener("command", () => { + internetTest.addEventListener("click", () => { this.onInternetTest(); }); const torConnectStatus = document.getElementById( "torPreferences-status-tor-connect" ); - torConnectStatus.querySelector( - ".torPreferences-status-name" - ).textContent = TorStrings.settings.statusTorLabel; const torConnectResult = torConnectStatus.querySelector( ".torPreferences-status-result" ); const torConnectButton = document.getElementById( "torPreferences-status-tor-connect-button" ); - torConnectButton.setAttribute( - "label", - TorStrings.torConnect.torConnectButton - ); - torConnectButton.addEventListener("command", () => { + torConnectButton.addEventListener("click", () => { TorConnect.openTorConnect({ beginBootstrap: true }); }); this._populateStatus = () => { + let internetId; switch (this._internetStatus) { case InternetStatus.Online: internetStatus.classList.remove("offline"); - internetResult.textContent = - TorStrings.settings.statusInternetOnline; - internetResult.hidden = false; + internetId = "tor-connection-internet-status-online"; break; case InternetStatus.Offline: internetStatus.classList.add("offline"); - internetResult.textContent = - TorStrings.settings.statusInternetOffline; - internetResult.hidden = false; + internetId = "tor-connection-internet-status-offline"; break; case InternetStatus.Unknown: default: internetStatus.classList.remove("offline"); - internetResult.hidden = true; break; } + if (internetId) { + document.l10n.setAttributes(internetResult, internetId); + internetResult.hidden = false; + } else { + internetResult.hidden = true; + } + + let connectId; // FIXME: What about the TorConnectState.Disabled state? if (TorConnect.state === TorConnectState.Bootstrapped) { torConnectStatus.classList.add("connected"); torConnectStatus.classList.remove("blocked"); - torConnectResult.textContent = TorStrings.settings.statusTorConnected; + connectId = "tor-connection-network-status-connected"; // NOTE: If the button is focused when we hide it, the focus may be // lost. But we don't have an obvious place to put the focus instead. torConnectButton.hidden = true; @@ -2441,26 +2386,18 @@ const gConnectionPane = (function () { "blocked", TorConnect.potentiallyBlocked ); - torConnectResult.textContent = TorConnect.potentiallyBlocked - ? TorStrings.settings.statusTorBlocked - : TorStrings.settings.statusTorNotConnected; + connectId = TorConnect.potentiallyBlocked + ? "tor-connection-network-status-blocked" + : "tor-connection-network-status-not-connected"; torConnectButton.hidden = false; } + document.l10n.setAttributes(torConnectResult, connectId); }; this._populateStatus(); // Quickstart - prefpane.querySelector(selectors.quickstart.header).innerText = - TorStrings.settings.quickstartHeading; - prefpane.querySelector(selectors.quickstart.description).textContent = - TorStrings.settings.quickstartDescription; - - this._enableQuickstartCheckbox = prefpane.querySelector( - selectors.quickstart.enableQuickstartCheckbox - ); - this._enableQuickstartCheckbox.setAttribute( - "label", - TorStrings.settings.quickstartCheckbox + this._enableQuickstartCheckbox = document.getElementById( + "torPreferences-quickstart-toggle" ); this._enableQuickstartCheckbox.addEventListener("command", e => { const checked = this._enableQuickstartCheckbox.checked; @@ -2470,22 +2407,10 @@ const gConnectionPane = (function () { this._enableQuickstartCheckbox.checked = TorSettings.quickstart.enabled; Services.obs.addObserver(this, TorSettingsTopics.SettingsChanged); - // Bridge setup - prefpane.querySelector(selectors.bridges.header).innerText = - TorStrings.settings.bridgesHeading; - prefpane.querySelector(selectors.bridges.description).textContent = - TorStrings.settings.bridgesDescription2; - { - const learnMore = prefpane.querySelector(selectors.bridges.learnMore); - learnMore.setAttribute("value", TorStrings.settings.learnMore); - learnMore.setAttribute("href", TorStrings.settings.learnMoreBridgesURL); - if (TorStrings.settings.learnMoreBridgesURL.startsWith("about:")) { - learnMore.setAttribute("useoriginprincipal", "true"); - } - } - // Location { + const prefpane = document.getElementById("mainPrefPane"); + const locationGroup = prefpane.querySelector( selectors.bridges.locationGroup ); @@ -2571,33 +2496,18 @@ const gConnectionPane = (function () { } // Advanced setup - prefpane.querySelector(selectors.advanced.header).innerText = - TorStrings.settings.advancedHeading; - prefpane.querySelector(selectors.advanced.label).textContent = - TorStrings.settings.advancedLabel; - { - const settingsButton = prefpane.querySelector( - selectors.advanced.button - ); - settingsButton.setAttribute( - "label", - TorStrings.settings.advancedButton - ); - settingsButton.addEventListener("command", () => { + document + .getElementById("torPreferences-advanced-button") + .addEventListener("click", () => { this.onAdvancedSettings(); }); - } // Tor logs - prefpane.querySelector(selectors.advanced.torLogsLabel).textContent = - TorStrings.settings.showTorDaemonLogs; - const torLogsButton = prefpane.querySelector( - selectors.advanced.torLogsButton - ); - torLogsButton.setAttribute("label", TorStrings.settings.showLogs); - torLogsButton.addEventListener("command", () => { - this.onViewTorLogs(); - }); + document + .getElementById("torPreferences-buttonTorLogs") + .addEventListener("click", () => { + this.onViewTorLogs(); + }); Services.obs.addObserver(this, TorConnectTopics.StateChange); }, ===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -11,16 +11,21 @@ data-category="paneConnection" hidden="true" > - <html:h1 id="torPreferences-header" /> + <html:h1 data-l10n-id="tor-connection-settings-heading"></html:h1> </hbox> <groupbox data-category="paneConnection" hidden="true"> <description flex="1"> - <html:span id="torPreferences-description" class="tail-with-learn-more" /> + <html:span + data-l10n-id="tor-connection-overview" + class="tail-with-learn-more" + ></html:span> <label - id="torPreferences-learnMore" class="learnMore text-link" is="text-link" + href="about:manual#about" + useoriginprincipal="true" + data-l10n-id="tor-connection-browser-learn-more-link" /> </description> </groupbox> @@ -36,33 +41,45 @@ class="torPreferences-status-grouping" > <image class="torPreferences-status-icon" /> - <html:span class="torPreferences-status-name"></html:span> + <html:span + class="torPreferences-status-name" + data-l10n-id="tor-connection-internet-status-label" + ></html:span> <html:span class="torPreferences-status-result"></html:span> - <button id="torPreferences-status-internet-test" /> + <html:button + id="torPreferences-status-internet-test" + data-l10n-id="tor-connection-internet-status-test-button" + ></html:button> </hbox> <hbox id="torPreferences-status-tor-connect" class="torPreferences-status-grouping" > <image class="torPreferences-status-icon" /> - <html:span class="torPreferences-status-name"></html:span> + <html:span + class="torPreferences-status-name" + data-l10n-id="tor-connection-network-status-label" + ></html:span> <html:span class="torPreferences-status-result"></html:span> - <button id="torPreferences-status-tor-connect-button" /> + <html:button + id="torPreferences-status-tor-connect-button" + data-l10n-id="tor-connection-network-status-connect-button" + ></html:button> </hbox> </hbox> </groupbox>  - <groupbox - id="torPreferences-quickstart-group" - data-category="paneConnection" - hidden="true" - > - <html:h2 id="torPreferences-quickstart-header" /> - <description flex="1"> - <html:span id="torPreferences-quickstart-description" /> + <groupbox data-category="paneConnection" hidden="true"> + <label> + <html:h2 data-l10n-id="tor-connection-quickstart-heading"></html:h2> + </label> + <description flex="1" data-l10n-id="tor-connection-quickstart-description"> </description> - <checkbox id="torPreferences-quickstart-toggle" /> + <checkbox + id="torPreferences-quickstart-toggle" + data-l10n-id="tor-connection-quickstart-checkbox" + /> </groupbox>  @@ -71,6 +88,7 @@ id="torPreferences-bridges-header" class="tor-focusable-heading" tabindex="-1" + data-l10n-id="tor-bridges-heading" ></html:h1> </hbox> <groupbox @@ -80,13 +98,15 @@ > <description flex="1"> <html:span - id="torPreferences-bridges-description" class="tail-with-learn-more" + data-l10n-id="tor-bridges-overview" /> <label - id="torPreferences-bridges-learnMore" class="learnMore text-link" is="text-link" + href="about:manual#bridges" + useoriginprincipal="true" + data-l10n-id="tor-bridges-learn-more-link" /> </description> <hbox @@ -479,7 +499,7 @@  <hbox class="subcategory" data-category="paneConnection" hidden="true"> - <html:h1 id="torPreferences-advanced-header" /> + <html:h1 data-l10n-id="tor-advanced-settings-heading"></html:h1> </hbox> <groupbox id="torPreferences-advanced-group" @@ -487,14 +507,20 @@ hidden="true" > <hbox align="center"> - <label id="torPreferences-advanced-label" flex="1" /> - <button id="torPreferences-advanced-button" class="accessory-button" /> + <label data-l10n-id="tor-advanced-settings-description" flex="1" /> + <html:button + id="torPreferences-advanced-button" + class="accessory-button" + data-l10n-id="tor-advanced-settings-button" + ></html:button> </hbox> <hbox align="center" data-subcategory="viewlogs"> - <label id="torPreferences-torLogs" flex="1" /> - <vbox> - <button id="torPreferences-buttonTorLogs" class="accessory-button" /> - </vbox> + <label data-l10n-id="tor-view-log-description" flex="1" /> + <html:button + id="torPreferences-buttonTorLogs" + class="accessory-button" + data-l10n-id="tor-view-log-button" + ></html:button> </hbox> </groupbox> </html:template> ===================================== browser/components/torpreferences/content/connectionSettingsDialog.js ===================================== @@ -4,10 +4,6 @@ const { TorSettings, TorProxyType } = ChromeUtils.importESModule( "resource://gre/modules/TorSettings.sys.mjs" ); -const { TorStrings } = ChromeUtils.importESModule( - "resource://gre/modules/TorStrings.sys.mjs" -); - const gConnectionSettingsDialog = { _useProxyCheckbox: null, _proxyTypeLabel: null, @@ -25,7 +21,6 @@ const gConnectionSettingsDialog = { _allowedPortsTextbox: null, selectors: { - header: "#torPreferences-connection-header", useProxyCheckbox: "checkbox#torPreferences-connection-toggleProxy", proxyTypeLabel: "label#torPreferences-localProxy-type", proxyTypeList: "menulist#torPreferences-localProxy-builtinList", @@ -53,36 +48,27 @@ const gConnectionSettingsDialog = { init() { const selectors = this.selectors; - document.documentElement.setAttribute( - "title", - TorStrings.settings.connectionSettingsDialogTitle - ); - document.querySelector(selectors.header).textContent = - TorStrings.settings.connectionSettingsDialogHeader; - // Local Proxy this._useProxyCheckbox = document.querySelector(selectors.useProxyCheckbox); - this._useProxyCheckbox.setAttribute( - "label", - TorStrings.settings.useLocalProxy - ); this._useProxyCheckbox.addEventListener("command", e => { const checked = this._useProxyCheckbox.checked; this.onToggleProxy(checked); }); this._proxyTypeLabel = document.querySelector(selectors.proxyTypeLabel); - this._proxyTypeLabel.setAttribute("value", TorStrings.settings.proxyType); let mockProxies = [ { value: TorProxyType.Socks4, - label: TorStrings.settings.proxyTypeSOCKS4, + l10nId: "tor-advanced-dialog-proxy-socks4-menuitem", }, { value: TorProxyType.Socks5, - label: TorStrings.settings.proxyTypeSOCKS5, + l10nId: "tor-advanced-dialog-proxy-socks5-menuitem", + }, + { + value: TorProxyType.HTTPS, + l10nId: "tor-advanced-dialog-proxy-http-menuitem", }, - { value: TorProxyType.HTTPS, label: TorStrings.settings.proxyTypeHTTP }, ]; this._proxyTypeMenulist = document.querySelector(selectors.proxyTypeList); this._proxyTypeMenulist.addEventListener("command", e => { @@ -92,24 +78,16 @@ const gConnectionSettingsDialog = { for (let currentProxy of mockProxies) { let menuEntry = window.document.createXULElement("menuitem"); menuEntry.setAttribute("value", currentProxy.value); - menuEntry.setAttribute("label", currentProxy.label); + menuEntry.setAttribute("data-l10n-id", currentProxy.l10nId); this._proxyTypeMenulist.querySelector("menupopup").appendChild(menuEntry); } this._proxyAddressLabel = document.querySelector( selectors.proxyAddressLabel ); - this._proxyAddressLabel.setAttribute( - "value", - TorStrings.settings.proxyAddress - ); this._proxyAddressTextbox = document.querySelector( selectors.proxyAddressTextbox ); - this._proxyAddressTextbox.setAttribute( - "placeholder", - TorStrings.settings.proxyAddressPlaceholder - ); this._proxyAddressTextbox.addEventListener("blur", e => { let value = this._proxyAddressTextbox.value.trim(); let colon = value.lastIndexOf(":"); @@ -122,36 +100,19 @@ const gConnectionSettingsDialog = { } }); this._proxyPortLabel = document.querySelector(selectors.proxyPortLabel); - this._proxyPortLabel.setAttribute("value", TorStrings.settings.proxyPort); this._proxyPortTextbox = document.querySelector(selectors.proxyPortTextbox); this._proxyUsernameLabel = document.querySelector( selectors.proxyUsernameLabel ); - this._proxyUsernameLabel.setAttribute( - "value", - TorStrings.settings.proxyUsername - ); this._proxyUsernameTextbox = document.querySelector( selectors.proxyUsernameTextbox ); - this._proxyUsernameTextbox.setAttribute( - "placeholder", - TorStrings.settings.proxyUsernamePasswordPlaceholder - ); this._proxyPasswordLabel = document.querySelector( selectors.proxyPasswordLabel ); - this._proxyPasswordLabel.setAttribute( - "value", - TorStrings.settings.proxyPassword - ); this._proxyPasswordTextbox = document.querySelector( selectors.proxyPasswordTextbox ); - this._proxyPasswordTextbox.setAttribute( - "placeholder", - TorStrings.settings.proxyUsernamePasswordPlaceholder - ); this.onToggleProxy(false); if (TorSettings.proxy.enabled) { @@ -167,10 +128,6 @@ const gConnectionSettingsDialog = { this._useFirewallCheckbox = document.querySelector( selectors.useFirewallCheckbox ); - this._useFirewallCheckbox.setAttribute( - "label", - TorStrings.settings.useFirewall - ); this._useFirewallCheckbox.addEventListener("command", e => { const checked = this._useFirewallCheckbox.checked; this.onToggleFirewall(checked); @@ -178,17 +135,9 @@ const gConnectionSettingsDialog = { this._allowedPortsLabel = document.querySelector( selectors.firewallAllowedPortsLabel ); - this._allowedPortsLabel.setAttribute( - "value", - TorStrings.settings.allowedPorts - ); this._allowedPortsTextbox = document.querySelector( selectors.firewallAllowedPortsTextbox ); - this._allowedPortsTextbox.setAttribute( - "placeholder", - TorStrings.settings.allowedPortsPlaceholder - ); this.onToggleFirewall(false); if (TorSettings.firewall.enabled) { ===================================== browser/components/torpreferences/content/connectionSettingsDialog.xhtml ===================================== @@ -7,16 +7,31 @@ type="child" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" + data-l10n-id="tor-advanced-dialog-title" > <dialog id="torPreferences-connection-dialog" buttons="accept,cancel"> + <linkset> + <html:link rel="localization" href="branding/brand.ftl" /> + <html:link rel="localization" href="browser/tor-browser.ftl" /> + </linkset> + <script src="chrome://browser/content/torpreferences/connectionSettingsDialog.js" /> - <html:h3 id="torPreferences-connection-header"></html:h3> + <html:h3 + id="torPreferences-connection-header" + data-l10n-id="tor-advanced-dialog-introduction" + ></html:h3>  - <checkbox id="torPreferences-connection-toggleProxy" label="" /> + <checkbox + id="torPreferences-connection-toggleProxy" + data-l10n-id="tor-advanced-dialog-proxy-checkbox" + /> <box id="torPreferences-connection-grid"> <hbox class="indent" align="center"> - <label id="torPreferences-localProxy-type" /> + <label + id="torPreferences-localProxy-type" + data-l10n-id="tor-advanced-dialog-proxy-type-selector-label" + /> </hbox> <hbox align="center"> <spacer flex="1" /> @@ -28,15 +43,22 @@ </menulist> </hbox> <hbox class="indent" align="center"> - <label id="torPreferences-localProxy-address" /> + <label + id="torPreferences-localProxy-address" + data-l10n-id="tor-advanced-dialog-proxy-address-input-label" + /> </hbox> <hbox align="center"> <html:input id="torPreferences-localProxy-textboxAddress" type="text" class="torMarginFix" + data-l10n-id="tor-advanced-dialog-proxy-address-input" + /> + <label + id="torPreferences-localProxy-port" + data-l10n-id="tor-advanced-dialog-proxy-port-input-label" /> - <label id="torPreferences-localProxy-port" />  <html:input id="torPreferences-localProxy-textboxPort" @@ -49,27 +71,41 @@ /> </hbox> <hbox class="indent" align="center"> - <label id="torPreferences-localProxy-username" /> + <label + id="torPreferences-localProxy-username" + data-l10n-id="tor-advanced-dialog-proxy-username-input-label" + /> </hbox> <hbox align="center"> <html:input id="torPreferences-localProxy-textboxUsername" type="text" class="torMarginFix" + data-l10n-id="tor-advanced-dialog-proxy-username-input" + /> + <label + id="torPreferences-localProxy-password" + data-l10n-id="tor-advanced-dialog-proxy-password-input-label" /> - <label id="torPreferences-localProxy-password" /> <html:input id="torPreferences-localProxy-textboxPassword" class="torMarginFix" type="password" + data-l10n-id="tor-advanced-dialog-proxy-password-input" /> </hbox> </box>  - <checkbox id="torPreferences-connection-toggleFirewall" label="" /> + <checkbox + id="torPreferences-connection-toggleFirewall" + data-l10n-id="tor-advanced-dialog-firewall-checkbox" + /> <box id="torPreferences-connection-firewall"> <hbox class="indent" align="center"> - <label id="torPreferences-connection-allowedPorts" /> + <label + id="torPreferences-connection-allowedPorts" + data-l10n-id="tor-advanced-dialog-firewall-ports-input-label" + /> </hbox> <hbox id="torPreferences-connection-hboxAllowedPorts" align="center"> <html:input @@ -77,6 +113,7 @@ type="text" class="torMarginFix" value="80,443" + data-l10n-id="tor-advanced-dialog-firewall-ports-input" /> </hbox> </box> ===================================== browser/components/torpreferences/content/provideBridgeDialog.js ===================================== @@ -1,9 +1,5 @@ "use strict"; -const { TorStrings } = ChromeUtils.importESModule( - "resource://gre/modules/TorStrings.sys.mjs" -); - const { TorSettings, TorBridgeSource, validateBridgeLines } = ChromeUtils.importESModule("resource://gre/modules/TorSettings.sys.mjs"); @@ -191,10 +187,8 @@ const gProvideBridgeDialog = { this._result.connect = connect; this._acceptButton.setAttribute( - "label", - connect - ? TorStrings.settings.bridgeButtonConnect - : TorStrings.settings.bridgeButtonAccept + "data-l10n-id", + connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-accept" ); } }, ===================================== browser/components/torpreferences/content/requestBridgeDialog.js ===================================== @@ -3,9 +3,6 @@ const { BridgeDB } = ChromeUtils.importESModule( "resource://gre/modules/BridgeDB.sys.mjs" ); -const { TorStrings } = ChromeUtils.importESModule( - "resource://gre/modules/TorStrings.sys.mjs" -); const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule( "resource://gre/modules/TorConnect.sys.mjs" @@ -20,8 +17,6 @@ const gRequestBridgeDialog = { "button#torPreferences-requestBridge-refreshCaptchaButton", incorrectCaptchaHbox: "hbox#torPreferences-requestBridge-incorrectCaptchaHbox", - incorrectCaptchaLabel: - "label#torPreferences-requestBridge-incorrectCaptchaError", }, init() { @@ -33,10 +28,6 @@ const gRequestBridgeDialog = { "torPreferences-requestBridge-dialog" ); - document.documentElement.setAttribute( - "title", - TorStrings.settings.requestBridgeDialogTitle - ); // user may have opened a Request Bridge dialog in another tab, so update the // CAPTCHA image or close out the dialog if we have a bridge list this._dialog.addEventListener("focusin", () => { @@ -59,7 +50,6 @@ const gRequestBridgeDialog = { }); this._dialogHeader = this._dialog.querySelector(selectors.dialogHeader); - this._dialogHeader.textContent = TorStrings.settings.contactingBridgeDB; this._captchaImage = this._dialog.querySelector(selectors.captchaImage); @@ -71,10 +61,6 @@ const gRequestBridgeDialog = { this._captchaEntryTextbox = this._dialog.querySelector( selectors.captchaEntryTextbox ); - this._captchaEntryTextbox.setAttribute( - "placeholder", - TorStrings.settings.captchaTextboxPlaceholder - ); this._captchaEntryTextbox.disabled = true; // disable submit if entry textbox is empty this._captchaEntryTextbox.oninput = () => { @@ -89,13 +75,6 @@ const gRequestBridgeDialog = { this._incorrectCaptchaHbox = this._dialog.querySelector( selectors.incorrectCaptchaHbox ); - this._incorrectCaptchaLabel = this._dialog.querySelector( - selectors.incorrectCaptchaLabel - ); - this._incorrectCaptchaLabel.setAttribute( - "value", - TorStrings.settings.incorrectCaptcha - ); Services.obs.addObserver(this, TorConnectTopics.StateChange); this.onAcceptStateChange(); @@ -111,10 +90,8 @@ const gRequestBridgeDialog = { const connect = TorConnect.canBeginBootstrap; this._result.connect = connect; this._submitButton.setAttribute( - "label", - connect - ? TorStrings.settings.bridgeButtonConnect - : TorStrings.settings.submitCaptcha + "data-l10n-id", + connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-submit" ); }, @@ -129,7 +106,10 @@ const gRequestBridgeDialog = { _setcaptchaImage(uri) { if (uri != this._captchaImage.src) { this._captchaImage.src = uri; - this._dialogHeader.textContent = TorStrings.settings.solveTheCaptcha; + this._dialogHeader.setAttribute( + "data-l10n-id", + "request-bridge-dialog-top-solve" + ); this._setUIDisabled(false); this._captchaEntryTextbox.focus(); this._captchaEntryTextbox.select(); @@ -185,7 +165,10 @@ const gRequestBridgeDialog = { onRefreshCaptcha() { this._setUIDisabled(true); this._captchaImage.src = ""; - this._dialogHeader.textContent = TorStrings.settings.contactingBridgeDB; + this._dialogHeader.setAttribute( + "data-l10n-id", + "request-bridge-dialog-top-wait" + ); this._captchaEntryTextbox.value = ""; this._incorrectCaptchaHbox.style.visibility = "hidden"; ===================================== browser/components/torpreferences/content/requestBridgeDialog.xhtml ===================================== @@ -7,20 +7,26 @@ type="child" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" + data-l10n-id="request-bridge-dialog-title" > <dialog id="torPreferences-requestBridge-dialog" buttons="accept,cancel"> + <linkset> + <html:link rel="localization" href="browser/tor-browser.ftl" /> + </linkset> + <script src="chrome://browser/content/torpreferences/requestBridgeDialog.js" /> -  - <html:h3 id="torPreferences-requestBridge-header"></html:h3> + <html:h3 + id="torPreferences-requestBridge-header" + data-l10n-id="request-bridge-dialog-top-solve" + ></html:h3>  <image id="torPreferences-requestBridge-captchaImage" flex="1" /> <hbox id="torPreferences-requestBridge-inputHbox"> <html:input id="torPreferences-requestBridge-captchaTextbox" type="text" + data-l10n-id="request-bridge-dialog-captcha-input" /> <button id="torPreferences-requestBridge-refreshCaptchaButton" @@ -30,7 +36,7 @@ </hbox> <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center"> <image id="torPreferences-requestBridge-errorIcon" /> - <label id="torPreferences-requestBridge-incorrectCaptchaError" flex="1" /> + <label data-l10n-id="request-bridge-dialog-captcha-failed" flex="1" /> </hbox> </dialog> </window> ===================================== browser/components/torpreferences/content/torLogDialog.js ===================================== @@ -7,21 +7,13 @@ const { setTimeout, clearTimeout } = ChromeUtils.importESModule( const { TorProviderBuilder } = ChromeUtils.importESModule( "resource://gre/modules/TorProviderBuilder.sys.mjs" ); -const { TorStrings } = ChromeUtils.importESModule( - "resource://gre/modules/TorStrings.sys.mjs" -); window.addEventListener( "DOMContentLoaded", () => { - document.documentElement.setAttribute( - "title", - TorStrings.settings.torLogDialogTitle - ); - const dialog = document.getElementById("torPreferences-torLog-dialog"); const copyLogButton = dialog.getButton("extra1"); - copyLogButton.setAttribute("label", TorStrings.settings.copyLog); + copyLogButton.setAttribute("data-l10n-id", "tor-log-dialog-copy-button"); const logText = document.getElementById( "torPreferences-torDialog-textarea" @@ -35,8 +27,10 @@ window.addEventListener( ); clipboard.copyString(logText.value); - const label = copyLogButton.querySelector("label"); - label.setAttribute("value", TorStrings.settings.copied); + copyLogButton.setAttribute( + "data-l10n-id", + "tor-log-dialog-copy-button-copied" + ); copyLogButton.classList.add("primary"); const RESTORE_TIME = 1200; @@ -44,7 +38,10 @@ window.addEventListener( clearTimeout(restoreButtonTimeout); } restoreButtonTimeout = setTimeout(() => { - label.setAttribute("value", TorStrings.settings.copyLog); + copyLogButton.setAttribute( + "data-l10n-id", + "tor-log-dialog-copy-button" + ); copyLogButton.classList.remove("primary"); restoreButtonTimeout = null; }, RESTORE_TIME); ===================================== browser/components/torpreferences/content/torLogDialog.xhtml ===================================== @@ -7,8 +7,13 @@ type="child" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" + data-l10n-id="tor-log-dialog-title" > <dialog id="torPreferences-torLog-dialog" buttons="accept,extra1"> + <linkset> + <html:link rel="localization" href="browser/tor-browser.ftl" /> + </linkset> + <script src="chrome://browser/content/torpreferences/torLogDialog.js" /> <html:textarea ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -1023,6 +1023,11 @@ groupbox#torPreferences-bridges-group textarea { } /* Connection settings dialog */ +#torPreferences-connection-dialog label { + /* Do not wrap the labels. */ + white-space: nowrap; +} + #torPreferences-connection-header { margin: 4px 0 14px 0; } ===================================== browser/locales/en-US/browser/tor-browser.ftl ===================================== @@ -45,7 +45,55 @@ tor-browser-home-message-testing = This is an unstable version of Tor Browser fo home-mode-choice-tor = .label = Tor Browser Home -## Tor Bridges Settings +## Tor connection settings. + +# "Connection" refers to the Tor Browser's connection to the Tor network. +tor-connection-settings-heading = Connection +# -brand-short-name refers to 'Tor Browser', localized. +tor-connection-overview = { -brand-short-name } routes your traffic over the Tor Network, run by thousands of volunteers around the world. +tor-connection-browser-learn-more-link = Learn more +tor-connection-quickstart-heading = Quickstart +# -brand-short-name refers to 'Tor Browser', localized. +tor-connection-quickstart-description = Quickstart connects { -brand-short-name } to the Tor Network automatically when launched, based on your last used connection settings. +tor-connection-quickstart-checkbox = + .label = Always connect automatically + +# Prefix before the internet connection status. +# "Internet" is not a proper noun, but is capitalized because it is the start of a sentence. +tor-connection-internet-status-label = Internet: +# Button to test the internet connection. +# Here "Test" is a verb, as in "test the internet connection". +# Uses sentence case in English (US). +tor-connection-internet-status-test-button = Test +# Shown when the user is connected to the internet. +# Uses sentence case in English (US). +tor-connection-internet-status-online = Online +# Shown when the user is not connected to the internet. +# Uses sentence case in English (US). +tor-connection-internet-status-offline = Offline + +# Prefix before the Tor network connection status. +# Uses sentence case in English (US). +tor-connection-network-status-label = Tor network: +# Shown when the user is connected to the Tor network. +# Uses sentence case in English (US). +tor-connection-network-status-connected = Connected +# Shown when the user is not connected to the Tor network. +# Uses sentence case in English (US). +tor-connection-network-status-not-connected = Not connected +# Shown when the user's Tor connection may be blocked. +# Uses sentence case in English (US). +tor-connection-network-status-blocked = Potentially blocked +# Button shown when we are not yet connected to the Tor network. +# It will open a page to start connecting to the Tor network. +# Uses sentence case in English (US). +tor-connection-network-status-connect-button = Connect + +## Tor Bridges Settings. + +tor-bridges-heading = Bridges +tor-bridges-overview = Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another. +tor-bridges-learn-more-link = Learn more # Toggle button for enabling and disabling the use of bridges. tor-bridges-use-bridges = @@ -78,6 +126,16 @@ tor-bridges-menu-item-remove-all-bridges = Remove all bridges # Shown when one of the built-in bridges is in use. tor-bridges-built-in-status-connected = Connected +# "obfs4" is a technical name, and likely should not be translated. +tor-bridges-built-in-obfs4-name = obfs4 +tor-bridges-built-in-obfs4-description = Makes your Tor traffic look like random data. May not work in heavily censored regions. +# "Snowflake" is a proper noun for a type of Tor bridge, and likely should not be translated. +tor-bridges-built-in-snowflake-name = Snowflake +# "Snowflake" is a proper noun for a type of Tor bridge, and likely should not be translated. +tor-bridges-built-in-snowflake-description = Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example. +# "meek-azure" is a technical name, and likely should not be translated. +tor-bridges-built-in-meek-azure-name = meek-azure +tor-bridges-built-in-meek-azure-description = Makes it look like you’re connected to a Microsoft website, instead of using Tor. May work in heavily censored regions, but is usually very slow. # Shown at the start of a Tor bridge line. # $type (String) - The Tor bridge type ("snowflake", "obfs4", "meek-azure"). @@ -195,6 +253,7 @@ tor-bridges-add-bridges-heading = Add bridges # Shown as a heading when the user has existing bridges that can be replaced. tor-bridges-replace-bridges-heading = Replace your bridges +# -brand-short-name refers to 'Tor Browser', localized. tor-bridges-select-built-in-description = Choose from one of { -brand-short-name }’s built-in bridges tor-bridges-select-built-in-button = Select a built-in bridge… @@ -233,6 +292,23 @@ tor-bridges-provider-email-instruction = Email { $address } tor-bridges-request-from-browser = You can also get bridges from the bridge bot without leaving { -brand-short-name }. tor-bridges-request-button = Request bridges… +## Warning dialog when removing all bridges. + +remove-all-bridges-warning-title = Remove all bridges? +remove-all-bridges-warning-description = If these bridges were received from torproject.org or added manually, this action cannot be undone +remove-all-bridges-warning-remove-button = Remove + +## Bridge QR code dialog. + +bridge-qr-dialog-title = + .title = Scan the QR code + +## Common button used in bridge dialogs. + +bridge-dialog-button-connect = Connect +bridge-dialog-button-accept = OK +bridge-dialog-button-submit = Submit + ## User provided bridge dialog. # Used when the user is editing their existing bridge addresses. @@ -300,11 +376,92 @@ user-provide-bridge-dialog-next-button = ## Built-in bridges dialog. +built-in-dialog-title = + .title = Select a Built-In Bridge +# -brand-short-name refers to 'Tor Browser', localized. +built-in-dialog-introduction = { -brand-short-name } includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor. +# "obfs4" is a technical name, and likely should not be translated. +built-in-dialog-obfs4-radio-option = + .label = obfs4 +# "Snowflake" is a proper noun for a type of Tor bridge, and likely should not be translated. +built-in-dialog-snowflake-radio-option = + .label = Snowflake +# "meek-azure" is a technical name, and likely should not be translated. +built-in-dialog-meek-azure-radio-option = + .label = meek-azure # Label attached to the built-in bridge option that is already in use. # The "aria-label" should use the same text, but include some ending punctuation to separate it from the sentence that follows. This is used for screen reader users. built-in-dialog-current-bridge-label = Current bridge .aria-label = Current bridge. +request-bridge-dialog-title = + .title = Request Bridge +request-bridge-dialog-top-wait = Contacting BridgeDB. Please Wait. +request-bridge-dialog-top-solve = Solve the CAPTCHA to request a bridge. +request-bridge-dialog-captcha-input = + .placeholder = Enter the characters from the image +request-bridge-dialog-captcha-failed = The solution is not correct. Please try again. + +## Tor advanced settings. + +tor-advanced-settings-heading = Advanced +tor-advanced-settings-description = Configure how { -brand-short-name } connects to the internet. +# Button that opens the advanced connection settings dialog. +# Uses sentence case in English (US). +tor-advanced-settings-button = Settings… +# "log" is a noun, referring to the recorded text output of the Tor process. +tor-view-log-description = View the Tor log. +# "log" is a noun, referring to the recorded text output of the Tor process. +# Uses sentence case in English (US). +tor-view-log-button = View log… + +## Tor log dialog. + +# "log" is a noun, referring to the recorded text output of the Tor process. +tor-log-dialog-title = + .title = Tor log +# "log" is a noun, referring to the recorded text output of the Tor process. +tor-log-dialog-copy-button = + .label = Copy Tor log to clipboard +# Button text changes for a short time after activating the button. +tor-log-dialog-copy-button-copied = + .label = Copied! + +## Tor advanced connection settings dialog. + +tor-advanced-dialog-title = + .title = Connection settings +tor-advanced-dialog-introduction = Configure how { -brand-short-name } connects to the internet. +tor-advanced-dialog-proxy-checkbox = + .label = I use a proxy to connect to the internet +tor-advanced-dialog-proxy-type-selector-label = Proxy type +# SOCKS4 is a technical name, and should likely not be translated. +tor-advanced-dialog-proxy-socks4-menuitem = + .label = SOCKS4 +# SOCKS5 is a technical name, and should likely not be translated. +tor-advanced-dialog-proxy-socks5-menuitem = + .label = SOCKS5 +# HTTP and HTTPS are technical names, and should likely not be translated. +# The "/" refers to "HTTP or HTTPS" and can be translated. +tor-advanced-dialog-proxy-http-menuitem = + .label = HTTP/HTTPS +# "address" is a noun, referring to an network IP address. +tor-advanced-dialog-proxy-address-input-label = Address +tor-advanced-dialog-proxy-address-input = + .placeholder = IP address or hostname +tor-advanced-dialog-proxy-port-input-label = Port +tor-advanced-dialog-proxy-username-input-label = Username +tor-advanced-dialog-proxy-username-input = + .placeholder = Optional +tor-advanced-dialog-proxy-password-input-label = Password +tor-advanced-dialog-proxy-password-input = + .placeholder = Optional +tor-advanced-dialog-firewall-checkbox = + .label = This computer goes through a firewall that only allows connections to certain ports +tor-advanced-dialog-firewall-ports-input-label = Allowed ports +tor-advanced-dialog-firewall-ports-input = + .placeholder = Comma-separated values + ## About Tor Browser dialog. # '<label data-l10n-name="project-link">' and '</label>' should wrap the link text for the Tor Project, and will link to the Tor Project web page. ===================================== toolkit/modules/TorStrings.sys.mjs ===================================== @@ -67,107 +67,23 @@ const Loader = { */ settings() { const strings = { - categoryTitle: "Connection", // Message box torPreferencesDescription: "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world.", - // Status - statusInternetLabel: "Internet:", - statusInternetTest: "Test", - statusInternetOnline: "Online", - statusInternetOffline: "Offline", - statusTorLabel: "Tor Network:", - statusTorConnected: "Connected", - statusTorNotConnected: "Not Connected", - statusTorBlocked: "Potentially Blocked", - learnMore: "Learn more", // Quickstart - quickstartHeading: "Quickstart", - quickstartDescription: - "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.", quickstartCheckbox: "Always connect automatically", - // Bridge settings - bridgesHeading: "Bridges", - bridgesDescription2: - "Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.", bridgeLocation: "Your location", bridgeLocationAutomatic: "Automatic", bridgeLocationFrequent: "Frequently selected locations", bridgeLocationOther: "Other locations", bridgeChooseForMe: "Choose a Bridge For Me…", - remove: "Remove", - bridgeDisableBuiltIn: "Disable built-in bridges", - copied: "Copied!", - bridgeRemoveAllDialogTitle: "Remove all bridges?", - bridgeRemoveAllDialogDescription: - "If these bridges were received from torproject.org or added manually, this action cannot be undone", - // Advanced settings - advancedHeading: "Advanced", - advancedLabel: "Configure how Tor Browser connects to the internet", - advancedButton: "Settings…", - showTorDaemonLogs: "View the Tor logs", - showLogs: "View Logs…", - // Remove all bridges dialog - removeBridgesQuestion: "Remove all the bridges?", - removeBridgesWarning: "This action cannot be undone.", - cancel: "Cancel", - // Scan bridge QR dialog - scanQrTitle: "Scan the QR code", - // Builtin bridges dialog - builtinBridgeHeader: "Select a Built-In Bridge", - builtinBridgeDescription2: - "Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor.", - builtinBridgeObfs4Title: "obfs4 (Built-in)", - builtinBridgeObfs4Description2: - "Makes your Tor traffic look like random data. May not work in heavily censored regions.", - builtinBridgeSnowflake: "Snowflake", - builtinBridgeSnowflakeDescription2: - "Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example.", - builtinBridgeMeekAzure: "meek-azure", - builtinBridgeMeekAzureDescription2: - "Makes it look like you’re connected to a Microsoft website, instead of using Tor. May work in heavily censored regions, but is usually very slow.", - bridgeButtonConnect: "Connect", - bridgeButtonAccept: "OK", - // Request bridges dialog - requestBridgeDialogTitle: "Request Bridge", - submitCaptcha: "Submit", - contactingBridgeDB: "Contacting BridgeDB. Please Wait.", - solveTheCaptcha: "Solve the CAPTCHA to request a bridge.", - captchaTextboxPlaceholder: "Enter the characters from the image", - incorrectCaptcha: "The solution is not correct. Please try again.", - // Connection settings dialog - connectionSettingsDialogTitle: "Connection Settings", - connectionSettingsDialogHeader: - "Configure how Tor Browser connects to the Internet", - useLocalProxy: "I use a proxy to connect to the Internet", - proxyType: "Proxy Type", - proxyTypeSOCKS4: "SOCKS4", - proxyTypeSOCKS5: "SOCKS5", - proxyTypeHTTP: "HTTP/HTTPS", - proxyAddress: "Address", - proxyAddressPlaceholder: "IP address or hostname", - proxyPort: "Port", - proxyUsername: "Username", - proxyPassword: "Password", - proxyUsernamePasswordPlaceholder: "Optional", - useFirewall: - "This computer goes through a firewall that only allows connections to certain ports", - allowedPorts: "Allowed Ports", - allowedPortsPlaceholder: "Comma-seperated values", - // Log dialog - torLogDialogTitle: "Tor Logs", - copyLog: "Copy Tor Log to Clipboard", }; const tsb = new TorPropertyStringBundle( "chrome://torbutton/locale/settings.properties", "settings." ); - return { - ...tsb.getStrings(strings), - learnMoreTorBrowserURL: "about:manual#about", - learnMoreBridgesURL: "about:manual#bridges", - }; + return tsb.getStrings(strings); } /* Tor Network Settings Strings */, torConnect() { ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -3,95 +3,17 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -settings.categoryTitle=Connection +# Still used in TorConnect. # Message box settings.torPreferencesDescription=Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. -# Status -settings.statusInternetLabel=Internet: -settings.statusInternetTest=Test -settings.statusInternetOnline=Online -settings.statusInternetOffline=Offline -settings.statusTorLabel=Tor Network: -settings.statusTorConnected=Connected -settings.statusTorNotConnected=Not Connected -settings.statusTorBlocked=Potentially Blocked -settings.learnMore=Learn more - -# Quickstart -settings.quickstartHeading=Quickstart -settings.quickstartDescription=Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings. settings.quickstartCheckbox=Always connect automatically -# Bridge settings -settings.bridgesHeading=Bridges -settings.bridgesDescription2=Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another. +# Might be removed in tor-browser#42477 + settings.bridgeLocation=Your location settings.bridgeLocationAutomatic=Automatic settings.bridgeLocationFrequent=Frequently selected locations settings.bridgeLocationOther=Other locations settings.bridgeChooseForMe=Choose a Bridge For Me… - -settings.remove=Remove -settings.bridgeDisableBuiltIn=Disable built-in bridges -settings.copied=Copied! -settings.bridgeRemoveAllDialogTitle=Remove all bridges? -settings.bridgeRemoveAllDialogDescription=If these bridges were received from torproject.org or added manually, this action cannot be undone - -# Advanced settings -settings.advancedHeading=Advanced -settings.advancedLabel=Configure how Tor Browser connects to the internet -settings.advancedButton=Settings… -settings.showTorDaemonLogs=View the Tor logs -settings.showLogs=View Logs… - -# Remove all bridges dialog -settings.removeBridgesQuestion=Remove all the bridges? -settings.removeBridgesWarning=This action cannot be undone. -settings.cancel=Cancel - -# Scan bridge QR dialog -settings.scanQrTitle=Scan the QR code - -# Builtin bridges dialog -settings.builtinBridgeHeader=Select a Built-In Bridge -settings.builtinBridgeDescription2=Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor. -settings.builtinBridgeObfs4Title=obfs4 (Built-in) -settings.builtinBridgeObfs4Description2=Makes your Tor traffic look like random data. May not work in heavily censored regions. -settings.builtinBridgeSnowflake=Snowflake -settings.builtinBridgeSnowflakeDescription2=Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example. -settings.builtinBridgeMeekAzure=meek-azure -settings.builtinBridgeMeekAzureDescription2=Makes it look like you’re connected to a Microsoft website, instead of using Tor. May work in heavily censored regions, but is usually very slow. -settings.bridgeButtonConnect=Connect -settings.bridgeButtonAccept=OK - -# Request bridges dialog -settings.requestBridgeDialogTitle=Request Bridge -settings.submitCaptcha=Submit -settings.contactingBridgeDB=Contacting BridgeDB. Please Wait. -settings.solveTheCaptcha=Solve the CAPTCHA to request a bridge. -settings.captchaTextboxPlaceholder=Enter the characters from the image -settings.incorrectCaptcha=The solution is not correct. Please try again. - -# Connection settings dialog -settings.connectionSettingsDialogTitle=Connection Settings -settings.connectionSettingsDialogHeader=Configure how Tor Browser connects to the Internet -settings.useLocalProxy=I use a proxy to connect to the Internet -settings.proxyType=Proxy Type -settings.proxyTypeSOCKS4=SOCKS4 -settings.proxyTypeSOCKS5=SOCKS5 -settings.proxyTypeHTTP=HTTP/HTTPS -settings.proxyAddress=Address -settings.proxyAddressPlaceholder=IP address or hostname -settings.proxyPort=Port -settings.proxyUsername=Username -settings.proxyPassword=Password -settings.proxyUsernamePasswordPlaceholder=Optional -settings.useFirewall=This computer goes through a firewall that only allows connections to certain ports -settings.allowedPorts=Allowed Ports -settings.allowedPortsPlaceholder=Comma-separated values - -# Log dialog -settings.torLogDialogTitle=Tor Logs -settings.copyLog=Copy Tor Log to Clipboard ===================================== tools/torbrowser/l10n/migrations/bug-42207-settings.py ===================================== @@ -0,0 +1,88 @@ +from fluent.migrate.helpers import transforms_from + + +def migrate(ctx): + legacy_path = "settings.properties" + ctx.add_transforms( + "tor-browser.ftl", + "tor-browser.ftl", + transforms_from( + """ +tor-connection-settings-heading = { COPY(path, "settings.categoryTitle") } +tor-connection-browser-learn-more-link = { COPY(path, "settings.learnMore") } + +tor-connection-quickstart-heading = { COPY(path, "settings.quickstartHeading") } +tor-connection-quickstart-checkbox = + .label = { COPY(path, "settings.quickstartCheckbox") } + +tor-connection-internet-status-label = { COPY(path, "settings.statusInternetLabel") } +tor-connection-internet-status-test-button = { COPY(path, "settings.statusInternetTest") } +tor-connection-internet-status-online = { COPY(path, "settings.statusInternetOnline") } +tor-connection-internet-status-offline = { COPY(path, "settings.statusInternetOffline") } + +tor-bridges-heading = { COPY(path, "settings.bridgesHeading") } +tor-bridges-overview = { COPY(path, "settings.bridgesDescription2") } +tor-bridges-learn-more-link = { COPY(path, "settings.learnMore") } + +tor-bridges-built-in-obfs4-description = { COPY(path, "settings.builtinBridgeObfs4Description2") } +tor-bridges-built-in-snowflake-name = { COPY(path, "settings.builtinBridgeSnowflake") } +tor-bridges-built-in-snowflake-description = { COPY(path, "settings.builtinBridgeSnowflakeDescription2") } +tor-bridges-built-in-meek-azure-name = { COPY(path, "settings.builtinBridgeMeekAzure") } +tor-bridges-built-in-meek-azure-description = { COPY(path, "settings.builtinBridgeMeekAzureDescription2") } + +remove-all-bridges-warning-title = { COPY(path, "settings.bridgeRemoveAllDialogTitle") } +remove-all-bridges-warning-description = { COPY(path, "settings.bridgeRemoveAllDialogDescription") } +remove-all-bridges-warning-remove-button = { COPY(path, "settings.remove") } + +bridge-qr-dialog-title = + .title = { COPY(path, "settings.scanQrTitle") } + +bridge-dialog-button-connect = { COPY(path, "settings.bridgeButtonConnect") } +bridge-dialog-button-accept = { COPY(path, "settings.bridgeButtonAccept") } +bridge-dialog-button-submit = { COPY(path, "settings.submitCaptcha") } + +built-in-dialog-title = + .title = { COPY(path, "settings.builtinBridgeHeader") } +built-in-dialog-snowflake-radio-option = + .label = { COPY(path, "settings.builtinBridgeSnowflake") } +built-in-dialog-meek-azure-radio-option = + .label = { COPY(path, "settings.builtinBridgeMeekAzure") } + +request-bridge-dialog-title = + .title = { COPY(path, "settings.requestBridgeDialogTitle") } +request-bridge-dialog-top-wait = { COPY(path, "settings.contactingBridgeDB") } +request-bridge-dialog-top-solve = { COPY(path, "settings.solveTheCaptcha") } +request-bridge-dialog-captcha-input = + .placeholder = { COPY(path, "settings.captchaTextboxPlaceholder") } +request-bridge-dialog-captcha-failed = { COPY(path, "settings.incorrectCaptcha") } + +tor-advanced-settings-heading = { COPY(path, "settings.advancedHeading") } +tor-advanced-settings-button = { COPY(path, "settings.advancedButton") } + +tor-log-dialog-copy-button-copied = + .label = { COPY(path, "settings.copied") } + +tor-advanced-dialog-proxy-socks4-menuitem = + .label = { COPY(path, "settings.proxyTypeSOCKS4") } +tor-advanced-dialog-proxy-socks5-menuitem = + .label = { COPY(path, "settings.proxyTypeSOCKS5") } +tor-advanced-dialog-proxy-http-menuitem = + .label = { COPY(path, "settings.proxyTypeHTTP") } +tor-advanced-dialog-proxy-address-input-label = { COPY(path, "settings.proxyAddress") } +tor-advanced-dialog-proxy-address-input = + .placeholder = { COPY(path, "settings.proxyAddressPlaceholder") } +tor-advanced-dialog-proxy-port-input-label = { COPY(path, "settings.proxyPort") } +tor-advanced-dialog-proxy-username-input-label = { COPY(path, "settings.proxyUsername") } +tor-advanced-dialog-proxy-username-input = + .placeholder = { COPY(path, "settings.proxyUsernamePasswordPlaceholder") } +tor-advanced-dialog-proxy-password-input-label = { COPY(path, "settings.proxyPassword") } +tor-advanced-dialog-proxy-password-input = + .placeholder = { COPY(path, "settings.proxyUsernamePasswordPlaceholder") } +tor-advanced-dialog-firewall-checkbox = + .label = { COPY(path, "settings.useFirewall") } +tor-advanced-dialog-firewall-ports-input = + .placeholder = { COPY(path, "settings.allowedPortsPlaceholder") } +""", + path=legacy_path, + ), + ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3f77b1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3f77b1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 2 commits: fixup! Bug 40933: Add tor-launcher functionality
by richard (＠richard) 09 Apr '24

09 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 2b1f695a by Pier Angelo Vendrame at 2024-04-09T19:50:54+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42510: Do not call SETCONF when we do not own the tor daemon. - - - - - 3f77b1ff by Pier Angelo Vendrame at 2024-04-09T19:50:54+00:00 fixup! Bug 40597: Implement TorSettings module Bug 42511: Fixed a typo TorConnectState.DisabledState -> TorConnectState.Disabled - - - - - 2 changed files: - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/modules/TorConnect.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -226,16 +226,18 @@ export class TorProvider { throw e; } - try { - await lazy.TorSettings.initializedPromise; - await this.writeSettings(lazy.TorSettings.getSettings()); - } catch (e) { - logger.warn( - "Failed to initialize TorSettings or to write our settings, so uninitializing.", - e - ); - this.uninit(); - throw e; + if (this.ownsTorDaemon) { + try { + await lazy.TorSettings.initializedPromise; + await this.writeSettings(lazy.TorSettings.getSettings()); + } catch (e) { + logger.warn( + "Failed to initialize TorSettings or to write our settings, so uninitializing.", + e + ); + this.uninit(); + throw e; + } } TorLauncherUtil.setProxyConfiguration(this.#socksSettings); ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -723,7 +723,7 @@ class DisabledState extends StateCallback { allowedTransitions = Object.freeze([]); constructor() { - super(TorConnectState.DisabledState); + super(TorConnectState.Disabled); } async run() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5dc406… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5dc406… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] geckoview tools in tor-browser moved into their own directory (fat-aar)
by Pier Angelo Vendrame (＠pierov) 09 Apr '24

09 Apr '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 872cff7c by Dan Ballard at 2024-04-09T11:41:30-07:00 geckoview tools in tor-browser moved into their own directory (fat-aar) - - - - - 1 changed file: - projects/geckoview/build Changes: ===================================== projects/geckoview/build ===================================== @@ -89,8 +89,9 @@ export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] MOZCONFIG_EOF echo "Starting the creation of the fake fat AAR $(date)" - pushd tools/torbrowser - make fat-aar ARCHS="[% c('arch') %]" + pushd tools/geckoview + touch android-env.sh + make fataar ARCHS="[% c('arch') %]" popd MOZCONFIG=mozconfig-android-all ./mach gradle \ geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal \ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 09 Apr '24

09 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 5dc406d2 by Dan Ballard at 2024-04-09T10:18:53-07:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser add geckoview tools - - - - - 11 changed files: - + tools/geckoview/.gitignore - + tools/geckoview/Makefile - + tools/geckoview/android-env-linux-template.sh - + tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build.sh - + tools/geckoview/clobber.sh - + tools/geckoview/config.sh - tools/torbrowser/fataar.py → tools/geckoview/fataar.py - + tools/geckoview/jslint.sh - + tools/geckoview/package-gradle.sh - tools/torbrowser/Makefile Changes: ===================================== tools/geckoview/.gitignore ===================================== @@ -0,0 +1 @@ +android-env.sh ===================================== tools/geckoview/Makefile ===================================== @@ -0,0 +1,43 @@ +.DEFAULT_GOAL := all + +# one of armv7 aarch64 x86 x86_64 +ARCH=aarch64 + +ARCHS=$(ARCH) +OS="${shell uname}" + +# https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… +mkfile_path := "$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))" + +DEV_ROOT = "$(mkfile_path)/../.." + +clobber: env + ./clobber.sh $(DEV_ROOT) $(ARCH) + +config: env + ./config.sh $(DEV_ROOT) $(ARCH) + +build: env + ./build.sh $(DEV_ROOT) $(ARCH) + +fataar: env + bash -c "source android-env.sh && ./fataar.py $(DEV_ROOT) $(ARCHS)" + +package: env + ./package-gradle.sh $(DEV_ROOT) $(ARCH) + +show: + ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/ + ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/$(shell ls ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni | tail -n 2 | head -n 1) + +env: + test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; } + +all: env build package + +jslint: + ./jslint.sh $(DEV_ROOT) $(JS) + +clean: + rm -rf $(BUILD_OUTPUT) + ===================================== tools/geckoview/android-env-linux-template.sh ===================================== @@ -0,0 +1,7 @@ +export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component +export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +export ANDROID_HOME=$HOME/.mozbuild/android-sdk-linux/ # or $HOME/Android/Sdk/ # Or .../android-toolchain/android-sdk-linux if you extract android-toolchain from tor-browser-build +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313/ # for 115esr +export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-7.5.1 # Or the version that we currently use +export LOCAL_DEV_BUILD=1 +export PATH=/FULL/PATH/TO/tor-browser-build/out/clang/clang-16.x.y-arm/bin/:$PATH # prepend our newly built and assembled clang to the path so it gets used to build geckoview ===================================== tools/geckoview/android-env-macos-template.sh ===================================== @@ -0,0 +1,7 @@ +export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component +export JAVA_HOME=/opt/homebrew/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ # for arm64. Or JAVA_HOME=/usr/local/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ for x86_64. +export ANDROID_HOME=$HOME/Library/Android/sdk # or $HOME/.mozbuild/android-sdk-macosx/ +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313 # will need to download NDK 23.2.8568313 via android studio +export GRADLE_HOME=/opt/homebrew/Cellar/gradle(a)7/7.6.4 # for arm64 or /usr/local/Cellar/gradle(a)7/7.6.4 for x86_64. Make sure the version is up to date +export LOCAL_DEV_BUILD=1 +export PATH=$ANDROID_HOME/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/bin/:$PATH # prepend android studios latest ndk to the path so it's clang gets used to build geckoview. NDK 25.2.9519653 uses clang 14.0.7, ideally we'd use clang 16 (to be the same as Linux) but that's not an option yet for android studio. NDK 26.1.10909125 uses clang 17.0.2, which we should evaluate with the esr128 migration ===================================== tools/geckoview/build.sh ===================================== @@ -0,0 +1,9 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 + +source android-env.sh + +cd $DEV_ROOT +MOZCONFIG=mozconfig-android-$ARCH ./mach build ===================================== tools/geckoview/clobber.sh ===================================== @@ -0,0 +1,10 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 + +source android-env.sh + +cd $DEV_ROOT +MOZCONFIG=mozconfig-android-$ARCH ./mach clobber +MOZCONFIG=mozconfig-android-all ./mach clobber ===================================== tools/geckoview/config.sh ===================================== @@ -0,0 +1,9 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 + +source android-env.sh + +cd $DEV_ROOT +MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries ===================================== tools/torbrowser/fataar.py → tools/geckoview/fataar.py ===================================== ===================================== tools/geckoview/jslint.sh ===================================== @@ -0,0 +1,9 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +JS_FILE=$2 + +source android-env.sh + +cd $DEV_ROOT +./mach lint -l eslint --fix $JS_FILE ===================================== tools/geckoview/package-gradle.sh ===================================== @@ -0,0 +1,15 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 + +source android-env.sh + +env ARCHS=$ARCH make fat-aar + +cd $DEV_ROOT +MOZCONFIG=mozconfig-android-$ARCH ./mach build binaries +MOZCONFIG=mozconfig-android-$ARCH ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenRepository +MOZCONFIG=mozconfig-android-all ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal exoplayer2:publishDebugPublicationToMavenLocal + + ===================================== tools/torbrowser/Makefile ===================================== @@ -47,9 +47,6 @@ build: deploy: ./deploy.sh $(BINARIES) $(BUILD_OUTPUT) -fat-aar: - ./fataar.py $(DEV_ROOT) $(ARCHS) - all: build deploy run: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5dc406d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5dc406d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 17 commits: fixup! Lox integration
by Pier Angelo Vendrame (＠pierov) 09 Apr '24

09 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: a2c8eab3 by Henry Wilkes at 2024-04-09T13:35:51+01:00 fixup! Lox integration Bug 42489: Add a logger for the Lox module. - - - - - 21115918 by Henry Wilkes at 2024-04-09T13:36:00+01:00 fixup! Lox integration Bug 42489: Change "loxid" to "loxId". This follows the camel case convention. - - - - - 64fd04bf by Henry Wilkes at 2024-04-09T13:36:01+01:00 fixup! Lox integration Bug 42489: Require a loxId argument for most methods. This ensures that a method only works on the credentials of the *expected* loxId, rather than the newest `TorSettings.bridges.lox_id` value which may change during a session. We also add `#activeLoxId` to stay in sync with `TorSettings.brigdes.lox_id`. We merge `clearInvites` into its updater. - - - - - 2411aa86 by Henry Wilkes at 2024-04-09T13:36:01+01:00 fixup! Lox integration Bug 42489: Make loading the stored preferences unconditional on the #credentials value. Also change the type of `#events` to always be an Array. - - - - - 2b7376cd by Henry Wilkes at 2024-04-09T13:36:03+01:00 fixup! Lox integration Bug 42489: Generated loxId is unlikely to clash with existing ones, but we add some free logic to guarantee this. - - - - - 4a114a5d by Henry Wilkes at 2024-04-09T13:36:09+01:00 fixup! Lox integration Bug 42489: Return copies of Lox module internals to ensure they cannot be edited by a caller. - - - - - e7248fe1 by Henry Wilkes at 2024-04-09T13:57:23+01:00 fixup! Lox integration Bug 42489: Add notifications to the Lox module. We ensure changes to credentials pass through #changeCredentials to check whether we should send a notification. - - - - - e8846a94 by Henry Wilkes at 2024-04-09T13:57:29+01:00 fixup! Lox integration Bug 42489: Add #assertInitialized. - - - - - b459399f by Henry Wilkes at 2024-04-09T16:17:17+01:00 fixup! Lox integration Bug 42489: Change LoxError. Move the LoxErrors types into LoxError. Only set the type if it is specific. - - - - - 23921826 by Henry Wilkes at 2024-04-09T16:17:25+01:00 fixup! Lox integration Bug 42489: Change the Lox Authority URL. - - - - - c9db0992 by Henry Wilkes at 2024-04-09T16:17:26+01:00 fixup! Lox integration Bug 42489: Try and re fetch the pubKey, encTable and constants if they failed before. For example, if they fail via a domain front request, we should try again with `fetch` when we are bootstrapped. - - - - - a9522e4e by Henry Wilkes at 2024-04-09T16:17:26+01:00 fixup! Lox integration Bug 42489: Make sure trust level strings are converted to integers. - - - - - 63e0f941 by Henry Wilkes at 2024-04-09T16:22:17+01:00 fixup! Lox integration Bug 42489: Tidy #attemptUpgrade by returning early with a promise. - - - - - 40ca47e1 by Henry Wilkes at 2024-04-09T16:22:18+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42489: Listen for notifications from Lox module, and pass in loxId to methods. - - - - - 23b9aa5b by Henry Wilkes at 2024-04-09T16:22:29+01:00 fixup! Bug 40597: Implement TorSettings module Bug 42489: Listen for notifications from Lox module. Also, do not save the bridge_strings to the preferences if they come from the Lox module. In DomainFrontedRequests distinguish between reachability errors, response errors and other errors in DomainFrontedRequest to improve Lox error messaging. - - - - - 46ac1528 by Henry Wilkes at 2024-04-09T16:22:53+01:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42489: Drop getLocalizedStringForError from TorLauncherUtil. - - - - - 9abd099f by Henry Wilkes at 2024-04-09T16:22:53+01:00 fixup! Add TorStrings module for localization Bug 42489: Drop nserror strings. - - - - - 8 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/loxInviteDialog.js - browser/components/torpreferences/content/provideBridgeDialog.js - toolkit/components/lox/Lox.sys.mjs - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/modules/DomainFrontedRequests.sys.mjs - toolkit/modules/TorSettings.sys.mjs - toolkit/torbutton/chrome/locale/en-US/torlauncher.properties Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -36,7 +36,7 @@ const { TorStrings } = ChromeUtils.importESModule( "resource://gre/modules/TorStrings.sys.mjs" ); -const { Lox } = ChromeUtils.importESModule( +const { Lox, LoxTopics } = ChromeUtils.importESModule( "resource://gre/modules/Lox.sys.mjs" ); @@ -1319,27 +1319,18 @@ const gLoxStatus = { this._invitesButton.addEventListener("click", () => { gSubDialog.open( "chrome://browser/content/torpreferences/loxInviteDialog.xhtml", - { - features: "resizable=yes", - closedCallback: () => { - // TODO: Listen for events from Lox, rather than call _updateInvites - // directly. - this._updateInvites(); - }, - } + { features: "resizable=yes" } ); }); this._unlockAlertButton.addEventListener("click", () => { - // TODO: Have a way to ensure that the cleared event data matches the - // current _loxId - Lox.clearEventData(); - // TODO: Listen for events from Lox, rather than call _updateUnlocks - // directly. - this._updateUnlocks(); + Lox.clearEventData(this._loxId); }); Services.obs.addObserver(this, TorSettingsTopics.SettingsChanged); - // TODO: Listen for new events from Lox, when it is supported. + Services.obs.addObserver(this, LoxTopics.UpdateEvents); + Services.obs.addObserver(this, LoxTopics.UpdateNextUnlock); + Services.obs.addObserver(this, LoxTopics.UpdateRemainingInvites); + Services.obs.addObserver(this, LoxTopics.NewInvite); // NOTE: Before initializedPromise completes, this area is hidden. TorSettings.initializedPromise.then(() => { @@ -1352,6 +1343,10 @@ const gLoxStatus = { */ uninit() { Services.obs.removeObserver(this, TorSettingsTopics.SettingsChanged); + Services.obs.removeObserver(this, LoxTopics.UpdateEvents); + Services.obs.removeObserver(this, LoxTopics.UpdateNextUnlock); + Services.obs.removeObserver(this, LoxTopics.UpdateRemainingInvites); + Services.obs.removeObserver(this, LoxTopics.NewInvite); }, observe(subject, topic, data) { @@ -1365,6 +1360,18 @@ const gLoxStatus = { this._updateLoxId(); } break; + case LoxTopics.UpdateNextUnlock: + this._updateNextUnlock(); + break; + case LoxTopics.UpdateEvents: + this._updatePendingEvents(); + break; + case LoxTopics.UpdateRemainingInvites: + this._updateRemainingInvites(); + break; + case LoxTopics.NewInvite: + this._updateHaveExistingInvites(); + break; } }, @@ -1384,43 +1391,126 @@ const gLoxStatus = { TorSettings.bridges.source === TorBridgeSource.Lox ? TorSettings.bridges.lox_id : ""; - if (loxId !== this._loxId) { - this._loxId = loxId; - this._updateUnlocks(); - this._updateInvites(); + if (loxId === this._loxId) { + return; } + this._loxId = loxId; + // We unset _nextUnlock to ensure the areas no longer use the old value for + // the new loxId. + this._updateNextUnlock(true); + this._updateRemainingInvites(); + this._updateHaveExistingInvites(); + this._updatePendingEvents(); }, /** - * Update the display of the current or next unlock. + * The remaining invites shown, or null if uninitialized or no loxId. + * + * @type {integer?} */ - async _updateUnlocks() { - // Cache the loxId before we await. - const loxId = this._loxId; - - if (!loxId) { - // NOTE: This area should already be hidden by the change in Lox source, - // but we clean up for the next non-empty id. - this._area.classList.remove("show-unlock-alert"); - this._area.classList.remove("show-next-unlock"); + _remainingInvites: null, + /** + * Update the shown value. + */ + _updateRemainingInvites() { + const numInvites = this._loxId + ? Lox.getRemainingInviteCount(this._loxId) + : null; + if (numInvites === this._remainingInvites) { return; } - - let pendingEvents; - let nextUnlock; - let numInvites; - // Fetch the latest events or details about the next unlock. - try { - nextUnlock = await Lox.getNextUnlock(); - pendingEvents = Lox.getEventData(); - numInvites = Lox.getRemainingInviteCount(); - } catch (e) { - console.error("Failed get get lox updates", e); + this._remainingInvites = numInvites; + this._updateUnlockArea(); + this._updateInvitesArea(); + }, + /** + * Whether we have existing invites, or null if uninitialized or no loxId. + * + * @type {boolean?} + */ + _haveExistingInvites: null, + /** + * Update the shown value. + */ + _updateHaveExistingInvites() { + const haveInvites = this._loxId ? !!Lox.getInvites().length : null; + if (haveInvites === this._haveExistingInvites) { + return; + } + this._haveExistingInvites = haveInvites; + this._updateInvitesArea(); + }, + /** + * Details about the next unlock, or null if uninitialized or no loxId. + * + * @type {UnlockData?} + */ + _nextUnlock: null, + /** + * Tracker id to ensure that the results from later calls to _updateNextUnlock + * take priority over earlier calls. + * + * @type {integer} + */ + _nextUnlockCallId: 0, + /** + * Update the shown value asynchronously. + * + * @param {boolean} [unset=false] - Whether to set the _nextUnlock value to + * null before waiting for the new value. I.e. ensure that the current value + * will not be used. + */ + async _updateNextUnlock(unset = false) { + // NOTE: We do not expect the integer to exceed the maximum integer. + this._nextUnlockCallId++; + const callId = this._nextUnlockCallId; + if (unset) { + this._nextUnlock = null; + } + const nextUnlock = this._loxId + ? await Lox.getNextUnlock(this._loxId) + : null; + if (callId !== this._nextUnlockCallId) { + // Replaced by another update. + // E.g. if the _loxId changed. Or if getNextUnlock triggered + // LoxTopics.UpdateNextUnlock. return; } + // Should be safe to trigger the update, even when the value hasn't changed. + this._nextUnlock = nextUnlock; + this._updateUnlockArea(); + }, + /** + * The list of events the user has not yet cleared, or null if uninitialized + * or no loxId. + * + * @type {EventData[]?} + */ + _pendingEvents: null, + /** + * Update the shown value. + */ + _updatePendingEvents() { + // Should be safe to trigger the update, even when the value hasn't changed. + this._pendingEvents = this._loxId ? Lox.getEventData(this._loxId) : null; + this._updateUnlockArea(); + }, - if (loxId !== this._loxId) { - // Replaced during await. + /** + * Update the display of the current or next unlock. + */ + _updateUnlockArea() { + if ( + !this._loxId || + this._pendingEvents === null || + this._remainingInvites === null || + this._nextUnlock === null + ) { + // Uninitialized or no Lox source. + // NOTE: This area may already be hidden by the change in Lox source, + // but we clean up for the next non-empty id. + this._area.classList.remove("show-unlock-alert"); + this._area.classList.remove("show-next-unlock"); return; } @@ -1428,6 +1518,7 @@ const gLoxStatus = { const alertHadFocus = this._unlockAlert.contains(document.activeElement); const detailsHadFocus = this._detailsArea.contains(document.activeElement); + const pendingEvents = this._pendingEvents; const showAlert = !!pendingEvents.length; this._area.classList.toggle("show-unlock-alert", showAlert); this._area.classList.toggle("show-next-unlock", !showAlert); @@ -1479,7 +1570,7 @@ const gLoxStatus = { document.l10n.setAttributes( this._unlockAlertInviteItem, "tor-bridges-lox-new-invites", - { numInvites } + { numInvites: this._remainingInvites } ); this._unlockAlert.classList.toggle( "lox-unlock-upgrade", @@ -1494,7 +1585,7 @@ const gLoxStatus = { const numDays = Math.max( 1, Math.ceil( - (new Date(nextUnlock.date).getTime() - Date.now()) / + (new Date(this._nextUnlock.date).getTime() - Date.now()) / (24 * 60 * 60 * 1000) ) ); @@ -1505,9 +1596,9 @@ const gLoxStatus = { ); // Gain 2 bridges from level 0 to 1. After that gain invites. - const bridgeGain = nextUnlock.nextLevel === 1; - const firstInvites = nextUnlock.nextLevel === 2; - const moreInvites = nextUnlock.nextLevel > 2; + const bridgeGain = this._nextUnlock.nextLevel === 1; + const firstInvites = this._nextUnlock.nextLevel === 2; + const moreInvites = this._nextUnlock.nextLevel > 2; this._detailsArea.classList.toggle("lox-next-gain-bridges", bridgeGain); this._detailsArea.classList.toggle( @@ -1529,24 +1620,19 @@ const gLoxStatus = { /** * Update the invites area. */ - _updateInvites() { - if (!this._loxId) { - return; - } - - let remainingInvites; - let existingInvites; - // Fetch the latest events or details about the next unlock. - try { - remainingInvites = Lox.getRemainingInviteCount(); - existingInvites = Lox.getInvites().length; - } catch (e) { - console.error("Failed get get remaining invites", e); - return; + _updateInvitesArea() { + let hasInvites; + if ( + !this._loxId || + this._remainingInvites === null || + this._haveExistingInvites === null + ) { + // Not initialized yet. + hasInvites = false; + } else { + hasInvites = this._haveExistingInvites || !!this._remainingInvites; } - const hasInvites = !!existingInvites || !!remainingInvites; - if (!hasInvites) { if ( this._remainingInvitesEl.contains(document.activeElement) || @@ -1563,11 +1649,13 @@ const gLoxStatus = { // creating new ones. this._detailsArea.classList.toggle("lox-has-invites", hasInvites); - document.l10n.setAttributes( - this._remainingInvitesEl, - "tor-bridges-lox-remaining-invites", - { numInvites: remainingInvites } - ); + if (hasInvites) { + document.l10n.setAttributes( + this._remainingInvitesEl, + "tor-bridges-lox-remaining-invites", + { numInvites: this._remainingInvites } + ); + } }, }; ===================================== browser/components/torpreferences/content/loxInviteDialog.js ===================================== @@ -3,14 +3,14 @@ const { TorSettings, TorSettingsTopics, TorBridgeSource } = ChromeUtils.importESModule("resource://gre/modules/TorSettings.sys.mjs"); -const { Lox, LoxErrors } = ChromeUtils.importESModule( +const { Lox, LoxError, LoxTopics } = ChromeUtils.importESModule( "resource://gre/modules/Lox.sys.mjs" ); /** * Fake Lox module -const LoxErrors = { +const LoxError = { LoxServerUnreachable: "LoxServerUnreachable", Other: "Other", }; @@ -36,7 +36,7 @@ const Lox = { return; } if (!this.remainingInvites) { - rej({ type: LoxErrors.Other }); + rej({ type: LoxError.Other }); return; } const invite = JSON.stringify({ @@ -104,7 +104,8 @@ const gLoxInvites = { // NOTE: TorSettings should already be initialized when this dialog is // opened. Services.obs.addObserver(this, TorSettingsTopics.SettingsChanged); - // TODO: Listen for new invites from Lox, when supported. + Services.obs.addObserver(this, LoxTopics.UpdateRemainingInvites); + Services.obs.addObserver(this, LoxTopics.NewInvite); // Set initial _loxId value. Can close this dialog. this._updateLoxId(); @@ -118,6 +119,8 @@ const gLoxInvites = { */ uninit() { Services.obs.removeObserver(this, TorSettingsTopics.SettingsChanged); + Services.obs.removeObserver(this, LoxTopics.UpdateRemainingInvites); + Services.obs.removeObserver(this, LoxTopics.NewInvite); }, observe(subject, topic, data) { @@ -131,6 +134,12 @@ const gLoxInvites = { this._updateLoxId(); } break; + case LoxTopics.UpdateRemainingInvites: + this._updateRemainingInvites(); + break; + case LoxTopics.NewInvite: + this._updateExistingInvites(); + break; } }, @@ -204,7 +213,7 @@ const gLoxInvites = { * Update the display of the remaining invites. */ _updateRemainingInvites() { - this._remainingInvites = Lox.getRemainingInviteCount(); + this._remainingInvites = Lox.getRemainingInviteCount(this._loxId); document.l10n.setAttributes( this._remainingInvitesEl, @@ -254,7 +263,7 @@ const gLoxInvites = { this._connectingEl.focus(); let lostFocus = false; - Lox.generateInvite() + Lox.generateInvite(this._loxId) .finally(() => { // Fetch whether the connecting label still has focus before we hide it. lostFocus = this._connectingEl.contains(document.activeElement); @@ -275,15 +284,11 @@ const gLoxInvites = { // message. this._inviteListEl.focus(); } - - // TODO: When Lox sends out notifications, let the observer handle the - // change rather than calling _updateRemainingInvites directly. - this._updateRemainingInvites(); }, loxError => { console.error("Failed to generate an invite", loxError); - switch (loxError.type) { - case LoxErrors.LoxServerUnreachable: + switch (loxError instanceof LoxError ? loxError.code : null) { + case LoxError.LoxServerUnreachable: this._updateGenerateError("no-server"); break; default: ===================================== browser/components/torpreferences/content/provideBridgeDialog.js ===================================== @@ -15,14 +15,14 @@ const { TorParsers } = ChromeUtils.importESModule( "resource://gre/modules/TorParsers.sys.mjs" ); -const { Lox, LoxErrors } = ChromeUtils.importESModule( +const { Lox, LoxError } = ChromeUtils.importESModule( "resource://gre/modules/Lox.sys.mjs" ); /* * Fake Lox module: -const LoxErrors = { +const LoxError = { BadInvite: "BadInvite", LoxServerUnreachable: "LoxServerUnreachable", Other: "Other", @@ -30,9 +30,9 @@ const LoxErrors = { const Lox = { failError: null, - // failError: LoxErrors.BadInvite, - // failError: LoxErrors.LoxServerUnreachable, - // failError: LoxErrors.Other, + // failError: LoxError.BadInvite, + // failError: LoxError.LoxServerUnreachable, + // failError: LoxError.Other, redeemInvite(invite) { return new Promise((res, rej) => { setTimeout(() => { @@ -281,13 +281,13 @@ const gProvideBridgeDialog = { }, loxError => { console.error("Redeeming failed", loxError); - switch (loxError.type) { - case LoxErrors.BadInvite: + switch (loxError instanceof LoxError ? loxError.code : null) { + case LoxError.BadInvite: // TODO: distinguish between a bad invite, an invite that has // expired, and an invite that has already been redeemed. this.updateError({ type: "bad-invite" }); break; - case LoxErrors.LoxServerUnreachable: + case LoxError.LoxServerUnreachable: this.updateError({ type: "no-server" }); break; default: ===================================== toolkit/components/lox/Lox.sys.mjs ===================================== @@ -5,15 +5,32 @@ import { } from "resource://gre/modules/Timer.sys.mjs"; const lazy = {}; + +ChromeUtils.defineLazyGetter(lazy, "logger", () => { + let { ConsoleAPI } = ChromeUtils.importESModule( + "resource://gre/modules/Console.sys.mjs" + ); + return new ConsoleAPI({ + maxLogLevel: "warn", + maxLogLevelPref: "lox.log_level", + prefix: "Lox", + }); +}); + ChromeUtils.defineESModuleGetters(lazy, { DomainFrontRequestBuilder: "resource://gre/modules/DomainFrontedRequests.sys.mjs", + DomainFrontRequestNetworkError: + "resource://gre/modules/DomainFrontedRequests.sys.mjs", + DomainFrontRequestResponseError: + "resource://gre/modules/DomainFrontedRequests.sys.mjs", TorConnect: "resource://gre/modules/TorConnect.sys.mjs", TorConnectState: "resource://gre/modules/TorConnect.sys.mjs", TorSettings: "resource://gre/modules/TorSettings.sys.mjs", TorSettingsTopics: "resource://gre/modules/TorSettings.sys.mjs", TorBridgeSource: "resource://gre/modules/TorSettings.sys.mjs", }); + XPCOMUtils.defineLazyModuleGetters(lazy, { init: "resource://gre/modules/lox_wasm.jsm", open_invite: "resource://gre/modules/lox_wasm.jsm", @@ -37,13 +54,22 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { handle_blockage_migration: "resource://gre/modules/lox_wasm.jsm", }); -export const LoxErrors = Object.freeze({ - BadInvite: "BadInvite", - MissingCredential: "MissingCredential", - LoxServerUnreachable: "LoxServerUnreachable", - NoInvitations: "NoInvitations", - InitError: "InitializationError", - NotInitialized: "NotInitialized", +export const LoxTopics = Object.freeze({ + // Whenever the bridges *might* have changed. + // getBridges only uses #credentials, so this will only fire when it changes. + UpdateBridges: "lox:update-bridges", + // Whenever we gain a new upgrade or blockage event, or clear events. + UpdateEvents: "lox:update-events", + // Whenever the next unlock *might* have changed. + // getNextUnlock uses #credentials and #constants, sow ill fire when either + // value changes. + UpdateNextUnlock: "lox:update-next-unlock", + // Whenever the remaining invites *might* have changed. + // getRemainingInviteCount only uses #credentials, so will only fire when it + // changes. + UpdateRemainingInvites: "lox:update-remaining-invites", + // Whenever we generate a new invite. + NewInvite: "lox:new-invite", }); const LoxSettingsPrefs = Object.freeze({ @@ -56,10 +82,21 @@ const LoxSettingsPrefs = Object.freeze({ constants: "lox.settings.constants", }); -class LoxError extends Error { - constructor(type) { - super(""); - this.type = type; +/** + * Error class for Lox. + */ +export class LoxError extends Error { + static BadInvite = "BadInvite"; + static LoxServerUnreachable = "LoxServerUnreachable"; + + /** + * @param {string} message - The error message. + * @param {string?} [code] - The specific error type, if any. + */ + constructor(message, code = null) { + super(message); + this.name = "LoxError"; + this.code = code; } } @@ -70,14 +107,65 @@ class LoxImpl { #encTablePromise = null; #constantsPromise = null; #domainFrontedRequests = null; - #invites = null; + /** + * The list of invites generated. + * + * @type {string[]} + */ + #invites = []; #pubKeys = null; #encTable = null; #constants = null; - #credentials = null; + /** + * The latest credentials for a given lox id. + * + * @type {Object<string, string>} + */ + #credentials = {}; + /** + * The list of accumulated blockage or upgrade events. + * + * This can be cleared when the user acknowledges the events. + * + * @type {EventData[]} + */ #events = []; #backgroundInterval = null; + /** + * The lox ID that is currently active. + * + * Stays in sync with TorSettings.bridges.lox_id. null when uninitialized. + * + * @type {string?} + */ + #activeLoxId = null; + + /** + * Update the active lox id. + */ + #updateActiveLoxId() { + const loxId = lazy.TorSettings.bridges.lox_id; + if (loxId === this.#activeLoxId) { + return; + } + lazy.logger.debug( + `#activeLoxId switching from "${this.#activeLoxId}" to "${loxId}"` + ); + if (this.#activeLoxId !== null) { + lazy.logger.debug( + `Clearing event data and invites for "${this.#activeLoxId}"` + ); + // If not initializing clear the metadata for the old lox ID when it + // changes. + this.clearEventData(this.#activeLoxId); + // TODO: Do we want to keep invites? See tor-browser#42453 + this.#invites = []; + this.#store(); + } + this.#activeLoxId = loxId; + } + observe(subject, topic, data) { switch (topic) { case lazy.TorSettingsTopics.SettingsChanged: @@ -87,11 +175,8 @@ class LoxImpl { changes.includes("bridges.source") || changes.includes("bridges.lox_id") ) { - // if lox_id has changed, clear event and invite queues - if (changes.includes("bridges.lox_id")) { - this.clearEventData(); - this.clearInvites(); - } + // The lox_id may have changed. + this.#updateActiveLoxId(); // Only run background tasks if Lox is enabled if (this.#inuse) { @@ -108,6 +193,8 @@ class LoxImpl { } break; case lazy.TorSettingsTopics.Ready: + // Set the initial #activeLoxId. + this.#updateActiveLoxId(); // Run background tasks every 12 hours if Lox is enabled if (this.#inuse) { this.#backgroundInterval = setInterval( @@ -119,36 +206,86 @@ class LoxImpl { } } + /** + * Assert that the module is initialized. + */ + #assertInitialized() { + if (!this.#initialized) { + throw new LoxError("Not initialized"); + } + } + get #inuse() { return ( + Boolean(this.#activeLoxId) && lazy.TorSettings.bridges.enabled === true && - lazy.TorSettings.bridges.source === lazy.TorBridgeSource.Lox && - lazy.TorSettings.bridges.lox_id + lazy.TorSettings.bridges.source === lazy.TorBridgeSource.Lox ); } + /** + * Change some existing credentials for an ID to a new value. + * + * @param {string} loxId - The ID to change the credentials for. + * @param {string} newCredentials - The new credentials to set. + */ + #changeCredentials(loxId, newCredentials) { + // FIXME: Several async methods want to update the credentials, but they + // might race and conflict with each. tor-browser#42492 + if (!newCredentials) { + // Avoid overwriting and losing our current credentials. + throw new LoxError(`Empty credentials being set for ${loxId}`); + } + if (!this.#credentials[loxId]) { + // Unexpected, but we still want to save the value to storage. + lazy.logger.warn(`Lox ID ${loxId} is missing existing credentials`); + } + + this.#credentials[loxId] = newCredentials; + this.#store(); + + // NOTE: In principle we could determine within this module whether the + // bridges, remaining invites, or next unlock changes in value when + // switching credentials. + // However, this logic can be done by the topic observers, as needed. In + // particular, TorSettings.bridges.bridge_strings has its own logic + // determining whether its value has changed. + + // Let TorSettings know about possibly new bridges. + Services.obs.notifyObservers(null, LoxTopics.UpdateBridges); + // Let UI know about changes. + Services.obs.notifyObservers(null, LoxTopics.UpdateRemainingInvites); + Services.obs.notifyObservers(null, LoxTopics.UpdateNextUnlock); + } + + /** + * Fetch the latest credentials. + * + * @param {string} loxId - The ID to get the credentials for. + * + * @returns {string} - The credentials. + */ + #getCredentials(loxId) { + const cred = loxId ? this.#credentials[loxId] : undefined; + if (!cred) { + throw new LoxError(`No credentials for ${loxId}`); + } + return cred; + } + /** * Formats and returns bridges from the stored Lox credential. * - * @param {string} loxid The id string associated with a lox credential. + * @param {string} loxId The id string associated with a lox credential. * * @returns {string[]} An array of formatted bridge lines. The array is empty * if there are no bridges. */ - getBridges(loxid) { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } - if (loxid === null) { - return []; - } - if (!this.#credentials[loxid]) { - // This lox id doesn't correspond to a stored credential - throw new LoxError(LoxErrors.MissingCredential); - } + getBridges(loxId) { + this.#assertInitialized(); // Note: this is messy now but can be mostly removed after we have // https://gitlab.torproject.org/tpo/anti-censorship/lox/-/issues/46 - let bridgelines = JSON.parse(this.#credentials[loxid]).bridgelines; + let bridgelines = JSON.parse(this.#getCredentials(loxId)).bridgelines; let bridges = []; for (const bridge of bridgelines) { let addr = bridge.addr; @@ -219,18 +356,12 @@ class LoxImpl { } #load() { - if (this.#credentials === null) { - let cred = Services.prefs.getStringPref(LoxSettingsPrefs.credentials, ""); - this.#credentials = cred !== "" ? JSON.parse(cred) : {}; - let invites = Services.prefs.getStringPref(LoxSettingsPrefs.invites, ""); - if (invites !== "") { - this.#invites = JSON.parse(invites); - } - let events = Services.prefs.getStringPref(LoxSettingsPrefs.events, ""); - if (events !== "") { - this.#events = JSON.parse(events); - } - } + const cred = Services.prefs.getStringPref(LoxSettingsPrefs.credentials, ""); + this.#credentials = cred ? JSON.parse(cred) : {}; + const invites = Services.prefs.getStringPref(LoxSettingsPrefs.invites, ""); + this.#invites = invites ? JSON.parse(invites) : []; + const events = Services.prefs.getStringPref(LoxSettingsPrefs.events, ""); + this.#events = events ? JSON.parse(events) : []; this.#pubKeys = Services.prefs.getStringPref( LoxSettingsPrefs.pubkeys, null @@ -246,16 +377,21 @@ class LoxImpl { } async #getPubKeys() { + // FIXME: We are always refetching #pubKeys, #encTable and #constants once + // per session, but they may change more frequently. tor-browser#42502 if (this.#pubKeyPromise === null) { this.#pubKeyPromise = this.#makeRequest("pubkeys", []) .then(pubKeys => { this.#pubKeys = JSON.stringify(pubKeys); this.#store(); }) - .catch(() => { + .catch(error => { + lazy.logger.debug("Failed to get pubkeys", error); + // Make the next call try again. + this.#pubKeyPromise = null; // We always try to update, but if that doesn't work fall back to stored data if (!this.#pubKeys) { - throw new LoxError(LoxErrors.LoxServerUnreachable); + throw error; } }); } @@ -269,10 +405,13 @@ class LoxImpl { this.#encTable = JSON.stringify(encTable); this.#store(); }) - .catch(() => { + .catch(error => { + lazy.logger.debug("Failed to get encTable", error); + // Make the next call try again. + this.#encTablePromise = null; // Try to update first, but if that doesn't work fall back to stored data if (!this.#encTable) { - throw new LoxError(LoxErrors.LoxServerUnreachable); + throw error; } }); } @@ -284,55 +423,96 @@ class LoxImpl { // Try to update first, but if that doesn't work fall back to stored data this.#constantsPromise = this.#makeRequest("constants", []) .then(constants => { + const prevValue = this.#constants; this.#constants = JSON.stringify(constants); this.#store(); + if (prevValue !== this.#constants) { + Services.obs.notifyObservers(null, LoxTopics.UpdateNextUnlock); + } }) - .catch(() => { + .catch(error => { + lazy.logger.debug("Failed to get constants", error); + // Make the next call try again. + this.#constantsPromise = null; if (!this.#constants) { - throw new LoxError(LoxErrors.LoxServerUnreachable); + throw error; } }); } await this.#constantsPromise; } + /** + * Parse a decimal string to a non-negative integer. + * + * @param {string} str - The string to parse. + * @returns {integer} - The integer. + */ + static #parseNonNegativeInteger(str) { + if (typeof str !== "string" || !/^[0-9]+$/.test(str)) { + throw new LoxError(`Expected a non-negative decimal integer: "${str}"`); + } + return parseInt(str, 10); + } + + /** + * Get the current lox trust level. + * + * @param {string} loxId - The ID to fetch the level for. + * @returns {integer} - The trust level. + */ + #getLevel(loxId) { + return LoxImpl.#parseNonNegativeInteger( + lazy.get_trust_level(this.#getCredentials(loxId)) + ); + } + /** * Check for blockages and attempt to perform a levelup * * If either blockages or a levelup happened, add an event to the event queue */ async #backgroundTasks() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); + this.#assertInitialized(); + let addedEvent = false; + // Only run background tasks for the active lox ID. + const loxId = this.#activeLoxId; + if (!loxId) { + lazy.logger.warn("No loxId for the background task"); + return; } - const loxid = lazy.TorSettings.bridges.lox_id; try { - const levelup = await this.#attemptUpgrade(loxid); + const levelup = await this.#attemptUpgrade(loxId); if (levelup) { - const level = lazy.get_trust_level(this.#credentials[loxid]); + const level = this.#getLevel(loxId); const newEvent = { type: "levelup", newlevel: level, }; this.#events.push(newEvent); this.#store(); + addedEvent = true; } } catch (err) { - console.log(err); + lazy.logger.error(err); } try { - const leveldown = await this.#blockageMigration(loxid); + const leveldown = await this.#blockageMigration(loxId); if (leveldown) { - let level = lazy.get_trust_level(this.#credentials[loxid]); + let level = this.#getLevel(loxId); const newEvent = { type: "blockage", newlevel: level, }; this.#events.push(newEvent); this.#store(); + addedEvent = true; } } catch (err) { - console.log(err); + lazy.logger.error(err); + } + if (addedEvent) { + Services.obs.notifyObservers(null, LoxTopics.UpdateEvents); } } @@ -356,10 +536,8 @@ class LoxImpl { await lazy.init(this.#window); lazy.set_panic_hook(); if (typeof lazy.open_invite !== "function") { - throw new LoxError(LoxErrors.InitError); + throw new LoxError("Initialization failed"); } - this.#invites = []; - this.#events = []; this.#load(); this.#initialized = true; } @@ -376,14 +554,14 @@ class LoxImpl { } this.#initialized = false; this.#window = null; - this.#invites = null; + this.#invites = []; this.#pubKeys = null; this.#encTable = null; this.#constants = null; this.#pubKeyPromise = null; this.#encTablePromise = null; this.#constantsPromise = null; - this.#credentials = null; + this.#credentials = {}; this.#events = []; if (this.#backgroundInterval) { clearInterval(this.#backgroundInterval); @@ -398,13 +576,11 @@ class LoxImpl { * @returns {bool} Whether the value passed in was a Lox invitation. */ validateInvitation(invite) { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } + this.#assertInitialized(); try { lazy.invitation_is_trusted(invite); } catch (err) { - console.log(err); + lazy.logger.error(err); return false; } return true; @@ -413,11 +589,9 @@ class LoxImpl { // Note: This is only here for testing purposes. We're going to be using telegram // to issue open invitations for Lox bridges. async requestOpenInvite() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } + this.#assertInitialized(); let invite = await this.#makeRequest("invite", []); - console.log(invite); + lazy.logger.debug(invite); return invite; } @@ -425,36 +599,37 @@ class LoxImpl { * Redeems a Lox invitation to obtain a credential and bridges. * * @param {string} invite A Lox invitation. - * @returns {string} The loxid of the associated credential on success. + * @returns {string} The loxId of the associated credential on success. */ async redeemInvite(invite) { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } + this.#assertInitialized(); await this.#getPubKeys(); let request = await lazy.open_invite(JSON.parse(invite).invite); - let id = this.#genLoxId(); - let response; - try { - response = await this.#makeRequest( - "openreq", - JSON.parse(request).request - ); - } catch { - throw new LoxError(LoxErrors.LoxServerUnreachable); - } - console.log("openreq response: ", response); + let response = await this.#makeRequest( + "openreq", + JSON.parse(request).request + ); + lazy.logger.debug("openreq response: ", response); if (response.hasOwnProperty("error")) { - throw new LoxError(LoxErrors.BadInvite); + throw new LoxError( + `Error response to "openreq": ${response.error}`, + LoxError.BadInvite + ); } let cred = lazy.handle_new_lox_credential( request, JSON.stringify(response), this.#pubKeys ); - this.#credentials[id] = cred; + // Generate an id that is not already in the #credentials map. + let loxId; + do { + loxId = this.#genLoxId(); + } while (Object.hasOwn(this.#credentials, loxId)); + // Set new credentials. + this.#credentials[loxId] = cred; this.#store(); - return id; + return loxId; } /** @@ -463,10 +638,9 @@ class LoxImpl { * @returns {string[]} A list of all historical invites. */ getInvites() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } - return this.#invites; + this.#assertInitialized(); + // Return a copy. + return structuredClone(this.#invites); } /** @@ -477,212 +651,191 @@ class LoxImpl { * - there is no saved Lox credential, or * - the saved credential does not have any invitations available. * + * @param {string} loxId - The ID to generate an invite for. * @returns {string} A valid Lox invitation. */ - async generateInvite() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } - const loxid = lazy.TorSettings.bridges.lox_id; - if (!loxid || !this.#credentials[loxid]) { - throw new LoxError(LoxErrors.MissingCredential); - } + async generateInvite(loxId) { + this.#assertInitialized(); await this.#getPubKeys(); await this.#getEncTable(); - let level = lazy.get_trust_level(this.#credentials[loxid]); + let level = this.#getLevel(loxId); if (level < 1) { - throw new LoxError(LoxErrors.NoInvitations); + throw new LoxError(`Cannot generate invites at level ${level}`); } let request = lazy.issue_invite( - JSON.stringify(this.#credentials[loxid]), + JSON.stringify(this.#getCredentials(loxId)), this.#encTable, this.#pubKeys ); - let response; - try { - response = await this.#makeRequest( - "issueinvite", - JSON.parse(request).request - ); - } catch { - throw new LoxError(LoxErrors.LoxServerUnreachable); - } + let response = await this.#makeRequest( + "issueinvite", + JSON.parse(request).request + ); if (response.hasOwnProperty("error")) { - console.log(response.error); - throw new LoxError(LoxErrors.NoInvitations); + lazy.logger.error(response.error); + throw new LoxError(`Error response to "issueinvite": ${response.error}`); } else { - this.#credentials[loxid] = response; const invite = lazy.prepare_invite(response); this.#invites.push(invite); // cap length of stored invites if (this.#invites.len > 50) { this.#invites.shift(); } - return invite; + this.#store(); + this.#changeCredentials(loxId, response); + Services.obs.notifyObservers(null, LoxTopics.NewInvite); + // Return a copy. + // Right now invite is just a string, but that might change in the future. + return structuredClone(invite); } } /** * Get the number of invites that a user has remaining. * + * @param {string} loxId - The ID to check. * @returns {int} The number of invites that can still be generated by a * user's credential. */ - getRemainingInviteCount() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } - const loxid = lazy.TorSettings.bridges.lox_id; - if (!loxid || !this.#credentials[loxid]) { - throw new LoxError(LoxErrors.MissingCredential); - } - return parseInt(lazy.get_invites_remaining(this.#credentials[loxid])); + getRemainingInviteCount(loxId) { + this.#assertInitialized(); + return LoxImpl.#parseNonNegativeInteger( + lazy.get_invites_remaining(this.#getCredentials(loxId)) + ); } - async #blockageMigration(loxid) { - if (!loxid || !this.#credentials[loxid]) { - throw new LoxError(LoxErrors.MissingCredential); - } + async #blockageMigration(loxId) { await this.#getPubKeys(); let request; try { - request = lazy.check_blockage(this.#credentials[loxid], this.#pubKeys); + request = lazy.check_blockage(this.#getCredentials(loxId), this.#pubKeys); } catch { - console.log("Not ready for blockage migration"); + lazy.logger.log("Not ready for blockage migration"); return false; } let response = await this.#makeRequest("checkblockage", request); if (response.hasOwnProperty("error")) { - console.log(response.error); - throw new LoxError(LoxErrors.LoxServerUnreachable); + lazy.logger.error(response.error); + throw new LoxError( + `Error response to "checkblockage": ${response.error}` + ); } const migrationCred = lazy.handle_check_blockage( - this.#credentials[loxid], + this.#getCredentials(loxId), JSON.stringify(response) ); request = lazy.blockage_migration( - this.#credentials[loxid], + this.#getCredentials(loxId), migrationCred, this.#pubKeys ); response = await this.#makeRequest("blockagemigration", request); if (response.hasOwnProperty("error")) { - console.log(response.error); - throw new LoxError(LoxErrors.LoxServerUnreachable); + lazy.logger.error(response.error); + throw new LoxError( + `Error response to "blockagemigration": ${response.error}` + ); } const cred = lazy.handle_blockage_migration( - this.#credentials[loxid], + this.#getCredentials(loxId), JSON.stringify(response), this.#pubKeys ); - this.#credentials[loxid] = cred; - this.#store(); + this.#changeCredentials(loxId, cred); return true; } /** Attempts to upgrade the currently saved Lox credential. * If an upgrade is available, save an event in the event list. * - * @returns {boolean} whether a levelup event occured + * @returns {boolean} Whether a levelup event occurred. */ - async #attemptUpgrade(loxid) { - if (!loxid || !this.#credentials[loxid]) { - throw new LoxError(LoxErrors.MissingCredential); - } + async #attemptUpgrade(loxId) { await this.#getPubKeys(); await this.#getEncTable(); await this.#getConstants(); - let success = false; - let level = lazy.get_trust_level(this.#credentials[loxid]); + let level = this.#getLevel(loxId); if (level < 1) { // attempt trust promotion instead - try { - success = await this.#trustMigration(); - } catch (err) { - console.log(err); - return false; - } - } else { - let request = lazy.level_up( - this.#credentials[loxid], - this.#encTable, - this.#pubKeys - ); - const response = await this.#makeRequest("levelup", request); - if (response.hasOwnProperty("error")) { - console.log(response.error); - throw new LoxError(LoxErrors.LoxServerUnreachable); - } - const cred = lazy.handle_level_up( - request, - JSON.stringify(response), - this.#pubKeys - ); - this.#credentials[loxid] = cred; - return true; + return this.#trustMigration(loxId); + } + let request = lazy.level_up( + this.#getCredentials(loxId), + this.#encTable, + this.#pubKeys + ); + const response = await this.#makeRequest("levelup", request); + if (response.hasOwnProperty("error")) { + lazy.logger.error(response.error); + throw new LoxError(`Error response to "levelup": ${response.error}`); } - return success; + const cred = lazy.handle_level_up( + request, + JSON.stringify(response), + this.#pubKeys + ); + this.#changeCredentials(loxId, cred); + return true; } /** * Attempt to migrate from an untrusted to a trusted Lox credential * - * @returns {Promise<bool>} A bool value indicated whether the credential - * was successfully migrated. + * @param {string} loxId - The ID to use. + * @returns {boolean} Whether the credential was successfully migrated. */ - async #trustMigration() { - const loxid = lazy.TorSettings.bridges.lox_id; - if (!loxid || !this.#credentials[loxid]) { - throw new LoxError(LoxErrors.MissingCredential); - } + async #trustMigration(loxId) { await this.#getPubKeys(); return new Promise((resolve, reject) => { let request = ""; try { - request = lazy.trust_promotion(this.#credentials[loxid], this.#pubKeys); + request = lazy.trust_promotion( + this.#getCredentials(loxId), + this.#pubKeys + ); } catch (err) { - console.log("Not ready to upgrade"); + lazy.logger.debug("Not ready to upgrade"); resolve(false); } this.#makeRequest("trustpromo", JSON.parse(request).request) .then(response => { if (response.hasOwnProperty("error")) { + lazy.logger.error("Error response from trustpromo", response.error); resolve(false); } - console.log("Got promotion cred"); - console.log(response); - console.log(request); + lazy.logger.debug("Got promotion cred", response, request); let promoCred = lazy.handle_trust_promotion( request, JSON.stringify(response) ); - console.log("Formatted promotion cred"); + lazy.logger.debug("Formatted promotion cred"); request = lazy.trust_migration( - this.#credentials[loxid], + this.#getCredentials(loxId), promoCred, this.#pubKeys ); - console.log("Formatted migration request"); + lazy.logger.debug("Formatted migration request"); this.#makeRequest("trustmig", JSON.parse(request).request) .then(response => { if (response.hasOwnProperty("error")) { + lazy.logger.error( + "Error response from trustmig", + response.error + ); resolve(false); } - console.log("Got new credential"); + lazy.logger.debug("Got new credential"); let cred = lazy.handle_trust_migration(request, response); - this.#credentials[loxid] = cred; - this.#store(); + this.#changeCredentials(loxId, cred); resolve(true); }) .catch(err => { - console.log(err); - console.log("Failed trust migration"); + lazy.logger.error("Failed trust migration", err); resolve(false); }); }) .catch(err => { - console.log(err); - console.log("Failed trust promotion"); + lazy.logger.error("Failed trust promotion", err); resolve(false); }); }); @@ -701,88 +854,105 @@ class LoxImpl { /** * Get a list of accumulated events. * + * @param {string} loxId - The ID to get events for. * @returns {EventData[]} A list of the accumulated, unacknowledged events * associated with a user's credential. */ - getEventData() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } - const loxid = lazy.TorSettings.bridges.lox_id; - if (!loxid || !this.#credentials[loxid]) { - throw new LoxError(LoxErrors.MissingCredential); + getEventData(loxId) { + this.#assertInitialized(); + if (loxId !== this.#activeLoxId) { + lazy.logger.warn( + `No event data for loxId ${loxId} since it was replaced by ${ + this.#activeLoxId + }` + ); + return []; } - return this.#events; + // Return a copy. + return structuredClone(this.#events); } /** * Clears accumulated event data. + * + * Should be called whenever the user acknowledges the existing events. + * + * @param {string} loxId - The ID to clear events for. */ - clearEventData() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); + clearEventData(loxId) { + this.#assertInitialized(); + if (loxId !== this.#activeLoxId) { + lazy.logger.warn( + `Not clearing event data for loxId ${loxId} since it was replaced by ${ + this.#activeLoxId + }` + ); + return; } this.#events = []; this.#store(); - } - - /** - * Clears accumulated invitations. - */ - clearInvites() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } - this.#invites = []; - this.#store(); + Services.obs.notifyObservers(null, LoxTopics.UpdateEvents); } /** * @typedef {object} UnlockData * - * @property {string} date - The date-time for the next level up, formatted as YYYY-MM-DDTHH:mm:ssZ. - * @property {integer} nextLevel - The next level. Levels count from 0, so this will be 1 or greater. - * + * @property {string} date - The date-time for the next level up, formatted as + * YYYY-MM-DDTHH:mm:ssZ. + * @property {integer} nextLevel - The next level. Levels count from 0, so + * this will be 1 or greater. */ /** * Get details about the next feature unlock. * + * NOTE: A call to this method may trigger LoxTopics.UpdateNextUnlock. + * + * @param {string} loxId - The ID to get the unlock for. * @returns {UnlockData} - Details about the next unlock. */ - async getNextUnlock() { - if (!this.#initialized) { - throw new LoxError(LoxErrors.NotInitialized); - } - const loxid = lazy.TorSettings.bridges.lox_id; - if (!loxid || !this.#credentials[loxid]) { - throw new LoxError(LoxErrors.MissingCredential); - } + async getNextUnlock(loxId) { + this.#assertInitialized(); await this.#getConstants(); - let nextUnlocks = JSON.parse( - lazy.get_next_unlock(this.#constants, this.#credentials[loxid]) + let nextUnlock = JSON.parse( + lazy.get_next_unlock(this.#constants, this.#getCredentials(loxId)) ); - const level = parseInt(lazy.get_trust_level(this.#credentials[loxid])); - const unlocks = { - date: nextUnlocks.trust_level_unlock_date, + const level = this.#getLevel(loxId); + return { + date: nextUnlock.trust_level_unlock_date, nextLevel: level + 1, }; - return unlocks; } async #makeRequest(procedure, args) { // TODO: Customize to for Lox - const serviceUrl = "https://rdsys-frontend-01.torproject.org/lox"; + const serviceUrl = "https://lox.torproject.org"; const url = `${serviceUrl}/${procedure}`; if (lazy.TorConnect.state === lazy.TorConnectState.Bootstrapped) { - const request = await fetch(url, { - method: "POST", - headers: { - "Content-Type": "application/vnd.api+json", - }, - body: JSON.stringify(args), - }); + let request; + try { + request = await fetch(url, { + method: "POST", + headers: { + "Content-Type": "application/vnd.api+json", + }, + body: JSON.stringify(args), + }); + } catch (error) { + lazy.logger.debug("fetch fail", url, args, error); + throw new LoxError( + `fetch "${procedure}" from Lox authority failed: ${error?.message}`, + LoxError.LoxServerUnreachable + ); + } + if (!request.ok) { + lazy.logger.debug("fetch response", url, args, request); + // Do not treat as a LoxServerUnreachable type. + throw new LoxError( + `Lox authority responded to "${procedure}" with ${request.status}: ${request.statusText}` + ); + } return request.json(); } @@ -803,7 +973,26 @@ class LoxImpl { }); } const builder = await this.#domainFrontedRequests; - return builder.buildPostRequest(url, args); + try { + return await builder.buildPostRequest(url, args); + } catch (error) { + lazy.logger.debug("Domain front request fail", url, args, error); + if (error instanceof lazy.DomainFrontRequestNetworkError) { + throw new LoxError( + `Domain front fetch "${procedure}" from Lox authority failed: ${error?.message}`, + LoxError.LoxServerUnreachable + ); + } + if (error instanceof lazy.DomainFrontRequestResponseError) { + // Do not treat as a LoxServerUnreachable type. + throw new LoxError( + `Lox authority responded to domain front "${procedure}" with ${error.status}: ${error.statusText}` + ); + } + throw new LoxError( + `Domain front request for "${procedure}" from Lox authority failed: ${error?.message}` + ); + } } } ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -429,20 +429,6 @@ export const TorLauncherUtil = Object.freeze({ return aStringName; }, - getLocalizedStringForError(aNSResult) { - for (let prop in Cr) { - if (Cr[prop] === aNSResult) { - const key = "nsresult." + prop; - const rv = this.getLocalizedString(key); - if (rv !== key) { - return rv; - } - return prop; // As a fallback, return the NS_ERROR... name. - } - } - return undefined; - }, - getLocalizedBootstrapStatus(aStatusObj, aKeyword) { if (!aStatusObj || !aKeyword) { return ""; ===================================== toolkit/modules/DomainFrontedRequests.sys.mjs ===================================== @@ -347,6 +347,31 @@ class MeekTransportAndroid { } } +/** + * Corresponds to a Network error with the request. + */ +export class DomainFrontRequestNetworkError extends Error { + constructor(request, statusCode) { + super(`Error fetching ${request.name}: ${statusCode}`); + this.name = "DomainFrontRequestNetworkError"; + this.statusCode = statusCode; + } +} + +/** + * Corresponds to a non-ok response from the server. + */ +export class DomainFrontRequestResponseError extends Error { + constructor(request) { + super( + `Error response from ${request.name} server: ${request.responseStatus}` + ); + this.name = "DomainFrontRequestResponseError"; + this.status = request.responseStatus; + this.statusText = request.responseStatusText; + } +} + /** * Callback object to promisify the XPCOM request. */ @@ -379,12 +404,11 @@ class ResponseListener { onStopRequest(request, status) { try { if (!Components.isSuccessCode(status)) { - const errorMessage = - lazy.TorLauncherUtil.getLocalizedStringForError(status); - this.#reject(new Error(errorMessage)); + // Assume this is a network error. + this.#reject(new DomainFrontRequestNetworkError(request, status)); } if (request.responseStatus !== 200) { - this.#reject(new Error(request.responseStatusText)); + this.#reject(new DomainFrontRequestResponseError(request)); } } catch (err) { this.#reject(err); ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -7,6 +7,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs", Lox: "resource://gre/modules/Lox.sys.mjs", + LoxTopics: "resource://gre/modules/Lox.sys.mjs", TorParsers: "resource://gre/modules/TorParsers.sys.mjs", TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", }); @@ -330,7 +331,17 @@ class TorSettingsImpl { if (!val) { return; } - this.bridges.bridge_strings = lazy.Lox.getBridges(val); + let bridgeStrings; + try { + bridgeStrings = lazy.Lox.getBridges(val); + } catch (error) { + addError(`No bridges for lox_id ${val}: ${error?.message}`); + // Set as invalid, which will make the builtin_type "" and set the + // bridge_strings to be empty at the next #cleanupSettings. + this.bridges.source = TorBridgeSource.Invalid; + return; + } + this.bridges.bridge_strings = bridgeStrings; }, }, }); @@ -692,7 +703,7 @@ class TorSettingsImpl { try { await lazy.Lox.init(); } catch (e) { - lazy.logger.error("Could not initialize Lox.", e.type); + lazy.logger.error("Could not initialize Lox.", e); } if ( @@ -711,6 +722,8 @@ class TorSettingsImpl { } } + Services.obs.addObserver(this, lazy.LoxTopics.UpdateBridges); + lazy.logger.info("Ready"); } @@ -718,9 +731,28 @@ class TorSettingsImpl { * Unload or uninit our settings. */ async uninit() { + Services.obs.removeObserver(this, lazy.LoxTopics.UpdateBridges); await lazy.Lox.uninit(); } + observe(subject, topic, data) { + switch (topic) { + case lazy.LoxTopics.UpdateBridges: + if (this.bridges.lox_id) { + // Fetch the newest bridges. + this.bridges.bridge_strings = lazy.Lox.getBridges( + this.bridges.lox_id + ); + // No need to save to prefs since bridge_strings is not stored for Lox + // source. But we do pass on the changes to TorProvider. + // FIXME: This can compete with TorConnect to reach TorProvider. + // tor-browser#42316 + this.applySettings(); + } + break; + } + } + /** * Check whether the object has been successfully initialized, and throw if * it has not. @@ -763,24 +795,32 @@ class TorSettingsImpl { TorSettingsPrefs.bridges.source, TorBridgeSource.Invalid ); - this.bridges.lox_id = Services.prefs.getStringPref( - TorSettingsPrefs.bridges.lox_id, - "" - ); - if (this.bridges.source == TorBridgeSource.BuiltIn) { - this.bridges.builtin_type = Services.prefs.getStringPref( - TorSettingsPrefs.bridges.builtin_type, - "" - ); - } else { - const bridgeBranchPrefs = Services.prefs - .getBranch(TorSettingsPrefs.bridges.bridge_strings) - .getChildList(""); - this.bridges.bridge_strings = Array.from(bridgeBranchPrefs, pref => - Services.prefs.getStringPref( - `${TorSettingsPrefs.bridges.bridge_strings}${pref}` - ) - ); + switch (this.bridges.source) { + case TorBridgeSource.BridgeDB: + case TorBridgeSource.UserProvided: + this.bridges.bridge_strings = Services.prefs + .getBranch(TorSettingsPrefs.bridges.bridge_strings) + .getChildList("") + .map(pref => + Services.prefs.getStringPref( + `${TorSettingsPrefs.bridges.bridge_strings}${pref}` + ) + ); + break; + case TorBridgeSource.BuiltIn: + // bridge_strings is set via builtin_type. + this.bridges.builtin_type = Services.prefs.getStringPref( + TorSettingsPrefs.bridges.builtin_type, + "" + ); + break; + case TorBridgeSource.Lox: + // bridge_strings is set via lox id. + this.bridges.lox_id = Services.prefs.getStringPref( + TorSettingsPrefs.bridges.lox_id, + "" + ); + break; } /* Proxy */ this.proxy.enabled = Services.prefs.getBoolPref( @@ -866,7 +906,10 @@ class TorSettingsImpl { ); }); // write new ones - if (this.bridges.source !== TorBridgeSource.BuiltIn) { + if ( + this.bridges.source !== TorBridgeSource.Lox && + this.bridges.source !== TorBridgeSource.BuiltIn + ) { this.bridges.bridge_strings.forEach((string, index) => { Services.prefs.setStringPref( `${TorSettingsPrefs.bridges.bridge_strings}.${index}`, ===================================== toolkit/torbutton/chrome/locale/en-US/torlauncher.properties ===================================== @@ -55,7 +55,3 @@ torlauncher.bootstrapWarning.timeout=connection timeout torlauncher.bootstrapWarning.noroute=no route to host torlauncher.bootstrapWarning.ioerror=read/write error torlauncher.bootstrapWarning.pt_missing=missing pluggable transport - -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4255b3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4255b3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.10.0esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new tag mullvad-browser-115.10.0esr-13.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.10.0esr-13.0-1] 20 commits: MB 38: Mullvad Browser configuration
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch mullvad-browser-115.10.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: ab9a059e by Pier Angelo Vendrame at 2024-04-08T22:24:47+02:00 MB 38: Mullvad Browser configuration - - - - - 3ea9f651 by Pier Angelo Vendrame at 2024-04-08T22:24:47+02:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - b2ac6bd8 by Pier Angelo Vendrame at 2024-04-08T22:24:47+02:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - c5b7f306 by Pier Angelo Vendrame at 2024-04-08T22:24:47+02:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 202a501a by Pier Angelo Vendrame at 2024-04-08T22:24:47+02:00 MB 37: Customization for the about dialog - - - - - 60db32aa by Henry Wilkes at 2024-04-08T22:24:48+02:00 MB 39: Add home page about:mullvad-browser - - - - - 1093b116 by Henry Wilkes at 2024-04-08T22:24:48+02:00 fixup! MB 39: Add home page about:mullvad-browser Bug 271: Show update in about:mullvad-browser - - - - - de482aba by hackademix at 2024-04-08T22:24:48+02:00 MB 97: Remove UI cues to install new extensions. - - - - - 37cdffef by hackademix at 2024-04-08T22:24:48+02:00 MB 47: uBlock Origin customization - - - - - 246685ff by Pier Angelo Vendrame at 2024-04-08T22:24:49+02:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 3226e13f by Pier Angelo Vendrame at 2024-04-08T22:24:49+02:00 MB 87: Disable the default browser box on Windows and Linux Windows and Linux will be distributed only as portable apps at the beginning, so they should not be settable as default browsers. We will need to improve the logic once we decide to ship system-wide installers, too. - - - - - e58605be by Pier Angelo Vendrame at 2024-04-08T22:24:49+02:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - f9964a97 by Henry Wilkes at 2024-04-08T22:24:49+02:00 fixup! MB 112: Updater customization for Mullvad Browser Bug 271: Do not open update override page in a new tab, and show in about:mullvad-browser instead. - - - - - b99eb01d by Nicolas Vigier at 2024-04-08T22:24:49+02:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - 7fdc26ef by Pier Angelo Vendrame at 2024-04-08T22:24:50+02:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - b7661568 by Pier Angelo Vendrame at 2024-04-08T22:24:50+02:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - 0184e75e by hackademix at 2024-04-08T22:24:50+02:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - 7a95efda by Richard Pospesel at 2024-04-08T22:24:50+02:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - 3b8315c9 by rui hildt at 2024-04-08T22:24:50+02:00 MB 213: Customize the search engines list - - - - - 430baa35 by hackademix at 2024-04-08T22:24:51+02:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 30 changed files: - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.js - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/9c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/9c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.10.0esr-13.0-1] 108 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.10.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 725e506a by Eitan Isaacson at 2024-04-08T19:34:03+02:00 Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie Differential Revision: https://phabricator.services.mozilla.com/D179737 - - - - - f08de1b1 by Pier Angelo Vendrame at 2024-04-08T19:34:03+02:00 Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized Allow using NSS for checking MAR signatures also in platforms where OS-native APIs are used by default, i.e., macOS and Windows. Differential Revision: https://phabricator.services.mozilla.com/D177743 - - - - - a3172cb1 by Pier Angelo Vendrame at 2024-04-08T19:34:03+02:00 Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D186456 - - - - - c0294c8d by Emilio Cobos Álvarez at 2024-04-08T19:34:04+02:00 Bug 1853731 - Use html:img for message-bar-icon. r=Gijs,dao,settings-reviewers,desktop-theme-reviewers,sfoster Differential Revision: https://phabricator.services.mozilla.com/D188521 - - - - - 36300a0b by Pier Angelo Vendrame at 2024-04-08T19:34:04+02:00 Bug 1854117 - Sort the DLL blocklist flags. r=mossop,win-reviewers,gstoll Differential Revision: https://phabricator.services.mozilla.com/D188716 - - - - - ef0c31df by Eden Chuang at 2024-04-08T19:34:04+02:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - dcfc380f by edgul at 2024-04-08T19:34:04+02:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 2df76bab by Kelsey Gilbert at 2024-04-08T19:34:05+02:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - 5c28a706 by Mark Banner at 2024-04-08T19:34:05+02:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - 14e36bbe by Bob Owen at 2024-04-08T19:34:05+02:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - 08d77150 by Malte Juergens at 2024-04-08T19:34:05+02:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - dc36198c by Andreas Pehrson at 2024-04-08T19:34:05+02:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - d33bae3a by Pier Angelo Vendrame at 2024-04-08T19:34:06+02:00 Bug 1860020 - Remove the assertion on the value of toolkit.telemetry.enabled. r=KrisWright,chutten Bug 1444275 introduced an assertion on the parent process to check that the value of toolkit.telemetry.enabled is the expected one. However, this expected value could be different from the one set and locked e.g. in some forks. Therefore, the assertion prevented debug builds from working in these cases. Differential Revision: https://phabricator.services.mozilla.com/D195080 - - - - - dd524e8c by Kagami Sascha Rosylight at 2024-04-08T19:34:06+02:00 Bug 1865238 - Use One UI Sans KR VF for Korean sans-serif font on Android r=jfkthame Per /etc/fonts.xml, there are now only two `<family lang="ko">` nodes there: * OneUISansKRVF series * SECCJK series (but no KR postfix anymore?) This patch uses One UI Sans KR VF as the replacement as this is newer and is a variable font (tested with https://codepen.io/SaschaNaz/pen/ExrdYXJ) Differential Revision: https://phabricator.services.mozilla.com/D195078 - - - - - 029d5577 by Pier Angelo Vendrame at 2024-04-08T19:34:06+02:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - f1f4c1d4 by Pier Angelo Vendrame at 2024-04-08T19:34:06+02:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr Differential Revision: https://phabricator.services.mozilla.com/D198967 - - - - - aa5e6ca0 by Pier Angelo Vendrame at 2024-04-08T19:34:06+02:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 53c12e15 by Tom Ritter at 2024-04-08T19:34:07+02:00 Bug 1885258: Hidden fonts should obey the allow list r=jfkthame Differential Revision: https://phabricator.services.mozilla.com/D204571 - - - - - 446ba9db by Henry Wilkes at 2024-04-08T19:34:07+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 67e959bf by hackademix at 2024-04-08T19:34:07+02:00 Bug 42194: Fix blank net error page on failed DNS resolution with active proxy. - - - - - 52611d6a by Henry Wilkes at 2024-04-08T19:34:07+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - cff31be3 by Pier Angelo Vendrame at 2024-04-08T19:34:07+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - afcd6a10 by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - 56e9b923 by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - ad6e621c by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - e96dab77 by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - ccbbbbeb by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 2d49fc60 by Marco Simonelli at 2024-04-08T19:34:09+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - f95584fc by hackademix at 2024-04-08T19:34:09+02:00 Bug 41854: Allow overriding download spam protection. - - - - - bcf39f09 by Gaba at 2024-04-08T19:34:09+02:00 Adding issue and merge request templates - - - - - a43c809f by Pier Angelo Vendrame at 2024-04-08T19:34:09+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - f480a0a7 by Pier Angelo Vendrame at 2024-04-08T19:34:10+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - e901b2e8 by Pier Angelo Vendrame at 2024-04-08T19:34:10+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - bdffa105 by Dan Ballard at 2024-04-08T19:34:10+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 8f12c48f by Matthew Finkel at 2024-04-08T19:34:10+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 992d272f by Matthew Finkel at 2024-04-08T19:34:10+02:00 Bug 28125: Prevent non-Necko network connections - - - - - ac1bbfa3 by Mike Perry at 2024-04-08T19:34:11+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - bc550b31 by Alex Catarineu at 2024-04-08T19:34:11+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - c2e4dc38 by Georg Koppen at 2024-04-08T19:34:11+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 28c18e1e by Kathy Brade at 2024-04-08T19:34:11+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - dd261b8e by Kathy Brade at 2024-04-08T19:34:11+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 1df66507 by Alex Catarineu at 2024-04-08T19:34:12+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - d9e8c2e9 by Kathy Brade at 2024-04-08T19:34:12+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - ce3343ac by Arthur Edelstein at 2024-04-08T19:34:12+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - ea817fc9 by Alex Catarineu at 2024-04-08T19:34:12+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 969dcb9c by cypherpunks1 at 2024-04-08T19:34:12+02:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 93342874 by Pier Angelo Vendrame at 2024-04-08T19:34:13+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - dc37fecc by Georg Koppen at 2024-04-08T19:34:13+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 6e3e5057 by Alex Catarineu at 2024-04-08T19:34:13+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 18aba92a by cypherpunks1 at 2024-04-08T19:34:13+02:00 Bug 41568: Disable LaterRun - - - - - 54389046 by cypherpunks1 at 2024-04-08T19:34:14+02:00 Bug 40717: Hide Windows SSO in settings - - - - - cde48fd0 by Pier Angelo Vendrame at 2024-04-08T19:34:14+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - a67536f8 by cypherpunks1 at 2024-04-08T19:34:14+02:00 Bug 40175: Add origin attributes to about:reader top-level requests - - - - - b5b235a9 by Richard Pospesel at 2024-04-08T19:34:14+02:00 Bug 41327: Disable UrlbarProviderInterventions - - - - - 81e11adf by Richard Pospesel at 2024-04-08T19:34:14+02:00 Bug 42037: Disable about:firefoxview page - - - - - 82ca0c8c by Mike Perry at 2024-04-08T19:34:15+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 26446000 by Pier Angelo Vendrame at 2024-04-08T19:37:07+02:00 fixup! Firefox preference overrides. Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth. We will have to revert this during the ESR-transition. - - - - - ba32e138 by Richard Pospesel at 2024-04-08T19:37:08+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 6912b1cb by Pier Angelo Vendrame at 2024-04-08T19:37:08+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 78af49c4 by Alex Catarineu at 2024-04-08T19:37:08+02:00 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. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 1a2355c7 by Alex Catarineu at 2024-04-08T19:37:08+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 1ca01b5d by Alex Catarineu at 2024-04-08T19:37:08+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - acc096e3 by Alex Catarineu at 2024-04-08T19:37:09+02:00 Bug 26345: Hide tracking protection UI - - - - - 8810e3a9 by Pier Angelo Vendrame at 2024-04-08T19:37:09+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 3dfa38cf by Alex Catarineu at 2024-04-08T19:37:09+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 6c25f591 by Mike Perry at 2024-04-08T19:37:09+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - dbe9b6c7 by Igor Oliveira at 2024-04-08T19:37:09+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height. - - - - - 3e0d8623 by Pier Angelo Vendrame at 2024-04-08T19:37:10+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - b21d7f38 by Matthew Finkel at 2024-04-08T19:37:10+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - f1fb4c42 by cypherpunks1 at 2024-04-08T19:37:10+02:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - 0b690c5c by cypherpunks1 at 2024-04-08T19:37:10+02:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - d64f63dc by hackademix at 2024-04-08T19:37:11+02:00 Bug 42288: Allow language spoofing in status messages. - - - - - 80460b48 by Pier Angelo Vendrame at 2024-04-08T19:37:11+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - cb24e68d by hackademix at 2024-04-08T19:37:11+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 6dcbdca5 by hackademix at 2024-04-08T19:37:11+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 22b51b42 by hackademix at 2024-04-08T19:37:11+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 3efe06ee by hackademix at 2024-04-08T19:37:12+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 60c67b88 by hackademix at 2024-04-08T19:37:12+02:00 Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - de231230 by hackademix at 2024-04-08T19:37:12+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 97324a4a by Pier Angelo Vendrame at 2024-04-08T19:37:12+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - cdf96e05 by Pier Angelo Vendrame at 2024-04-08T19:37:12+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 42335: Do not localize the order of languages - - - - - 8c1d07fa by p13dz at 2024-04-08T19:37:13+02:00 Bug 40283: Workaround for the file upload bug - - - - - dd62f089 by Arthur Edelstein at 2024-04-08T19:37:13+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 0a36e971 by cypherpunks1 at 2024-04-08T19:37:13+02:00 Bug 41740: Change the RFP value of devicePixelRatio to 2 - - - - - 13541e2f by Pier Angelo Vendrame at 2024-04-08T19:37:13+02:00 Bug 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - 4e2eeb54 by cypherpunks1 at 2024-04-08T19:37:14+02:00 Bug 41881: Don't persist custom network requests on private windows - - - - - 7a1b62b8 by hackademix at 2024-04-08T19:37:14+02:00 Bug 42019: Empty browser's clipboard on browser shutdown - - - - - 121a4faa by hackademix at 2024-04-08T19:37:14+02:00 Bug 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - 620b210b by Pier Angelo Vendrame at 2024-04-08T19:37:14+02:00 Bug 42376: Pass the locale list when constructing l10n in datetimebox The datetime input is inconsistent with other inputs when using spoof English: its placeholder is not translated, unlike the default values and texts of all the other inputs. - - - - - 74d7c959 by Pier Angelo Vendrame at 2024-04-08T19:37:14+02:00 Bug 42428: Make RFP spoof the timezone of document.lastModified. - - - - - e79525ac by Pier Angelo Vendrame at 2024-04-08T19:37:15+02:00 Bug 42472: Spoof timezone in XSLT. - - - - - 23bd2c90 by Pier Angelo Vendrame at 2024-04-08T19:37:15+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 427757dc by Henry Wilkes at 2024-04-08T19:37:15+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 5aa6a314 by Kathy Brade at 2024-04-08T19:37:15+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - c35081bd by Pier Angelo Vendrame at 2024-04-08T19:37:15+02:00 Bug 42061: Create an alpha update channel. - - - - - e082b667 by Nicolas Vigier at 2024-04-08T19:37:16+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 99824eb8 by hackademix at 2024-04-08T19:37:16+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 646f53bf by Pier Angelo Vendrame at 2024-04-08T19:37:16+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 88577ca6 by Alex Catarineu at 2024-04-08T19:37:16+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - f51c7502 by Matthew Finkel at 2024-04-08T19:37:17+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 76523927 by Henry Wilkes at 2024-04-08T19:37:17+02:00 Bug 41736: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - 714ee4d3 by hackademix at 2024-04-08T19:37:17+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - ff825a19 by Pier Angelo Vendrame at 2024-04-08T19:37:17+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 9aba858e by Pier Angelo Vendrame at 2024-04-08T19:37:17+02:00 Bug 40926: Implemented the New Identity feature - - - - - bfb4d727 by hackademix at 2024-04-08T19:37:18+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42236: Let users decide whether to load their home page on new identity. - - - - - f7b145d5 by hackademix at 2024-04-08T19:37:18+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 129dd5c6 by Henry Wilkes at 2024-04-08T19:37:18+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - 9cad59ad by Pier Angelo Vendrame at 2024-04-08T19:37:18+02:00 Bug 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - accessible/android/SessionAccessibility.cpp - accessible/android/SessionAccessibility.h - accessible/ipc/DocAccessibleParent.cpp - accessible/ipc/DocAccessibleParent.h - accessible/ipc/moz.build - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-addons.js - browser/base/content/browser-context.inc - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/5b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/5b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.10.0esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new tag base-browser-115.10.0esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.10.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new branch base-browser-115.10.0esr-13.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.10.0esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new tag tor-browser-115.10.0esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.0-1] 154 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch tor-browser-115.10.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 725e506a by Eitan Isaacson at 2024-04-08T19:34:03+02:00 Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie Differential Revision: https://phabricator.services.mozilla.com/D179737 - - - - - f08de1b1 by Pier Angelo Vendrame at 2024-04-08T19:34:03+02:00 Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized Allow using NSS for checking MAR signatures also in platforms where OS-native APIs are used by default, i.e., macOS and Windows. Differential Revision: https://phabricator.services.mozilla.com/D177743 - - - - - a3172cb1 by Pier Angelo Vendrame at 2024-04-08T19:34:03+02:00 Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D186456 - - - - - c0294c8d by Emilio Cobos Álvarez at 2024-04-08T19:34:04+02:00 Bug 1853731 - Use html:img for message-bar-icon. r=Gijs,dao,settings-reviewers,desktop-theme-reviewers,sfoster Differential Revision: https://phabricator.services.mozilla.com/D188521 - - - - - 36300a0b by Pier Angelo Vendrame at 2024-04-08T19:34:04+02:00 Bug 1854117 - Sort the DLL blocklist flags. r=mossop,win-reviewers,gstoll Differential Revision: https://phabricator.services.mozilla.com/D188716 - - - - - ef0c31df by Eden Chuang at 2024-04-08T19:34:04+02:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - dcfc380f by edgul at 2024-04-08T19:34:04+02:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 2df76bab by Kelsey Gilbert at 2024-04-08T19:34:05+02:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - 5c28a706 by Mark Banner at 2024-04-08T19:34:05+02:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - 14e36bbe by Bob Owen at 2024-04-08T19:34:05+02:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - 08d77150 by Malte Juergens at 2024-04-08T19:34:05+02:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - dc36198c by Andreas Pehrson at 2024-04-08T19:34:05+02:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - d33bae3a by Pier Angelo Vendrame at 2024-04-08T19:34:06+02:00 Bug 1860020 - Remove the assertion on the value of toolkit.telemetry.enabled. r=KrisWright,chutten Bug 1444275 introduced an assertion on the parent process to check that the value of toolkit.telemetry.enabled is the expected one. However, this expected value could be different from the one set and locked e.g. in some forks. Therefore, the assertion prevented debug builds from working in these cases. Differential Revision: https://phabricator.services.mozilla.com/D195080 - - - - - dd524e8c by Kagami Sascha Rosylight at 2024-04-08T19:34:06+02:00 Bug 1865238 - Use One UI Sans KR VF for Korean sans-serif font on Android r=jfkthame Per /etc/fonts.xml, there are now only two `<family lang="ko">` nodes there: * OneUISansKRVF series * SECCJK series (but no KR postfix anymore?) This patch uses One UI Sans KR VF as the replacement as this is newer and is a variable font (tested with https://codepen.io/SaschaNaz/pen/ExrdYXJ) Differential Revision: https://phabricator.services.mozilla.com/D195078 - - - - - 029d5577 by Pier Angelo Vendrame at 2024-04-08T19:34:06+02:00 Bug 1875306 - Localize numbers in the underflow and overflow error messages. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D198965 - - - - - f1f4c1d4 by Pier Angelo Vendrame at 2024-04-08T19:34:06+02:00 Bug 1875313 - Use en-US as a fallback when spoof English is enabled in ICUUtils. r=timhuang,tjr Differential Revision: https://phabricator.services.mozilla.com/D198967 - - - - - aa5e6ca0 by Pier Angelo Vendrame at 2024-04-08T19:34:06+02:00 Bug 1880988 - Apply spoof English to the default detail summary. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D202203 - - - - - 53c12e15 by Tom Ritter at 2024-04-08T19:34:07+02:00 Bug 1885258: Hidden fonts should obey the allow list r=jfkthame Differential Revision: https://phabricator.services.mozilla.com/D204571 - - - - - 446ba9db by Henry Wilkes at 2024-04-08T19:34:07+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 67e959bf by hackademix at 2024-04-08T19:34:07+02:00 Bug 42194: Fix blank net error page on failed DNS resolution with active proxy. - - - - - 52611d6a by Henry Wilkes at 2024-04-08T19:34:07+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - cff31be3 by Pier Angelo Vendrame at 2024-04-08T19:34:07+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - afcd6a10 by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - 56e9b923 by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - ad6e621c by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - e96dab77 by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - ccbbbbeb by Marco Simonelli at 2024-04-08T19:34:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 2d49fc60 by Marco Simonelli at 2024-04-08T19:34:09+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - f95584fc by hackademix at 2024-04-08T19:34:09+02:00 Bug 41854: Allow overriding download spam protection. - - - - - bcf39f09 by Gaba at 2024-04-08T19:34:09+02:00 Adding issue and merge request templates - - - - - a43c809f by Pier Angelo Vendrame at 2024-04-08T19:34:09+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - f480a0a7 by Pier Angelo Vendrame at 2024-04-08T19:34:10+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - e901b2e8 by Pier Angelo Vendrame at 2024-04-08T19:34:10+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - bdffa105 by Dan Ballard at 2024-04-08T19:34:10+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 8f12c48f by Matthew Finkel at 2024-04-08T19:34:10+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 992d272f by Matthew Finkel at 2024-04-08T19:34:10+02:00 Bug 28125: Prevent non-Necko network connections - - - - - ac1bbfa3 by Mike Perry at 2024-04-08T19:34:11+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - bc550b31 by Alex Catarineu at 2024-04-08T19:34:11+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - c2e4dc38 by Georg Koppen at 2024-04-08T19:34:11+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 28c18e1e by Kathy Brade at 2024-04-08T19:34:11+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - dd261b8e by Kathy Brade at 2024-04-08T19:34:11+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 1df66507 by Alex Catarineu at 2024-04-08T19:34:12+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - d9e8c2e9 by Kathy Brade at 2024-04-08T19:34:12+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - ce3343ac by Arthur Edelstein at 2024-04-08T19:34:12+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - ea817fc9 by Alex Catarineu at 2024-04-08T19:34:12+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 969dcb9c by cypherpunks1 at 2024-04-08T19:34:12+02:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 93342874 by Pier Angelo Vendrame at 2024-04-08T19:34:13+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - dc37fecc by Georg Koppen at 2024-04-08T19:34:13+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 6e3e5057 by Alex Catarineu at 2024-04-08T19:34:13+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 18aba92a by cypherpunks1 at 2024-04-08T19:34:13+02:00 Bug 41568: Disable LaterRun - - - - - 54389046 by cypherpunks1 at 2024-04-08T19:34:14+02:00 Bug 40717: Hide Windows SSO in settings - - - - - cde48fd0 by Pier Angelo Vendrame at 2024-04-08T19:34:14+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - a67536f8 by cypherpunks1 at 2024-04-08T19:34:14+02:00 Bug 40175: Add origin attributes to about:reader top-level requests - - - - - b5b235a9 by Richard Pospesel at 2024-04-08T19:34:14+02:00 Bug 41327: Disable UrlbarProviderInterventions - - - - - 81e11adf by Richard Pospesel at 2024-04-08T19:34:14+02:00 Bug 42037: Disable about:firefoxview page - - - - - 82ca0c8c by Mike Perry at 2024-04-08T19:34:15+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 26446000 by Pier Angelo Vendrame at 2024-04-08T19:37:07+02:00 fixup! Firefox preference overrides. Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth. We will have to revert this during the ESR-transition. - - - - - ba32e138 by Richard Pospesel at 2024-04-08T19:37:08+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 6912b1cb by Pier Angelo Vendrame at 2024-04-08T19:37:08+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 78af49c4 by Alex Catarineu at 2024-04-08T19:37:08+02:00 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. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 1a2355c7 by Alex Catarineu at 2024-04-08T19:37:08+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 1ca01b5d by Alex Catarineu at 2024-04-08T19:37:08+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - acc096e3 by Alex Catarineu at 2024-04-08T19:37:09+02:00 Bug 26345: Hide tracking protection UI - - - - - 8810e3a9 by Pier Angelo Vendrame at 2024-04-08T19:37:09+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 3dfa38cf by Alex Catarineu at 2024-04-08T19:37:09+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 6c25f591 by Mike Perry at 2024-04-08T19:37:09+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - dbe9b6c7 by Igor Oliveira at 2024-04-08T19:37:09+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height. - - - - - 3e0d8623 by Pier Angelo Vendrame at 2024-04-08T19:37:10+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - b21d7f38 by Matthew Finkel at 2024-04-08T19:37:10+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - f1fb4c42 by cypherpunks1 at 2024-04-08T19:37:10+02:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - 0b690c5c by cypherpunks1 at 2024-04-08T19:37:10+02:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - d64f63dc by hackademix at 2024-04-08T19:37:11+02:00 Bug 42288: Allow language spoofing in status messages. - - - - - 80460b48 by Pier Angelo Vendrame at 2024-04-08T19:37:11+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - cb24e68d by hackademix at 2024-04-08T19:37:11+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 6dcbdca5 by hackademix at 2024-04-08T19:37:11+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 22b51b42 by hackademix at 2024-04-08T19:37:11+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 3efe06ee by hackademix at 2024-04-08T19:37:12+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 60c67b88 by hackademix at 2024-04-08T19:37:12+02:00 Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - de231230 by hackademix at 2024-04-08T19:37:12+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 97324a4a by Pier Angelo Vendrame at 2024-04-08T19:37:12+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - cdf96e05 by Pier Angelo Vendrame at 2024-04-08T19:37:12+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 42335: Do not localize the order of languages - - - - - 8c1d07fa by p13dz at 2024-04-08T19:37:13+02:00 Bug 40283: Workaround for the file upload bug - - - - - dd62f089 by Arthur Edelstein at 2024-04-08T19:37:13+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 0a36e971 by cypherpunks1 at 2024-04-08T19:37:13+02:00 Bug 41740: Change the RFP value of devicePixelRatio to 2 - - - - - 13541e2f by Pier Angelo Vendrame at 2024-04-08T19:37:13+02:00 Bug 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - 4e2eeb54 by cypherpunks1 at 2024-04-08T19:37:14+02:00 Bug 41881: Don't persist custom network requests on private windows - - - - - 7a1b62b8 by hackademix at 2024-04-08T19:37:14+02:00 Bug 42019: Empty browser's clipboard on browser shutdown - - - - - 121a4faa by hackademix at 2024-04-08T19:37:14+02:00 Bug 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - 620b210b by Pier Angelo Vendrame at 2024-04-08T19:37:14+02:00 Bug 42376: Pass the locale list when constructing l10n in datetimebox The datetime input is inconsistent with other inputs when using spoof English: its placeholder is not translated, unlike the default values and texts of all the other inputs. - - - - - 74d7c959 by Pier Angelo Vendrame at 2024-04-08T19:37:14+02:00 Bug 42428: Make RFP spoof the timezone of document.lastModified. - - - - - e79525ac by Pier Angelo Vendrame at 2024-04-08T19:37:15+02:00 Bug 42472: Spoof timezone in XSLT. - - - - - 23bd2c90 by Pier Angelo Vendrame at 2024-04-08T19:37:15+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 427757dc by Henry Wilkes at 2024-04-08T19:37:15+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 5aa6a314 by Kathy Brade at 2024-04-08T19:37:15+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - c35081bd by Pier Angelo Vendrame at 2024-04-08T19:37:15+02:00 Bug 42061: Create an alpha update channel. - - - - - e082b667 by Nicolas Vigier at 2024-04-08T19:37:16+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 99824eb8 by hackademix at 2024-04-08T19:37:16+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 646f53bf by Pier Angelo Vendrame at 2024-04-08T19:37:16+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 88577ca6 by Alex Catarineu at 2024-04-08T19:37:16+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - f51c7502 by Matthew Finkel at 2024-04-08T19:37:17+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 76523927 by Henry Wilkes at 2024-04-08T19:37:17+02:00 Bug 41736: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - 714ee4d3 by hackademix at 2024-04-08T19:37:17+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - ff825a19 by Pier Angelo Vendrame at 2024-04-08T19:37:17+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 9aba858e by Pier Angelo Vendrame at 2024-04-08T19:37:17+02:00 Bug 40926: Implemented the New Identity feature - - - - - bfb4d727 by hackademix at 2024-04-08T19:37:18+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42236: Let users decide whether to load their home page on new identity. - - - - - f7b145d5 by hackademix at 2024-04-08T19:37:18+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 129dd5c6 by Henry Wilkes at 2024-04-08T19:37:18+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - 9cad59ad by Pier Angelo Vendrame at 2024-04-08T19:37:18+02:00 Bug 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 17adf70a by Richard Pospesel at 2024-04-08T19:38:15+02:00 Bug 41649: Create rebase and security backport gitlab issue templates - - - - - 5af7d3ed by Richard Pospesel at 2024-04-08T19:38:15+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 348c1604 by Henry Wilkes at 2024-04-08T19:38:15+02:00 Bug 41803: Add some developer tools for working on tor-browser. - - - - - 559d7793 by Kathy Brade at 2024-04-08T19:38:15+02:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 48886604 by Alex Catarineu at 2024-04-08T19:38:16+02:00 Add TorStrings module for localization - - - - - 9eed743c by Henry Wilkes at 2024-04-08T19:38:16+02:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - 8b8c67f4 by Henry Wilkes at 2024-04-08T19:38:16+02:00 Tor Browser localization migration scripts. - - - - - e0b35372 by Mike Perry at 2024-04-08T19:38:16+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one Bug 42088: New application icons (used in-app and on linux). Bug 42087: New application icons (windows). - - - - - 7f366644 by sanketh at 2024-04-08T19:38:16+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - 513c3538 by Mike Perry at 2024-04-08T19:38:17+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - 019fcb2a by Henry Wilkes at 2024-04-08T19:38:17+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - f5a7073b by Pier Angelo Vendrame at 2024-04-08T19:38:17+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - ecc3b390 by Pier Angelo Vendrame at 2024-04-08T19:38:17+02:00 Bug 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - c603f8c9 by Pier Angelo Vendrame at 2024-04-08T19:38:18+02:00 Bug 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - 188f3f21 by Richard Pospesel at 2024-04-08T19:38:18+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - 2bb87c70 by Arthur Edelstein at 2024-04-08T19:38:18+02:00 Bug 3455: Add DomainIsolator, for isolating circuit by domain. Add an XPCOM component that registers a ProtocolProxyChannelFilter which sets the username/password for each web request according to url bar domain. Bug 9442: Add New Circuit button Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. Bug 19206: Clear out the domain isolator state on `New Identity`. Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes Bug 21745: Fix handling of catch-all circuit Bug 41741: Refactor the domain isolator and new circuit - - - - - 00425710 by Henry Wilkes at 2024-04-08T19:38:18+02:00 Bug 41600: Add a tor circuit display panel. - - - - - 26d5bccb by hackademix at 2024-04-08T19:38:18+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 8445a4ca by Amogh Pradeep at 2024-04-08T19:38:19+02:00 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review - - - - - 6fac0c4d by Matthew Finkel at 2024-04-08T19:38:19+02:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 38d1462a by Kathy Brade at 2024-04-08T19:38:19+02:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - e842433e by Pier Angelo Vendrame at 2024-04-08T19:38:19+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - 0f6b6988 by Richard Pospesel at 2024-04-08T19:38:19+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - 3a209fe0 by Richard Pospesel at 2024-04-08T19:38:20+02:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - 9af2878b by Henry Wilkes at 2024-04-08T19:38:20+02:00 Bug 7494: Create local home page for TBB. Bug 41333: Update about:tor to new design. Including: + make the favicon match the branding icon. + make the location bar show a search icon. - - - - - bf188dd0 by Arthur Edelstein at 2024-04-08T19:38:20+02:00 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. - - - - - 49a0ca4c by Pier Angelo Vendrame at 2024-04-08T19:38:20+02:00 Bug 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - 9260cfa8 by Kathy Brade at 2024-04-08T19:38:21+02:00 Bug 12647: Support symlinks in the updater. - - - - - e6e44a36 by Kathy Brade at 2024-04-08T19:38:21+02:00 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - e39f4f7c by Kathy Brade at 2024-04-08T19:38:21+02:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - 30ef6c1e by Georg Koppen at 2024-04-08T19:38:21+02:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - 8c60711e by Mike Perry at 2024-04-08T19:38:21+02:00 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. - - - - - 5b41c715 by Alex Catarineu at 2024-04-08T19:38:22+02:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - 79d179d0 by Henry Wilkes at 2024-04-08T19:38:22+02:00 Bug 41906: Hide DNS over HTTPS preferences. - - - - - 86188a7e by Richard Pospesel at 2024-04-08T19:38:22+02:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - 7a78688a by Kathy Brade at 2024-04-08T19:38:22+02:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - 9602a916 by Alex Catarineu at 2024-04-08T19:38:23+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - 983ca769 by Pier Angelo Vendrame at 2024-04-08T19:38:23+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 08436810 by Pier Angelo Vendrame at 2024-04-08T19:38:23+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 363feb31 by Pier Angelo Vendrame at 2024-04-08T19:38:23+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - de3e34b5 by Henry Wilkes at 2024-04-08T19:38:23+02:00 Bug 42110: Add TorUIUtils module for common tor component methods. - - - - - 004fb40f by Dan Ballard at 2024-04-08T19:38:24+02:00 Bug 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 113c8205 by Henry Wilkes at 2024-04-08T19:38:24+02:00 Bug 41736: Customize toolbar for tor-browser. - - - - - a9b4d1ba by hackademix at 2024-04-08T19:38:24+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 2f3c0064 by Henry Wilkes at 2024-04-08T19:38:24+02:00 Customize moz-toggle for tor-browser. - - - - - 9823bb8a by Richard Pospesel at 2024-04-08T19:38:24+02:00 Bug 41822: Unconditionally disable default browser UX in about:preferences - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/Backport Android Security Fixes.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - accessible/android/SessionAccessibility.cpp - accessible/android/SessionAccessibility.h - accessible/ipc/DocAccessibleParent.cpp - accessible/ipc/DocAccessibleParent.h - accessible/ipc/moz.build - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b6d0a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b6d0a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-115.10.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new branch mullvad-browser-115.10.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! MB 1: Mullvad Browser branding
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 8abd3ea6 by Pier Angelo Vendrame at 2024-04-08T20:15:44+00:00 fixup! MB 1: Mullvad Browser branding Bug 42490: Write the browser logo SVG also outside of omni.ja. For Mullvad Browser, we have to add this also to the various moz.build that are inside each branding directory, because we do not call FirefoxBranding for them. - - - - - 3 changed files: - browser/branding/mb-alpha/moz.build - browser/branding/mb-nightly/moz.build - browser/branding/mb-release/moz.build Changes: ===================================== browser/branding/mb-alpha/moz.build ===================================== @@ -23,6 +23,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': FINAL_TARGET_FILES.chrome.icons.default += [ + 'content/about-logo.svg', 'default128.png', 'default16.png', 'default256.png', ===================================== browser/branding/mb-nightly/moz.build ===================================== @@ -23,6 +23,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': FINAL_TARGET_FILES.chrome.icons.default += [ + 'content/about-logo.svg', 'default128.png', 'default16.png', 'default256.png', ===================================== browser/branding/mb-release/moz.build ===================================== @@ -23,6 +23,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': FINAL_TARGET_FILES.chrome.icons.default += [ + 'content/about-logo.svg', 'default128.png', 'default16.png', 'default256.png', View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8ab… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8ab… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] Bug 41901: Hardcode normalized FontSubstitutes.
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 2d505062 by Pier Angelo Vendrame at 2024-04-08T20:10:54+00:00 Bug 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 4 changed files: - gfx/thebes/StandardFonts-win10.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxGDIFontList.cpp Changes: ===================================== gfx/thebes/StandardFonts-win10.inc ===================================== @@ -199,3 +199,68 @@ static const char* kLangPackFonts[] = { // "Rockwell Nova", // Pan-European Supplemental Fonts - EXCLUDED // "Verdana Pro", // Pan-European Supplemental Fonts - EXCLUDED }; + +struct FontSubstitute { + const char *substituteName; + const char *actualFontName; +}; + +static const FontSubstitute kFontSubstitutes[] = { + // Common substitutions + {"Arabic Transparent", "Arial"}, + {"Arabic Transparent Bold", "Arial Bold"}, + {"Arial Baltic", "Arial"}, + {"Arial CE", "Arial"}, + {"Arial CYR", "Arial"}, + {"Arial Greek", "Arial"}, + {"Arial TUR", "Arial"}, + {"Courier New Baltic", "Courier New"}, + {"Courier New CE", "Courier New"}, + {"Courier New CYR", "Courier New"}, + {"Courier New Greek", "Courier New"}, + {"Courier New TUR", "Courier New"}, + {"Helv", "MS Sans Serif"}, + {"Helvetica", "Arial"}, + {"MS Shell Dlg 2", "Tahoma"}, + {"Tahoma Armenian", "Tahoma"}, + {"Times", "Times New Roman"}, + {"Times New Roman Baltic", "Times New Roman"}, + {"Times New Roman CE", "Times New Roman"}, + {"Times New Roman CYR", "Times New Roman"}, + {"Times New Roman Greek", "Times New Roman"}, + {"Times New Roman TUR", "Times New Roman"}, + {"Tms Rmn", "MS Serif"}, + // Common, except Japanese (which uses MS UI Gothic, instead) + {"MS Shell Dlg", "Microsoft Sans Serif"}, + // Arabic + {"Arial (Arabic)", "Arial"}, + {"Courier New (Arabic)", "Courier New"}, + {"Times New Roman (Arabic)", "Times New Roman"}, + // Cyrillic + Greek + {"Courier", "Courier New"}, + // Greek + {"Fixedsys Greek", "Fixedsys"}, + {"MS Serif Greek", "MS Serif"}, + {"MS Sans Serif Greek", "MS Sans Serif"}, + {"Small Fonts Greek", "Small Fonts"}, + {"System Greek", "System"}, + // Hebrew + {"Arial (Hebrew)", "Arial"}, + {"Courier New (Hebrew)", "Courier New"}, + {"David Transparent", "David"}, + {"Fixed Miriam Transparent", "Miriam Fixed"}, + {"Miriam Transparent", "Miriam"}, + {"Rod Transparent", "Rod"}, + {"Times New Roman (Hebrew)", "Times New Roman"}, + // Japanese + {"標準明朝", "ＭＳ明朝"}, + {"標準ゴシック", "ＭＳゴシック"}, + {"ゴシック", "ＭＳゴシック"}, + {"ｺﾞｼｯｸ", "ＭＳゴシック"}, + {"ｸｰﾘｴ", "Courier"}, + {"ﾀｲﾑｽﾞﾛﾏﾝ", "Times New Roman"}, + {"ﾍﾙﾍﾞﾁｶ", "Arial"}, + // Simplified Chinese + {"FangSong_GB2312", "FangSong"}, + {"KaiTi_GB2312", "KaiTi"}, +}; ===================================== gfx/thebes/gfxDWriteFontList.cpp ===================================== @@ -1923,6 +1923,20 @@ static void RemoveCharsetFromFontSubstitute(nsACString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxDWriteFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + AddSubstitute(substituteName, actualFontName); + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; @@ -1957,39 +1971,46 @@ nsresult gfxDWriteFontList::GetFontSubstitutes() { BuildKeyNameFromFontName(substituteName); RemoveCharsetFromFontSubstitute(actualFontName); BuildKeyNameFromFontName(actualFontName); - if (SharedFontList()) { - // Skip substitution if the original font is available, unless the option - // to apply substitutions unconditionally is enabled. - if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { - // Font substitutions are recorded for the canonical family names; we - // don't need FindFamily to consider localized aliases when searching. - if (SharedFontList()->FindFamily(substituteName, - /*aPrimaryNameOnly*/ true)) { - continue; - } - } - if (SharedFontList()->FindFamily(actualFontName, + AddSubstitute(substituteName, actualFontName); + } + + return NS_OK; +} + +void gfxDWriteFontList::AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName) { + if (SharedFontList()) { + // Skip substitution if the original font is available, unless the + // option to apply substitutions unconditionally is enabled. + if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { + // Font substitutions are recorded for the canonical family names; + // we don't need FindFamily to consider localized aliases when + // searching. + if (SharedFontList()->FindFamily(substituteName, /*aPrimaryNameOnly*/ true)) { - mSubstitutions.InsertOrUpdate(substituteName, - MakeUnique<nsCString>(actualFontName)); - } else if (mSubstitutions.Get(actualFontName)) { - mSubstitutions.InsertOrUpdate( - substituteName, - MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); - } else { - mNonExistingFonts.AppendElement(substituteName); + return; } + } + if (SharedFontList()->FindFamily(actualFontName, + /*aPrimaryNameOnly*/ true)) { + mSubstitutions.InsertOrUpdate(substituteName, + MakeUnique<nsCString>(actualFontName)); + } else if (mSubstitutions.Get(actualFontName)) { + mSubstitutions.InsertOrUpdate( + substituteName, + MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); } else { - gfxFontFamily* ff; - if (!actualFontName.IsEmpty() && - (ff = mFontFamilies.GetWeak(actualFontName))) { - mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); - } else { - mNonExistingFonts.AppendElement(substituteName); - } + mNonExistingFonts.AppendElement(substituteName); + } + } else { + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); } } - return NS_OK; } struct FontSubstitution { ===================================== gfx/thebes/gfxDWriteFontList.h ===================================== @@ -466,6 +466,9 @@ class gfxDWriteFontList final : public gfxPlatformFontList { const nsTArray<nsCString>* aForceClassicFams = nullptr) MOZ_REQUIRES(mLock); + void AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName); + #ifdef MOZ_BUNDLED_FONTS already_AddRefed<IDWriteFontCollection> CreateBundledFontsCollection( IDWriteFactory* aFactory); ===================================== gfx/thebes/gfxGDIFontList.cpp ===================================== @@ -31,6 +31,10 @@ #include "mozilla/StaticPrefs_gfx.h" #include "mozilla/Telemetry.h" +#include "nsContentUtils.h" + +#include "StandardFonts-win10.inc" + #include <usp10.h> using namespace mozilla; @@ -50,6 +54,10 @@ static __inline void BuildKeyNameFromFontName(nsAString& aName) { if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); ToLowerCase(aName); } +static __inline void BuildKeyNameFromFontName(nsACString& aName) { + if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); + ToLowerCase(aName); +} // Implementation of gfxPlatformFontList for Win32 GDI, // using GDI font enumeration APIs to get the list of fonts @@ -529,6 +537,26 @@ static void RemoveCharsetFromFontSubstitute(nsAString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxGDIFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); + } + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/2d5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/2d5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] Bug 41901: Hardcode normalized FontSubstitutes.
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 621f7857 by Pier Angelo Vendrame at 2024-04-08T20:10:21+00:00 Bug 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 4 changed files: - gfx/thebes/StandardFonts-win10.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxGDIFontList.cpp Changes: ===================================== gfx/thebes/StandardFonts-win10.inc ===================================== @@ -199,3 +199,68 @@ static const char* kLangPackFonts[] = { // "Rockwell Nova", // Pan-European Supplemental Fonts - EXCLUDED // "Verdana Pro", // Pan-European Supplemental Fonts - EXCLUDED }; + +struct FontSubstitute { + const char *substituteName; + const char *actualFontName; +}; + +static const FontSubstitute kFontSubstitutes[] = { + // Common substitutions + {"Arabic Transparent", "Arial"}, + {"Arabic Transparent Bold", "Arial Bold"}, + {"Arial Baltic", "Arial"}, + {"Arial CE", "Arial"}, + {"Arial CYR", "Arial"}, + {"Arial Greek", "Arial"}, + {"Arial TUR", "Arial"}, + {"Courier New Baltic", "Courier New"}, + {"Courier New CE", "Courier New"}, + {"Courier New CYR", "Courier New"}, + {"Courier New Greek", "Courier New"}, + {"Courier New TUR", "Courier New"}, + {"Helv", "MS Sans Serif"}, + {"Helvetica", "Arial"}, + {"MS Shell Dlg 2", "Tahoma"}, + {"Tahoma Armenian", "Tahoma"}, + {"Times", "Times New Roman"}, + {"Times New Roman Baltic", "Times New Roman"}, + {"Times New Roman CE", "Times New Roman"}, + {"Times New Roman CYR", "Times New Roman"}, + {"Times New Roman Greek", "Times New Roman"}, + {"Times New Roman TUR", "Times New Roman"}, + {"Tms Rmn", "MS Serif"}, + // Common, except Japanese (which uses MS UI Gothic, instead) + {"MS Shell Dlg", "Microsoft Sans Serif"}, + // Arabic + {"Arial (Arabic)", "Arial"}, + {"Courier New (Arabic)", "Courier New"}, + {"Times New Roman (Arabic)", "Times New Roman"}, + // Cyrillic + Greek + {"Courier", "Courier New"}, + // Greek + {"Fixedsys Greek", "Fixedsys"}, + {"MS Serif Greek", "MS Serif"}, + {"MS Sans Serif Greek", "MS Sans Serif"}, + {"Small Fonts Greek", "Small Fonts"}, + {"System Greek", "System"}, + // Hebrew + {"Arial (Hebrew)", "Arial"}, + {"Courier New (Hebrew)", "Courier New"}, + {"David Transparent", "David"}, + {"Fixed Miriam Transparent", "Miriam Fixed"}, + {"Miriam Transparent", "Miriam"}, + {"Rod Transparent", "Rod"}, + {"Times New Roman (Hebrew)", "Times New Roman"}, + // Japanese + {"標準明朝", "ＭＳ明朝"}, + {"標準ゴシック", "ＭＳゴシック"}, + {"ゴシック", "ＭＳゴシック"}, + {"ｺﾞｼｯｸ", "ＭＳゴシック"}, + {"ｸｰﾘｴ", "Courier"}, + {"ﾀｲﾑｽﾞﾛﾏﾝ", "Times New Roman"}, + {"ﾍﾙﾍﾞﾁｶ", "Arial"}, + // Simplified Chinese + {"FangSong_GB2312", "FangSong"}, + {"KaiTi_GB2312", "KaiTi"}, +}; ===================================== gfx/thebes/gfxDWriteFontList.cpp ===================================== @@ -1923,6 +1923,20 @@ static void RemoveCharsetFromFontSubstitute(nsACString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxDWriteFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + AddSubstitute(substituteName, actualFontName); + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; @@ -1957,39 +1971,46 @@ nsresult gfxDWriteFontList::GetFontSubstitutes() { BuildKeyNameFromFontName(substituteName); RemoveCharsetFromFontSubstitute(actualFontName); BuildKeyNameFromFontName(actualFontName); - if (SharedFontList()) { - // Skip substitution if the original font is available, unless the option - // to apply substitutions unconditionally is enabled. - if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { - // Font substitutions are recorded for the canonical family names; we - // don't need FindFamily to consider localized aliases when searching. - if (SharedFontList()->FindFamily(substituteName, - /*aPrimaryNameOnly*/ true)) { - continue; - } - } - if (SharedFontList()->FindFamily(actualFontName, + AddSubstitute(substituteName, actualFontName); + } + + return NS_OK; +} + +void gfxDWriteFontList::AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName) { + if (SharedFontList()) { + // Skip substitution if the original font is available, unless the + // option to apply substitutions unconditionally is enabled. + if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { + // Font substitutions are recorded for the canonical family names; + // we don't need FindFamily to consider localized aliases when + // searching. + if (SharedFontList()->FindFamily(substituteName, /*aPrimaryNameOnly*/ true)) { - mSubstitutions.InsertOrUpdate(substituteName, - MakeUnique<nsCString>(actualFontName)); - } else if (mSubstitutions.Get(actualFontName)) { - mSubstitutions.InsertOrUpdate( - substituteName, - MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); - } else { - mNonExistingFonts.AppendElement(substituteName); + return; } + } + if (SharedFontList()->FindFamily(actualFontName, + /*aPrimaryNameOnly*/ true)) { + mSubstitutions.InsertOrUpdate(substituteName, + MakeUnique<nsCString>(actualFontName)); + } else if (mSubstitutions.Get(actualFontName)) { + mSubstitutions.InsertOrUpdate( + substituteName, + MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); } else { - gfxFontFamily* ff; - if (!actualFontName.IsEmpty() && - (ff = mFontFamilies.GetWeak(actualFontName))) { - mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); - } else { - mNonExistingFonts.AppendElement(substituteName); - } + mNonExistingFonts.AppendElement(substituteName); + } + } else { + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); } } - return NS_OK; } struct FontSubstitution { ===================================== gfx/thebes/gfxDWriteFontList.h ===================================== @@ -466,6 +466,9 @@ class gfxDWriteFontList final : public gfxPlatformFontList { const nsTArray<nsCString>* aForceClassicFams = nullptr) MOZ_REQUIRES(mLock); + void AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName); + #ifdef MOZ_BUNDLED_FONTS already_AddRefed<IDWriteFontCollection> CreateBundledFontsCollection( IDWriteFactory* aFactory); ===================================== gfx/thebes/gfxGDIFontList.cpp ===================================== @@ -31,6 +31,10 @@ #include "mozilla/StaticPrefs_gfx.h" #include "mozilla/Telemetry.h" +#include "nsContentUtils.h" + +#include "StandardFonts-win10.inc" + #include <usp10.h> using namespace mozilla; @@ -50,6 +54,10 @@ static __inline void BuildKeyNameFromFontName(nsAString& aName) { if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); ToLowerCase(aName); } +static __inline void BuildKeyNameFromFontName(nsACString& aName) { + if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); + ToLowerCase(aName); +} // Implementation of gfxPlatformFontList for Win32 GDI, // using GDI font enumeration APIs to get the list of fonts @@ -529,6 +537,26 @@ static void RemoveCharsetFromFontSubstitute(nsAString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxGDIFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); + } + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/621f785… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/621f785… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] Bug 41901: Hardcode normalized FontSubstitutes.
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4255b354 by Pier Angelo Vendrame at 2024-04-08T19:55:24+00:00 Bug 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 4 changed files: - gfx/thebes/StandardFonts-win10.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxGDIFontList.cpp Changes: ===================================== gfx/thebes/StandardFonts-win10.inc ===================================== @@ -199,3 +199,68 @@ static const char* kLangPackFonts[] = { // "Rockwell Nova", // Pan-European Supplemental Fonts - EXCLUDED // "Verdana Pro", // Pan-European Supplemental Fonts - EXCLUDED }; + +struct FontSubstitute { + const char *substituteName; + const char *actualFontName; +}; + +static const FontSubstitute kFontSubstitutes[] = { + // Common substitutions + {"Arabic Transparent", "Arial"}, + {"Arabic Transparent Bold", "Arial Bold"}, + {"Arial Baltic", "Arial"}, + {"Arial CE", "Arial"}, + {"Arial CYR", "Arial"}, + {"Arial Greek", "Arial"}, + {"Arial TUR", "Arial"}, + {"Courier New Baltic", "Courier New"}, + {"Courier New CE", "Courier New"}, + {"Courier New CYR", "Courier New"}, + {"Courier New Greek", "Courier New"}, + {"Courier New TUR", "Courier New"}, + {"Helv", "MS Sans Serif"}, + {"Helvetica", "Arial"}, + {"MS Shell Dlg 2", "Tahoma"}, + {"Tahoma Armenian", "Tahoma"}, + {"Times", "Times New Roman"}, + {"Times New Roman Baltic", "Times New Roman"}, + {"Times New Roman CE", "Times New Roman"}, + {"Times New Roman CYR", "Times New Roman"}, + {"Times New Roman Greek", "Times New Roman"}, + {"Times New Roman TUR", "Times New Roman"}, + {"Tms Rmn", "MS Serif"}, + // Common, except Japanese (which uses MS UI Gothic, instead) + {"MS Shell Dlg", "Microsoft Sans Serif"}, + // Arabic + {"Arial (Arabic)", "Arial"}, + {"Courier New (Arabic)", "Courier New"}, + {"Times New Roman (Arabic)", "Times New Roman"}, + // Cyrillic + Greek + {"Courier", "Courier New"}, + // Greek + {"Fixedsys Greek", "Fixedsys"}, + {"MS Serif Greek", "MS Serif"}, + {"MS Sans Serif Greek", "MS Sans Serif"}, + {"Small Fonts Greek", "Small Fonts"}, + {"System Greek", "System"}, + // Hebrew + {"Arial (Hebrew)", "Arial"}, + {"Courier New (Hebrew)", "Courier New"}, + {"David Transparent", "David"}, + {"Fixed Miriam Transparent", "Miriam Fixed"}, + {"Miriam Transparent", "Miriam"}, + {"Rod Transparent", "Rod"}, + {"Times New Roman (Hebrew)", "Times New Roman"}, + // Japanese + {"標準明朝", "ＭＳ明朝"}, + {"標準ゴシック", "ＭＳゴシック"}, + {"ゴシック", "ＭＳゴシック"}, + {"ｺﾞｼｯｸ", "ＭＳゴシック"}, + {"ｸｰﾘｴ", "Courier"}, + {"ﾀｲﾑｽﾞﾛﾏﾝ", "Times New Roman"}, + {"ﾍﾙﾍﾞﾁｶ", "Arial"}, + // Simplified Chinese + {"FangSong_GB2312", "FangSong"}, + {"KaiTi_GB2312", "KaiTi"}, +}; ===================================== gfx/thebes/gfxDWriteFontList.cpp ===================================== @@ -1923,6 +1923,20 @@ static void RemoveCharsetFromFontSubstitute(nsACString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxDWriteFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + AddSubstitute(substituteName, actualFontName); + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; @@ -1957,39 +1971,46 @@ nsresult gfxDWriteFontList::GetFontSubstitutes() { BuildKeyNameFromFontName(substituteName); RemoveCharsetFromFontSubstitute(actualFontName); BuildKeyNameFromFontName(actualFontName); - if (SharedFontList()) { - // Skip substitution if the original font is available, unless the option - // to apply substitutions unconditionally is enabled. - if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { - // Font substitutions are recorded for the canonical family names; we - // don't need FindFamily to consider localized aliases when searching. - if (SharedFontList()->FindFamily(substituteName, - /*aPrimaryNameOnly*/ true)) { - continue; - } - } - if (SharedFontList()->FindFamily(actualFontName, + AddSubstitute(substituteName, actualFontName); + } + + return NS_OK; +} + +void gfxDWriteFontList::AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName) { + if (SharedFontList()) { + // Skip substitution if the original font is available, unless the + // option to apply substitutions unconditionally is enabled. + if (!StaticPrefs::gfx_windows_font_substitutes_always_AtStartup()) { + // Font substitutions are recorded for the canonical family names; + // we don't need FindFamily to consider localized aliases when + // searching. + if (SharedFontList()->FindFamily(substituteName, /*aPrimaryNameOnly*/ true)) { - mSubstitutions.InsertOrUpdate(substituteName, - MakeUnique<nsCString>(actualFontName)); - } else if (mSubstitutions.Get(actualFontName)) { - mSubstitutions.InsertOrUpdate( - substituteName, - MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); - } else { - mNonExistingFonts.AppendElement(substituteName); + return; } + } + if (SharedFontList()->FindFamily(actualFontName, + /*aPrimaryNameOnly*/ true)) { + mSubstitutions.InsertOrUpdate(substituteName, + MakeUnique<nsCString>(actualFontName)); + } else if (mSubstitutions.Get(actualFontName)) { + mSubstitutions.InsertOrUpdate( + substituteName, + MakeUnique<nsCString>(*mSubstitutions.Get(actualFontName))); } else { - gfxFontFamily* ff; - if (!actualFontName.IsEmpty() && - (ff = mFontFamilies.GetWeak(actualFontName))) { - mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); - } else { - mNonExistingFonts.AppendElement(substituteName); - } + mNonExistingFonts.AppendElement(substituteName); + } + } else { + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); } } - return NS_OK; } struct FontSubstitution { ===================================== gfx/thebes/gfxDWriteFontList.h ===================================== @@ -466,6 +466,9 @@ class gfxDWriteFontList final : public gfxPlatformFontList { const nsTArray<nsCString>* aForceClassicFams = nullptr) MOZ_REQUIRES(mLock); + void AddSubstitute(const nsCString& substituteName, + const nsCString& actualFontName); + #ifdef MOZ_BUNDLED_FONTS already_AddRefed<IDWriteFontCollection> CreateBundledFontsCollection( IDWriteFactory* aFactory); ===================================== gfx/thebes/gfxGDIFontList.cpp ===================================== @@ -31,6 +31,10 @@ #include "mozilla/StaticPrefs_gfx.h" #include "mozilla/Telemetry.h" +#include "nsContentUtils.h" + +#include "StandardFonts-win10.inc" + #include <usp10.h> using namespace mozilla; @@ -50,6 +54,10 @@ static __inline void BuildKeyNameFromFontName(nsAString& aName) { if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); ToLowerCase(aName); } +static __inline void BuildKeyNameFromFontName(nsACString& aName) { + if (aName.Length() >= LF_FACESIZE) aName.Truncate(LF_FACESIZE - 1); + ToLowerCase(aName); +} // Implementation of gfxPlatformFontList for Win32 GDI, // using GDI font enumeration APIs to get the list of fonts @@ -529,6 +537,26 @@ static void RemoveCharsetFromFontSubstitute(nsAString& aName) { #define MAX_VALUE_DATA 512 nsresult gfxGDIFontList::GetFontSubstitutes() { + if (nsContentUtils::ShouldResistFingerprinting( + "Ignore any fingerprintable user font customization and normalize " + "font substitutes across different Windows SKUs.", + RFPTarget::Unknown)) { + for (const FontSubstitute& fs : kFontSubstitutes) { + nsAutoCString substituteName(fs.substituteName); + nsAutoCString actualFontName(fs.actualFontName); + BuildKeyNameFromFontName(substituteName); + BuildKeyNameFromFontName(actualFontName); + gfxFontFamily* ff; + if (!actualFontName.IsEmpty() && + (ff = mFontFamilies.GetWeak(actualFontName))) { + mFontSubstitutes.InsertOrUpdate(substituteName, RefPtr{ff}); + } else { + mNonExistingFonts.AppendElement(substituteName); + } + } + return NS_OK; + } + HKEY hKey; DWORD i, rv, lenAlias, lenActual, valueType; WCHAR aliasName[MAX_VALUE_NAME]; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4255b35… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4255b35… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.10.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new branch tor-browser-115.10.0esr-13.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: eabcfada by hackademix at 2024-04-08T19:53:21+00:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -537,27 +537,17 @@ class _RFPHelper { ]) ); - if ( - !win._rfpSizeOffset || - (win._rfpOriginalSize && - win.outerWidth === win._rfpOriginalSize.width && - win.outerHeight === win._rfpOriginalSize.height) - ) { - const BASELINE_ROUNDING = 10; - const offset = s => - s - Math.round(s / BASELINE_ROUNDING) * BASELINE_ROUNDING; + const isInitialSize = + win._rfpOriginalSize && + win.outerWidth === win._rfpOriginalSize.width && + win.outerHeight === win._rfpOriginalSize.height; + + // We may need to shrink this window to rounded size if the browser container + // area is taller than the original, meaning extra chrome (like the optional + // "Only Show on New Tab" bookmarks toobar) was present and now gone. + const needToShrink = + isInitialSize && containerHeight > win._rfpOriginalSize.containerHeight; - win._rfpSizeOffset = { - width: offset(parentWidth), - height: offset(parentHeight), - }; - log( - `${logPrefix} Window size offsets %o (from %s, %s)`, - win._rfpSizeOffset, - parentWidth, - parentHeight - ); - } log( `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${ isNewTab ? " (new tab)." : "." @@ -573,33 +563,27 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (width, height) => { - lastRoundedSize = {width, height}; + lastRoundedSize = { width, height }; + log( + `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${width} x ${height}` + ); return { "--letterboxing-width": `var(--rdm-width, ${width}px)`, "--letterboxing-height": `var(--rdm-height, ${height}px)`, - } + }; }; - let result; + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!this.letterboxingEnabled) { - const offset = win._rfpSizeOffset; - result = r(aWidth - offset.width, aHeight - offset.height); - log( - `${logPrefix} Letterboxing disabled, applying baseline rounding offsets: (${aWidth}, ${aHeight}) => ${result.width} x ${result.height})` - ); - return result; + if (!(isInitialSize || this.letterboxingEnabled)) { + // just round size to int + return r(aWidth, aHeight); } - log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - result = r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; + return r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); } let matchingArea = aWidth * aHeight; @@ -625,14 +609,9 @@ class _RFPHelper { // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this // case, we won't round the size and default to the max. - result = targetDimensions + return targetDimensions ? r(targetDimensions.width, targetDimensions.height) : r(aWidth, aHeight); - - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; }; const styleChanges = Object.assign([], { @@ -654,6 +633,10 @@ class _RFPHelper { lazy.logConsole.error(e); } } + if (needToShrink) { + win.shrinkToLetterbox(); + this._recordWindowSize(win); + } }); }, }); @@ -741,15 +724,20 @@ class _RFPHelper { aWindow.setTimeout(() => { tabBrowser.tabpanels?.classList.add("letterboxing-ready"); if (!aWindow._rfpOriginalSize) { - aWindow._rfpOriginalSize = { - width: aWindow.outerWidth, - height: aWindow.outerHeight, - }; - log("Recording original window size", aWindow._rfpOriginalSize); + this._recordWindowSize(aWindow); } }); } + _recordWindowSize(aWindow) { + aWindow._rfpOriginalSize = { + width: aWindow.outerWidth, + height: aWindow.outerHeight, + containerHeight: aWindow.gBrowser.getBrowserContainer()?.clientHeight, + }; + log("Recording original window size", aWindow._rfpOriginalSize); + } + // We will attach this method to each browser window. When called // it will instantly resize the window to exactly fit the selected // (possibly letterboxed) browser. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eabcfad… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eabcfad… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_10_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed new tag FIREFOX_115_10_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 76baafb8 by hackademix at 2024-04-08T19:52:12+00:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -537,27 +537,17 @@ class _RFPHelper { ]) ); - if ( - !win._rfpSizeOffset || - (win._rfpOriginalSize && - win.outerWidth === win._rfpOriginalSize.width && - win.outerHeight === win._rfpOriginalSize.height) - ) { - const BASELINE_ROUNDING = 10; - const offset = s => - s - Math.round(s / BASELINE_ROUNDING) * BASELINE_ROUNDING; + const isInitialSize = + win._rfpOriginalSize && + win.outerWidth === win._rfpOriginalSize.width && + win.outerHeight === win._rfpOriginalSize.height; + + // We may need to shrink this window to rounded size if the browser container + // area is taller than the original, meaning extra chrome (like the optional + // "Only Show on New Tab" bookmarks toobar) was present and now gone. + const needToShrink = + isInitialSize && containerHeight > win._rfpOriginalSize.containerHeight; - win._rfpSizeOffset = { - width: offset(parentWidth), - height: offset(parentHeight), - }; - log( - `${logPrefix} Window size offsets %o (from %s, %s)`, - win._rfpSizeOffset, - parentWidth, - parentHeight - ); - } log( `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${ isNewTab ? " (new tab)." : "." @@ -573,33 +563,27 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (width, height) => { - lastRoundedSize = {width, height}; + lastRoundedSize = { width, height }; + log( + `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${width} x ${height}` + ); return { "--letterboxing-width": `var(--rdm-width, ${width}px)`, "--letterboxing-height": `var(--rdm-height, ${height}px)`, - } + }; }; - let result; + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!this.letterboxingEnabled) { - const offset = win._rfpSizeOffset; - result = r(aWidth - offset.width, aHeight - offset.height); - log( - `${logPrefix} Letterboxing disabled, applying baseline rounding offsets: (${aWidth}, ${aHeight}) => ${result.width} x ${result.height})` - ); - return result; + if (!(isInitialSize || this.letterboxingEnabled)) { + // just round size to int + return r(aWidth, aHeight); } - log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - result = r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; + return r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); } let matchingArea = aWidth * aHeight; @@ -625,14 +609,9 @@ class _RFPHelper { // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this // case, we won't round the size and default to the max. - result = targetDimensions + return targetDimensions ? r(targetDimensions.width, targetDimensions.height) : r(aWidth, aHeight); - - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; }; const styleChanges = Object.assign([], { @@ -654,6 +633,10 @@ class _RFPHelper { lazy.logConsole.error(e); } } + if (needToShrink) { + win.shrinkToLetterbox(); + this._recordWindowSize(win); + } }); }, }); @@ -741,15 +724,20 @@ class _RFPHelper { aWindow.setTimeout(() => { tabBrowser.tabpanels?.classList.add("letterboxing-ready"); if (!aWindow._rfpOriginalSize) { - aWindow._rfpOriginalSize = { - width: aWindow.outerWidth, - height: aWindow.outerHeight, - }; - log("Recording original window size", aWindow._rfpOriginalSize); + this._recordWindowSize(aWindow); } }); } + _recordWindowSize(aWindow) { + aWindow._rfpOriginalSize = { + width: aWindow.outerWidth, + height: aWindow.outerHeight, + containerHeight: aWindow.gBrowser.getBrowserContainer()?.clientHeight, + }; + log("Recording original window size", aWindow._rfpOriginalSize); + } + // We will attach this method to each browser window. When called // it will instantly resize the window to exactly fit the selected // (possibly letterboxed) browser. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/76b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/76b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f2f79405 by hackademix at 2024-04-08T19:10:15+00:00 fixup! Bug 41631: Prevent weird initial window dimensions caused by subpixel computations Bug 42192: Correctly round new windows when bookmarks toolbar is set to "Only Show on New Tab" - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -537,27 +537,17 @@ class _RFPHelper { ]) ); - if ( - !win._rfpSizeOffset || - (win._rfpOriginalSize && - win.outerWidth === win._rfpOriginalSize.width && - win.outerHeight === win._rfpOriginalSize.height) - ) { - const BASELINE_ROUNDING = 10; - const offset = s => - s - Math.round(s / BASELINE_ROUNDING) * BASELINE_ROUNDING; + const isInitialSize = + win._rfpOriginalSize && + win.outerWidth === win._rfpOriginalSize.width && + win.outerHeight === win._rfpOriginalSize.height; + + // We may need to shrink this window to rounded size if the browser container + // area is taller than the original, meaning extra chrome (like the optional + // "Only Show on New Tab" bookmarks toobar) was present and now gone. + const needToShrink = + isInitialSize && containerHeight > win._rfpOriginalSize.containerHeight; - win._rfpSizeOffset = { - width: offset(parentWidth), - height: offset(parentHeight), - }; - log( - `${logPrefix} Window size offsets %o (from %s, %s)`, - win._rfpSizeOffset, - parentWidth, - parentHeight - ); - } log( `${logPrefix} contentWidth=${contentWidth} contentHeight=${contentHeight} parentWidth=${parentWidth} parentHeight=${parentHeight} containerWidth=${containerWidth} containerHeight=${containerHeight}${ isNewTab ? " (new tab)." : "." @@ -573,33 +563,27 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (width, height) => { - lastRoundedSize = {width, height}; + lastRoundedSize = { width, height }; + log( + `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${width} x ${height}` + ); return { "--letterboxing-width": `var(--rdm-width, ${width}px)`, "--letterboxing-height": `var(--rdm-height, ${height}px)`, - } + }; }; - let result; + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); - if (!this.letterboxingEnabled) { - const offset = win._rfpSizeOffset; - result = r(aWidth - offset.width, aHeight - offset.height); - log( - `${logPrefix} Letterboxing disabled, applying baseline rounding offsets: (${aWidth}, ${aHeight}) => ${result.width} x ${result.height})` - ); - return result; + if (!(isInitialSize || this.letterboxingEnabled)) { + // just round size to int + return r(aWidth, aHeight); } - log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - result = r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; + return r(this.steppedSize(aWidth, true), this.steppedSize(aHeight)); } let matchingArea = aWidth * aHeight; @@ -625,14 +609,9 @@ class _RFPHelper { // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this // case, we won't round the size and default to the max. - result = targetDimensions + return targetDimensions ? r(targetDimensions.width, targetDimensions.height) : r(aWidth, aHeight); - - log( - `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` - ); - return result; }; const styleChanges = Object.assign([], { @@ -654,6 +633,10 @@ class _RFPHelper { lazy.logConsole.error(e); } } + if (needToShrink) { + win.shrinkToLetterbox(); + this._recordWindowSize(win); + } }); }, }); @@ -741,15 +724,20 @@ class _RFPHelper { aWindow.setTimeout(() => { tabBrowser.tabpanels?.classList.add("letterboxing-ready"); if (!aWindow._rfpOriginalSize) { - aWindow._rfpOriginalSize = { - width: aWindow.outerWidth, - height: aWindow.outerHeight, - }; - log("Recording original window size", aWindow._rfpOriginalSize); + this._recordWindowSize(aWindow); } }); } + _recordWindowSize(aWindow) { + aWindow._rfpOriginalSize = { + width: aWindow.outerWidth, + height: aWindow.outerHeight, + containerHeight: aWindow.gBrowser.getBrowserContainer()?.clientHeight, + }; + log("Recording original window size", aWindow._rfpOriginalSize); + } + // We will attach this method to each browser window. When called // it will instantly resize the window to exactly fit the selected // (possibly letterboxed) browser. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f2f7940… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f2f7940… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 3 commits: fixup! Bug 40209: Implement Basic Crypto Safety
by richard (＠richard) 08 Apr '24

08 Apr '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 3ddbe28a by Henry Wilkes at 2024-04-08T18:58:55+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 42202: Migrate crypto safety strings to Fluent. - - - - - 58d32687 by Henry Wilkes at 2024-04-08T18:58:55+00:00 fixup! Tor Browser strings Bug 42202: Migrate crypto safety strings to Fluent. - - - - - bb6f56ad by Henry Wilkes at 2024-04-08T18:58:55+00:00 fixup! Tor Browser localization migration scripts. Bug 42202: Migrate crypto safety strings to Fluent. - - - - - 5 changed files: - browser/actors/CryptoSafetyParent.jsm - browser/locales/en-US/browser/tor-browser.ftl - − browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties - browser/locales/jar.mn - + tools/torbrowser/l10n/migrations/bug-42202-crypto-safety.py Changes: ===================================== browser/actors/CryptoSafetyParent.jsm ===================================== @@ -20,17 +20,8 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/TorDomainIsolator.jsm" ); -XPCOMUtils.defineLazyGetter(lazy, "cryptoSafetyBundle", () => { - return Services.strings.createBundle( - "chrome://browser/locale/cryptoSafetyPrompt.properties" - ); -}); - -// en-US fallback in case a locale is missing a string. -XPCOMUtils.defineLazyGetter(lazy, "fallbackCryptoSafetyBundle", () => { - return Services.strings.createBundle( - "resource:///chrome/en-US/locale/browser/cryptoSafetyPrompt.properties" - ); +ChromeUtils.defineLazyGetter(lazy, "CryptoStrings", function () { + return new Localization(["browser/tor-browser.ftl"]); }); XPCOMUtils.defineLazyPreferenceGetter( @@ -40,26 +31,8 @@ XPCOMUtils.defineLazyPreferenceGetter( true // Defaults to true. ); -/** - * Get a formatted string from the locale's bundle, or the en-US bundle if the - * string is missing. - * - * @param {string} name - The string's name. - * @param {string[]} [args] - Positional arguments to pass to the format string, - * or leave empty if none are needed. - * - * @returns {string} - The formatted string. - */ -function getString(name, args = []) { - try { - return lazy.cryptoSafetyBundle.formatStringFromName(name, args); - } catch { - return lazy.fallbackCryptoSafetyBundle.formatStringFromName(name, args); - } -} - class CryptoSafetyParent extends JSWindowActorParent { - receiveMessage(aMessage) { + async receiveMessage(aMessage) { if ( !lazy.isCryptoSafetyEnabled || aMessage.name !== "CryptoSafety:CopiedText" @@ -72,14 +45,25 @@ class CryptoSafetyParent extends JSWindowActorParent { address = `${address.substring(0, 32)}…`; } + const [titleText, bodyText, reloadText, dismissText] = + await lazy.CryptoStrings.formatValues([ + { id: "crypto-safety-prompt-title" }, + { + id: "crypto-safety-prompt-body", + args: { address, host: aMessage.data.host }, + }, + { id: "crypto-safety-prompt-reload-button" }, + { id: "crypto-safety-prompt-dismiss-button" }, + ]); + const buttonPressed = Services.prompt.confirmEx( this.browsingContext.topChromeWindow, - getString("cryptoSafetyPrompt.cryptoTitle"), - getString("cryptoSafetyPrompt.cryptoBody", [address, aMessage.data.host]), + titleText, + bodyText, Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0 + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1, - getString("cryptoSafetyPrompt.primaryAction"), - getString("cryptoSafetyPrompt.secondaryAction"), + reloadText, + dismissText, null, null, {} ===================================== browser/locales/en-US/browser/tor-browser.ftl ===================================== @@ -382,3 +382,12 @@ tor-circuit-panel-new-button = New Tor circuit for this site tor-circuit-panel-new-button-description-guard = Your guard node may not change # Shown when the first node in the circuit is a bridge node. tor-circuit-panel-new-button-description-bridge = Your bridge may not change + +## This dialog is shown when copying a suspected cryptocurrency address from a plain HTTP website. + +crypto-safety-prompt-title = Cryptocurrency address copied from an insecure website +# $address (String) - The cryptocurrency address, possibly truncated. +# $host (String) - The website host the address was copied from. +crypto-safety-prompt-body = The copied text ({ $address }) appears to be a cryptocurrency address. Since the connection to { $host } is not secure, the address may have been modified and should not be trusted. You can try establishing a secure connection by reconnecting with a new circuit. +crypto-safety-prompt-reload-button = Reload Tab with a New Circuit +crypto-safety-prompt-dismiss-button = Dismiss Warning ===================================== browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties deleted ===================================== @@ -1,19 +0,0 @@ -# Copyright (c) 2022, The Tor Project, Inc. -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -cryptoSafetyPrompt.cryptoTitle=Cryptocurrency address copied from an insecure website -# LOCALIZATION NOTE: -# %1$S is the copied cryptocurrency address. -# %2$S is the website host. -cryptoSafetyPrompt.cryptoBody=The copied text (%1$S) appears to be a cryptocurrency address. Since the connection to %2$S is not secure, the address may have been modified and should not be trusted. You can try establishing a secure connection by reconnecting with a new circuit. -# LOCALIZATION NOTE: %S will be replaced with the cryptocurrency address. -cryptoSafetyPrompt.cryptoWarning=A cryptocurrency address (%S) has been copied from an insecure website. It could have been modified. -cryptoSafetyPrompt.whatCanHeading=What can you do about it? -cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to establish a secure connection, or accept the risk and dismiss this warning. -cryptoSafetyPrompt.learnMore=Learn more -cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit -cryptoSafetyPrompt.primaryActionAccessKey=R -cryptoSafetyPrompt.secondaryAction=Dismiss Warning -cryptoSafetyPrompt.secondaryActionAccessKey=B ===================================== browser/locales/jar.mn ===================================== @@ -33,5 +33,4 @@ locale/browser/safebrowsing/safebrowsing.properties (%chrome/browser/safebrowsing/safebrowsing.properties) locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) - locale/browser/cryptoSafetyPrompt.properties (%chrome/browser/cryptoSafetyPrompt.properties) % locale browser-region @AB_CD@ %locale/browser-region/ ===================================== tools/torbrowser/l10n/migrations/bug-42202-crypto-safety.py ===================================== @@ -0,0 +1,34 @@ +import fluent.syntax.ast as FTL +from fluent.migrate.helpers import VARIABLE_REFERENCE, transforms_from +from fluent.migrate.transforms import REPLACE + + +def migrate(ctx): + legacy_path = "cryptoSafetyPrompt.properties" + + ctx.add_transforms( + "tor-browser.ftl", + "tor-browser.ftl", + transforms_from( + """ +crypto-safety-prompt-title = { COPY(path, "cryptoSafetyPrompt.cryptoTitle") } +crypto-safety-prompt-reload-button = { COPY(path, "cryptoSafetyPrompt.primaryAction") } +crypto-safety-prompt-dismiss-button = { COPY(path, "cryptoSafetyPrompt.secondaryAction") } +""", + path=legacy_path, + ) + + [ + # Replace "%1$S" and "%2$S" with "{ $address }" and "{ $host }" + FTL.Message( + id=FTL.Identifier("crypto-safety-prompt-body"), + value=REPLACE( + legacy_path, + "cryptoSafetyPrompt.cryptoBody", + { + "%1$S": VARIABLE_REFERENCE("address"), + "%2$S": VARIABLE_REFERENCE("host"), + }, + ), + ), + ], + ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/27fee8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/27fee8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.1esr-13.0-1] fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: e3dbf1b5 by Pier Angelo Vendrame at 2024-04-08T17:41:35+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 42335: Do not localize the order of languages - - - - - 1 changed file: - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/main.js ===================================== @@ -1463,7 +1463,9 @@ var gMainPane = { name, }; }); - locales.sort((a, b) => a.code.localeCompare(b.code)); + // tor-browser#42335: Sort language codes independently from the locale, + // so do not use localeCompare. + locales.sort((a, b) => a.code > b.code); let fragment = document.createDocumentFragment(); for (let { code, name } of locales) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/e3d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/e3d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.1esr-13.0-1] fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch base-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: bbff47d9 by Pier Angelo Vendrame at 2024-04-08T17:41:07+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 42335: Do not localize the order of languages - - - - - 1 changed file: - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/main.js ===================================== @@ -1463,7 +1463,9 @@ var gMainPane = { name, }; }); - locales.sort((a, b) => a.code.localeCompare(b.code)); + // tor-browser#42335: Sort language codes independently from the locale, + // so do not use localeCompare. + locales.sort((a, b) => a.code > b.code); let fragment = document.createDocumentFragment(); for (let { code, name } of locales) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bbff47d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bbff47d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.1esr-13.0-1] fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: c584d988 by Pier Angelo Vendrame at 2024-04-08T17:40:45+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 42335: Do not localize the order of languages - - - - - 1 changed file: - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/main.js ===================================== @@ -1456,7 +1456,9 @@ var gMainPane = { name, }; }); - locales.sort((a, b) => a.code.localeCompare(b.code)); + // tor-browser#42335: Sort language codes independently from the locale, + // so do not use localeCompare. + locales.sort((a, b) => a.code > b.code); let fragment = document.createDocumentFragment(); for (let { code, name } of locales) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c584d98… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c584d98… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: caf40825 by NoisyCoil at 2024-04-08T16:40:48+02:00 fixup! Base Browser's .mozconfigs. Bug 42501: Move `--disable-eme` to OS- and architecture-specific mozconfigs. - - - - - 9 changed files: - browser/config/mozconfigs/base-browser - mozconfig-linux-i686 - mozconfig-linux-x86_64 - mozconfig-linux-x86_64-asan - mozconfig-linux-x86_64-dev - mozconfig-macos - mozconfig-macos-dev - mozconfig-windows-i686 - mozconfig-windows-x86_64 Changes: ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -24,8 +24,6 @@ ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-parental-controls -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection # See bugs #30575 and #32418: system policies are harmful either because they # could allow proxy bypass, and override a number of other preferences we set ===================================== mozconfig-linux-i686 ===================================== @@ -10,3 +10,7 @@ ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --enable-default-toolkit=cairo-gtk3 + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64 ===================================== @@ -7,3 +7,7 @@ ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --enable-default-toolkit=cairo-gtk3 + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64-asan ===================================== @@ -20,3 +20,7 @@ ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --disable-strip ac_add_options --disable-install-strip + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64-dev ===================================== @@ -17,3 +17,7 @@ ac_add_options --disable-install-strip ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-base-browser-update + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-macos ===================================== @@ -10,3 +10,7 @@ ac_add_options --disable-update-agent # For base-browser we do not enable portable mode on macOS. ac_add_options --without-relative-data-dir + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-macos-dev ===================================== @@ -17,3 +17,6 @@ ac_add_options --enable-nss-mar # See bug #41131 ac_add_options --disable-update-agent +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-windows-i686 ===================================== @@ -19,3 +19,7 @@ ac_add_options --disable-update-agent # Bug 1782837: Not supported because Mozilla (and therefore also us) build # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled. ac_add_options --disable-notification-server + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-windows-x86_64 ===================================== @@ -18,3 +18,7 @@ ac_add_options --disable-update-agent # Bug 1782837: Not supported because Mozilla (and therefore also us) build # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled. ac_add_options --disable-notification-server + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/caf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/caf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 2c131c74 by NoisyCoil at 2024-04-08T16:34:40+02:00 fixup! Base Browser's .mozconfigs. Bug 42501: Move `--disable-eme` to OS- and architecture-specific mozconfigs. - - - - - 9 changed files: - browser/config/mozconfigs/base-browser - mozconfig-linux-i686 - mozconfig-linux-x86_64 - mozconfig-linux-x86_64-asan - mozconfig-linux-x86_64-dev - mozconfig-macos - mozconfig-macos-dev - mozconfig-windows-i686 - mozconfig-windows-x86_64 Changes: ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -29,8 +29,6 @@ ac_add_options --disable-crashreporter # Before removing, please notice that WebRTC does not work on mingw (Bug 1393901) ac_add_options --disable-webrtc ac_add_options --disable-parental-controls -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection # See bugs #30575 and #32418: system policies are harmful either because they # could allow proxy bypass, and override a number of other preferences we set ===================================== mozconfig-linux-i686 ===================================== @@ -10,3 +10,7 @@ ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --enable-default-toolkit=cairo-gtk3 + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64 ===================================== @@ -7,3 +7,7 @@ ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --enable-default-toolkit=cairo-gtk3 + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64-asan ===================================== @@ -20,3 +20,7 @@ ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --disable-strip ac_add_options --disable-install-strip + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64-dev ===================================== @@ -16,3 +16,7 @@ ac_add_options --disable-install-strip ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-base-browser-update + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-macos ===================================== @@ -10,3 +10,7 @@ ac_add_options --disable-update-agent # For base-browser we do not enable portable mode on macOS. ac_add_options --without-relative-data-dir + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-macos-dev ===================================== @@ -17,3 +17,6 @@ ac_add_options --enable-nss-mar # See bug #41131 ac_add_options --disable-update-agent +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-windows-i686 ===================================== @@ -19,3 +19,7 @@ ac_add_options --disable-update-agent # Bug 1782837: Not supported because Mozilla (and therefore also us) build # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled. ac_add_options --disable-notification-server + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-windows-x86_64 ===================================== @@ -19,3 +19,7 @@ ac_add_options --disable-update-agent # Bug 1782837: Not supported because Mozilla (and therefore also us) build # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled. ac_add_options --disable-notification-server + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2c131c7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2c131c7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 91bc2eb9 by NoisyCoil at 2024-04-08T16:28:56+02:00 fixup! Base Browser's .mozconfigs. Bug 42491: Add mozconfig-linux-aarch64. - - - - - 1 changed file: - + mozconfig-linux-aarch64 Changes: ===================================== mozconfig-linux-aarch64 ===================================== @@ -0,0 +1,12 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser + +ac_add_options --target=aarch64-unknown-linux-gnu + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --enable-default-toolkit=cairo-gtk3 + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/91bc2eb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/91bc2eb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 2 commits: fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 55a8e45b by NoisyCoil at 2024-04-08T14:22:45+00:00 fixup! Base Browser's .mozconfigs. Bug 42491: Add mozconfig-linux-aarch64. - - - - - 27fee80a by NoisyCoil at 2024-04-08T14:22:45+00:00 fixup! TB3: Tor Browser's official .mozconfigs. - - - - - 1 changed file: - + mozconfig-linux-aarch64 Changes: ===================================== mozconfig-linux-aarch64 ===================================== @@ -0,0 +1,12 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --target=aarch64-unknown-linux-gnu + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --enable-default-toolkit=cairo-gtk3 + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9ed772… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9ed772… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: c3b548a0 by NoisyCoil at 2024-04-08T13:17:33+00:00 fixup! Base Browser's .mozconfigs. Bug 279: Add mozconfig-linux-aarch64. - - - - - 1 changed file: - + mozconfig-linux-aarch64 Changes: ===================================== mozconfig-linux-aarch64 ===================================== @@ -0,0 +1,12 @@ +. $topsrcdir/browser/config/mozconfigs/mullvad-browser + +ac_add_options --target=aarch64-unknown-linux-gnu + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --enable-default-toolkit=cairo-gtk3 + View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/c3b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/c3b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 9ed772d1 by NoisyCoil at 2024-04-08T13:14:13+00:00 fixup! Base Browser's .mozconfigs. Bug 42501: Move `--disable-eme` to OS- and architecture-specific mozconfigs. - - - - - 9 changed files: - browser/config/mozconfigs/base-browser - mozconfig-linux-i686 - mozconfig-linux-x86_64 - mozconfig-linux-x86_64-asan - mozconfig-linux-x86_64-dev - mozconfig-macos - mozconfig-macos-dev - mozconfig-windows-i686 - mozconfig-windows-x86_64 Changes: ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -26,8 +26,6 @@ ac_add_options --disable-crashreporter # Before removing, please notice that WebRTC does not work on mingw (Bug 1393901) ac_add_options --disable-webrtc ac_add_options --disable-parental-controls -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection # See bugs #30575 and #32418: system policies are harmful either because they # could allow proxy bypass, and override a number of other preferences we set ===================================== mozconfig-linux-i686 ===================================== @@ -10,3 +10,7 @@ ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --enable-default-toolkit=cairo-gtk3 + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64 ===================================== @@ -7,3 +7,7 @@ ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --enable-default-toolkit=cairo-gtk3 + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64-asan ===================================== @@ -20,3 +20,7 @@ ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --disable-strip ac_add_options --disable-install-strip + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-linux-x86_64-dev ===================================== @@ -18,3 +18,7 @@ ac_add_options --disable-install-strip ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-base-browser-update + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-macos ===================================== @@ -9,3 +9,7 @@ ac_add_options --enable-nss-mar ac_add_options --disable-update-agent ac_add_options --with-relative-data-dir=../TorBrowser-Data/Browser + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-macos-dev ===================================== @@ -22,3 +22,7 @@ export MOZ_APP_REMOTINGNAME="Tor Browser Dev" ac_add_options --with-branding=browser/branding/tb-nightly ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-base-browser-update + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-windows-i686 ===================================== @@ -19,3 +19,7 @@ ac_add_options --disable-update-agent # Bug 1782837: Not supported because Mozilla (and therefore also us) build # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled. ac_add_options --disable-notification-server + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + ===================================== mozconfig-windows-x86_64 ===================================== @@ -19,3 +19,7 @@ ac_add_options --disable-update-agent # Bug 1782837: Not supported because Mozilla (and therefore also us) build # libc++ with LIBCXX_ENABLE_FILESYSTEM disabled. ac_add_options --disable-notification-server + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9ed772d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9ed772d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.1esr-13.0-1] 2 commits: fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 08 Apr '24

08 Apr '24

ma1 pushed to branch mullvad-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 1d90ed3d by hackademix at 2024-04-08T13:31:55+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42236: Let users decide whether to load their home page on new identity. - - - - - 8e7cdd60 by hackademix at 2024-04-08T13:31:56+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 2 changed files: - browser/components/newidentity/content/newidentity.js - browser/locales/en-US/chrome/browser/newIdentity.properties Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -10,37 +10,28 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { ); const brandShortName = brandBundle.GetStringFromName("brandShortName"); - let strings = { - new_identity: "New Identity", - new_identity_sentence_case: "New identity", - new_identity_prompt_title: "Reset your identity?", - new_identity_prompt: `${brandShortName} will close all windows and tabs. All website sessions will be lost. \nRestart ${brandShortName} now to reset your identity?`, - new_identity_restart: `Restart ${brandShortName}`, - new_identity_ask_again: "Never ask me again", - new_identity_menu_accesskey: "I", - }; - let bundle = null; + const fallbackBundle = Services.strings.createBundle( + "resource:///chrome/en-US/locale/browser/newIdentity.properties" + ); + const strings = {}; + const brandedStrings = ["new_identity_prompt", "new_identity_restart"]; + for (let { key } of fallbackBundle.getSimpleEnumeration()) { + strings[key] = fallbackBundle.GetStringFromName(key); + } try { - bundle = Services.strings.createBundle( + const bundle = Services.strings.createBundle( "chrome://browser/locale/newIdentity.properties" ); - } catch (e) { - console.warn("Could not load the New Identity strings"); - } - if (bundle) { for (const key of Object.keys(strings)) { try { strings[key] = bundle.GetStringFromName(key); } catch (e) {} } - strings.new_identity_prompt = strings.new_identity_prompt.replaceAll( - "%S", - brandShortName - ); - strings.new_identity_restart = strings.new_identity_restart.replaceAll( - "%S", - brandShortName - ); + } catch (e) { + console.warn("Could not load localized New Identity strings"); + } + for (let key of brandedStrings) { + strings[key] = strings[key].replaceAll("%S", brandShortName); } return strings; }); @@ -437,10 +428,79 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { logger.info("Opening a new window"); return new Promise(resolve => { // Open a new window forcing the about:privatebrowsing page (tor-browser#41765) - const win = OpenBrowserWindow({private: "no-home"}); + // unless user explicitly overrides this policy (tor-browser #42236) + const homePref = "browser.startup.homepage"; + const trustedHomePref = "browser.startup.homepage.new_identity"; + const homeURL = Services.prefs.getStringPref(homePref, ""); + const defaultHomeURL = Services.prefs + .getDefaultBranch("") + .getStringPref(homePref, ""); + const isTrustedHome = + homeURL === defaultHomeURL || + homeURL.startsWith("chrome://") || // about:blank and other built-ins + homeURL === Services.prefs.getStringPref(trustedHomePref, ""); + const isCustomHome = + Services.prefs.getIntPref("browser.startup.page") === 1; + const win = OpenBrowserWindow({ + private: isCustomHome && isTrustedHome ? "private" : "no-home", + }); // This mechanism to know when the new window is ready is used by // OpenBrowserWindow itself (see its definition in browser.js). - win.addEventListener("MozAfterPaint", () => resolve(), { once: true }); + win.addEventListener( + "MozAfterPaint", + () => { + resolve(); + if (isTrustedHome || !isCustomHome) { + return; + } + const tbl = win.TabsProgressListener; + const { onLocationChange } = tbl; + tbl.onLocationChange = (...args) => { + tbl.onLocationChange = onLocationChange; + tbl.onLocationChange(...args); + let displayAddress; + try { + const url = new URL(homeURL); + displayAddress = url.hostname; + if (!displayAddress) { + // no host, use full address and truncate if too long + const MAX_LEN = 32; + displayAddress = url.href; + if (displayAddress.length > MAX_LEN) { + displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; + } + } + } catch (e) { + // malformed URL, bail out + return; + } + const label = + NewIdentityStrings.new_identity_home_notification.replace( + "%S", + displayAddress + ); + const callback = () => { + Services.prefs.setStringPref(trustedHomePref, homeURL); + win.BrowserHome(); + }; + const notificationBox = win.gBrowser.getNotificationBox(); + notificationBox.appendNotification( + "new-identity-safe-home", + { + label, + priority: notificationBox.PRIORITY_INFO_MEDIUM, + }, + [ + { + label: NewIdentityStrings.new_identity_home_load_button, + callback, + }, + ] + ); + }; + }, + { once: true } + ); }); } ===================================== browser/locales/en-US/chrome/browser/newIdentity.properties ===================================== @@ -8,3 +8,6 @@ new_identity_restart = Restart %S new_identity_ask_again = Never ask me again # Shown in the File menu (use Alt to show File, if you do not see) new_identity_menu_accesskey = I +new_identity_home_notification = Tor Browser blocked your homepage (%S) from loading because it might recognize your previous session. +# %S is replaced with the custom homepage URL's domain if applicable, or some short-hand of it otherwise +new_identity_home_load_button = Load it anyway View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/1e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/1e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.1esr-13.0-1] 2 commits: fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 08 Apr '24

08 Apr '24

ma1 pushed to branch base-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: af4fa50b by hackademix at 2024-04-08T13:30:21+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42236: Let users decide whether to load their home page on new identity. - - - - - 772b3eef by hackademix at 2024-04-08T13:30:23+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 2 changed files: - browser/components/newidentity/content/newidentity.js - browser/locales/en-US/chrome/browser/newIdentity.properties Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -10,37 +10,28 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { ); const brandShortName = brandBundle.GetStringFromName("brandShortName"); - let strings = { - new_identity: "New Identity", - new_identity_sentence_case: "New identity", - new_identity_prompt_title: "Reset your identity?", - new_identity_prompt: `${brandShortName} will close all windows and tabs. All website sessions will be lost. \nRestart ${brandShortName} now to reset your identity?`, - new_identity_restart: `Restart ${brandShortName}`, - new_identity_ask_again: "Never ask me again", - new_identity_menu_accesskey: "I", - }; - let bundle = null; + const fallbackBundle = Services.strings.createBundle( + "resource:///chrome/en-US/locale/browser/newIdentity.properties" + ); + const strings = {}; + const brandedStrings = ["new_identity_prompt", "new_identity_restart"]; + for (let { key } of fallbackBundle.getSimpleEnumeration()) { + strings[key] = fallbackBundle.GetStringFromName(key); + } try { - bundle = Services.strings.createBundle( + const bundle = Services.strings.createBundle( "chrome://browser/locale/newIdentity.properties" ); - } catch (e) { - console.warn("Could not load the New Identity strings"); - } - if (bundle) { for (const key of Object.keys(strings)) { try { strings[key] = bundle.GetStringFromName(key); } catch (e) {} } - strings.new_identity_prompt = strings.new_identity_prompt.replaceAll( - "%S", - brandShortName - ); - strings.new_identity_restart = strings.new_identity_restart.replaceAll( - "%S", - brandShortName - ); + } catch (e) { + console.warn("Could not load localized New Identity strings"); + } + for (let key of brandedStrings) { + strings[key] = strings[key].replaceAll("%S", brandShortName); } return strings; }); @@ -437,10 +428,79 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { logger.info("Opening a new window"); return new Promise(resolve => { // Open a new window forcing the about:privatebrowsing page (tor-browser#41765) - const win = OpenBrowserWindow({private: "no-home"}); + // unless user explicitly overrides this policy (tor-browser #42236) + const homePref = "browser.startup.homepage"; + const trustedHomePref = "browser.startup.homepage.new_identity"; + const homeURL = Services.prefs.getStringPref(homePref, ""); + const defaultHomeURL = Services.prefs + .getDefaultBranch("") + .getStringPref(homePref, ""); + const isTrustedHome = + homeURL === defaultHomeURL || + homeURL.startsWith("chrome://") || // about:blank and other built-ins + homeURL === Services.prefs.getStringPref(trustedHomePref, ""); + const isCustomHome = + Services.prefs.getIntPref("browser.startup.page") === 1; + const win = OpenBrowserWindow({ + private: isCustomHome && isTrustedHome ? "private" : "no-home", + }); // This mechanism to know when the new window is ready is used by // OpenBrowserWindow itself (see its definition in browser.js). - win.addEventListener("MozAfterPaint", () => resolve(), { once: true }); + win.addEventListener( + "MozAfterPaint", + () => { + resolve(); + if (isTrustedHome || !isCustomHome) { + return; + } + const tbl = win.TabsProgressListener; + const { onLocationChange } = tbl; + tbl.onLocationChange = (...args) => { + tbl.onLocationChange = onLocationChange; + tbl.onLocationChange(...args); + let displayAddress; + try { + const url = new URL(homeURL); + displayAddress = url.hostname; + if (!displayAddress) { + // no host, use full address and truncate if too long + const MAX_LEN = 32; + displayAddress = url.href; + if (displayAddress.length > MAX_LEN) { + displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; + } + } + } catch (e) { + // malformed URL, bail out + return; + } + const label = + NewIdentityStrings.new_identity_home_notification.replace( + "%S", + displayAddress + ); + const callback = () => { + Services.prefs.setStringPref(trustedHomePref, homeURL); + win.BrowserHome(); + }; + const notificationBox = win.gBrowser.getNotificationBox(); + notificationBox.appendNotification( + "new-identity-safe-home", + { + label, + priority: notificationBox.PRIORITY_INFO_MEDIUM, + }, + [ + { + label: NewIdentityStrings.new_identity_home_load_button, + callback, + }, + ] + ); + }; + }, + { once: true } + ); }); } ===================================== browser/locales/en-US/chrome/browser/newIdentity.properties ===================================== @@ -8,3 +8,6 @@ new_identity_restart = Restart %S new_identity_ask_again = Never ask me again # Shown in the File menu (use Alt to show File, if you do not see) new_identity_menu_accesskey = I +new_identity_home_notification = Tor Browser blocked your homepage (%S) from loading because it might recognize your previous session. +# %S is replaced with the custom homepage URL's domain if applicable, or some short-hand of it otherwise +new_identity_home_load_button = Load it anyway View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a975b0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a975b0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.1esr-13.0-1] 2 commits: fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 08 Apr '24

08 Apr '24

ma1 pushed to branch tor-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: db383978 by hackademix at 2024-04-08T13:29:33+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42236: Let users decide whether to load their home page on new identity. - - - - - ed19d5f4 by hackademix at 2024-04-08T13:29:35+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 2 changed files: - browser/components/newidentity/content/newidentity.js - browser/locales/en-US/chrome/browser/newIdentity.properties Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -10,37 +10,28 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { ); const brandShortName = brandBundle.GetStringFromName("brandShortName"); - let strings = { - new_identity: "New Identity", - new_identity_sentence_case: "New identity", - new_identity_prompt_title: "Reset your identity?", - new_identity_prompt: `${brandShortName} will close all windows and tabs. All website sessions will be lost. \nRestart ${brandShortName} now to reset your identity?`, - new_identity_restart: `Restart ${brandShortName}`, - new_identity_ask_again: "Never ask me again", - new_identity_menu_accesskey: "I", - }; - let bundle = null; + const fallbackBundle = Services.strings.createBundle( + "resource:///chrome/en-US/locale/browser/newIdentity.properties" + ); + const strings = {}; + const brandedStrings = ["new_identity_prompt", "new_identity_restart"]; + for (let { key } of fallbackBundle.getSimpleEnumeration()) { + strings[key] = fallbackBundle.GetStringFromName(key); + } try { - bundle = Services.strings.createBundle( + const bundle = Services.strings.createBundle( "chrome://browser/locale/newIdentity.properties" ); - } catch (e) { - console.warn("Could not load the New Identity strings"); - } - if (bundle) { for (const key of Object.keys(strings)) { try { strings[key] = bundle.GetStringFromName(key); } catch (e) {} } - strings.new_identity_prompt = strings.new_identity_prompt.replaceAll( - "%S", - brandShortName - ); - strings.new_identity_restart = strings.new_identity_restart.replaceAll( - "%S", - brandShortName - ); + } catch (e) { + console.warn("Could not load localized New Identity strings"); + } + for (let key of brandedStrings) { + strings[key] = strings[key].replaceAll("%S", brandShortName); } return strings; }); @@ -437,10 +428,79 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { logger.info("Opening a new window"); return new Promise(resolve => { // Open a new window forcing the about:privatebrowsing page (tor-browser#41765) - const win = OpenBrowserWindow({private: "no-home"}); + // unless user explicitly overrides this policy (tor-browser #42236) + const homePref = "browser.startup.homepage"; + const trustedHomePref = "browser.startup.homepage.new_identity"; + const homeURL = Services.prefs.getStringPref(homePref, ""); + const defaultHomeURL = Services.prefs + .getDefaultBranch("") + .getStringPref(homePref, ""); + const isTrustedHome = + homeURL === defaultHomeURL || + homeURL.startsWith("chrome://") || // about:blank and other built-ins + homeURL === Services.prefs.getStringPref(trustedHomePref, ""); + const isCustomHome = + Services.prefs.getIntPref("browser.startup.page") === 1; + const win = OpenBrowserWindow({ + private: isCustomHome && isTrustedHome ? "private" : "no-home", + }); // This mechanism to know when the new window is ready is used by // OpenBrowserWindow itself (see its definition in browser.js). - win.addEventListener("MozAfterPaint", () => resolve(), { once: true }); + win.addEventListener( + "MozAfterPaint", + () => { + resolve(); + if (isTrustedHome || !isCustomHome) { + return; + } + const tbl = win.TabsProgressListener; + const { onLocationChange } = tbl; + tbl.onLocationChange = (...args) => { + tbl.onLocationChange = onLocationChange; + tbl.onLocationChange(...args); + let displayAddress; + try { + const url = new URL(homeURL); + displayAddress = url.hostname; + if (!displayAddress) { + // no host, use full address and truncate if too long + const MAX_LEN = 32; + displayAddress = url.href; + if (displayAddress.length > MAX_LEN) { + displayAddress = `${displayAddress.substring(0, MAX_LEN)}…`; + } + } + } catch (e) { + // malformed URL, bail out + return; + } + const label = + NewIdentityStrings.new_identity_home_notification.replace( + "%S", + displayAddress + ); + const callback = () => { + Services.prefs.setStringPref(trustedHomePref, homeURL); + win.BrowserHome(); + }; + const notificationBox = win.gBrowser.getNotificationBox(); + notificationBox.appendNotification( + "new-identity-safe-home", + { + label, + priority: notificationBox.PRIORITY_INFO_MEDIUM, + }, + [ + { + label: NewIdentityStrings.new_identity_home_load_button, + callback, + }, + ] + ); + }; + }, + { once: true } + ); }); } ===================================== browser/locales/en-US/chrome/browser/newIdentity.properties ===================================== @@ -8,3 +8,6 @@ new_identity_restart = Restart %S new_identity_ask_again = Never ask me again # Shown in the File menu (use Alt to show File, if you do not see) new_identity_menu_accesskey = I +new_identity_home_notification = Tor Browser blocked your homepage (%S) from loading because it might recognize your previous session. +# %S is replaced with the custom homepage URL's domain if applicable, or some short-hand of it otherwise +new_identity_home_load_button = Load it anyway View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4b70c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4b70c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.1esr-13.0-1] 2 commits: fixup! MB 39: Add home page about:mullvad-browser
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 0d3b0974 by Henry Wilkes at 2024-04-08T13:00:37+02:00 fixup! MB 39: Add home page about:mullvad-browser Bug 271: Show update in about:mullvad-browser - - - - - 1e1a2221 by Henry Wilkes at 2024-04-08T13:00:46+02:00 fixup! MB 112: Updater customization for Mullvad Browser Bug 271: Do not open update override page in a new tab, and show in about:mullvad-browser instead. - - - - - 11 changed files: - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs - + browser/components/mullvad-browser/content/2728-sparkles.svg - browser/components/mullvad-browser/content/aboutMullvadBrowser.css - + browser/components/mullvad-browser/content/aboutMullvadBrowser.js - browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml - browser/components/mullvad-browser/jar.mn - browser/components/mullvad-browser/moz.build - browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl Changes: ===================================== browser/components/BrowserContentHandler.sys.mjs ===================================== @@ -666,6 +666,23 @@ nsBrowserContentHandler.prototype = { } } + // Retrieve the home page early so we can compare it against + // about:mullvad-browser to decide whether or not we need an override page + // (second tab) after an update was applied. + var startPage = ""; + try { + var choice = prefb.getIntPref("browser.startup.page"); + if (choice == 1 || choice == 3) { + startPage = lazy.HomePage.get(); + } + } catch (e) { + console.error(e); + } + + if (startPage == "about:blank") { + startPage = ""; + } + var override; var overridePage = ""; var additionalPage = ""; @@ -734,6 +751,17 @@ nsBrowserContentHandler.prototype = { "%OLD_BASE_BROWSER_VERSION%", old_forkVersion ); + if (overridePage && AppConstants.BASE_BROWSER_UPDATE) { + // Mullvad Browser, copied from tor-browser: Instead of opening + // the post-update "override page" directly, we include a link in + // about:mullvad-browser. + prefb.setCharPref("mullvadbrowser.post_update.url", overridePage); + prefb.setBoolPref("mullvadbrowser.post_update.shouldNotify", true); + // If the user's homepage is about:tor, we will inform them + // about the update on that page; otherwise, we arrange to + // open about:tor in a secondary tab. + overridePage = startPage === "about:mullvad-browser" ? "" : "about:mullvad-browser"; + } break; case OVERRIDE_NEW_BUILD_ID: if (lazy.UpdateManager.readyUpdate) { @@ -806,20 +834,6 @@ nsBrowserContentHandler.prototype = { } } - var startPage = ""; - try { - var choice = prefb.getIntPref("browser.startup.page"); - if (choice == 1 || choice == 3) { - startPage = lazy.HomePage.get(); - } - } catch (e) { - console.error(e); - } - - if (startPage == "about:blank") { - startPage = ""; - } - let skipStartPage = override == OVERRIDE_NEW_PROFILE && prefb.getBoolPref("browser.startup.firstrunSkipsHomepage"); ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -370,6 +370,20 @@ let JSWINDOWACTORS = { matches: ["about:messagepreview", "about:messagepreview?*"], }, + AboutMullvadBrowser: { + parent: { + esModuleURI: "resource:///actors/AboutMullvadBrowserParent.sys.mjs", + }, + child: { + esModuleURI: "resource:///actors/AboutMullvadBrowserChild.sys.mjs", + events: { + DOMContentLoaded: {}, + }, + }, + + matches: ["about:mullvad-browser"], + }, + AboutPlugins: { parent: { esModuleURI: "resource:///actors/AboutPluginsParent.sys.mjs", ===================================== browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs ===================================== @@ -0,0 +1,14 @@ +export class AboutMullvadBrowserChild extends JSWindowActorChild { + handleEvent(event) { + switch (event.type) { + case "DOMContentLoaded": + this.sendQuery("AboutMullvadBrowser:GetUpdateData").then(data => { + const updateEvent = new this.contentWindow.CustomEvent("UpdateData", { + detail: Cu.cloneInto(data, this.contentWindow), + }); + this.contentWindow.dispatchEvent(updateEvent); + }); + break; + } + } +} ===================================== browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs ===================================== @@ -0,0 +1,23 @@ +export class AboutMullvadBrowserParent extends JSWindowActorParent { + receiveMessage(message) { + const shouldNotifyPref = "mullvadbrowser.post_update.shouldNotify"; + switch (message.name) { + case "AboutMullvadBrowser:GetUpdateData": + if (!Services.prefs.getBoolPref(shouldNotifyPref, false)) { + return Promise.resolve(null); + } + Services.prefs.clearUserPref(shouldNotifyPref); + return Promise.resolve({ + version: Services.prefs.getCharPref( + "browser.startup.homepage_override.mullvadbrowser.version" + ), + url: + Services.prefs.getCharPref("mullvadbrowser.post_update.url", "") || + Services.urlFormatter.formatURLPref( + "startup.homepage_override_url" + ), + }); + } + return undefined; + } +} ===================================== browser/components/mullvad-browser/content/2728-sparkles.svg ===================================== @@ -0,0 +1,3 @@ + +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M34.347 16.893l-8.899-3.294-3.323-10.891c-.128-.42-.517-.708-.956-.708-.439 0-.828.288-.956.708l-3.322 10.891-8.9 3.294c-.393.146-.653.519-.653.938 0 .418.26.793.653.938l8.895 3.293 3.324 11.223c.126.424.516.715.959.715.442 0 .833-.291.959-.716l3.324-11.223 8.896-3.293c.391-.144.652-.518.652-.937 0-.418-.261-.792-.653-.938z"/><path fill="#FFCC4D" d="M14.347 27.894l-2.314-.856-.9-3.3c-.118-.436-.513-.738-.964-.738-.451 0-.846.302-.965.737l-.9 3.3-2.313.856c-.393.145-.653.52-.653.938 0 .418.26.793.653.938l2.301.853.907 3.622c.112.444.511.756.97.756.459 0 .858-.312.97-.757l.907-3.622 2.301-.853c.393-.144.653-.519.653-.937 0-.418-.26-.793-.653-.937zM10.009 6.231l-2.364-.875-.876-2.365c-.145-.393-.519-.653-.938-.653-.418 0-.792.26-.938.653l-.875 2.365-2.365.875c-.393.146-.653.52-.653.938 0 .418.26.793.653.938l2.365.875.875 2.365c.146.393.52.653.938.653.418 0 .792-.26.938-.653l.875-2.365 2.365-.875c.393-.146.653-.52.653-.938 0-.418-.26-.792-.653-.938z"/></svg> ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.css ===================================== @@ -44,14 +44,14 @@ p { #header { display: grid; - grid-template-rows: auto auto; - grid-template-columns: auto; + grid-template: "heading" auto "text" auto / auto; justify-items: center; align-content: center; gap: 1.5em; } #headingContainer { + grid-area: heading; display: inline flex; flex-direction: row; white-space: nowrap; @@ -59,6 +59,32 @@ p { gap: 16px; } +#mullvad-browser-update, +#mullvad-browser-intro { + grid-area: text; +} + +body:not(.has-update) #mullvad-browser-update { + display: none; +} + +body:not(.no-update) #mullvad-browser-intro { + /* Invisible but still reserves space for when the page is initially loaded to + * prevent the Mullvad title from jumping. */ + visibility: hidden; +} + +#mullvad-browser-update-img { + height: 1em; + vertical-align: sub; + margin-inline-end: 0.3em; +} + +#mullvad-browser-update a { + /* Increase gap between the link and the rest of the text. */ + margin-inline: 0.4em; +} + #footer { padding-block: 40px; background: rgba(0, 0, 0, 0.2); ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.js ===================================== @@ -0,0 +1,20 @@ +"use strict"; + +window.addEventListener("UpdateData", event => { + const detail = event.detail; + if (detail) { + const { url, version } = detail; + + const text = document.getElementById("mullvad-browser-update"); + document.l10n.setAttributes( + text.querySelector("span"), + "about-mullvad-browser-update-message", + { version } + ); + text.querySelector("a").href = url; + } + // Before the first call, neither the intro nor update text are shown, this + // prevents the intro text from flashing in and out when we have an update. + document.body.classList.toggle("no-update", !detail); + document.body.classList.toggle("has-update", !!detail); +}); ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml ===================================== @@ -21,6 +21,8 @@ rel="localization" href="browser/mullvad-browser/aboutMullvadBrowser.ftl" /> + + <script src="chrome://browser/content/mullvad-browser/aboutMullvadBrowser.js"></script> </head> <body> <div id="header"> @@ -48,11 +50,22 @@ data-l10n-id="about-mullvad-browser-heading" ></h1> </div> - <p data-l10n-id="about-mullvad-browser-developed-by"> + <p + id="mullvad-browser-intro" + data-l10n-id="about-mullvad-browser-developed-by" + > <a data-l10n-name="tor-project-link" href="https://www.torproject.org"> </a> <a data-l10n-name="mullvad-vpn-link" href="https://mullvad.net"> </a> </p> + <p id="mullvad-browser-update"> + <img + id="mullvad-browser-update-img" + alt="" + src="chrome://browser/content/mullvad-browser/2728-sparkles.svg" + /> + <span><a data-l10n-name="update-link"></a></span> + </p> </div> <div id="footer"> <p data-l10n-id="about-mullvad-browser-use-vpn"> ===================================== browser/components/mullvad-browser/jar.mn ===================================== @@ -1,4 +1,6 @@ browser.jar: + content/browser/mullvad-browser/aboutMullvadBrowser.js (content/aboutMullvadBrowser.js) content/browser/mullvad-browser/aboutMullvadBrowser.xhtml (content/aboutMullvadBrowser.xhtml) content/browser/mullvad-browser/aboutMullvadBrowser.css (content/aboutMullvadBrowser.css) content/browser/mullvad-browser/mullvadBrowserFont.css (content/mullvadBrowserFont.css) + content/browser/mullvad-browser/2728-sparkles.svg (content/2728-sparkles.svg) ===================================== browser/components/mullvad-browser/moz.build ===================================== @@ -1 +1,6 @@ JAR_MANIFESTS += ["jar.mn"] + +FINAL_TARGET_FILES.actors += [ + "AboutMullvadBrowserChild.sys.mjs", + "AboutMullvadBrowserParent.sys.mjs", +] ===================================== browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl ===================================== @@ -3,6 +3,11 @@ about-mullvad-browser-developed-by = Developed in collaboration between the <a d about-mullvad-browser-use-vpn = Get more privacy by using the browser <a data-l10n-name="with-vpn-link">with Mullvad VPN</a>. about-mullvad-browser-learn-more = Curious to learn more about the browser? <a data-l10n-name="learn-more-link">Take a dive into the mole hole</a>. +# Update message. +# <a data-l10n-name="update-link"> should contain the link text and close with </a>. +# $version (String) - The new browser version. +about-mullvad-browser-update-message = { -brand-short-name } has been updated to { $version }. <a data-l10n-name="update-link">See what’s new</a> + ## Deprecated. To be removed when 13.5 becomes stable. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/1b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/1b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.1esr-13.0-1] 3 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: aba1e5a0 by Pier Angelo Vendrame at 2024-04-08T12:52:20+02:00 fixup! Firefox preference overrides. Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth. We will have to revert this during the ESR-transition. - - - - - 81838b89 by Pier Angelo Vendrame at 2024-04-08T12:52:22+02:00 Bug 42428: Make RFP spoof the timezone of document.lastModified. - - - - - 1b1e94cd by Pier Angelo Vendrame at 2024-04-08T12:52:22+02:00 Bug 42472: Spoof timezone in XSLT. - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - dom/base/Document.cpp - dom/xslt/xslt/txEXSLTFunctions.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -396,6 +396,9 @@ pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). // Provides a uniform look and feel across platforms. Added with tor-browser#41496. pref("widget.non-native-theme.enabled", true); +// tor-browser#41676: Set the TZ environment variable as a defense-in-depth. +// TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. +pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); // tor-browser#41943: lock and revisit after it gets flipped to true in stable Firefox pref("javascript.options.spectre.disable_for_isolated_content", false, locked); ===================================== dom/base/Document.cpp ===================================== @@ -4103,10 +4103,11 @@ void Document::SetDocumentURI(nsIURI* aURI) { } } -static void GetFormattedTimeString(PRTime aTime, +static void GetFormattedTimeString(PRTime aTime, bool aUniversal, nsAString& aFormattedTimeString) { PRExplodedTime prtime; - PR_ExplodeTime(aTime, PR_LocalTimeParameters, &prtime); + PR_ExplodeTime(aTime, aUniversal ? PR_GMTParameters : PR_LocalTimeParameters, + &prtime); // "MM/DD/YYYY hh:mm:ss" char formatedTime[24]; if (SprintfLiteral(formatedTime, "%02d/%02d/%04d %02d:%02d:%02d", @@ -4124,7 +4125,9 @@ void Document::GetLastModified(nsAString& aLastModified) const { if (!mLastModified.IsEmpty()) { aLastModified.Assign(mLastModified); } else { - GetFormattedTimeString(PR_Now(), aLastModified); + GetFormattedTimeString(PR_Now(), + ShouldResistFingerprinting(RFPTarget::Unknown), + aLastModified); } } @@ -11053,7 +11056,8 @@ void Document::RetrieveRelevantHeaders(nsIChannel* aChannel) { mLastModified.Truncate(); if (modDate != 0) { - GetFormattedTimeString(modDate, mLastModified); + GetFormattedTimeString( + modDate, ShouldResistFingerprinting(RFPTarget::Unknown), mLastModified); } } ===================================== dom/xslt/xslt/txEXSLTFunctions.cpp ===================================== @@ -591,7 +591,14 @@ nsresult txEXSLTFunctionCall::evaluate(txIEvalContext* aContext, // http://exslt.org/date/functions/date-time/ PRExplodedTime prtime; - PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &prtime); + PR_ExplodeTime( + PR_Now(), + // We are not allowed to access the Document when evaluating this, so + // fall back to the general function. + nsContentUtils::ShouldResistFingerprinting(RFPTarget::Unknown) + ? PR_GMTParameters + : PR_LocalTimeParameters, + &prtime); int32_t offset = (prtime.tm_params.tp_gmt_offset + prtime.tm_params.tp_dst_offset) / View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/6c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/6c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.1esr-13.0-1] 3 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch base-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 5c690113 by Pier Angelo Vendrame at 2024-04-08T12:51:54+02:00 fixup! Firefox preference overrides. Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth. We will have to revert this during the ESR-transition. - - - - - d1e8e6ba by Pier Angelo Vendrame at 2024-04-08T12:51:55+02:00 Bug 42428: Make RFP spoof the timezone of document.lastModified. - - - - - a975b00f by Pier Angelo Vendrame at 2024-04-08T12:51:56+02:00 Bug 42472: Spoof timezone in XSLT. - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - dom/base/Document.cpp - dom/xslt/xslt/txEXSLTFunctions.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -397,6 +397,9 @@ pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). // Provides a uniform look and feel across platforms. Added with tor-browser#41496. pref("widget.non-native-theme.enabled", true); +// tor-browser#41676: Set the TZ environment variable as a defense-in-depth. +// TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. +pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); // tor-browser#41943: lock and revisit after it gets flipped to true in stable Firefox pref("javascript.options.spectre.disable_for_isolated_content", false, locked); ===================================== dom/base/Document.cpp ===================================== @@ -4103,10 +4103,11 @@ void Document::SetDocumentURI(nsIURI* aURI) { } } -static void GetFormattedTimeString(PRTime aTime, +static void GetFormattedTimeString(PRTime aTime, bool aUniversal, nsAString& aFormattedTimeString) { PRExplodedTime prtime; - PR_ExplodeTime(aTime, PR_LocalTimeParameters, &prtime); + PR_ExplodeTime(aTime, aUniversal ? PR_GMTParameters : PR_LocalTimeParameters, + &prtime); // "MM/DD/YYYY hh:mm:ss" char formatedTime[24]; if (SprintfLiteral(formatedTime, "%02d/%02d/%04d %02d:%02d:%02d", @@ -4124,7 +4125,9 @@ void Document::GetLastModified(nsAString& aLastModified) const { if (!mLastModified.IsEmpty()) { aLastModified.Assign(mLastModified); } else { - GetFormattedTimeString(PR_Now(), aLastModified); + GetFormattedTimeString(PR_Now(), + ShouldResistFingerprinting(RFPTarget::Unknown), + aLastModified); } } @@ -11053,7 +11056,8 @@ void Document::RetrieveRelevantHeaders(nsIChannel* aChannel) { mLastModified.Truncate(); if (modDate != 0) { - GetFormattedTimeString(modDate, mLastModified); + GetFormattedTimeString( + modDate, ShouldResistFingerprinting(RFPTarget::Unknown), mLastModified); } } ===================================== dom/xslt/xslt/txEXSLTFunctions.cpp ===================================== @@ -591,7 +591,14 @@ nsresult txEXSLTFunctionCall::evaluate(txIEvalContext* aContext, // http://exslt.org/date/functions/date-time/ PRExplodedTime prtime; - PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &prtime); + PR_ExplodeTime( + PR_Now(), + // We are not allowed to access the Document when evaluating this, so + // fall back to the general function. + nsContentUtils::ShouldResistFingerprinting(RFPTarget::Unknown) + ? PR_GMTParameters + : PR_LocalTimeParameters, + &prtime); int32_t offset = (prtime.tm_params.tp_gmt_offset + prtime.tm_params.tp_dst_offset) / View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9cd4e9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9cd4e9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.1esr-13.0-1] 3 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 59d59b87 by Pier Angelo Vendrame at 2024-04-08T12:48:52+02:00 fixup! Firefox preference overrides. Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth. We will have to revert this during the ESR-transition. - - - - - e29b76ff by Pier Angelo Vendrame at 2024-04-08T12:50:50+02:00 Bug 42428: Make RFP spoof the timezone of document.lastModified. - - - - - 4b70c6b0 by Pier Angelo Vendrame at 2024-04-08T12:51:14+02:00 Bug 42472: Spoof timezone in XSLT. - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - dom/base/Document.cpp - dom/xslt/xslt/txEXSLTFunctions.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -397,6 +397,9 @@ pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). // Provides a uniform look and feel across platforms. Added with tor-browser#41496. pref("widget.non-native-theme.enabled", true); +// tor-browser#41676: Set the TZ environment variable as a defense-in-depth. +// TODO: Remove this in ESR-128, as it has been removed in 116 with Bug 1837582. +pref("privacy.resistFingerprinting.testing.setTZtoUTC", true); // tor-browser#41943: lock and revisit after it gets flipped to true in stable Firefox pref("javascript.options.spectre.disable_for_isolated_content", false, locked); ===================================== dom/base/Document.cpp ===================================== @@ -4104,10 +4104,11 @@ void Document::SetDocumentURI(nsIURI* aURI) { } } -static void GetFormattedTimeString(PRTime aTime, +static void GetFormattedTimeString(PRTime aTime, bool aUniversal, nsAString& aFormattedTimeString) { PRExplodedTime prtime; - PR_ExplodeTime(aTime, PR_LocalTimeParameters, &prtime); + PR_ExplodeTime(aTime, aUniversal ? PR_GMTParameters : PR_LocalTimeParameters, + &prtime); // "MM/DD/YYYY hh:mm:ss" char formatedTime[24]; if (SprintfLiteral(formatedTime, "%02d/%02d/%04d %02d:%02d:%02d", @@ -4125,7 +4126,9 @@ void Document::GetLastModified(nsAString& aLastModified) const { if (!mLastModified.IsEmpty()) { aLastModified.Assign(mLastModified); } else { - GetFormattedTimeString(PR_Now(), aLastModified); + GetFormattedTimeString(PR_Now(), + ShouldResistFingerprinting(RFPTarget::Unknown), + aLastModified); } } @@ -11113,7 +11116,8 @@ void Document::RetrieveRelevantHeaders(nsIChannel* aChannel) { mLastModified.Truncate(); if (modDate != 0) { - GetFormattedTimeString(modDate, mLastModified); + GetFormattedTimeString( + modDate, ShouldResistFingerprinting(RFPTarget::Unknown), mLastModified); } } ===================================== dom/xslt/xslt/txEXSLTFunctions.cpp ===================================== @@ -591,7 +591,14 @@ nsresult txEXSLTFunctionCall::evaluate(txIEvalContext* aContext, // http://exslt.org/date/functions/date-time/ PRExplodedTime prtime; - PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &prtime); + PR_ExplodeTime( + PR_Now(), + // We are not allowed to access the Document when evaluating this, so + // fall back to the general function. + nsContentUtils::ShouldResistFingerprinting(RFPTarget::Unknown) + ? PR_GMTParameters + : PR_LocalTimeParameters, + &prtime); int32_t offset = (prtime.tm_params.tp_gmt_offset + prtime.tm_params.tp_dst_offset) / View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e69ef2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e69ef2… 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 41110: Avoid Fontconfig warning about "ambiguous path"
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: f834378b by Rusty Bird at 2024-04-08T12:37:48+02:00 Bug 41110: Avoid Fontconfig warning about "ambiguous path" - - - - - 1 changed file: - projects/browser/Bundle-Data/linux/Data/fontconfig/fonts.conf Changes: ===================================== projects/browser/Bundle-Data/linux/Data/fontconfig/fonts.conf ===================================== @@ -39,7 +39,7 @@ PERFORMANCE OF THIS SOFTWARE.  - <dir>fonts</dir> + <dir prefix="cwd">fonts</dir> <!-- Accept deprecated 'mono' alias, replacing it with 'monospace' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 08 Apr '24

08 Apr '24

ma1 pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 1c3780c3 by hackademix at 2024-04-08T09:42:42+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -398,8 +398,11 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { const homePref = "browser.startup.homepage"; const trustedHomePref = "browser.startup.homepage.new_identity"; const homeURL = Services.prefs.getStringPref(homePref, ""); + const defaultHomeURL = Services.prefs + .getDefaultBranch("") + .getStringPref(homePref, ""); const isTrustedHome = - homeURL === "about:tor" || + homeURL === defaultHomeURL || homeURL.startsWith("chrome://") || // about:blank and other built-ins homeURL === Services.prefs.getStringPref(trustedHomePref, ""); const isCustomHome = View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1c3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1c3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! MB 1: Mullvad Browser branding
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 54e1ff1a by Pier Angelo Vendrame at 2024-04-08T09:40:46+02:00 fixup! MB 1: Mullvad Browser branding Bug 42490: Write the browser logo SVG also outside of omni.ja. - - - - - 2 changed files: - browser/branding/branding-common.mozbuild - browser/installer/package-manifest.in Changes: ===================================== browser/branding/branding-common.mozbuild ===================================== @@ -25,6 +25,7 @@ def FirefoxBranding(): ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': FINAL_TARGET_FILES.chrome.icons.default += [ + 'content/about-logo.svg', 'default128.png', 'default16.png', 'default256.png', ===================================== browser/installer/package-manifest.in ===================================== @@ -228,6 +228,7 @@ @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest #ifdef MOZ_GTK +@RESPATH@/browser/chrome/icons/default/about-logo.svg @RESPATH@/browser/chrome/icons/default/default16.png @RESPATH@/browser/chrome/icons/default/default32.png @RESPATH@/browser/chrome/icons/default/default48.png View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/54e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/54e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 08 Apr '24

08 Apr '24

ma1 pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 96048e5a by hackademix at 2024-04-08T09:39:24+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -398,8 +398,11 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { const homePref = "browser.startup.homepage"; const trustedHomePref = "browser.startup.homepage.new_identity"; const homeURL = Services.prefs.getStringPref(homePref, ""); + const defaultHomeURL = Services.prefs + .getDefaultBranch("") + .getStringPref(homePref, ""); const isTrustedHome = - homeURL === "about:tor" || + homeURL === defaultHomeURL || homeURL.startsWith("chrome://") || // about:blank and other built-ins homeURL === Services.prefs.getStringPref(trustedHomePref, ""); const isCustomHome = View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/96048e5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/96048e5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 08 Apr '24

08 Apr '24

ma1 pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4d7d8276 by hackademix at 2024-04-08T09:31:41+02:00 fixup! Bug 40926: Implemented the New Identity feature MB 283: Make new identity homepage check brand-agnostic. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -398,8 +398,11 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { const homePref = "browser.startup.homepage"; const trustedHomePref = "browser.startup.homepage.new_identity"; const homeURL = Services.prefs.getStringPref(homePref, ""); + const defaultHomeURL = Services.prefs + .getDefaultBranch("") + .getStringPref(homePref, ""); const isTrustedHome = - homeURL === "about:tor" || + homeURL === defaultHomeURL || homeURL.startsWith("chrome://") || // about:blank and other built-ins homeURL === Services.prefs.getStringPref(trustedHomePref, ""); const isCustomHome = View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4d7d827… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4d7d827… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 2 commits: fixup! Bug 2176: Rebrand Firefox to TorBrowser
by Pier Angelo Vendrame (＠pierov) 08 Apr '24

08 Apr '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: e0cdf1dc by Pier Angelo Vendrame at 2024-03-28T19:38:41+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 42490: Write the browser logo SVG also outside of omni.ja. - - - - - 224492f6 by Pier Angelo Vendrame at 2024-03-28T19:38:42+01:00 fixup! Bug 7494: Create local home page for TBB. Bug 42490: Write the browser logo SVG also outside of omni.ja. Update the path to the Tor Browser logo. - - - - - 4 changed files: - browser/branding/branding-common.mozbuild - browser/branding/tb-alpha/content/about-logo.svg - browser/branding/tb-alpha/content/jar.mn - − browser/branding/tb-alpha/content/tor-browser-logo.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/494af3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/494af3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI
by Dan Ballard (＠dan) 04 Apr '24

04 Apr '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 7e46e5e3 by clairehurst at 2024-04-04T20:16:41+00:00 fixup! Add Tor integration and UI - - - - - 1 changed file: - fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsFragment.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsFragment.kt ===================================== @@ -1,3 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + package org.mozilla.fenix.tor import android.os.Bundle @@ -8,15 +12,11 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import org.mozilla.fenix.R import org.mozilla.fenix.components.Components -import org.mozilla.fenix.databinding.FragmentHomeBinding -import org.mozilla.fenix.databinding.FragmentTorConnectionAssistBinding import org.mozilla.fenix.databinding.TorBootstrapLoggerBinding -import org.mozilla.fenix.databinding.TorNetworkSettingsBetaConnectionFeaturesBinding -import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.tor.view.TorBootstrapLoggerViewHolder -class TorLogsFragment(): Fragment(), TorLogs { +class TorLogsFragment : Fragment(), TorLogs { private var entries = mutableListOf<String>() internal var _binding: TorBootstrapLoggerBinding? = null @@ -35,15 +35,17 @@ class TorLogsFragment(): Fragment(), TorLogs { components.torController.registerTorLogListener(this) - val currentEntries = components.torController.logEntries - .filter { it.second != null } + val currentEntries = components.torController.logEntries.filter { it.second != null } .filter { !(it.second!!.startsWith("Circuit") && it.first == "ON") } // Keep synchronized with format in onTorStatusUpdate .flatMap { listOf("(${it.first}) '${it.second}'") } val entriesLen = currentEntries.size - val subListOffset = if (entriesLen > TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES) TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES else entriesLen - entries = currentEntries.subList((entriesLen - subListOffset), entriesLen) as MutableList<String> - val initLog = "---------------" + getString(R.string.tor_initializing_log) + "---------------" + val subListOffset = + if (entriesLen > TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES) TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES else entriesLen + entries = + currentEntries.subList((entriesLen - subListOffset), entriesLen) as MutableList<String> + val initLog = + "---------------" + getString(R.string.tor_initializing_log) + "---------------" entries.add(0, initLog) with(binding.torBootstrapLogEntries) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7e4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7e4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Bug 42195: Fix "Whats new URL"
by Dan Ballard (＠dan) 04 Apr '24

04 Apr '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 6b497d60 by clairehurst at 2024-04-04T12:25:17-07:00 fixup! Bug 42195: Fix "Whats new URL" Fix Whats New Url for dev/debug build add to whats new url, remove autoformatting - - - - - 1 changed file: - fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt ===================================== @@ -101,9 +101,18 @@ object SupportUtils { } fun getTorWhatsNewUrl(): String { - val alpha = if (BuildConfig.VERSION_NAME.contains('a')) "alpha-" else "" - val versionNumberNoDecimals = BuildConfig.VERSION_NAME.split('.').joinToString("") - return "https://blog.torproject.org/new-${alpha}release-tor-browser-${versionNumber…" + val fullVersionName: String = BuildConfig.VERSION_NAME // e.g. "115.2.1-beta (13.5a5)" + if (!fullVersionName.contains('(') || !fullVersionName.contains(')')) { + return "https://blog.torproject.org/" + } + val versionNumber: String = fullVersionName.substring( + fullVersionName.indexOf('(') + 1, + fullVersionName.indexOf(')'), + ) // e.g. "13.5a5" + val alpha: String = if (versionNumber.contains('a')) "alpha-" else "" + val versionNumberNoDecimals: String = + versionNumber.split('.').joinToString("") // e.g. "135a5" + return "https://blog.torproject.org/new-${alpha}release-tor-browser-${versionNumber…" // e.g. "https://blog.torproject.org/new-alpha-release-tor-browser-135a5/ } fun getMozillaPageUrl(page: MozillaPage, locale: Locale = Locale.getDefault()): String { View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6b4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6b4… 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.5a6
by richard (＠richard) 28 Mar '24

28 Mar '24

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: a4a76ca2 by Richard Pospesel at 2024-03-28T17:25:29+00:00 alpha: new version, 13.5a6 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/13.5a2-13.5a5-linux-i686-ALL.xml - − update_3/alpha/13.5a2-13.5a5-linux-x86_64-ALL.xml - − update_3/alpha/13.5a2-13.5a5-macos-ALL.xml - − update_3/alpha/13.5a2-13.5a5-windows-i686-ALL.xml - − update_3/alpha/13.5a2-13.5a5-windows-x86_64-ALL.xml - − update_3/alpha/13.5a3-13.5a5-linux-i686-ALL.xml - − update_3/alpha/13.5a3-13.5a5-linux-x86_64-ALL.xml - − update_3/alpha/13.5a3-13.5a5-macos-ALL.xml - − update_3/alpha/13.5a3-13.5a5-windows-i686-ALL.xml - − update_3/alpha/13.5a3-13.5a5-windows-x86_64-ALL.xml - + update_3/alpha/13.5a3-13.5a6-linux-i686-ALL.xml - + update_3/alpha/13.5a3-13.5a6-linux-x86_64-ALL.xml - + update_3/alpha/13.5a3-13.5a6-macos-ALL.xml - + update_3/alpha/13.5a3-13.5a6-windows-i686-ALL.xml - + update_3/alpha/13.5a3-13.5a6-windows-x86_64-ALL.xml - − update_3/alpha/13.5a4-13.5a5-linux-i686-ALL.xml - − update_3/alpha/13.5a4-13.5a5-linux-x86_64-ALL.xml - − update_3/alpha/13.5a4-13.5a5-macos-ALL.xml - − update_3/alpha/13.5a4-13.5a5-windows-i686-ALL.xml - − update_3/alpha/13.5a4-13.5a5-windows-x86_64-ALL.xml - + update_3/alpha/13.5a4-13.5a6-linux-i686-ALL.xml - + update_3/alpha/13.5a4-13.5a6-linux-x86_64-ALL.xml - + update_3/alpha/13.5a4-13.5a6-macos-ALL.xml - + update_3/alpha/13.5a4-13.5a6-windows-i686-ALL.xml - + update_3/alpha/13.5a4-13.5a6-windows-x86_64-ALL.xml - + update_3/alpha/13.5a5-13.5a6-linux-i686-ALL.xml - + update_3/alpha/13.5a5-13.5a6-linux-x86_64-ALL.xml - + update_3/alpha/13.5a5-13.5a6-macos-ALL.xml - + update_3/alpha/13.5a5-13.5a6-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/mullvad-browser-update-responses][main] alpha: new version, 13.5a6
by richard (＠richard) 28 Mar '24

28 Mar '24

richard pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: 20834b5b by Richard Pospesel at 2024-03-28T15:05:17+00:00 alpha: new version, 13.5a6 - - - - - 29 changed files: - update_1/alpha/.htaccess - − update_1/alpha/13.5a2-13.5a5-linux-x86_64-ALL.xml - − update_1/alpha/13.5a2-13.5a5-macos-ALL.xml - − update_1/alpha/13.5a2-13.5a5-windows-x86_64-ALL.xml - − update_1/alpha/13.5a3-13.5a5-linux-x86_64-ALL.xml - − update_1/alpha/13.5a3-13.5a5-macos-ALL.xml - − update_1/alpha/13.5a3-13.5a5-windows-x86_64-ALL.xml - + update_1/alpha/13.5a3-13.5a6-linux-x86_64-ALL.xml - + update_1/alpha/13.5a3-13.5a6-macos-ALL.xml - + update_1/alpha/13.5a3-13.5a6-windows-x86_64-ALL.xml - − update_1/alpha/13.5a4-13.5a5-linux-x86_64-ALL.xml - − update_1/alpha/13.5a4-13.5a5-macos-ALL.xml - − update_1/alpha/13.5a4-13.5a5-windows-x86_64-ALL.xml - + update_1/alpha/13.5a4-13.5a6-linux-x86_64-ALL.xml - + update_1/alpha/13.5a4-13.5a6-macos-ALL.xml - + update_1/alpha/13.5a4-13.5a6-windows-x86_64-ALL.xml - + update_1/alpha/13.5a5-13.5a6-linux-x86_64-ALL.xml - + update_1/alpha/13.5a5-13.5a6-macos-ALL.xml - + update_1/alpha/13.5a5-13.5a6-windows-x86_64-ALL.xml - − update_1/alpha/13.5a5-linux-x86_64-ALL.xml - − update_1/alpha/13.5a5-macos-ALL.xml - − update_1/alpha/13.5a5-windows-x86_64-ALL.xml - + update_1/alpha/13.5a6-linux-x86_64-ALL.xml - + update_1/alpha/13.5a6-macos-ALL.xml - + update_1/alpha/13.5a6-windows-x86_64-ALL.xml - update_1/alpha/download-linux-x86_64.json - update_1/alpha/download-macos.json - update_1/alpha/download-windows-x86_64.json - update_1/alpha/downloads.json Changes: ===================================== update_1/alpha/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/13.5a5/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a2/ALL 13.5a2-13.5a5-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a5-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a5-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a5-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 13.5a5-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a2/ALL 13.5a2-13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a2/ALL 13.5a2-13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a3/ALL 13.5a3-13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/13.5a4/ALL 13.5a4-13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a5-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 13.5a5-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a2/ALL 13.5a2-13.5a5-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a3/ALL 13.5a3-13.5a5-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a4/ALL 13.5a4-13.5a5-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a5-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a5-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/13.5a6/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a6-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a6-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a6-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 13.5a6-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 13.5a6-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a3/ALL 13.5a3-13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a4/ALL 13.5a4-13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/13.5a5/ALL 13.5a5-13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a3/ALL 13.5a3-13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a4/ALL 13.5a4-13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/13.5a5/ALL 13.5a5-13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 13.5a6-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 13.5a6-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a3/ALL 13.5a3-13.5a6-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a4/ALL 13.5a4-13.5a6-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/13.5a5/ALL 13.5a5-13.5a6-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 13.5a6-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 13.5a6-windows-x86_64-ALL.xml [last] ===================================== update_1/alpha/13.5a2-13.5a5-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5_…" hashFunction="SHA512" hashValue="c37f1c87ee2058c4d485c912e7a1359cc7aa84d2f01379a38d3f973600cadad4c2f301d73c994341db1a493867d2b4bd8d74fabf5a60d94f7ea6bf8bea530256" size="108109851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64--13.5a2…" hashFunction="SHA512" hashValue="1bccb4e6d90149c717ab67c69b14a7fc700d895234fada19e3e1c931fbdf20547e9328d3811fa2e2086870066942c7db9da9de2b03cf1a13ae783cc95604fe54" size="16054601" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a2-13.5a5-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5_ALL.mar" hashFunction="SHA512" hashValue="0536943cd18634ea55d18b1ad6a1983fa4a2fd2e965b4c8c8e5a46ccbd740a9001b912e08a9d353af382b03f6134dd16e35bdfca69931f8deb870ca8bab21125" size="115516247" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos--13.5a2-13.5a5…" hashFunction="SHA512" hashValue="96de560f4b1c1365b04337ffceda5fa2343a37f50871fe96ae5060d323f78bcc328a53c220ca7d1d181486c6ebd9fc3096d0b473e85c03539b5dfa70d8ec1507" size="17554527" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a2-13.5a5-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="e8891aee4466d407aded4aad20d73af25017dfdb983c07e1c47a4d32e24c4a3d0e107c3e28f5253c8c235ce766402d6d309e39f20550a8ab910f1623e211a34a" size="89555375" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="478f55fa20621b1a0791a71e4014d74c444725574b1ad9bf273027ff5ed0b06464560b110c06f3c587bd30af8a30854ccb81a3803441b8a992bddc7346ccfb51" size="13159675" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a5-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5_…" hashFunction="SHA512" hashValue="c37f1c87ee2058c4d485c912e7a1359cc7aa84d2f01379a38d3f973600cadad4c2f301d73c994341db1a493867d2b4bd8d74fabf5a60d94f7ea6bf8bea530256" size="108109851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64--13.5a3…" hashFunction="SHA512" hashValue="f11799aaaa4f95320479b9688ba344916a9b33b894da79c2b0598b302f272bf874c19da4c28a81554b244c08bec98411aec397f2f059b36e98aab8b36a432d4e" size="15271970" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a5-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5_ALL.mar" hashFunction="SHA512" hashValue="0536943cd18634ea55d18b1ad6a1983fa4a2fd2e965b4c8c8e5a46ccbd740a9001b912e08a9d353af382b03f6134dd16e35bdfca69931f8deb870ca8bab21125" size="115516247" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos--13.5a3-13.5a5…" hashFunction="SHA512" hashValue="e849c7bca7a3794f4cfef54264f2867a16b13dbd3dd82278b057b53c759e472475488950ba94d2d761b472082890d5232dde8dd156f9ccc6d508124f77e602b4" size="15988169" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a5-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="e8891aee4466d407aded4aad20d73af25017dfdb983c07e1c47a4d32e24c4a3d0e107c3e28f5253c8c235ce766402d6d309e39f20550a8ab910f1623e211a34a" size="89555375" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="f0d2cabd58cadb474073610ecee0a87939625e001802398879ed68d549075af9da6f01b72055df4572bf483d0818c6ca285eca3dc9548d6012ec152892f3576d" size="11946012" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a6-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6_…" hashFunction="SHA512" hashValue="44fcf94bf30811ae31ced8d9982988e06e10a1dfa0190b000b34604dcac0d17f1610d6f1c61d59a45ff309ef3b188b9c333b37fde1a2f6a75aca0271f39c6339" size="108111355" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64--13.5a3…" hashFunction="SHA512" hashValue="9e777fddfa0f657288f0390076bd6a43a37a87743ac742fdaf9b958b3b4611a38fdce7b333371d1cf095e2d1323fd654578933adda2c4604748284e2f6b5fbc1" size="16581110" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a6-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6_ALL.mar" hashFunction="SHA512" hashValue="7ad0fd05c9b20bf197f189151f8c67a0f82fa33612643f4dddccaf26ca0592b035984366a3371efdb64ad5cfea71618912656d63e1d859b3b5d5badb8ed128c7" size="115521323" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos--13.5a3-13.5a6…" hashFunction="SHA512" hashValue="4f1b8188d674402974cae1373fa8fa452d9f93862885af4cb7ae555febf5a0a8c383d828b325039722aa0abb6b0f9004911a29e9f0b9a611bd7ca3bb91a9367e" size="17344873" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a3-13.5a6-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="77a35c65b2e37e6012e9960ea1d5deca6f76dcb1a5bd76615873b251a984e23372e2a5f028416fcfd04c9acc942136c7846b78785f1f3b25e03805f6e4ef4cdb" size="89742748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="7210d892e7a75d3247ac12ddc7d466df521b256c0ac76b1d2804221d3cce6d38faf327e071ce349ab460bf57e387ecfdfc523f8a94c4f62637442f03f04d8e96" size="13826633" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a5-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5_…" hashFunction="SHA512" hashValue="c37f1c87ee2058c4d485c912e7a1359cc7aa84d2f01379a38d3f973600cadad4c2f301d73c994341db1a493867d2b4bd8d74fabf5a60d94f7ea6bf8bea530256" size="108109851" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64--13.5a4…" hashFunction="SHA512" hashValue="9801bb54884e7fd6168fe78e5c054df5d16fb37d1778da8d22706931b6e85f8608b3d4ed996cd32dd5abfda3c7a5b3aeae3bc5313c8d202a897b42ca815a3379" size="8561618" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a5-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5_ALL.mar" hashFunction="SHA512" hashValue="0536943cd18634ea55d18b1ad6a1983fa4a2fd2e965b4c8c8e5a46ccbd740a9001b912e08a9d353af382b03f6134dd16e35bdfca69931f8deb870ca8bab21125" size="115516247" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos--13.5a4-13.5a5…" hashFunction="SHA512" hashValue="9668895bb365476afc343b4bc4ac28bb259ac5b44df034b924081b1dd48a02b022ba712d0f58ac8c3717154e27e1e38ba2e71cb41911487cf9c3e09174ee60d6" size="12175381" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a5-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="e8891aee4466d407aded4aad20d73af25017dfdb983c07e1c47a4d32e24c4a3d0e107c3e28f5253c8c235ce766402d6d309e39f20550a8ab910f1623e211a34a" size="89555375" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="1666e9f89a4f66caadfde0d07c9aee6d20a83e3fbb9ce402bfa3ccc58eadf2fd8908e666c1dfadd292e2e9597411966506e10196c1598aad30ae16d254a5c101" size="8200880" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a6-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6_…" hashFunction="SHA512" hashValue="44fcf94bf30811ae31ced8d9982988e06e10a1dfa0190b000b34604dcac0d17f1610d6f1c61d59a45ff309ef3b188b9c333b37fde1a2f6a75aca0271f39c6339" size="108111355" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64--13.5a4…" hashFunction="SHA512" hashValue="422b7f0f69f4bb2474261143bbf4c947269f49ad165853636eec6f3b18708ac0e368afc5ff40efe7570413ac531337d577adb626867d1a794c39523b0c216bea" size="10315722" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a6-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6_ALL.mar" hashFunction="SHA512" hashValue="7ad0fd05c9b20bf197f189151f8c67a0f82fa33612643f4dddccaf26ca0592b035984366a3371efdb64ad5cfea71618912656d63e1d859b3b5d5badb8ed128c7" size="115521323" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos--13.5a4-13.5a6…" hashFunction="SHA512" hashValue="3bb3b0c5e75d032e95fefb5320072d0aa222bbd250a5a675a2271be8b1f17b44916bd5aee0a7ccb88da329f22cf6acde09f24eb4087d59ad0fb15f7a5f626845" size="13693861" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a4-13.5a6-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="77a35c65b2e37e6012e9960ea1d5deca6f76dcb1a5bd76615873b251a984e23372e2a5f028416fcfd04c9acc942136c7846b78785f1f3b25e03805f6e4ef4cdb" size="89742748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="91a657b6ab486dd9ba34e5529737afb17bc0de2a59ec06d76dc55dc484a685d6e8b2e80be9e5ac22688f4be56da10105e63855b81c49cd46ca047f0ea8b8ee44" size="10272365" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a6-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6_…" hashFunction="SHA512" hashValue="44fcf94bf30811ae31ced8d9982988e06e10a1dfa0190b000b34604dcac0d17f1610d6f1c61d59a45ff309ef3b188b9c333b37fde1a2f6a75aca0271f39c6339" size="108111355" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64--13.5a5…" hashFunction="SHA512" hashValue="b05f7e5a78b61aaa08c2b594e90760f7e9ff79f2fdeb31381f8a2c85afa5996bcabbb08dc0b1bb5142d16a7accdb40583753f23d73806d50f0a865f810bd77ea" size="6911078" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a6-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6_ALL.mar" hashFunction="SHA512" hashValue="7ad0fd05c9b20bf197f189151f8c67a0f82fa33612643f4dddccaf26ca0592b035984366a3371efdb64ad5cfea71618912656d63e1d859b3b5d5badb8ed128c7" size="115521323" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos--13.5a5-13.5a6…" hashFunction="SHA512" hashValue="3ed0b46b6cfc4d28778045acc0338ec5d6fc9e0f7f651d15607128cbf9ed1b287955670a686cf4f8e4fb3541c5cd63ed44d5548de62e9ba0eb35039aaf385fad" size="9947238" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-13.5a6-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="77a35c65b2e37e6012e9960ea1d5deca6f76dcb1a5bd76615873b251a984e23372e2a5f028416fcfd04c9acc942136c7846b78785f1f3b25e03805f6e4ef4cdb" size="89742748" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64--13.5…" hashFunction="SHA512" hashValue="8080c016add033f5dca2875c747a7f8c16ad68d28ec6d4bee5cd0d40fe33d3be7c5d085bd2f44aff073a0fbf73538915c481a99b8d695d2f6f12951d60a97c62" size="6715331" type="partial"></patch></update></updates> ===================================== update_1/alpha/13.5a5-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5_…" hashFunction="SHA512" hashValue="c37f1c87ee2058c4d485c912e7a1359cc7aa84d2f01379a38d3f973600cadad4c2f301d73c994341db1a493867d2b4bd8d74fabf5a60d94f7ea6bf8bea530256" size="108109851" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a5-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5_ALL.mar" hashFunction="SHA512" hashValue="0536943cd18634ea55d18b1ad6a1983fa4a2fd2e965b4c8c8e5a46ccbd740a9001b912e08a9d353af382b03f6134dd16e35bdfca69931f8deb870ca8bab21125" size="115516247" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a5-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="13.5a5" appVersion="13.5a5" platformVersion="115.8.0" buildID="20240221181853" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a5" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="e8891aee4466d407aded4aad20d73af25017dfdb983c07e1c47a4d32e24c4a3d0e107c3e28f5253c8c235ce766402d6d309e39f20550a8ab910f1623e211a34a" size="89555375" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a6-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6_…" hashFunction="SHA512" hashValue="44fcf94bf30811ae31ced8d9982988e06e10a1dfa0190b000b34604dcac0d17f1610d6f1c61d59a45ff309ef3b188b9c333b37fde1a2f6a75aca0271f39c6339" size="108111355" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a6-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6_ALL.mar" hashFunction="SHA512" hashValue="7ad0fd05c9b20bf197f189151f8c67a0f82fa33612643f4dddccaf26ca0592b035984366a3371efdb64ad5cfea71618912656d63e1d859b3b5d5badb8ed128c7" size="115521323" type="complete"></patch></update></updates> ===================================== update_1/alpha/13.5a6-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="13.5a6" appVersion="13.5a6" platformVersion="115.9.0" buildID="20240327135729" detailsURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/13.5a6" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-13.5a…" hashFunction="SHA512" hashValue="77a35c65b2e37e6012e9960ea1d5deca6f76dcb1a5bd76615873b251a984e23372e2a5f028416fcfd04c9acc942136c7846b78785f1f3b25e03805f6e4ef4cdb" size="89742748" type="complete"></patch></update></updates> ===================================== update_1/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5.…","git_tag":"mb-13.5a5-build1","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5.…","version":"13.5a5"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6.…","git_tag":"mb-13.5a6-build1","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6.…","version":"13.5a6"} \ No newline at end of file ===================================== update_1/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5.dmg","git_tag":"mb-13.5a5-build1","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5.dmg.asc","version":"13.5a5"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6.dmg","git_tag":"mb-13.5a6-build1","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6.dmg.asc","version":"13.5a6"} \ No newline at end of file ===================================== update_1/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.5a5-build1","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-porta…","version":"13.5a5"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-porta…","git_tag":"mb-13.5a6-build1","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-porta…","version":"13.5a6"} \ No newline at end of file ===================================== update_1/alpha/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5.…","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-linux-x86_64-13.5a5.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5.dmg","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-macos-13.5a5.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.5a5/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.5a5-build1","version":"13.5a5"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6.…","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-linux-x86_64-13.5a6.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6.dmg","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-macos-13.5a6.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-porta…","sig":"https://cdn.mullvad.net/browser/13.5a6/mullvad-browser-windows-x86_64-porta…"}}},"tag":"mb-13.5a6-build1","version":"13.5a6"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.5a6-build1
by richard (＠richard) 27 Mar '24

27 Mar '24

richard pushed new tag mb-13.5a6-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5a6-build1
by richard (＠richard) 27 Mar '24

27 Mar '24

richard pushed new tag tbb-13.5a6-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41094, 41095: Tor, Mullvad Browser 13.5a6 Release Prep
by richard (＠richard) 27 Mar '24

27 Mar '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: debb3452 by Richard Pospesel at 2024-03-27T17:41:10+00:00 Bug 41094,41095: Tor,Mullvad Browser 13.5a6 Release Prep - - - - - 12 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/browser/config - projects/firefox-android/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/translation/config - rbm.conf - tools/fetch-manual.py Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,58 @@ +Mullvad Browser 13.5a6 - March 28 2024 + * All Platforms + * Updated Firefox to 115.9.0esr + * Updated mullvad-browser-extension to 0.9.0 + * Bug 234: Make User-Agent request header match RFP's navigator.userAgent [mullvad-browser] + * Bug 271: After update, don't open the release page on Github. Instead link it in the startpage, like in Tor Browser [mullvad-browser] + * Bug 274: Rebase Mullvad Browser alpha onto Firefox 115.9.0esr [mullvad-browser] + * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] + * Bug 41916: Letterboxing preferences UI [tor-browser] + * Bug 41918: Add option to reuse last window size when letterboxing is enabled [tor-browser] + * Bug 42211: Fluent migration: new identity [tor-browser] + * Bug 42214: Fluent migration: security level [tor-browser] + * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] + * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] + * Bug 42443: Shrink the window to match letterboxing size when the emtpy area is doble-clicked [tor-browser] + * Bug 42472: Timezone May leak from XSLT Date function [tor-browser] + * Bug 42473: ESR 115.9.1 fixes [tor-browser] + * Windows + * Bug 80: Make 'Mullvad your default browser' does not work on Windows [mullvad-browser] + * Bug 42377: Hidden fonts are automatically added to the allow list [tor-browser] + * Bug 41089: Add filetype association to the installer of Mullvad Browser [tor-browser-build] + * Linux + * Bug 42438: Adapt the data import wizard to use the original $HOME on Linux [tor-browser] + * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + * Build System + * All Platforms + * Bug 41088: Remove use of projects/browser/run_scripts [tor-browser-build] + * Bug 41102: src archive does not match likely due to mismatched xz-utils version [tor-browser-build] + * Bug 40073: We should remove ./ when using 7-zip for zip files [rbm] + * Windows + * Bug 41097: authenticode-timestamping.sh fails to run again because tmp-timestamp already exists [tor-browser-build] + +Mullvad Browser 13.0.13 - March 22 2024 + * Windows + macOS + Linux + * Updated Firefox to 115.9.1esr + * Bug 42473: ESR 115.9.1 fixes [tor-browser] + * Bug 277: Rebase Mullvad Browser stable onto Firefox 115.9.1esr [mullvad-browser] + +Mullvad Browser 13.0.12 - March 19 2024 + * All Platforms + * Updated Firefox to 115.9.0esr + * Updated mullvad-browser-extension to 0.9.0 + * Updated uBlock Origin to 1.56.0 + * Bug 270: Mullvad support email has changed from `support(a)mullvad.net` to `support(a)mullvadvpn.net` [mullvad-browser] + * Bug 273: Rebase Mullvad Browser stable onto Firefox 115.9.0esr [mullvad-browser] + * Bug 42376: The placeholder of datetime inputs keeps being localized when spoof English is on [tor-browser] + * Bug 42378: spoof english + htmlform <details> can leak app language [tor-browser] + * Windows + * Bug 42377: Hidden fonts are automatically added to the allow list [tor-browser] + * Build System + * All Platforms + * Bug 41085: kick_devmole_build script prints wrong URL for Mullvad's build hashes [tor-browser-build] + * Bug 41097: authenticode-timestamping.sh fails to run again because tmp-timestamp already exists [tor-browser-build] + * Bug 41102: src archive does not match likely due to mismatched xz-utils version [tor-browser-build] + Mullvad Browser 13.5a5 - February 27 2024 * All Platforms * Updated Firefox to 115.8.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,90 @@ +Tor Browser 13.5a6 - March 28 2024 + * All Platforms + * Bug 41114: Fix no-async-promise-executor on TorConnect [tor-browser] + * Bug 41676: Set privacy.resistFingerprinting.testing.setTZtoUTC as a defense-in-depth [tor-browser] + * Bug 42336: Review the relationship between TorSettings and the TorProvider [tor-browser] + * Bug 42428: Timezone offset leak via document.lastModified [tor-browser] + * Bug 42435: Update moat domain fronting configuration [tor-browser] + * Bug 42437: Drop "torbrowser.version" preference [tor-browser] + * Bug 42444: Remove the "Prioritize .onion sites when known" option [tor-browser] + * Bug 42449: Rebase Tor Browser alpha onto Firefox 115.9.0esr [tor-browser] + * Bug 42459: Add startpage onion service to list of search providers [tor-browser] + * Bug 42466: Drop the "Onion Logo" from trademark statement [tor-browser] + * Bug 42472: Timezone May leak from XSLT Date function [tor-browser] + * Bug 42473: ESR 115.9.1 fixes [tor-browser] + * Bug 42481: Modularize SecurityLevel [tor-browser] + * Bug 41105: Bump version of snowflake to v2.9.2 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.9.0esr + * Bug 41916: Letterboxing preferences UI [tor-browser] + * Bug 41918: Add option to reuse last window size when letterboxing is enabled [tor-browser] + * Bug 42203: Fluent migration: about dialog [tor-browser] + * Bug 42209: Fluent migration: tor circuit [tor-browser] + * Bug 42211: Fluent migration: new identity [tor-browser] + * Bug 42214: Fluent migration: security level [tor-browser] + * Bug 42236: Let users decide whether to load their home page on new identity. [tor-browser] + * Bug 42443: Shrink the window to match letterboxing size when the emtpy area is doble-clicked [tor-browser] + * Bug 42446: Improve accessible descriptions in built-in dialog [tor-browser] + * Bug 42458: Update the "Submit Feedback" link in "About Tor Browser" [tor-browser] + * Windows + * Bug 42377: Hidden fonts are automatically added to the allow list [tor-browser] + * Linux + * Bug 42438: Adapt the data import wizard to use the original $HOME on Linux [tor-browser] + * Bug 41110: Avoid Fontconfig warning about "ambiguous path" [tor-browser-build] + * Android + * Updated GeckoView to 115.9.0esr + * Bug 41187: Improve Android's bridge settings UI [tor-browser] + * Bug 42427: Do not ship bridges as prefences anymore [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.21.8 + * Bug 41102: src archive does not match likely due to mismatched xz-utils version [tor-browser-build] + * Bug 41107: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo for new type of URL [tor-browser-build] + * Bug 40073: We should remove ./ when using 7-zip for zip files [rbm] + * Windows + macOS + Linux + * Bug 42305: (Semi-)Automatically merge translation resources across tor browser releases (desktop) [tor-browser] + * Bug 41088: Remove use of projects/browser/run_scripts [tor-browser-build] + * Windows + * Bug 41097: authenticode-timestamping.sh fails to run again because tmp-timestamp already exists [tor-browser-build] + * Android + * Bug 40502: Do not recommend addons on Tor Browser [tor-browser] + * Bug 41082: Package tor expert bundle on android as .aar that firefox-android can use in lieu of tor-android-service with geckoview bootstrap [tor-browser-build] + +Tor Browser 13.0.13 - March 22 2024 + * Windows + macOS + Linux + * Updated Firefox to 115.9.1esr + * Bug 42473: ESR 115.9.1 fixes [tor-browser] + * Bug 42474: Rebase stable browsers on 115.9.1 [tor-browser] + +Tor Browser 13.0.12 - March 19 2024 + * All Platforms + * Updated Snowflake to 2.9.2 + * Bug 42376: The placeholder of datetime inputs keeps being localized when spoof English is on [tor-browser] + * Bug 42378: spoof english + htmlform <details> can leak app language [tor-browser] + * Bug 42444: Remove the "Prioritize .onion sites when known" option [tor-browser] + * Bug 42448: Rebase Tor Browser stable onto Firefox 115.9.0esr [tor-browser] + * Bug 42459: Add startpage onion service to list of search providers [tor-browser] + * Bug 41105: Bump version of snowflake to v2.9.2 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.9.0esr + * Windows + * Bug 42377: Hidden fonts are automatically added to the allow list [tor-browser] + * Android + * Updated GeckoView to 115.9.0esr + * Bug 42407: TTP-03-010 WP3: Potential phishing [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.21.8 + * Bug 41102: src archive does not match likely due to mismatched xz-utils version [tor-browser-build] + +Tor Browser 13.0.11 - March 06 2024 + * All Platforms + * Bug 42435: Update moat domain fronting configuration [tor-browser] + * Build System + * All Platforms + * Bug 41085: kick_devmole_build script prints wrong URL for Mullvad's build hashes [tor-browser-build] + * Bug 41097: authenticode-timestamping.sh fails to run again because tmp-timestamp already exists [tor-browser-build] + Tor Browser 13.5a5 - February 28 2024 * All Platforms * Updated OpenSSL to 3.0.13 ===================================== projects/browser/allowed_addons.json ===================================== @@ -11,13 +11,13 @@ "authors": [ { "id": 13299734, - "name": "Alexander Shutau", + "name": "Dark Reader Ltd", "url": "https://addons.mozilla.org/en-US/firefox/user/13299734/", "username": "alexanderby", - "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" + "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 1137843, + "average_daily_users": 1157805, "categories": { "firefox": [ "web-development", @@ -28,18 +28,18 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5688757, + "id": 5705306, "compatibility": { "firefox": { - "min": "54.0", + "min": "78.0", "max": "*" }, "android": { - "min": "54.0", + "min": "113.0", "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56887…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/57053…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -50,22 +50,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- Fixed errors when Adopted Stylesheets were not present.\n- Fixed breaking on ::view-transition selectors (Airbnb issue).\n- Users' fixes for websites." + "en-US": "- Analyze inline background images for root elements.\n- Support for \"background\" attribute.\n- Fixed performance for asynchronously resolved inline styles.\n- Fixed freezes and incorrect work on several websites.\n- Dev Tools: Formatting of CSS fixes.\n- Users' fixes for websites." }, - "reviewed": "2024-02-08T08:33:10Z", - "version": "4.9.77", + "reviewed": "2024-03-18T08:14:15Z", + "version": "4.9.80", "files": [ { - "id": 4233074, - "created": "2024-02-07T11:23:55Z", - "hash": "sha256:931de67e9091c69edd9fd3f348a7ed1de1dce7d136017fed641bd10eb0ae8891", + "id": 4249607, + "created": "2024-03-13T17:13:44Z", + "hash": "sha256:a93f1250b72cc27fe4a9b02be062c68fb079e45a1233d562852b48e1e9b99307", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 725369, + "size": 731722, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4233074/darkreader-4.9.77…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4249607/darkreader-4.9.80…", "permissions": [ "alarms", "contextMenus", @@ -143,7 +143,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-02-08T08:33:10Z", + "last_updated": "2024-03-18T08:14:15Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -218,10 +218,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5407, - "bayesian_average": 4.539579140237365, - "count": 5441, - "text_count": 1716 + "average": 4.5332, + "bayesian_average": 4.532093960246261, + "count": 5531, + "text_count": 1747 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -318,7 +318,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 24267 + "weekly_downloads": 23454 }, "notes": null }, @@ -334,7 +334,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 264838, + "average_daily_users": 266335, "categories": { "firefox": [ "privacy-security" @@ -547,10 +547,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8001, - "bayesian_average": 4.795468550922711, - "count": 1406, - "text_count": 252 + "average": 4.7986, + "bayesian_average": 4.793974484524402, + "count": 1415, + "text_count": 255 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -635,7 +635,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3215 + "weekly_downloads": 3292 }, "notes": null }, @@ -651,7 +651,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1223061, + "average_daily_users": 1231658, "categories": { "firefox": [ "privacy-security" @@ -1170,10 +1170,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7952, - "bayesian_average": 4.7924799598835, - "count": 2393, - "text_count": 455 + "average": 4.7988, + "bayesian_average": 4.796088382620796, + "count": 2415, + "text_count": 458 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1197,7 +1197,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 21906 + "weekly_downloads": 22533 }, "notes": null }, @@ -1213,7 +1213,7 @@ "picture_url": null } ], - "average_daily_users": 7691950, + "average_daily_users": 7819848, "categories": { "firefox": [ "privacy-security" @@ -1379,7 +1379,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2024-02-20T18:51:52Z", + "last_updated": "2024-03-26T17:25:30Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1524,10 +1524,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7887, - "bayesian_average": 4.788323774199536, - "count": 17283, - "text_count": 4511 + "average": 4.7892, + "bayesian_average": 4.788825346990968, + "count": 17455, + "text_count": 4552 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1590,7 +1590,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 170114 + "weekly_downloads": 158166 }, "notes": null }, @@ -1606,7 +1606,7 @@ "picture_url": null } ], - "average_daily_users": 177359, + "average_daily_users": 178562, "categories": { "firefox": [ "photos-music-videos", @@ -1702,10 +1702,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4571, - "bayesian_average": 4.452141766560867, - "count": 1201, - "text_count": 460 + "average": 4.4481, + "bayesian_average": 4.443180454772495, + "count": 1214, + "text_count": 467 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1727,7 +1727,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 466 + "weekly_downloads": 386 }, "notes": null }, @@ -1743,7 +1743,7 @@ "picture_url": null } ], - "average_daily_users": 79283, + "average_daily_users": 77166, "categories": { "firefox": [ "privacy-security", @@ -1853,10 +1853,10 @@ ], "promoted": null, "ratings": { - "average": 4.3787, - "bayesian_average": 4.364570736907983, - "count": 404, - "text_count": 113 + "average": 4.3753, + "bayesian_average": 4.3611016639271964, + "count": 405, + "text_count": 114 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, @@ -1878,7 +1878,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1367 + "weekly_downloads": 1963 }, "notes": null }, @@ -1894,7 +1894,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 302489, + "average_daily_users": 309800, "categories": { "firefox": [ "search-tools", @@ -2111,10 +2111,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6464, - "bayesian_average": 4.641961457940663, - "count": 1411, - "text_count": 273 + "average": 4.6336, + "bayesian_average": 4.629244598584173, + "count": 1441, + "text_count": 284 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2137,7 +2137,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 5867 + "weekly_downloads": 5510 }, "notes": null }, @@ -2160,7 +2160,7 @@ "picture_url": null } ], - "average_daily_users": 124312, + "average_daily_users": 124783, "categories": { "firefox": [ "search-tools", @@ -2441,10 +2441,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3717, - "bayesian_average": 4.36732284678191, - "count": 1329, - "text_count": 376 + "average": 4.3766, + "bayesian_average": 4.372232748328777, + "count": 1341, + "text_count": 379 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2464,7 +2464,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 37 + "weekly_downloads": 26 }, "notes": null }, @@ -2480,12 +2480,11 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 308206, + "average_daily_users": 307654, "categories": { "firefox": [ - "web-development", "privacy-security", - "other" + "alerts-updates" ] }, "contributions_url": "https://www.paypal.com/donate/?hosted_button_id=9ERKTU5MBH4EW&utm_content=p…", @@ -2550,20 +2549,20 @@ "default_locale": "en-US", "description": { "da": "Dette værktøj, vinder af \"2006 PC World World Class Award\", giver ekstra beskyttelse til din Firefox.\nDen lader kun JavaScript, Java og andet kørbart indhold køre fra betroede domæner du har valgt, fx din home-banking hjemmeside, og forsvarer \"tillids-grænserne\" mod cross-site scripting angreb (XXS).\nEn sådan forebyggende metode forhindrer udnyttelse af sikkerhedshuller (kendte som ukendte!) uden tab af funktionalitet...\nEksperterne er enige: Firefox er faktisk mere sikker med NoScript ;-)", - "de": "<b>WICHTIG</b>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Eine Anleitung in die Grundlagen von <b>NoScript 10</b></a>\n\nIst die neue Oberfläche von NoScript 10 immer noch ungewohnt?\nSehen Sie sich diese <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">von Nutzern erstellte NoScript 10 Einführung</a> und diesen <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">Vergleich zwischen NoScript 10 \"Quantum\" und NoScript 5 \"Classic\"</a> an.\n\nAls Gewinner des \"PC World World Class Award\" und ausgeliefert als Teil des Tor Browsers bietet Ihnen NoScript den besten verfügbaren Schutz im Internet.\n\nMit NoScript können Sie JavaScript, Flash, Java und andere ausführbare Inhalte bloß auf vertrauenswürdigen Domains Ihrer Wahl zulassen, z.B. beim Online-Banking. Somit verhindern Sie aus der Ferne ausnutzbare Schwachstellen inklusive Spectre und Meltdown.\n\nIhre vertrauenswürdigen Bereiche werden dank der einmaligen ClearClick Technologie gegen seitenübergreifende Scripting-Attacken (XSS), Cross-Zone DNS Rebinding / CSRF Attacken (Router Hacking), und Clickjacking-Versuche geschützt.\n\nDieser präventive Ansatz verhindert das Ausnutzen von (bekannten und unbekannten!) Sicherheitslücken ohne Verlust an Funktionalität, wo Sie diese benötigen.\nExperten sind sich einig: Firefox wird wirklich noch sicherer mithilfe von NoScript ;-)\n\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>", + "de": "<b>WICHTIG</b>\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Eine Anleitung in die Grundlagen von <b>NoScript 10</b></a>\n\nIst die neue Oberfläche von NoScript 10 immer noch ungewohnt?\nSehen Sie sich diese <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">von Nutzern erstellte NoScript 10 Einführung</a> und diesen <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…">Vergleich zwischen NoScript 10 \"Quantum\" und NoScript 5 \"Classic\"</a> an.\n\nAls Gewinner des \"PC World World Class Award\" und ausgeliefert als Teil des Tor Browsers bietet Ihnen NoScript den besten verfügbaren Schutz im Internet.\n\nMit NoScript können Sie JavaScript, Flash, Java und andere ausführbare Inhalte bloß auf vertrauenswürdigen Domains Ihrer Wahl zulassen, z.B. beim Online-Banking. Somit verhindern Sie aus der Ferne ausnutzbare Schwachstellen inklusive Spectre und Meltdown.\n\nIhre vertrauenswürdigen Bereiche werden dank der einmaligen ClearClick Technologie gegen seitenübergreifende Scripting-Attacken (XSS), Cross-Zone DNS Rebinding / CSRF Attacken (Router Hacking), und Clickjacking-Versuche geschützt.\n\nDieser präventive Ansatz verhindert das Ausnutzen von (bekannten und unbekannten!) Sicherheitslücken ohne Verlust an Funktionalität, wo Sie diese benötigen.\nExperten sind sich einig: Firefox wird wirklich noch sicherer mithilfe von NoScript ;-)\n\n\nFAQ: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\nForum: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>", "el": "Αυτό το πρόσθετο που κέρδισε το βραβείο «2006 World Class Award» του περιοδικού PC World, παρέχει πρόσθετη προστασία στον Firefox.\nΕπιτρέπει την εκτέλεση JavaScript, Java και άλλου εκτελέσιμου περιεχομένου, μόνο για έμπιστους τομείς δικτύου της επιλογής σας (π.χ. την δικτυακή υπηρεσία τραπεζικών συναλλαγών σας) και τους προστατεύει από τον κίνδυνο επιθέσεων cross-site scripting (XSS) .\nΑυτή η προσέγγιση προκαταβολικού μπλοκαρίσματος δεν επιτρέπει την εκμετάλλευση κενών ασφαλείας (ήδη γνωστών αλλά και άγνωστων ακόμα!) χωρίς να επηρεάζει την λειτουργικότητα...\nΟι ειδικοί συμφωνούν: Ο Firefox είναι πραγματικά ασφαλέστερος με το NoScript! ;-)", - "en-US": "Winner of the \"PC World - World Class Award\" and bundled with the Tor Browser, NoScript gives you the best available protection on the web. It allows JavaScript, Flash, and other executable content to run only from trusted domains of your choice (e.g. your banking site), thus mitigating remotely exploitable vulnerabilities, such as Spectre and Meltdown.\n\nIt protects your \"trust boundaries\" against cross-site scripting attacks (XSS), cross-zone DNS rebinding / CSRF attacks (router hacking), and Clickjacking attempts, thanks to its unique ClearClick technology.\n\nSuch a preemptive approach prevents exploitation of security vulnerabilities (known and unknown!) with no loss of functionality where you need it. Experts do agree: Firefox is really safer with NoScript ;-)\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>\n\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">A Basic <b>NoScript 10 Guide</b></a>\n\nStill confused by NoScript 10's new UI?\nCheck this <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">user-contributed NoScript 10 primer</a>.\nand this <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (or \"Legacy\") comparison</a>.", + "en-US": "Winner of the \"PC World - World Class Award\" and bundled with the Tor Browser, NoScript gives you the best available protection on the web. It allows JavaScript, Flash, and other executable content to run only from trusted domains of your choice (e.g. your banking site), thus mitigating remotely exploitable vulnerabilities, such as Spectre and Meltdown.\n\nIt protects your \"trust boundaries\" against cross-site scripting attacks (XSS), cross-zone DNS rebinding / CSRF attacks (router hacking), and Clickjacking attempts, thanks to its unique ClearClick technology.\n\nSuch a preemptive approach prevents exploitation of security vulnerabilities (known and unknown!) with no loss of functionality where you need it. \nExperts do agree: Firefox is really safer with NoScript!\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>\n\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">A Basic <b>NoScript 10 Guide</b></a>\n\nStill confused by NoScript 10's new UI?\nCheck this <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">user-contributed NoScript 10 primer</a>.\nand this <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (or \"Legacy\") comparison</a>.", "es": "Protección extra para su Firefox: NoScript sólo permite JavaScript, Java y otros plugins en los sitios web de confianza que Ud. elija (como la web de su banco). Este planteamiento preventivo basado en una lista blanca evita que se puedan explotar vulnerabilidades (conocidas o incluso desconocidas) sin pérdida de funcionalidad... Los expertos lo confirmarán: Firefox es realmente más seguro con NoScript :-)", - "fr": "<b>IMPORTANT</b>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Un Guide élémentaire pour <b>NoScript 10</b> (en anglais)</a>\n\nConfus avec la nouvelle interface graphique de NoScript 10 ?\nConsultez cette <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">introduction à NoScript 10, contribution d’un utilisateur</a> (en anglais)\net cette <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">comparaison entre NoScript 10 « Quantum » et NoScript 5 « Classic » (ou « Legacy »)</a> (en anglais).\n\nLauréat du « World Class Award » décerné par PC World et fourni avec le navigateur Tor, NoScript vous offre la meilleure protection disponible pour le Web.\n\nIl autorise le contenu actif JavaScript, Flash, Java et autres à ne s’exécuter que sur les domaines de confiance de votre choix, par exemple le site de votre banque, réduisant le risque d’exploitation à distance de vulnérabilités comme Spectre et Meltdown.\n\nIl protège vos zones de confiance contre les attaques par cross-site scripting (XSS), DNS rebinding / attaque CSRF (Cross Site Request Forgery) (piratage de routeur) et les tentatives de détournement de clic (Clickjacking) grâce à sa propre technologie ClearClick.\n\nCette approche préventive empêche l’exploitation des failles de sécurité (connues mais aussi inconnues) sans perte de fonctionnalités là où vous en avez besoin. Les experts en conviendront : Firefox est réellement plus sûr avec NoScript ;-)\n\nFAQ : <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a> (en anglais)\nForum : <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a> (en anglais)", - "it": "<b>IMPORTANTE</b>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Guida di base a <b>NoScript 10</b></a>\n\nAncora confuso dalla nuova interfaccia di NoScript 10?\nLeggi qui <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">i contributi degli utenti di NoScript 10</a>.\ne <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\"> una comparazione tra NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (o \"Legacy\")</a>.\n\nVincitore del premio \"PC World World Class Award\" ed incorporato nel browser Tor, NoScript ti offre la migliore protezione possibile per il web.\n\nAttiva JavaScript, Flash, Java e altri eseguibili solo sui domini fidati scelti da te, ad esempio il sito della tua banca, riducendo le possibili conseguenze di vulnerabilità, inclusi Spectre e Meltdown.\n\nProtegge la tua rete dagli attacchi cross-site scripting (XSS), cross-zone DNS rebinding / attacchi CSRF (intrusione nel router) e tentativi di Clickjacking, grazie alla sua tecnologia unica ClearClick. \n\nCon un approccio proattivo previene lo sfruttamento di vulnerabilità di sicurezza (conosciute e ancora sconosciute!) senza perdere le funzionalità necessarie.\nGli esperti sono d'accordo: Firefox è veramente più sicuro con NoScript ;-)\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>", - "nl": "<b>BELANGRIJK</b>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Een basale <b>Handleiding voor NoScript 10</b></a>\n\nNog steeds in verwarring door de nieuwe UI van NoScript 10?\nBekijk deze <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">door gebruikers aangeleverde beknopte handleiding voor NoScript 10</a>\nen deze <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">vergelijking tussen NoScript 10 ‘Quantum’ en NoScript 5 ‘Classic’ (of ‘Verouderd’)</a>.\n\nAls winnaar van de ‘PC World World Class Award’ en gebundeld met de Tor-browser biedt NoScript de best beschikbare bescherming op het web.\n\nHet zorgt ervoor dat JavaScript, Flash, Java en andere uitvoerbare inhoud alleen wordt uitgevoerd vanaf vertrouwde domeinen van uw keuze, zoals uw website voor thuisbankieren, zodat op afstand te misbruiken kwetsbaarheden, waaronder Spectre en Meltdown, worden verminderd.\n\nHet beschermt uw ‘vertrouwensgrenzen’ tegen cross-site-scripting-aanvallen (XSS), cross-zone-DNS-rebinding / CSRF-aanvallen (routerhacking) en Clickjacking-pogingen, dankzij de unieke ClearClick-technologie ervan. \n\nEen dergelijke preventieve benadering voorkomt exploitatie van beveiligingskwetsbaarheden (bekende en zelfs onbekende!) zonder verlies van functionaliteit waar dat nodig is.\nExperts zijn het ermee eens: Firefox is echt veiliger met NoScript ;-)\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nForum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>", + "fr": "<b>IMPORTANT</b>\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Un Guide élémentaire pour <b>NoScript 10</b> (en anglais)</a>\n\nConfus avec la nouvelle interface graphique de NoScript 10 ?\nConsultez cette <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">introduction à NoScript 10, contribution d’un utilisateur</a> (en anglais)\net cette <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…">comparaison entre NoScript 10 « Quantum » et NoScript 5 « Classic » (ou « Legacy »)</a> (en anglais).\n\nLauréat du « World Class Award » décerné par PC World et fourni avec le navigateur Tor, NoScript vous offre la meilleure protection disponible pour le Web.\n\nIl autorise le contenu actif JavaScript, Flash, Java et autres à ne s’exécuter que sur les domaines de confiance de votre choix, par exemple le site de votre banque, réduisant le risque d’exploitation à distance de vulnérabilités comme Spectre et Meltdown.\n\nIl protège vos zones de confiance contre les attaques par cross-site scripting (XSS), DNS rebinding / attaque CSRF (Cross Site Request Forgery) (piratage de routeur) et les tentatives de détournement de clic (Clickjacking) grâce à sa propre technologie ClearClick.\n\nCette approche préventive empêche l’exploitation des failles de sécurité (connues mais aussi inconnues) sans perte de fonctionnalités là où vous en avez besoin. Les experts en conviendront : Firefox est réellement plus sûr avec NoScript ;-)\n\nFAQ : <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a> (en anglais)\nForum : <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a> (en anglais)", + "it": "<b>IMPORTANTE</b>\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Guida di base a <b>NoScript 10</b></a>\n\nAncora confuso dalla nuova interfaccia di NoScript 10?\nLeggi qui <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">i contributi degli utenti di NoScript 10</a>.\ne <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…"> una comparazione tra NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (o \"Legacy\")</a>.\n\nVincitore del premio \"PC World World Class Award\" ed incorporato nel browser Tor, NoScript ti offre la migliore protezione possibile per il web.\n\nAttiva JavaScript, Flash, Java e altri eseguibili solo sui domini fidati scelti da te, ad esempio il sito della tua banca, riducendo le possibili conseguenze di vulnerabilità, inclusi Spectre e Meltdown.\n\nProtegge la tua rete dagli attacchi cross-site scripting (XSS), cross-zone DNS rebinding / attacchi CSRF (intrusione nel router) e tentativi di Clickjacking, grazie alla sua tecnologia unica ClearClick. \n\nCon un approccio proattivo previene lo sfruttamento di vulnerabilità di sicurezza (conosciute e ancora sconosciute!) senza perdere le funzionalità necessarie.\nGli esperti sono d'accordo: Firefox è veramente più sicuro con NoScript ;-)\n\nFAQ: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\nForum: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>", + "nl": "<b>BELANGRIJK</b>\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Een basale <b>Handleiding voor NoScript 10</b></a>\n\nNog steeds in verwarring door de nieuwe UI van NoScript 10?\nBekijk deze <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">door gebruikers aangeleverde beknopte handleiding voor NoScript 10</a>\nen deze <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…">vergelijking tussen NoScript 10 ‘Quantum’ en NoScript 5 ‘Classic’ (of ‘Verouderd’)</a>.\n\nAls winnaar van de ‘PC World World Class Award’ en gebundeld met de Tor-browser biedt NoScript de best beschikbare bescherming op het web.\n\nHet zorgt ervoor dat JavaScript, Flash, Java en andere uitvoerbare inhoud alleen wordt uitgevoerd vanaf vertrouwde domeinen van uw keuze, zoals uw website voor thuisbankieren, zodat op afstand te misbruiken kwetsbaarheden, waaronder Spectre en Meltdown, worden verminderd.\n\nHet beschermt uw ‘vertrouwensgrenzen’ tegen cross-site-scripting-aanvallen (XSS), cross-zone-DNS-rebinding / CSRF-aanvallen (routerhacking) en Clickjacking-pogingen, dankzij de unieke ClearClick-technologie ervan. \n\nEen dergelijke preventieve benadering voorkomt exploitatie van beveiligingskwetsbaarheden (bekende en zelfs onbekende!) zonder verlies van functionaliteit waar dat nodig is.\nExperts zijn het ermee eens: Firefox is echt veiliger met NoScript ;-)\n\nFAQ: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\nForum: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>", "pl": "Zwycięzca \"2006 PC World World Class Award\". Narzędzie to stanowi dodatkowe\nzabezpieczenie dla wszystkich przeglądarek Mozilli. NoScript pozwala\nwykonywać skrypty JavaScript i aplety Java tylko przez zaufane domeny\nwybrane przez użytkownika np. witryny banków internetowych oraz zabezpiecza\nprzed atakami typu \"cross-site scripting\" (XSS). Takie prewencyjne podejście\nzabezpiecza przed wykorzystaniem luk bezpieczeństwa - znanych i nieznanych -\nbez utraty funkcjonalności.\n\nEksperci są zgodni: Firefox z NoScript jest naprawdę bezpieczniejszy!", - "pt-BR": "IMPORTANTE\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">Um <b>guia básico do NoScript 10</b></a>\n\nAinda confuso com a nova interface gráfica do NoScript 10?\nConsulte esta <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">cartilha do NoScript 10 de contribuições de usuários</a>.\ne esta <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\">comparação entre NoScript 10 \"Quantum\" e NoScript 5 \"Classic\" (ou \"Legado\")</a>.\n\nVencedor do \"PC World World Class Award\" e incorporado ao Navegador Tor, o NoScript lhe oferece a melhor proteção disponível na web.\n\nEle permite que JavaScript, Flash, Java e outros conteúdos executáveis funcionem apenas em domínios de sua confiança, por exemplo no site do seu banco, mitigando vulnerabilidades de exploração remota, incluindo Spectre e Meltdown.\n\nProtege suas \"fronteiras seguras\" contra ataques 'cross-site scripting' (XSS), ataques 'cross-zone DNS rebinding / CSRF' (invasão de roteador) e tentativas de Clickjacking, graças à sua inigualável tecnologia ClearClick. \n\nTal abordagem preemptiva previne exploração de vulnerabilidades de segurança (conhecidas e até mesmo desconhecidas!) sem perda de funcionalidade onde você precisa.\nEspecialistas concordam: o Firefox é realmente mais seguro com o NoScript ;-)\n\nFAQ: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\nFórum: <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>", + "pt-BR": "IMPORTANTE\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">Um <b>guia básico do NoScript 10</b></a>\n\nAinda confuso com a nova interface gráfica do NoScript 10?\nConsulte esta <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">cartilha do NoScript 10 de contribuições de usuários</a>.\ne esta <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…">comparação entre NoScript 10 \"Quantum\" e NoScript 5 \"Classic\" (ou \"Legado\")</a>.\n\nVencedor do \"PC World World Class Award\" e incorporado ao Navegador Tor, o NoScript lhe oferece a melhor proteção disponível na web.\n\nEle permite que JavaScript, Flash, Java e outros conteúdos executáveis funcionem apenas em domínios de sua confiança, por exemplo no site do seu banco, mitigando vulnerabilidades de exploração remota, incluindo Spectre e Meltdown.\n\nProtege suas \"fronteiras seguras\" contra ataques 'cross-site scripting' (XSS), ataques 'cross-zone DNS rebinding / CSRF' (invasão de roteador) e tentativas de Clickjacking, graças à sua inigualável tecnologia ClearClick. \n\nTal abordagem preemptiva previne exploração de vulnerabilidades de segurança (conhecidas e até mesmo desconhecidas!) sem perda de funcionalidade onde você precisa.\nEspecialistas concordam: o Firefox é realmente mais seguro com o NoScript ;-)\n\nFAQ: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\nFórum: <a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>", "ru": "Победитель \"2006 PC World World Class Award», этот инструмент обеспечивает дополнительную защиту для Вашего Firefox.\nОно позволяет запуск JavaScript, Java и другого активного содержимого только для доверенных доменов по Вашему выбору, например, Ваш личный банковский веб-сайт. Обеспечивает безопасность Вашей работы в \"зоне доверия\", защищает от атак с использованием межузловых сценариев (XSS), кросс-зоны DNS подменой / CSRF-атак (хакерских маршрутизаторов), и атаки ClickJacking, благодаря своей уникальной технологии ClearClick. Он также реализует DoNotTrack защиту по умолчанию, см. <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/bd4266094d321e473190ea…" rel=\"nofollow\">http://snipurl.com/nsdntrack</a>.\nТакой упреждающий подход предотвращает использование уязвимостей (известных и даже неизвестных!) Без потери функциональности.\nЭксперты едины во мнении: Firefox действительно безопаснее с NoScript ;-)", "sk": "Víťaz ceny \"2006 PC World World Class Award\". Tento nástroj poskytuje špeciálnu ochranu Firefoxu.\nPovoľuje spúšťanie JavaScriptu, Javy a ďalšieho spustiteľného obsahu len na dôveryhodných doménach podľa vášho výberu, napr. na webovej stránke bankingu.\nTakýto preventívny prístup chráni pred zneužitím bezpečnostných dier (známych aj neznámych) bez straty funkčnosti.\nOdborníci by súhlasili: Firefox je s rozšírením NoScript naozaj bezpečnejší ;-)", "vi": "Đã chiến thắng trong \"Giải thưởng Cấp độ Thế giới PC World 2006\", công cụ này cung cấp lớp phòng vệ phụ thêm cho Firefox của bạn.\nNoScript chỉ cho phép JavaScript, Java (và các phần bổ trợ khác) trên những tên miền tin cậy mà bạn chọn (vd., trang web ngân hàng của bạn), canh gác \"vùng biên giới tin cậy\" của bạn chống lại các âm mưu tấn công cross-site scripting (XSS) và Clickjacking, nhờ công nghệ ClearClick của nó.\nPhương thức ngăn chặn trước dựa trên sổ trắng này ngăn chặn việc khai thác các lỗ hổng bảo mật (đã biết hay thậm chí chưa biết!) mà không làm mất đi chức năng...\nCác chuyên gia đều đồng ý rằng: Firefox thật sự an toàn hơn với NoScript :-)", "zh-TW": "這個工具是 2006 PC World 世界級大獎贏家，讓你的 Firefox 更加安全！\n\n使用此套件後，僅有你信任的網站（例如你的銀行）才能執行腳本、Java 與其他動態內容。建立「信任範圍」以抵擋跨網站腳本攻擊（XSS）。\n\n未雨綢繆、使用此套件避開安全漏洞（連未知的漏洞也照擋不誤），而不損失正常功能…\n\n連專家都同意、Firefox 有了 NoScript 後更加安全了 ;-)", - "zh-CN": "重要\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…" rel=\"nofollow\">一篇基础的<b>NoScript 10 指南</b></a>\n\n仍被 NoScript 10 的新 UI 所困惑？\n看看这篇<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…" rel=\"nofollow\">用户贡献的 NoScript 10 入门</a>。\n还有这篇<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…" rel=\"nofollow\"> NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (or \"Legacy\") comparison</a>。\n\n作为“PC World World Class Award”大奖的获得者并内置于 Tor 浏览器，NoScript 将为您提供最佳的网络保护。\n\n它只允许在您选择的信任域上执行 JavaScript、Flash、Java 和其他可执行内容，例如您的家庭银行网站，能够缓解包括 Spectre 和 Meltdown 等远程可利用漏洞。\n\n多亏了其独特的 ClearClick 技术，它可以保护您的“信任边界”不受跨站点脚本攻击（XSS），跨区 DNS 重新绑定/ CSRF 攻击（路由器黑客）和点击劫持（Clickjacking）尝试。\n\n这种先发制人的机制在不损失任何功能的前提下，防止利用安全漏洞（已知甚至未知的！）进行攻击。\n专家们一致同意：拥有 NoScript 的 Firefox 更安全 :-)\n\n常见问题解答：<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…" rel=\"nofollow\">https://noscript.net/faq</a>\n论坛：<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…" rel=\"nofollow\">https://noscript.net/forum</a>" + "zh-CN": "重要\n<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e19d2306e457c98e6c3e03…">一篇基础的<b>NoScript 10 指南</b></a>\n\n仍被 NoScript 10 的新 UI 所困惑？\n看看这篇<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f5ad7f79289d1b2c198593…">用户贡献的 NoScript 10 入门</a>。\n还有这篇<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4e700d4e76086494b5553f…"> NoScript 10 \"Quantum\" vs NoScript 5 \"Classic\" (or \"Legacy\") comparison</a>。\n\n作为“PC World World Class Award”大奖的获得者并内置于 Tor 浏览器，NoScript 将为您提供最佳的网络保护。\n\n它只允许在您选择的信任域上执行 JavaScript、Flash、Java 和其他可执行内容，例如您的家庭银行网站，能够缓解包括 Spectre 和 Meltdown 等远程可利用漏洞。\n\n多亏了其独特的 ClearClick 技术，它可以保护您的“信任边界”不受跨站点脚本攻击（XSS），跨区 DNS 重新绑定/ CSRF 攻击（路由器黑客）和点击劫持（Clickjacking）尝试。\n\n这种先发制人的机制在不损失任何功能的前提下，防止利用安全漏洞（已知甚至未知的！）进行攻击。\n专家们一致同意：拥有 NoScript 的 Firefox 更安全 :-)\n\n常见问题解答：<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a4a623eb90a9becd02eed…">https://noscript.net/faq</a>\n论坛：<a rel=\"nofollow\" href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8a6b9e607349db8d83719e…">https://noscript.net/forum</a>" }, "developer_comments": { "en-US": "Security issues affecting Firefox or the Tor Browser which can be fixed by a NoScript update are guaranteed to be addressed within 24 hours. This sometimes requires many updates to be issued in a short timespan, and when this happens you may notice NoScript UI's asking to \"<em>reload this page in order to operate properly</em>\". This is normal on \"live\" updates, and it just means the UI is out of sync with the page content, but there's no need to worry as <strong>all the restrictions to scripts and active content are still in place</strong>.", @@ -2619,12 +2618,12 @@ 960, 727 ], - "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267408.png?modified…", + "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267408.png?modified…", "thumbnail_size": [ 528, 400 ], - "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267408.jpg?modifi…" + "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267408.jpg?modifi…" }, { "id": 267511, @@ -2635,12 +2634,12 @@ 717, 542 ], - "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267511.png?modified…", + "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267511.png?modified…", "thumbnail_size": [ 529, 400 ], - "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267511.jpg?modifi…" + "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267511.jpg?modifi…" }, { "id": 267512, @@ -2651,12 +2650,12 @@ 717, 542 ], - "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267512.png?modified…", + "image_url": "https://addons.mozilla.org/user-media/previews/full/267/267512.png?modified…", "thumbnail_size": [ 529, 400 ], - "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267512.jpg?modifi…" + "thumbnail_url": "https://addons.mozilla.org/user-media/previews/thumbs/267/267512.jpg?modifi…" } ], "promoted": { @@ -2667,10 +2666,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3956, - "bayesian_average": 4.3929050879959695, - "count": 2174, - "text_count": 837 + "average": 4.399, + "bayesian_average": 4.396311536554253, + "count": 2193, + "text_count": 842 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2714,7 +2713,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7240 + "weekly_downloads": 7405 }, "notes": null }, @@ -2730,7 +2729,7 @@ "picture_url": null } ], - "average_daily_users": 161419, + "average_daily_users": 162666, "categories": { "firefox": [ "photos-music-videos", @@ -2839,10 +2838,10 @@ "category": "recommended" }, "ratings": { - "average": 3.8734, - "bayesian_average": 3.8693074295625123, - "count": 1224, - "text_count": 443 + "average": 3.8694, + "bayesian_average": 3.8653261105375534, + "count": 1233, + "text_count": 447 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2861,7 +2860,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1652 + "weekly_downloads": 1444 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -100,9 +100,9 @@ input_files: name: ublock-origin sha256sum: f5fbeeac511ca4e10a74723413727fda8e6f9236c726d16eb54ade1fbe7be5be enable: '[% c("var/mullvad-browser") %]' - - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.5-firef… + - URL: https://github.com/mullvad/browser-extension/releases/download/v0.9.0-firef… name: mullvad-extension - sha256sum: b8208cc73d3c3c87342b25367b1a5fa330cb528f3213a4c4de30512f1662ff45 + sha256sum: 65bf235aa1015054ae0a54a40c5a663e67fe1d0f0799e7b4726f98cccc7f3eab enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.5-1 - browser_build: 7 + browser_build: 8 variant: Beta # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 1 ===================================== projects/firefox/config ===================================== @@ -18,7 +18,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.5' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 1 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -16,7 +16,7 @@ container: var: geckoview_version: 115.9.0esr browser_branch: 13.5-1 - browser_build: 1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '[% IF c("var/use_go_1_20") %]1.20.14[% ELSE %]1.21.7[% END %]' +version: '[% IF c("var/use_go_1_20") %]1.20.14[% ELSE %]1.21.8[% END %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -120,10 +120,12 @@ input_files: project: '[% c("var/compiler") %]' enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' + # 1.21 series name: go - sha256sum: 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 + sha256sum: dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 enable: '[% !c("var/use_go_1_20") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' + # 1.20 series name: go sha256sum: 1aef321a0e3e38b7e91d2d7eb64040666cabdcc77d383de3c9522d0d69b67f4e enable: '[% c("var/use_go_1_20") %]' ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 136210 +version: 150100 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -23,6 +23,6 @@ input_files: - project: container-image - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip' name: manual - sha256sum: 6731381fd992cf65dd01e56e2b924005af633369da5ac9eb905fd8025255b386 + sha256sum: 039bdb04f97b803f0db2f12a6ba0a03a2091e8d8bd794e178c297e571f04eb7f - filename: packagemanual.py name: package_script ===================================== projects/translation/config ===================================== @@ -12,19 +12,19 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 3215fb9ae37cb115b607647122f0984a8a428b16 + git_hash: 891785fda28488bfe599afc8d3b9a155c0130f5f targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: f1a4b3d9af145b062b1a5b0cf2b83bd6bfcd03bb + git_hash: 020ff1e1fd29f39a75d1d7f795a4d80996472dd5 targets: nightly: git_hash: 'tor-browser' mullvad-browser: mullvad-browser: '[% INCLUDE build %]' - git_hash: 57de1569da0e2c48fd999a13e555f6b522041993 + git_hash: c5361cb496ae7e047fd9226139537f1fcfc7938d targets: nightly: git_hash: 'mullvad-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 44409d6f28faf0e332a00d53de67879de41bf07c + git_hash: 4962bd88652169e6a98afbe1d3b25847e909d213 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,12 +73,12 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5a5' - torbrowser_build: 'build2' + torbrowser_version: '13.5a6' + torbrowser_build: 'build1' torbrowser_incremental_from: + - '13.5a5' - '13.5a4' - '13.5a3' - - '13.5a2' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' ===================================== tools/fetch-manual.py ===================================== @@ -75,7 +75,7 @@ else: sha256.update(chunk) print(f"File downloaded as {manual_file}.") print( - "Please upload it to people.torproject.org and then update projects/manual/config:" + "Please upload it to tb-build-02.torproject.org:~tb-builder/public_html/. and then update projects/manual/config:" ) sha256 = sha256.hexdigest() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.5-1-build8
by Dan Ballard (＠dan) 27 Mar '24

27 Mar '24

Dan Ballard pushed new tag firefox-android-115.2.1-13.5-1-build8 at The Tor Project / Applications / firefox-android -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.9.0esr-13.5-1-build2
by richard (＠richard) 27 Mar '24

27 Mar '24

richard pushed new tag tor-browser-115.9.0esr-13.5-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.9.0esr-13.5-1-build2
by richard (＠richard) 27 Mar '24

27 Mar '24

richard pushed new tag mullvad-browser-115.9.0esr-13.5-1-build2 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI
by Dan Ballard (＠dan) 27 Mar '24

27 Mar '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: dd7c3469 by Dan Ballard at 2024-03-27T13:30:32-07:00 fixup! Add Tor integration and UI Bug 41187: Change settings moving Network Preferences to Connections menu and readd tor logs - - - - - 13 changed files: - fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - − fenix/app/src/main/java/org/mozilla/fenix/settings/TorNetworkSettingsFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerTAS.kt - + fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsFragment.kt - fenix/app/src/main/res/navigation/nav_graph.xml - fenix/app/src/main/res/values/preference_keys.xml - fenix/app/src/main/res/values/torbrowser_strings.xml - fenix/app/src/main/res/xml/preferences.xml - − fenix/app/src/main/res/xml/tor_network_settings_preferences.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -61,6 +61,8 @@ import org.mozilla.fenix.ext.showToolbar import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.perf.ProfilerViewModel import org.mozilla.fenix.settings.account.AccountUiView +import org.mozilla.fenix.tor.TorBridgeTransportConfig +import org.mozilla.fenix.tor.TorEvents import org.mozilla.fenix.utils.Settings import kotlin.system.exitProcess @@ -155,6 +157,8 @@ class SettingsFragment : PreferenceFragmentCompat() { } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { + //setPreferencesFromResource(R.xml.tor_network_settings_preferences, rootKey) + //setupConnectionPreferences() setPreferencesFromResource(R.xml.preferences, rootKey) } @@ -178,7 +182,10 @@ class SettingsFragment : PreferenceFragmentCompat() { update(shouldUpdateAccountUIState = !creatingFragment) requireView().findViewById<RecyclerView>(R.id.recycler_view) - ?.hideInitialScrollBar(viewLifecycleOwner.lifecycleScope) + .also { + it?.hideInitialScrollBar(viewLifecycleOwner.lifecycleScope) + it?.disableHidingAnimation() + } if (args.preferenceToScrollTo != null) { scrollToPreference(args.preferenceToScrollTo) @@ -277,9 +284,6 @@ class SettingsFragment : PreferenceFragmentCompat() { resources.getString(R.string.pref_key_search_settings) -> { SettingsFragmentDirections.actionSettingsFragmentToSearchEngineFragment() } - resources.getString(R.string.pref_key_tor_network_settings) -> { - SettingsFragmentDirections.actionSettingsFragmentToTorNetworkSettingsFragment() - } resources.getString(R.string.pref_key_tor_security_level_settings) -> { SettingsFragmentDirections.actionSettingsFragmentToTorSecurityLevelFragment() } @@ -523,6 +527,7 @@ class SettingsFragment : PreferenceFragmentCompat() { preferenceStartProfiler?.isVisible = showSecretDebugMenuThisSession && (requireContext().components.core.engine.profiler?.isProfilerActive() != null) } + setupCookieBannerPreference() setupAmoCollectionOverridePreference(requireContext().settings()) setupGeckoLogsPreference(requireContext().settings()) @@ -532,6 +537,7 @@ class SettingsFragment : PreferenceFragmentCompat() { setupSearchPreference() setupHomepagePreference() setupTrackingProtectionPreference() + setupConnectionPreferences() } /** @@ -566,6 +572,10 @@ class SettingsFragment : PreferenceFragmentCompat() { } } + private fun RecyclerView.disableHidingAnimation() { + this.setItemAnimator(null) + this.setLayoutAnimation(null) + } private fun updateFxAAllowDomesticChinaServerMenu() { val settings = requireContext().settings() val preferenceAllowDomesticChinaServer = @@ -705,6 +715,39 @@ class SettingsFragment : PreferenceFragmentCompat() { } } + internal fun setupConnectionPreferences() { + // will be needed for phase2 + //val torController = requireContext().components.torController + + requirePreference<Preference>(R.string.pref_key_tor_network_settings_bridge_config).apply { + setOnPreferenceClickListener { + val directions = + SettingsFragmentDirections + .actionSettingsFragmentToTorBridgeConfigFragment() + requireView().findNavController().navigate(directions) + true + } + } + + requirePreference<Preference>(R.string.pref_key_use_new_bootstrap).apply { + setOnPreferenceClickListener { + val directions = + SettingsFragmentDirections.actionSettingsFragmentToBetaConnectionFeaturesFragment() + requireView().findNavController().navigate(directions) + true + } + } + + requirePreference<Preference>(R.string.pref_key_tor_logs).apply { + setOnPreferenceClickListener { + val directions = + SettingsFragmentDirections.actionSettingsFragmentToTorLogsFragment() + requireView().findNavController().navigate(directions) + true + } + } + } + @VisibleForTesting internal fun setupCookieBannerPreference() { with(requirePreference<Preference>(R.string.pref_key_cookie_banner_settings)) { ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/TorNetworkSettingsFragment.kt deleted ===================================== @@ -1,172 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.settings - -import android.os.Bundle -import androidx.navigation.findNavController -import androidx.preference.Preference -import androidx.preference.PreferenceFragmentCompat -import org.mozilla.fenix.R -import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.nav -import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.ext.showToolbar -import org.mozilla.fenix.tor.TorBridgeTransportConfig -import org.mozilla.fenix.tor.TorEvents - -/** - * Lets the user configure Tor network connection settings - */ -class TorNetworkSettingsFragment : PreferenceFragmentCompat(), TorEvents { - override fun onResume() { - super.onResume() - - val torController = requireContext().components.torController - - torController.registerTorListener(this) - - showToolbar(getString(R.string.preferences_tor_network_settings)) - - val yesString = getString(R.string.preferences_tor_network_settings_yes) - val noString = getString(R.string.preferences_tor_network_settings_no) - - requirePreference<Preference>(R.string.pref_key_tor_network_settings_bridge_config).apply { - setOnPreferenceClickListener { - val directions = - TorNetworkSettingsFragmentDirections - .actionTorNetworkSettingsFragmentToTorBridgeConfigFragment() - requireView().findNavController().navigate(directions) - true - } - - if (torController.bridgesEnabled) { - if (torController.bridgeTransport == TorBridgeTransportConfig.USER_PROVIDED) { - summary = - getString( - R - .string - .preferences_tor_network_settings_bridge_config_description_user_provided_enabled - ) - } else { - summary = - getString( - R - .string - .preferences_tor_network_settings_bridge_config_description_builtin_transport_enabled - ) - } - } else { - summary = - getString( - R - .string - .preferences_tor_network_settings_bridge_config_description - ) - } - } - - requirePreference<Preference>(R.string.pref_key_tor_network_settings_bridges_enabled).apply { - val formatStringRes = R.string.preferences_tor_network_settings_bridges_enabled - title = if (torController.bridgesEnabled) { - getString(formatStringRes, yesString) - } else { - getString(formatStringRes, noString) - } - } - - requirePreference<Preference>(R.string.pref_key_use_new_bootstrap).apply { - setOnPreferenceClickListener { - val directions = - TorNetworkSettingsFragmentDirections.actionTorNetworkSettingsFragmentToBetaConnectionFeaturesFragment() - requireView().findNavController().navigate(directions) - true - } - } - - setStatus() - } - - private fun setStatus() { - val torController = requireContext().components.torController - val yesString = getString(R.string.preferences_tor_network_settings_yes) - val noString = getString(R.string.preferences_tor_network_settings_no) - - requirePreference<Preference>(R.string.pref_key_tor_network_settings_tor_ready).apply { - val formatStringRes = R.string.preferences_tor_network_settings_tor_ready - @SuppressWarnings("ComplexCondition") - title = if (!torController.isStarting && - torController.isConnected && - torController.isBootstrapped && - !torController.isRestarting) { - getString(formatStringRes, yesString) - } else { - getString(formatStringRes, noString) - } - } - - requirePreference<Preference>(R.string.pref_key_tor_network_settings_state).apply { - val formatStringRes = R.string.preferences_tor_network_settings_state - - title = if (torController.isRestarting) { - getString(formatStringRes, - getString( - R - .string - .preferences_tor_network_settings_restarting - ) - ) - } else if (torController.isStarting) { - getString(formatStringRes, - getString( - R - .string - .preferences_tor_network_settings_connecting - ) - ) - } else if (torController.isConnected) { - getString(formatStringRes, - getString( - R - .string - .preferences_tor_network_settings_connected - ) - ) - } else { - getString(formatStringRes, - getString( - R - .string - .preferences_tor_network_settings_disconnected - ) - ) - } - } - } - - override fun onStop() { - super.onStop() - requireContext().components.torController.unregisterTorListener(this) - } - - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - setPreferencesFromResource(R.xml.tor_network_settings_preferences, rootKey) - } - - @SuppressWarnings("EmptyFunctionBlock") - override fun onTorConnecting() { - } - - @SuppressWarnings("EmptyFunctionBlock") - override fun onTorConnected() { - } - - @SuppressWarnings("EmptyFunctionBlock") - override fun onTorStopped() { - } - - override fun onTorStatusUpdate(entry: String?, status: String?, progress: Double?) { - setStatus() - } -} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt ===================================== @@ -19,6 +19,7 @@ import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor import androidx.navigation.fragment.findNavController import com.google.android.material.appbar.AppBarLayout import org.mozilla.fenix.HomeActivity +import org.mozilla.fenix.R import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.hideToolbar import org.mozilla.fenix.ext.settings @@ -182,7 +183,9 @@ class TorBootstrapFragment : Fragment() { private fun openTorNetworkSettings() { val directions = - TorBootstrapFragmentDirections.actionTorbootstrapFragmentToTorNetworkSettingsFragment() + TorBootstrapFragmentDirections.actionTorbootstrapFragmentToSettingsFragment( + requireContext().getString(R.string.pref_key_connection) + ) findNavController().navigate(directions) } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -147,7 +147,7 @@ class TorConnectionAssistFragment : Fragment() { getString(R.string.connection_assist_configure_connection_button) binding.torBootstrapButton2.setOnClickListener { viewModel.cancelTorBootstrap() - openTorNetworkSettings() + openTorConnectionSettings() } } @@ -235,7 +235,7 @@ class TorConnectionAssistFragment : Fragment() { binding.torBootstrapButton2.text = getString(R.string.connection_assist_configure_connection_button) binding.torBootstrapButton2.setOnClickListener { - openTorNetworkSettings() + openTorConnectionSettings() } } @@ -376,9 +376,11 @@ class TorConnectionAssistFragment : Fragment() { ) } - private fun openTorNetworkSettings() { + private fun openTorConnectionSettings() { findNavController().navigate( - TorConnectionAssistFragmentDirections.actionTorConnectionAssistFragmentToTorNetworkSettings(), + TorConnectionAssistFragmentDirections.actionTorConnectionAssistFragmentToSettingsFragment( + requireContext().getString(R.string.pref_key_connection) + ), ) } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -17,6 +17,10 @@ class TorError( var details: String ) { } +interface TorLogs { + fun onLog(type: String?, message: String?) +} + internal enum class TorStatus(val status: String) { OFF("OFF"), STARTING("STARTING"), @@ -68,6 +72,9 @@ interface TorController: TorEvents { fun registerTorListener(l: TorEvents) fun unregisterTorListener(l: TorEvents) + fun registerTorLogListener(l: TorLogs) + fun unregisterTorLogListener(l: TorLogs) + fun initiateTorBootstrap(lifecycleScope: LifecycleCoroutineScope? = null, withDebugLogging: Boolean = false) fun stopTor() fun setTorStopped() ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -8,6 +8,7 @@ import mozilla.components.browser.engine.gecko.GeckoEngine import org.mozilla.fenix.ext.components import org.mozilla.geckoview.TorIntegrationAndroid import org.mozilla.geckoview.TorIntegrationAndroid.BootstrapStateChangeListener +import org.mozilla.geckoview.TorIntegrationAndroid.TorLogListener import org.mozilla.geckoview.TorSettings import org.mozilla.geckoview.TorSettings.BridgeBuiltinType import org.mozilla.geckoview.TorSettings.BridgeSource @@ -46,11 +47,12 @@ internal enum class TorConnectState(val state: String) { class TorControllerGV( private val context: Context, -) : TorController, TorEvents, BootstrapStateChangeListener { +) : TorController, TorEvents, BootstrapStateChangeListener, TorLogListener { private val TAG = "TorControllerGV" private var torListeners = mutableListOf<TorEvents>() + private var torLogListeners = mutableListOf<TorLogs>() internal var lastKnownStatus = TorConnectState.Initial internal var lastKnownError: TorError? = null @@ -146,10 +148,12 @@ class TorControllerGV( override fun start() { getTorIntegration().registerBootstrapStateChangeListener(this) + getTorIntegration().registerLogListener(this) } override fun stop() { getTorIntegration().unregisterBootstrapStateChangeListener(this) + getTorIntegration().unregisterLogListener(this) } // TorEvents @@ -180,6 +184,13 @@ class TorControllerGV( } } + override fun onLog(type: String?, message: String?) { + synchronized(torLogListeners) { + entries.add(Pair(type, message)) + torLogListeners.toList().forEach { it.onLog(type, message) } + } + } + override fun registerTorListener(l: TorEvents) { synchronized(torListeners) { if (torListeners.contains(l)) { @@ -198,6 +209,23 @@ class TorControllerGV( } } + override fun registerTorLogListener(l: TorLogs) { + synchronized(torLogListeners) { + if (torLogListeners.contains(l)) { + return + } + torLogListeners.add(l) + } + } + override fun unregisterTorLogListener(l: TorLogs) { + synchronized(torLogListeners) { + if (!torLogListeners.contains(l)) { + return + } + torLogListeners.remove(l) + } + } + override fun initiateTorBootstrap( lifecycleScope: LifecycleCoroutineScope?, withDebugLogging: Boolean, @@ -284,7 +312,6 @@ class TorControllerGV( onTorConnecting() } - entries.add(Pair(status, lastKnownStatus.toTorStatus().status)) onTorStatusUpdate(status, lastKnownStatus.toTorStatus().status, progress) } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerTAS.kt ===================================== @@ -211,6 +211,9 @@ class TorControllerTAS (private val context: Context): TorController { } } + override fun registerTorLogListener(l: TorLogs) {} + override fun unregisterTorLogListener(l: TorLogs) {} + private fun handlePendingRegistrationChanges() { pendingRegisterChangeList.forEach { if (it.second) { ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsFragment.kt ===================================== @@ -0,0 +1,79 @@ +package org.mozilla.fenix.tor + +import android.os.Bundle +import android.text.method.ScrollingMovementMethod +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import org.mozilla.fenix.R +import org.mozilla.fenix.components.Components +import org.mozilla.fenix.databinding.FragmentHomeBinding +import org.mozilla.fenix.databinding.FragmentTorConnectionAssistBinding +import org.mozilla.fenix.databinding.TorBootstrapLoggerBinding +import org.mozilla.fenix.databinding.TorNetworkSettingsBetaConnectionFeaturesBinding +import org.mozilla.fenix.ext.components +import org.mozilla.fenix.ext.requireComponents +import org.mozilla.fenix.tor.view.TorBootstrapLoggerViewHolder + +class TorLogsFragment(): Fragment(), TorLogs { + + private var entries = mutableListOf<String>() + internal var _binding: TorBootstrapLoggerBinding? = null + private val binding get() = _binding!! + + private var _components: Components? = null + private val components get() = _components!! + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?, + ): View { + _binding = TorBootstrapLoggerBinding.inflate(inflater) + _components = requireComponents + + components.torController.registerTorLogListener(this) + + val currentEntries = components.torController.logEntries + .filter { it.second != null } + .filter { !(it.second!!.startsWith("Circuit") && it.first == "ON") } + // Keep synchronized with format in onTorStatusUpdate + .flatMap { listOf("(${it.first}) '${it.second}'") } + val entriesLen = currentEntries.size + val subListOffset = if (entriesLen > TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES) TorBootstrapLoggerViewHolder.MAX_NEW_ENTRIES else entriesLen + entries = currentEntries.subList((entriesLen - subListOffset), entriesLen) as MutableList<String> + val initLog = "---------------" + getString(R.string.tor_initializing_log) + "---------------" + entries.add(0, initLog) + + with(binding.torBootstrapLogEntries) { + movementMethod = ScrollingMovementMethod() + text = formatLogEntries(entries) + } + + + return binding.root + } + + // TODO on destroy unregiuster + + private fun formatLogEntries(entries: List<String>) = entries.joinToString("\n") + + override fun onLog(type: String?, message: String?) { + if (message == null || type == null) return + if (type == "ON" && type.startsWith("Circuit")) return + + if (entries.size > TorBootstrapLoggerViewHolder.MAX_LINES) { + entries = entries.drop(1) as MutableList<String> + } + entries.add("($type) '$message'") + + binding.torBootstrapLogEntries.text = formatLogEntries(entries) + } + + override fun onStop() { + super.onStop() + components.torController.unregisterTorLogListener(this) + } + +} ===================================== fenix/app/src/main/res/navigation/nav_graph.xml ===================================== @@ -239,13 +239,6 @@ android:name="scrollToCollection" android:defaultValue="false" app:argType="boolean" /> - <action - android:id="@+id/action_homeFragment_to_torNetworkSettingsFragment" - app:destination="@id/torNetworkSettingsFragment" - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@anim/slide_in_left" - app:popExitAnim="@anim/slide_out_right" /> </fragment> <fragment @@ -269,12 +262,13 @@ app:popUpTo="@id/torbootstrapFragment" app:popUpToInclusive="true" /> <action - android:id="@+id/action_torbootstrapFragment_to_torNetworkSettingsFragment" - app:destination="@id/torNetworkSettingsFragment" + android:id="@+id/action_torbootstrapFragment_to_SettingsFragment" + app:destination="@id/settingsFragment" app:enterAnim="@anim/slide_in_right" app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> + </fragment> <fragment @@ -294,8 +288,8 @@ app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> <action - android:id="@+id/action_torConnectionAssistFragment_to_TorNetworkSettings" - app:destination="@id/torNetworkSettingsFragment" + android:id="@+id/action_torConnectionAssistFragment_to_TorConnectionSettings" + app:destination="@id/settingsFragment" app:enterAnim="@anim/slide_in_right" app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" @@ -702,8 +696,22 @@ app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> <action - android:id="@+id/action_settingsFragment_to_torNetworkSettingsFragment" - app:destination="@id/torNetworkSettingsFragment" + android:id="@+id/action_settingsFragment_to_torBridgeConfigFragment" + app:destination="@id/torBridgeConfigFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> + <action + android:id="@+id/action_settingsFragment_to_torLogsFragment" + app:destination="@+id/torLogsFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> + <action + android:id="@+id/action_settingsFragment_to_BetaConnectionFeaturesFragment" + app:destination="@+id/torBetaConnectionFeaturesFragment" app:enterAnim="@anim/slide_in_right" app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" @@ -965,24 +973,6 @@ android:id="@+id/sponsoredStoriesSettings" android:name="org.mozilla.fenix.settings.SponsoredStoriesSettingsFragment" android:label="@string/preferences_debug_settings_custom_sponsored_stories_parameters" /> - <fragment - android:id="@+id/torNetworkSettingsFragment" - android:name="org.mozilla.fenix.settings.TorNetworkSettingsFragment"> - <action - android:id="@+id/action_torNetworkSettingsFragment_to_torBridgeConfigFragment" - app:destination="@id/torBridgeConfigFragment" - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@anim/slide_in_left" - app:popExitAnim="@anim/slide_out_right" /> - <action - android:id="@+id/action_torNetworkSettingsFragment_to_BetaConnectionFeaturesFragment" - app:destination="@+id/torBetaConnectionFeaturesFragment" - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@anim/slide_in_left" - app:popExitAnim="@anim/slide_out_right" /> - </fragment> <fragment android:id="@+id/torBridgeConfigFragment" android:name="org.mozilla.fenix.settings.TorBridgeConfigFragment" @@ -993,6 +983,11 @@ android:name="org.mozilla.fenix.tor.TorBetaConnectionFeaturesFragment" android:label="Enable beta connection features" tools:layout="@layout/tor_network_settings_beta_connection_features" /> + <fragment + android:id="@+id/torLogsFragment" + android:name="org.mozilla.fenix.tor.TorLogsFragment" + android:label="Tor Logs" + tools:layout="@layout/tor_bootstrap_logger" /> <fragment android:id="@+id/trackingProtectionFragment" ===================================== fenix/app/src/main/res/values/preference_keys.xml ===================================== @@ -14,6 +14,8 @@ <string name="pref_key_accessibility" translatable="false">pref_key_accessibility</string> <string name="pref_key_accessibility_auto_size" translatable="false">pref_key_accessibility_auto_size</string> <string name="pref_key_accessibility_font_scale" translatable="false">pref_key_accessibility_font_scale</string> + <string name="pref_key_privacy" translatable="false">pref_key_privacy</string> + <string name="pref_key_connection" translatable="false">pref_key_connection</string> <string name="pref_key_accessibility_force_enable_zoom" translatable="false">pref_key_accessibility_force_enable_zoom</string> <string name="pref_key_advanced" translatable="false">pref_key_advanced</string> <string name="pref_key_language" translatable="false">pref_key_language</string> @@ -373,10 +375,10 @@ <string name="pref_key_tor_security_level_safer_option" translatable="false">pref_key_tor_security_level_safer_option</string> <string name="pref_key_tor_security_level_safest_option" translatable="false">pref_key_tor_security_level_safest_option</string> - <string name="pref_key_tor_network_settings" translatable="false">pref_key_tor_network_settings</string> <string name="pref_key_tor_network_settings_explanation" translatable="false">pref_key_tor_network_settings_explanation</string> <string name="pref_key_tor_network_settings_bridge_config" translatable="false">pref_key_tor_network_settings_bridge_config</string> <string name="pref_key_use_new_bootstrap" translatable="false">pref_key_use_new_bootstrap</string> + <string name="pref_key_tor_logs" translatable="false">pref_key_tor_logs</string> <string name="pref_key_use_new_bootstrap_with_android_native" translatable="false">pref_key_use_new_bootstrap_with_android_native</string> <string name="pref_key_use_new_bootstrap_with_html" translatable="false">pref_key_use_new_bootstrap_with_html</string> <string name="pref_key_tor_network_settings_bridge_config_explanation" translatable="false">pref_key_tor_network_settings_bridge_config_explanation</string> ===================================== fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -31,6 +31,7 @@ <string name="tor_explore_privately">Explore. Privately.</string> + <string name="preferences_tor_connection_settings_title">Connection</string> <string name="preferences_tor_network_settings">Tor Network</string> <string name="preferences_tor_network_settings_explanation">Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world.</string> <string name="preferences_tor_network_settings_bridge_config">Config Bridge</string> @@ -57,6 +58,8 @@ <string name="preferences_tor_network_settings_connected">Connected</string> <string name="preferences_tor_network_settings_restarting">Restarting</string> <string name="preferences_tor_network_settings_bridges_enabled">Bridges are enabled: %s</string> + <string name="preferences_tor_logs">Tor Logs</string> + <string name="preferences_tor_logs_description">View and copy your Tor logs</string>  <string name="preferences_tor_security_level_settings">Security Settings</string> ===================================== fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -93,6 +93,7 @@ <androidx.preference.PreferenceCategory android:title="@string/preferences_category_privacy_security" + android:key="@string/pref_key_privacy" android:layout="@layout/preference_category_no_icon_style"> <androidx.preference.Preference @@ -117,11 +118,6 @@ android:title="@string/preferences_cookie_banner_reduction" app:isPreferenceVisible="false" /> - <androidx.preference.Preference - android:key="@string/pref_key_tor_network_settings" - app:iconSpaceReserved="false" - android:title="@string/preferences_tor_network_settings" /> - <androidx.preference.Preference android:key="@string/pref_key_tracking_protection_settings" app:iconSpaceReserved="false" @@ -156,6 +152,41 @@ </androidx.preference.PreferenceCategory> +  + <PreferenceCategory + android:title="@string/preferences_tor_connection_settings_title" + android:key="@string/pref_key_connection" + android:layout="@layout/preference_category_no_icon_style"> + + <Preference + android:key="@string/pref_key_tor_network_settings_explanation" + app:iconSpaceReserved="false" + android:title="@string/preferences_tor_network_settings_explanation" /> + + <Preference + android:key="@string/pref_key_tor_network_settings_bridge_config" + app:iconSpaceReserved="false" + android:title="@string/preferences_tor_network_settings_bridge_config" + android:summary="@string/preferences_tor_network_settings_bridge_config_description" /> + + <Preference + android:key="@string/pref_key_use_new_bootstrap" + app:iconSpaceReserved="false" + android:title="Enable beta connection features" /> + + <Preference + android:key="@string/pref_key_tor_logs" + app:iconSpaceReserved="false" + android:title="@string/preferences_tor_logs" + android:summary="@string/preferences_tor_logs_description" /> + +  + +  + + </PreferenceCategory> + <PreferenceCategory android:title="@string/preferences_category_advanced" android:key="@string/pref_key_advanced" ===================================== fenix/app/src/main/res/xml/tor_network_settings_preferences.xml deleted ===================================== @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - <Preference - android:key="@string/pref_key_tor_network_settings_explanation" - android:title="@string/preferences_tor_network_settings_explanation" /> - <androidx.preference.PreferenceCategory - android:key="@string/pref_key_tor_network_settings_status" - android:title="@string/preferences_tor_network_settings_status" - app:iconSpaceReserved="false" - android:layout="@layout/preference_cat_style" > - <Preference - android:key="@string/pref_key_tor_network_settings_tor_ready" - android:title="@string/preferences_tor_network_settings_tor_ready" /> - <Preference - android:key="@string/pref_key_tor_network_settings_state" - android:title="@string/preferences_tor_network_settings_state" /> - <Preference - android:key="@string/pref_key_tor_network_settings_bridges_enabled" - android:title="@string/preferences_tor_network_settings_bridges_enabled" /> - </androidx.preference.PreferenceCategory> - <Preference - android:icon="@drawable/ic_tor_config_bridge" - android:key="@string/pref_key_tor_network_settings_bridge_config" - android:title="@string/preferences_tor_network_settings_bridge_config" - android:summary="@string/preferences_tor_network_settings_bridge_config_description" - app:allowDividerAbove="true" /> - <Preference - android:key="@string/pref_key_use_new_bootstrap" - android:title="Enable beta connection features" - app:allowDividerAbove="true" /> - -</androidx.preference.PreferenceScreen> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/dd7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/dd7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 27 Mar '24

27 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: a6c43d7e by Pier Angelo Vendrame at 2024-03-27T14:34:53+01:00 fixup! Bug 40925: Implemented the Security Level component Bug 42481: Modularize SecurityLevel. - - - - - 5 changed files: - browser/components/securitylevel/content/securityLevel.js - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/securitylevel/SecurityLevel.jsm → toolkit/components/securitylevel/SecurityLevel.sys.mjs - toolkit/components/securitylevel/components.conf - toolkit/components/securitylevel/moz.build Changes: ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -2,11 +2,9 @@ /* global AppConstants, Services, openPreferences, XPCOMUtils */ -ChromeUtils.defineModuleGetter( - this, - "SecurityLevelPrefs", - "resource://gre/modules/SecurityLevel.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", +}); /* Security Level Button Code ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -12,14 +12,9 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", }); -ChromeUtils.defineModuleGetter( - lazy, - "SecurityLevelPrefs", - "resource://gre/modules/SecurityLevel.jsm" -); - const BinaryInputStream = Components.Constructor( "@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream", ===================================== toolkit/components/securitylevel/SecurityLevel.jsm → toolkit/components/securitylevel/SecurityLevel.sys.mjs ===================================== @@ -1,17 +1,10 @@ -"use strict"; - -var EXPORTED_SYMBOLS = ["SecurityLevel", "SecurityLevelPrefs"]; - -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm"); +import { ConsoleAPI } from "resource://gre/modules/Console.sys.mjs"; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "ExtensionParent", - "resource://gre/modules/ExtensionParent.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs", +}); const logger = new ConsoleAPI({ maxLogLevel: "info", @@ -275,6 +268,7 @@ var initializeNoScriptControl = () => { // bind NoScript settings to the browser.security_level.security_slider // (see noscript-control.js). /* eslint-disable */ +// prettier-ignore const kSecuritySettings = { // Preference name : [0, 1-high 2-m 3-m 4-low] "javascript.options.ion" : [, false, false, false, true ], @@ -439,7 +433,7 @@ function migratePreferences() { } // This class is used to initialize the security level stuff at the startup -class SecurityLevel { +export class SecurityLevel { QueryInterface = ChromeUtils.generateQI(["nsIObserver"]); init() { @@ -460,7 +454,7 @@ class SecurityLevel { Getters and Setters for relevant torbutton prefs */ -const SecurityLevelPrefs = { +export const SecurityLevelPrefs = { SecurityLevels: Object.freeze({ safest: 1, safer: 2, ===================================== toolkit/components/securitylevel/components.conf ===================================== @@ -4,7 +4,7 @@ Classes = [ "contract_ids": [ "@torproject.org/security-level;1", ], - "jsm": "resource://gre/modules/SecurityLevel.jsm", + "esModule": "resource://gre/modules/SecurityLevel.sys.mjs", "constructor": "SecurityLevel", } ] ===================================== toolkit/components/securitylevel/moz.build ===================================== @@ -1,5 +1,5 @@ EXTRA_JS_MODULES += [ - "SecurityLevel.jsm", + "SecurityLevel.sys.mjs", ] XPCOM_MANIFESTS += [ View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a6c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a6c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 27 Mar '24

27 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: b0ff311a by Pier Angelo Vendrame at 2024-03-27T14:34:08+01:00 fixup! Bug 40925: Implemented the Security Level component Bug 42481: Modularize SecurityLevel. - - - - - 5 changed files: - browser/components/securitylevel/content/securityLevel.js - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/securitylevel/SecurityLevel.jsm → toolkit/components/securitylevel/SecurityLevel.sys.mjs - toolkit/components/securitylevel/components.conf - toolkit/components/securitylevel/moz.build Changes: ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -2,11 +2,9 @@ /* global AppConstants, Services, openPreferences, XPCOMUtils */ -ChromeUtils.defineModuleGetter( - this, - "SecurityLevelPrefs", - "resource://gre/modules/SecurityLevel.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", +}); /* Security Level Button Code ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -12,14 +12,9 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", }); -ChromeUtils.defineModuleGetter( - lazy, - "SecurityLevelPrefs", - "resource://gre/modules/SecurityLevel.jsm" -); - const BinaryInputStream = Components.Constructor( "@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream", ===================================== toolkit/components/securitylevel/SecurityLevel.jsm → toolkit/components/securitylevel/SecurityLevel.sys.mjs ===================================== @@ -1,17 +1,10 @@ -"use strict"; - -var EXPORTED_SYMBOLS = ["SecurityLevel", "SecurityLevelPrefs"]; - -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm"); +import { ConsoleAPI } from "resource://gre/modules/Console.sys.mjs"; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "ExtensionParent", - "resource://gre/modules/ExtensionParent.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs", +}); const logger = new ConsoleAPI({ maxLogLevel: "info", @@ -263,6 +256,7 @@ var initializeNoScriptControl = () => { // bind NoScript settings to the browser.security_level.security_slider // (see noscript-control.js). /* eslint-disable */ +// prettier-ignore const kSecuritySettings = { // Preference name : [0, 1-high 2-m 3-m 4-low] "javascript.options.ion" : [, false, false, false, true ], @@ -427,7 +421,7 @@ function migratePreferences() { } // This class is used to initialize the security level stuff at the startup -class SecurityLevel { +export class SecurityLevel { QueryInterface = ChromeUtils.generateQI(["nsIObserver"]); init() { @@ -448,7 +442,7 @@ class SecurityLevel { Getters and Setters for relevant torbutton prefs */ -const SecurityLevelPrefs = { +export const SecurityLevelPrefs = { SecurityLevels: Object.freeze({ safest: 1, safer: 2, ===================================== toolkit/components/securitylevel/components.conf ===================================== @@ -4,7 +4,7 @@ Classes = [ "contract_ids": [ "@torproject.org/security-level;1", ], - "jsm": "resource://gre/modules/SecurityLevel.jsm", + "esModule": "resource://gre/modules/SecurityLevel.sys.mjs", "constructor": "SecurityLevel", } ] ===================================== toolkit/components/securitylevel/moz.build ===================================== @@ -1,5 +1,5 @@ EXTRA_JS_MODULES += [ - "SecurityLevel.jsm", + "SecurityLevel.sys.mjs", ] XPCOM_MANIFESTS += [ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b0ff311… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b0ff311… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 2 commits: fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 27 Mar '24

27 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 41d01e49 by Pier Angelo Vendrame at 2024-03-27T10:04:05+01:00 fixup! Add TorStrings module for localization Bug 42481: Modularize SecurityLevel. - - - - - 494af376 by Pier Angelo Vendrame at 2024-03-27T10:07:34+01:00 fixup! Bug 40925: Implemented the Security Level component Bug 42481: Modularize SecurityLevel. - - - - - 6 changed files: - browser/components/securitylevel/content/securityLevel.js - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/securitylevel/SecurityLevel.jsm → toolkit/components/securitylevel/SecurityLevel.sys.mjs - toolkit/components/securitylevel/components.conf - toolkit/components/securitylevel/moz.build - toolkit/modules/TorStrings.sys.mjs Changes: ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -2,11 +2,9 @@ /* global AppConstants, Services, openPreferences, XPCOMUtils */ -ChromeUtils.defineModuleGetter( - this, - "SecurityLevelPrefs", - "resource://gre/modules/SecurityLevel.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", +}); /* Security Level Button Code ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -12,14 +12,9 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", + SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs", }); -ChromeUtils.defineModuleGetter( - lazy, - "SecurityLevelPrefs", - "resource://gre/modules/SecurityLevel.jsm" -); - const BinaryInputStream = Components.Constructor( "@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream", ===================================== toolkit/components/securitylevel/SecurityLevel.jsm → toolkit/components/securitylevel/SecurityLevel.sys.mjs ===================================== @@ -1,17 +1,10 @@ -"use strict"; - -var EXPORTED_SYMBOLS = ["SecurityLevel", "SecurityLevelPrefs"]; - -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm"); +import { ConsoleAPI } from "resource://gre/modules/Console.sys.mjs"; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "ExtensionParent", - "resource://gre/modules/ExtensionParent.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs", +}); const logger = new ConsoleAPI({ maxLogLevel: "info", @@ -263,6 +256,7 @@ var initializeNoScriptControl = () => { // bind NoScript settings to the browser.security_level.security_slider // (see noscript-control.js). /* eslint-disable */ +// prettier-ignore const kSecuritySettings = { // Preference name : [0, 1-high 2-m 3-m 4-low] "javascript.options.ion" : [, false, false, false, true ], @@ -427,7 +421,7 @@ function migratePreferences() { } // This class is used to initialize the security level stuff at the startup -class SecurityLevel { +export class SecurityLevel { QueryInterface = ChromeUtils.generateQI(["nsIObserver"]); init() { @@ -448,7 +442,7 @@ class SecurityLevel { Getters and Setters for relevant torbutton prefs */ -const SecurityLevelPrefs = { +export const SecurityLevelPrefs = { SecurityLevels: Object.freeze({ safest: 1, safer: 2, ===================================== toolkit/components/securitylevel/components.conf ===================================== @@ -4,7 +4,7 @@ Classes = [ "contract_ids": [ "@torproject.org/security-level;1", ], - "jsm": "resource://gre/modules/SecurityLevel.jsm", + "esModule": "resource://gre/modules/SecurityLevel.sys.mjs", "constructor": "SecurityLevel", } ] ===================================== toolkit/components/securitylevel/moz.build ===================================== @@ -1,5 +1,5 @@ EXTRA_JS_MODULES += [ - "SecurityLevel.jsm", + "SecurityLevel.sys.mjs", ] XPCOM_MANIFESTS += [ ===================================== toolkit/modules/TorStrings.sys.mjs ===================================== @@ -3,10 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { AppConstants } = ChromeUtils.import( - "resource://gre/modules/AppConstants.jsm" -); +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; function getLocale() { const locale = Services.locale.appLocaleAsBCP47; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9e01b1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9e01b1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] 3 commits: fixup! Implement Android-native Connection Assist UI
by Dan Ballard (＠dan) 26 Mar '24

26 Mar '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 333d9284 by clairehurst at 2024-03-26T17:06:53-06:00 fixup! Implement Android-native Connection Assist UI - - - - - 86815386 by clairehurst at 2024-03-26T17:06:54-06:00 fixup! Bug 41878: Add standalone Tor Bootstrap - - - - - 99f95c30 by clairehurst at 2024-03-26T17:06:54-06:00 fixup! Add Tor integration and UI - - - - - 12 changed files: - fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerTAS.kt - + fenix/app/src/main/res/drawable/connect_broken.xml - + fenix/app/src/main/res/drawable/globe_broken.xml - fenix/app/src/main/res/drawable/tor_bootstrap_background_gradient.xml - fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml - fenix/app/src/main/res/values/colors.xml - fenix/app/src/main/res/values/styles.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -168,6 +168,7 @@ import java.util.Locale import androidx.navigation.fragment.findNavController import mozilla.components.browser.engine.gecko.GeckoEngine import mozilla.components.browser.state.selector.findCustomTab +import org.mozilla.fenix.home.HomeFragment import org.mozilla.geckoview.TorIntegrationAndroid /** @@ -815,6 +816,10 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn final override fun onBackPressed() { supportFragmentManager.primaryNavigationFragment?.childFragmentManager?.fragments?.forEach { + if (it is HomeFragment){ + finish() + return + } if (it is UserInteractionHandler && it.onBackPressed()) { return } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -4,11 +4,19 @@ package org.mozilla.fenix.tor +import android.graphics.Color import android.os.Build import android.os.Bundle +import android.text.SpannableString +import android.text.Spanned +import android.text.TextPaint +import android.text.method.LinkMovementMethod +import android.text.style.ClickableSpan +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.appcompat.content.res.AppCompatResources import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle @@ -22,6 +30,7 @@ import org.mozilla.fenix.ext.hideToolbar class TorConnectionAssistFragment : Fragment() { + private val TAG = "TorConnectionAssistFrag" private var _binding: FragmentTorConnectionAssistBinding? = null private val binding get() = _binding!! @@ -49,13 +58,14 @@ class TorConnectionAssistFragment : Fragment() { lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { - viewModel.torConnectState.collect { - when (it) { - TorConnectState.Initial -> showConfiguring() + viewModel.torConnectState.collect { torConnectState -> + Log.d(TAG, "torConnectState is ${torConnectState.state}") + when (torConnectState) { + TorConnectState.Initial -> showSplash() TorConnectState.Configuring -> showConfiguring() TorConnectState.AutoBootstrapping -> showBootstrapping() TorConnectState.Bootstrapping -> showBootstrapping() - TorConnectState.Error -> TODO() + TorConnectState.Error -> showError() TorConnectState.Bootstrapped -> openHome() TorConnectState.Disabled -> openHome() } @@ -73,59 +83,302 @@ class TorConnectionAssistFragment : Fragment() { } } - viewModel.quickconnectToggle().observe( - viewLifecycleOwner + viewModel.quickstartToggle().observe( + viewLifecycleOwner, ) { - binding.quickstartSwitch.isChecked = it + binding.quickstartSwitch.isChecked = it == true + } + + binding.quickstartSwitch.setOnCheckedChangeListener { _, isChecked -> + viewModel.handleQuickstartChecked(isChecked) } + } + + private fun showSplash() { + binding.torBootstrapProgressBar.visibility = View.GONE + binding.settingsButton.visibility = View.GONE + binding.backButton.visibility = View.GONE + binding.torConnectImage.visibility = View.GONE + binding.titleLargeTextView.visibility = View.GONE + binding.titleDescription.visibility = View.GONE + binding.quickStartDescription.visibility = View.GONE + binding.quickstartSwitch.visibility = View.GONE + binding.torBootstrapButton1.visibility = View.GONE + binding.torBootstrapButton2.visibility = View.GONE + binding.wordmarkLogo.visibility = View.VISIBLE + } + + + private fun showConfiguring() { + binding.wordmarkLogo.visibility = View.GONE + + binding.torBootstrapProgressBar.visibility = View.INVISIBLE + binding.torBootstrapProgressBar.progress = 0 + binding.backButton.visibility = View.INVISIBLE + binding.settingsButton.visibility = View.VISIBLE binding.settingsButton.setOnClickListener { viewModel.cancelTorBootstrap() openSettings() } + binding.torConnectImage.visibility = View.VISIBLE + binding.torConnectImage.setImageResource(R.drawable.connect) + binding.titleLargeTextView.visibility = View.VISIBLE + binding.titleLargeTextView.text = getString(R.string.connection_assist_tor_connect_title) + binding.titleDescription.visibility = View.VISIBLE + binding.titleDescription.text = + getString(R.string.preferences_tor_network_settings_explanation) + binding.quickStartDescription.visibility = View.VISIBLE + binding.quickstartSwitch.visibility = View.VISIBLE + binding.quickstartSwitch.isChecked = viewModel.quickstartToggle().value == true + + binding.unblockTheInternetInCountryDescription.visibility = View.GONE + binding.countryDropDown.visibility = View.GONE - binding.torBootstrapConnectButton.setOnClickListener { + binding.torBootstrapButton1.visibility = View.VISIBLE + binding.torBootstrapButton1.text = getString(R.string.tor_bootstrap_connect) + binding.torBootstrapButton1.setOnClickListener { viewModel.handleConnect(lifecycleScope = lifecycleScope) + showBootstrapping() } - binding.quickstartSwitch.setOnCheckedChangeListener { _, isChecked -> - viewModel.handleQuickstartChecked(isChecked) + binding.torBootstrapButton2.visibility = View.VISIBLE + binding.torBootstrapButton2.text = + getString(R.string.connection_assist_configure_connection_button) + binding.torBootstrapButton2.setOnClickListener { + viewModel.cancelTorBootstrap() + openTorNetworkSettings() } } - private fun showConfiguring() { - binding.torBootstrapConnectButton.visibility = View.VISIBLE - binding.torBootstrapNetworkSettingsButton.text = + private fun showBootstrapping() { + binding.wordmarkLogo.visibility = View.GONE + + binding.torBootstrapProgressBar.visibility = View.VISIBLE + binding.torBootstrapProgressBar.progress = 0 + binding.backButton.visibility = View.INVISIBLE + binding.settingsButton.visibility = View.VISIBLE + binding.settingsButton.setOnClickListener { + viewModel.cancelTorBootstrap() + openSettings() + } + binding.torConnectImage.visibility = View.VISIBLE + binding.torConnectImage.setImageResource(R.drawable.connect) + binding.titleLargeTextView.visibility = View.VISIBLE + binding.titleLargeTextView.text = getString(R.string.connection_assist_connecting_title) + binding.titleDescription.visibility = View.VISIBLE + binding.titleDescription.text = + getString(R.string.preferences_tor_network_settings_explanation) + binding.quickstartSwitch.visibility = View.VISIBLE + binding.quickstartSwitch.isChecked = viewModel.quickstartToggle().value == true + binding.quickstartSwitch.jumpDrawablesToCurrentState() + binding.quickStartDescription.visibility = View.VISIBLE + binding.torBootstrapButton1.visibility = View.INVISIBLE + binding.torBootstrapButton2.visibility = View.VISIBLE + binding.torBootstrapButton2.text = getString(R.string.btn_cancel) + binding.torBootstrapButton2.setOnClickListener { viewModel.cancelTorBootstrap() } + } + + private suspend fun showError() { + viewModel.torError.collect { + Log.d( + TAG, + "TorError: details = ${it?.details ?: "null details"}, message = ${it?.message ?: "null message"}", + ) + when (viewModel.handleError(it)) { + ErrorScreen.CantConnectToInternet -> showCantConnectToInternet() + ErrorScreen.CantConnectToTorDirectly -> showCantConnectToTorDirectly() + ErrorScreen.WeCouldntFindYourLocation -> showWeCouldntFindYourLocation() + ErrorScreen.WereStillHavingTroubleConnecting -> showWereStillHavingTroubleConnecting() + ErrorScreen.WeWerentAbleToConnectAutomatically -> showWeWerentAbleToConnectAutomatically() + null -> { + // no op + Log.d(TAG, "ErrorScreen: null, nothing shown") + } + } + } + } + + private fun showCantConnectToInternet() { + Log.d(TAG, "showCantConnectToInternet()") + binding.torBootstrapProgressBar.visibility = View.VISIBLE + binding.torBootstrapProgressBar.progressTintList = + AppCompatResources.getColorStateList(requireContext(), R.color.warning_yellow) + binding.torBootstrapProgressBar.progress = 100 + + binding.backButton.visibility = View.VISIBLE + binding.backButton.setOnClickListener { + showConfiguring() + } + + binding.torConnectImage.setImageResource(R.drawable.globe_broken) + binding.titleLargeTextView.text = getString(R.string.connection_assist_internet_error_title) + + val learnMore: String = getString(R.string.connection_assist_internet_error_learn_more) + val internetErrorDescription: String = getString( + R.string.connection_assist_internet_error_description, + learnMore, + ) + handleDescriptionWithClickable(internetErrorDescription, learnMore) + + binding.quickStartDescription.visibility = View.GONE + binding.quickstartSwitch.visibility = View.GONE + + binding.torBootstrapButton1.visibility = View.VISIBLE + binding.torBootstrapButton1.text = + getString(R.string.connection_assist_internet_error_try_again) + binding.torBootstrapButton1.setOnClickListener { + showTryingAgain() + viewModel.handleConnect(lifecycleScope = lifecycleScope) + } + + binding.torBootstrapButton2.text = getString(R.string.connection_assist_configure_connection_button) - binding.torBootstrapNetworkSettingsButton.setOnClickListener { + binding.torBootstrapButton2.setOnClickListener { openTorNetworkSettings() } } - private fun showBootstrapping() { - binding.torBootstrapConnectButton.visibility = View.INVISIBLE - binding.torBootstrapNetworkSettingsButton.text = getString(R.string.btn_cancel) - binding.torBootstrapNetworkSettingsButton.setOnClickListener { + private fun showTryingAgain() { + Log.d(TAG, "showTryingAgain()") + binding.torBootstrapProgressBar.progress = 0 + binding.torBootstrapProgressBar.visibility = View.VISIBLE + binding.torBootstrapProgressBar.progressTintList = null + binding.torConnectImage.setImageResource(R.drawable.connect) + binding.titleLargeTextView.text = + getString(R.string.connection_assist_trying_again_waiting_title) + + binding.quickstartSwitch.visibility = View.GONE + binding.quickStartDescription.visibility = View.GONE + binding.torBootstrapButton1.visibility = View.INVISIBLE + binding.torBootstrapButton2.visibility = View.VISIBLE + binding.torBootstrapButton2.text = getString(R.string.btn_cancel) + binding.torBootstrapButton2.setOnClickListener { viewModel.cancelTorBootstrap() + showConfiguring() } } - private fun openSettings(preferenceToScrollTo: String? = null) { - findNavController().navigate( - TorConnectionAssistFragmentDirections - .actionTorConnectionAssistFragmentToSettingsFragment(preferenceToScrollTo), + private fun showCantConnectToTorDirectly() { + Log.d(TAG, "showCantConnectToTorDirectly()") + binding.torBootstrapProgressBar.visibility = View.VISIBLE + binding.torBootstrapProgressBar.progressTintList = + AppCompatResources.getColorStateList(requireContext(), R.color.warning_yellow) + binding.torBootstrapProgressBar.progress = 100 + + binding.backButton.visibility = View.VISIBLE + binding.backButton.setOnClickListener { + showConfiguring() + } + + binding.torConnectImage.setImageResource(R.drawable.globe_broken) + binding.titleLargeTextView.text = + getString(R.string.connection_assist_cant_connect_to_tor_title) + + val learnMore: String = getString(R.string.connection_assist_internet_error_learn_more) + val tryABridge: String = getString( + R.string.connection_assist_try_a_bridge_description, + learnMore, ) + handleDescriptionWithClickable(tryABridge, learnMore) + + binding.quickStartDescription.visibility = View.GONE + binding.quickstartSwitch.visibility = View.GONE + binding.unblockTheInternetInCountryDescription.visibility = View.VISIBLE + binding.countryDropDown.visibility = View.VISIBLE + // TODO implement countryDropDown + + binding.torBootstrapButton1.visibility = View.VISIBLE + binding.torBootstrapButton1.text = getString(R.string.connection_assist_try_a_bridge_button) + binding.torBootstrapButton1.setOnClickListener { + viewModel.tryABridge() + showTryingABridge() + } + binding.torBootstrapButton2.visibility = View.GONE } - private fun openTorNetworkSettings() { - findNavController().navigate( - TorConnectionAssistFragmentDirections - .actionTorConnectionAssistFragmentToTorNetworkSettings(), + private fun showTryingABridge() { + Log.d(TAG, "showTryingABridge()") + // TODO(Not implemented) + binding.torBootstrapButton2.setOnClickListener { + showTryingABridge() + } + } + + private fun showWeCouldntFindYourLocation() { + Log.d(TAG, "showWeCouldntFindYourLocation()") + // TODO(Not implemented) + binding.torBootstrapButton2.setOnClickListener { + showTryingABridge() + } + } + + private fun showWereStillHavingTroubleConnecting() { + Log.d(TAG, "showWereStillHavingTroubleConnecting()") + TODO("Not yet implemented") + } + + private fun showTryingOneMoreTime() { + Log.d(TAG, "showTryingOneMoreTime()") + TODO("Not yet implemented") + } + + private fun showWeWerentAbleToConnectAutomatically() { + Log.d(TAG, "showWeWerentAbleToConnectAutomatically()") + TODO("Not yet implemented") + } + + private fun showUnknownError() { + Log.d(TAG, "showUnknownError()") + TODO("Not yet implemented") + } + + /** + * from https://stackoverflow.com/questions/10696986/how-to-set-the-part-of-the-tex… + */ + private fun handleDescriptionWithClickable(errorDescription: String, learnMore: String) { + val errorDescriptionSpannableString = SpannableString(errorDescription) + val clickableSpan: ClickableSpan = object : ClickableSpan() { + override fun onClick(textView: View) { + showLearnMore() + } + + override fun updateDrawState(drawState: TextPaint) { + super.updateDrawState(drawState) + drawState.isUnderlineText = true + } + } + errorDescriptionSpannableString.setSpan( + clickableSpan, + errorDescription.length - learnMore.length, + errorDescription.length, + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE, ) + binding.titleDescription.text = errorDescriptionSpannableString + binding.titleDescription.movementMethod = LinkMovementMethod.getInstance() + binding.titleDescription.highlightColor = Color.TRANSPARENT + } + + private fun showLearnMore() { + //TODO("Not yet implemented") } private fun openHome() { + Log.d(TAG, "openHome()") //This doesn't seem to be ever called findNavController().navigate(TorConnectionAssistFragmentDirections.actionStartupHome()) } + private fun openSettings(preferenceToScrollTo: String? = null) { + findNavController().navigate( + TorConnectionAssistFragmentDirections.actionTorConnectionAssistFragmentToSettingsFragment( + preferenceToScrollTo, + ), + ) + } + + private fun openTorNetworkSettings() { + findNavController().navigate( + TorConnectionAssistFragmentDirections.actionTorConnectionAssistFragmentToTorNetworkSettings(), + ) + } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt ===================================== @@ -26,24 +26,30 @@ class TorConnectionAssistViewModel( private val _torConnectState = MutableStateFlow(TorConnectState.Initial) internal val torConnectState: StateFlow<TorConnectState> = _torConnectState - init { - _torController.registerTorListener(this) - } + private val _torError = MutableStateFlow(_torController.getLastErrorState()) + internal val torError: StateFlow<TorError?> = _torError private val _progress = MutableLiveData(0) fun progress(): LiveData<Int> { return _progress } - private val _quickconnectToggle = MutableLiveData(_torController.quickstart) - fun quickconnectToggle(): LiveData<Boolean> { - return _quickconnectToggle + private val _quickStartToggle = MutableLiveData<Boolean>() // don't initialize with quickstart off the bat + fun quickstartToggle(): LiveData<Boolean?> { + _quickStartToggle.value = _torController.quickstart // quickstart isn't ready until torSettings is ready + return _quickStartToggle + } + + init { + Log.d(TAG, "initiating TorConnectionAssistViewModel") + _torController.registerTorListener(this) } fun handleConnect( withDebugLogging: Boolean = false, lifecycleScope: LifecycleCoroutineScope? = null, ) { + Log.d(TAG, "handleConnect initiatingTorBootstrap with lifecycleScope = $lifecycleScope") _torController.initiateTorBootstrap( withDebugLogging = withDebugLogging, lifecycleScope = lifecycleScope, @@ -52,6 +58,7 @@ class TorConnectionAssistViewModel( fun handleQuickstartChecked(checked: Boolean) { _torController.quickstart = checked + _quickStartToggle.value = checked } fun cancelTorBootstrap() { @@ -66,7 +73,6 @@ class TorConnectionAssistViewModel( override fun onTorConnected() { Log.d(TAG, "onTorConnected()") _torController.unregisterTorListener(this) - _torConnectState.value = _torController.lastKnownStatus } override fun onTorStatusUpdate(entry: String?, status: String?, progress: Double?) { @@ -75,12 +81,32 @@ class TorConnectionAssistViewModel( _progress.value = progress.toInt() } _torConnectState.value = _torController.lastKnownStatus + _torError.value = _torController.getLastErrorState() } override fun onTorStopped() { Log.d(TAG, "onTorStopped()") - _progress.value = 0 - _torConnectState.value = _torController.lastKnownStatus } + internal fun handleError(it: TorError?): ErrorScreen? { + // TODO(Only partly implemented) + if (it?.message == null){ + return null + } + return ErrorScreen.CantConnectToInternet + } + + fun tryABridge() { + // TODO("Try a bridge not enabled") + // connect to bridge based on country + // try connecting + } +} + +internal enum class ErrorScreen { + CantConnectToInternet, + CantConnectToTorDirectly, + WeCouldntFindYourLocation, + WereStillHavingTroubleConnecting, + WeWerentAbleToConnectAutomatically, } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -12,6 +12,10 @@ interface TorEvents { fun onTorStatusUpdate(entry: String?, status: String?, progress: Double? = 0.0) fun onTorStopped() } +class TorError( + var message: String, + var details: String +) { } internal enum class TorStatus(val status: String) { OFF("OFF"), @@ -59,6 +63,8 @@ interface TorController: TorEvents { override fun onTorStatusUpdate(entry: String?, status: String?, progress: Double?) override fun onTorStopped() + fun getLastErrorState() : TorError? + fun registerTorListener(l: TorEvents) fun unregisterTorListener(l: TorEvents) ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -53,6 +53,7 @@ class TorControllerGV( private var torListeners = mutableListOf<TorEvents>() internal var lastKnownStatus = TorConnectState.Initial + internal var lastKnownError: TorError? = null private var wasTorBootstrapped = false private var isTorRestarting = false @@ -210,6 +211,7 @@ class TorControllerGV( override fun setTorStopped() { lastKnownStatus = TorConnectState.Configuring + onTorStatusUpdate(null, lastKnownStatus.toString(), 0.0) onTorStopped() } @@ -227,6 +229,10 @@ class TorControllerGV( } } + override fun getLastErrorState() : TorError? { + return lastKnownError + } + // TorEventsBootstrapStateChangeListener -> (lastKnowStatus, TorEvents) // Handle events from GeckoView TorAndroidIntegration and map to TorEvents based events // and state for firefox-android (designed for tor-android-service) @@ -263,7 +269,7 @@ class TorControllerGV( } lastKnownStatus = newState - + onTorStatusUpdate(null, newStateVal, null) } // TorEventsBootstrapStateChangeListener @@ -290,7 +296,7 @@ class TorControllerGV( // TorEventsBootstrapStateChangeListener override fun onBootstrapError(message: String?, details: String?) { - lastKnownStatus = TorConnectState.Error + lastKnownError = TorError(message ?: "", details ?: "") onBootstrapStateChange(TorConnectState.Error.state) } ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerTAS.kt ===================================== @@ -330,4 +330,10 @@ class TorControllerTAS (private val context: Context): TorController { companion object { const val torServiceResponseTimeout = 5000L } + + // Compat with TorControlGV Stubs + + override fun getLastErrorState() : TorError? { + return null; + } } ===================================== fenix/app/src/main/res/drawable/connect_broken.xml ===================================== @@ -0,0 +1,37 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="40dp" + android:height="40dp" + android:viewportWidth="40" + android:viewportHeight="40"> + <group> + <clip-path + android:pathData="M0,0h40v40h-40z"/> + <path + android:pathData="M8.317,5.337C11.521,2.781 15.582,1.253 19.999,1.253C30.352,1.253 38.745,9.647 38.745,20C38.745,24.418 37.218,28.478 34.662,31.681L32.577,29.597C34.611,26.937 35.819,23.611 35.819,20C35.819,11.26 28.739,4.18 19.999,4.18C16.389,4.18 13.063,5.388 10.401,7.421L8.317,5.337Z" + android:fillColor="#FBFBFE"/> + <path + android:pathData="M5.89,7.656C3.002,10.954 1.252,15.273 1.252,20C1.252,28.967 7.545,36.46 15.959,38.307C16.839,38.5 17.732,38.633 18.652,38.693V24.373C16.785,23.8 15.425,22.06 15.425,20C15.425,19.19 15.635,18.43 16.004,17.771L13.887,15.653C13.013,16.88 12.499,18.38 12.499,20C12.499,22.653 13.879,24.987 15.959,26.32V35.293C9.179,33.513 4.179,27.347 4.179,20C4.179,16.08 5.603,12.493 7.963,9.73L5.89,7.656Z" + android:fillColor="#FBFBFE"/> + <path + android:pathData="M16.399,13.419L18.618,15.638C19.054,15.501 19.517,15.427 19.998,15.427C22.525,15.427 24.572,17.473 24.572,20C24.572,20.481 24.498,20.945 24.36,21.38L26.579,23.599C27.165,22.531 27.498,21.304 27.498,20C27.498,15.86 24.138,12.5 19.998,12.5C18.694,12.5 17.468,12.833 16.399,13.419Z" + android:fillColor="#FBFBFE"/> + <path + android:pathData="M24.349,26.112L22.232,23.995C21.954,24.151 21.658,24.278 21.349,24.373V38.693C22.269,38.633 23.162,38.5 24.042,38.307C27.176,37.619 30.015,36.147 32.345,34.109L30.271,32.034C28.492,33.552 26.372,34.681 24.042,35.293V26.32C24.146,26.253 24.249,26.184 24.349,26.112Z" + android:fillColor="#FBFBFE"/> + <path + android:pathData="M30.653,27.67C32.21,25.514 33.127,22.864 33.127,20C33.127,12.753 27.247,6.873 20,6.873C17.138,6.873 14.488,7.791 12.33,9.348L14.437,11.455C16.037,10.412 17.947,9.807 20,9.807C25.634,9.807 30.194,14.367 30.194,20C30.194,22.051 29.587,23.962 28.544,25.562L30.653,27.67Z" + android:fillColor="#FBFBFE"/> + <path + android:pathData="M26.272,28.037L28.357,30.121C27.095,31.163 25.635,31.973 24.041,32.487V29.36C24.844,29.014 25.593,28.568 26.272,28.037Z" + android:fillColor="#FBFBFE"/> + <path + android:pathData="M11.962,13.727L9.878,11.643C8.001,13.914 6.873,16.826 6.873,20C6.873,25.84 10.686,30.787 15.96,32.487V29.36C12.34,27.8 9.806,24.193 9.806,20C9.806,17.633 10.611,15.457 11.962,13.727Z" + android:fillColor="#FBFBFE"/> + <path + android:pathData="M17.922,19.688L20.311,22.077C20.21,22.092 20.105,22.1 19.999,22.1C18.84,22.1 17.899,21.16 17.899,20C17.899,19.894 17.907,19.79 17.922,19.688Z" + android:fillColor="#FBFBFE"/> + <path + android:pathData="M2.89,4.642L35.228,36.98C35.879,37.632 35.879,38.688 35.228,39.339L35.228,39.339C34.576,39.991 33.52,39.991 32.868,39.339L0.53,7.001C-0.121,6.35 -0.121,5.294 0.53,4.642C1.182,3.991 2.238,3.991 2.89,4.642Z" + android:fillColor="#FBFBFE"/> + </group> +</vector> ===================================== fenix/app/src/main/res/drawable/globe_broken.xml ===================================== @@ -0,0 +1,18 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="40dp" + android:height="40dp" + android:viewportWidth="40" + android:viewportHeight="40"> + <path + android:pathData="M4.209,1.999L37.355,35.145L35.145,37.355L1.999,4.209L4.209,1.999Z" + android:fillColor="#FBFBFE" + android:fillType="evenOdd"/> + <path + android:pathData="M7.869,5.703C3.82,9.142 1.25,14.271 1.25,20C1.25,30.03 9.126,38.221 19.031,38.725L19.041,38.733L19.047,38.726C19.363,38.742 19.681,38.75 20,38.75C20.32,38.75 20.638,38.742 20.954,38.726L20.96,38.733L20.97,38.725C26.306,38.453 31.053,35.951 34.297,32.132L32.079,29.913C30.228,32.166 27.759,33.891 24.931,34.831C26.854,32.438 28.243,29.75 29.097,26.931L26.534,24.368C25.642,28.517 23.465,32.438 20,35.474C15.763,31.76 13.451,26.722 13.063,21.563H23.728L20.603,18.438H13.063C13.22,16.35 13.692,14.282 14.479,12.313L12.102,9.936C10.844,12.632 10.12,15.52 9.93,18.438H4.453C4.872,14.209 6.978,10.477 10.087,7.922L7.869,5.703ZM15.069,34.831C11.952,30.951 10.239,26.295 9.93,21.563H4.453C5.07,27.779 9.331,32.924 15.069,34.831Z" + android:fillColor="#FBFBFE" + android:fillType="evenOdd"/> + <path + android:pathData="M13.678,7.093C14.106,6.433 14.569,5.791 15.069,5.169C14.263,5.437 13.486,5.769 12.744,6.159L10.448,3.863C12.985,2.358 15.907,1.434 19.031,1.275L19.041,1.267L19.047,1.274C19.363,1.258 19.681,1.25 20,1.25C20.32,1.25 20.638,1.258 20.954,1.274L20.96,1.267L20.97,1.275C30.875,1.779 38.75,9.97 38.75,20C38.75,23.489 37.798,26.755 36.138,29.553L33.842,27.257C34.752,25.525 35.346,23.601 35.548,21.563H30.071C30.033,22.146 29.974,22.728 29.893,23.308L25.023,18.438H26.938C26.55,13.278 24.238,8.24 20,4.526C18.361,5.963 17.01,7.598 15.947,9.361L13.678,7.093ZM30.071,18.438H35.548C34.931,12.221 30.67,7.076 24.931,5.169C28.049,9.049 29.762,13.705 30.071,18.438Z" + android:fillColor="#FBFBFE" + android:fillType="evenOdd"/> +</vector> ===================================== fenix/app/src/main/res/drawable/tor_bootstrap_background_gradient.xml ===================================== @@ -7,9 +7,9 @@ <shape> <gradient android:angle="225" - android:startColor="#FF7329A4" - android:centerColor="#FF3A3274" - android:endColor="#FF3A3274" + android:startColor="@color/backgroundGradientLight" + android:centerColor="@color/backgroundGradientDark" + android:endColor="@color/backgroundGradientDark" android:type="linear" /> </shape> </item> ===================================== fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml ===================================== @@ -3,29 +3,63 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/tor_bootstrap_background_gradient"> + android:background="@drawable/tor_bootstrap_background_gradient" + android:paddingBottom="16dp"> <ProgressBar android:id="@+id/tor_bootstrap_progress_bar" style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="6dp" + android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <ImageView + <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/settings_button" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginTop="26dp" - android:layout_marginEnd="20dp" - android:contentDescription="@string/settings" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/mozac_ic_settings" /> + app:layout_constraintTop_toTopOf="parent"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/settings" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/mozac_ic_settings" /> + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/back_button" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:visibility="invisible" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/settings" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/mozac_ic_back" /> + </androidx.constraintlayout.widget.ConstraintLayout> + <ImageView android:id="@+id/tor_connect_image" @@ -45,99 +79,139 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:layout_marginTop="24dp" android:layout_marginEnd="24dp" android:text="@string/connection_assist_tor_connect_title" android:textColor="#FBFBFE" - android:textFontWeight="400" android:textSize="22sp" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tor_connect_image" /> + app:layout_constraintTop_toBottomOf="@id/tor_connect_image" + app:layout_constraintVertical_bias="0.03" /> <TextView - android:id="@+id/connect_to_tor_description" + android:id="@+id/title_description" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:layout_marginTop="16dp" android:layout_marginEnd="24dp" + android:lineSpacingExtra="6dp" android:text="@string/preferences_tor_network_settings_explanation" android:textColor="#FBFBFE" - android:textFontWeight="400" android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/title_large_text_view" /> + app:layout_constraintTop_toBottomOf="@id/title_large_text_view" + app:layout_constraintVertical_bias="0.03" /> + <TextView - android:id="@+id/connect_automatically" - android:layout_width="wrap_content" + android:id="@+id/quick_start_description" + android:layout_width="230dp" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:layout_marginTop="24dp" android:text="@string/connection_assist_always_connect_automatically_toggle_description" - android:textColor="#80FBFBFE" + android:textColor="#FBFBFE" android:textSize="14sp" - app:layout_constraintBottom_toBottomOf="@+id/quickstart_switch" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/quickstart_switch" - app:layout_constraintVertical_bias="1.25" /> + app:layout_constraintTop_toBottomOf="@+id/title_description" + app:layout_constraintVertical_bias=".03" /> <androidx.appcompat.widget.SwitchCompat android:id="@+id/quickstart_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="24dp" + android:layout_marginStart="100dp" android:layout_marginEnd="24dp" android:layout_marginBottom="24dp" - android:enabled="false" android:gravity="center" - app:thumbTint="#7D6298" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/connect_to_tor_description" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintStart_toEndOf="@+id/quick_start_description" + app:layout_constraintTop_toBottomOf="@id/title_description" + app:layout_constraintVertical_bias=".023" app:layout_goneMarginEnd="6dp" app:layout_goneMarginTop="9dp" /> - <Button - android:id="@+id/tor_bootstrap_connect_button" + <TextView + android:id="@+id/unblock_the_internet_in_country_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginTop="24dp" + android:layout_marginEnd="24dp" + android:text="@string/connection_assist_unblock_the_internet_in_country_or_region" + android:textColor="#FBFBFE" + android:visibility="invisible" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/title_description" /> + + <androidx.appcompat.widget.AppCompatSpinner + android:id="@+id/country_drop_down" + style="@style/Widget.AppCompat.Spinner.Underlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="24dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="24dp" + android:textColor="#FBFBFE" + android:tooltipText="@string/connection_assist_share_my_location_country_or_region" + android:visibility="invisible" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/unblock_the_internet_in_country_description" /> + + <ImageView + android:id="@+id/wordmarkLogo" + android:layout_width="160dp" + android:layout_height="160dp" + android:src="@mipmap/ic_launcher_round" + + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:contentDescription="" /> + + <Button + android:id="@+id/tor_bootstrap_button_1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:layout_marginBottom="8dp" android:background="@drawable/rounded_corners" android:backgroundTint="@color/connect_button_purple" - android:maxWidth="312dp" + android:minWidth="360dp" android:text="@string/tor_bootstrap_connect" android:textAllCaps="false" android:textColor="#FBFBFE" - android:textFontWeight="500" android:textSize="14sp" android:textStyle="bold" - app:layout_constraintBottom_toTopOf="@id/tor_bootstrap_network_settings_button" + app:layout_constraintBottom_toTopOf="@id/tor_bootstrap_button_2" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/quickstart_switch" app:layout_constraintVertical_bias="1" /> - <Button - android:id="@+id/tor_bootstrap_network_settings_button" - android:layout_width="match_parent" + android:id="@+id/tor_bootstrap_button_2" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" - android:layout_marginBottom="24dp" + android:layout_marginBottom="8dp" android:background="@drawable/rounded_corners" android:backgroundTint="@color/configure_connection_button_white" - android:maxWidth="312dp" + android:minWidth="360dp" android:text="@string/connection_assist_configure_connection_button" android:textAllCaps="false" android:textColor="#15141A" - android:textFontWeight="500" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" ===================================== fenix/app/src/main/res/values/colors.xml ===================================== @@ -273,6 +273,8 @@ <color name="sync_disconnected_background_private_theme">#5B5846</color> <color name="onboarding_illustration_deselected_private_theme">#99FBFBFE</color> <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color> + <color name="backgroundGradientDark">#FF3A3274</color> + <color name="backgroundGradientLight">#FF7329A4</color>  <color name="accent_normal_theme">@color/photonInk20</color> @@ -344,5 +346,6 @@  <color name="connect_button_purple">#9059FF</color> <color name="configure_connection_button_white">#E1E0E7</color> + <color name="warning_yellow">#FFA436</color> </resources> ===================================== fenix/app/src/main/res/values/styles.xml ===================================== @@ -12,7 +12,7 @@ <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item> <item name="android:progressBarStyleHorizontal">@style/progressBarStyleHorizontal</item> <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:windowBackground">@color/fx_mobile_layer_color_1</item> + <item name="android:windowBackground">@color/backgroundGradientDark</item> <item name="android:colorEdgeEffect">@color/accent_normal_theme</item> <item name="android:colorAccent">@color/fx_mobile_text_color_primary</item> <item name="android:textColorPrimary">@color/state_list_text_color</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/5a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/5a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Disable features and functionality
by Dan Ballard (＠dan) 26 Mar '24

26 Mar '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 5ab6ae0a by clairehurst at 2024-03-25T13:01:48-06:00 fixup! Disable features and functionality - - - - - 1 changed file: - android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt Changes: ===================================== android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/AddonsManagerAdapter.kt ===================================== @@ -316,7 +316,7 @@ class AddonsManagerAdapter( } // Add recommended section and addons if available - if (recommendedAddons.isNotEmpty()) { + if (false) { // recommendedAddons.isNotEmpty() tor-browser#40502: Do not recommend addons on Tor Browser itemsWithSections.add(Section(R.string.mozac_feature_addons_recommended_section, true)) val filteredRecommendedAddons = recommendedAddons.filter { it.id !in excludedAddonIDs View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/5ab… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/5ab… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Bug 42247: Android helpers for the TorProvider
by Pier Angelo Vendrame (＠pierov) 26 Mar '24

26 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 9e01b1a9 by Dan Ballard at 2024-03-26T11:33:26-07:00 fixup! Bug 42247: Android helpers for the TorProvider Bug 41187: Add support for tor logs in android integration - - - - - 4 changed files: - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs Changes: ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java ===================================== @@ -46,6 +46,7 @@ public class TorIntegrationAndroid implements BundleEventListener { private static final String EVENT_BOOTSTRAP_PROGRESS = "GeckoView:Tor:BootstrapProgress"; private static final String EVENT_BOOTSTRAP_COMPLETE = "GeckoView:Tor:BootstrapComplete"; private static final String EVENT_BOOTSTRAP_ERROR = "GeckoView:Tor:BootstrapError"; + private static final String EVENT_TOR_LOGS = "GeckoView:Tor:Logs"; private static final String EVENT_SETTINGS_READY = "GeckoView:Tor:SettingsReady"; private static final String EVENT_SETTINGS_CHANGED = "GeckoView:Tor:SettingsChanged"; private static final String EVENT_SETTINGS_OPEN = "GeckoView:Tor:OpenSettings"; @@ -118,6 +119,7 @@ public class TorIntegrationAndroid implements BundleEventListener { EVENT_BOOTSTRAP_PROGRESS, EVENT_BOOTSTRAP_COMPLETE, EVENT_BOOTSTRAP_ERROR, + EVENT_TOR_LOGS, EVENT_SETTINGS_OPEN); } @@ -168,6 +170,12 @@ public class TorIntegrationAndroid implements BundleEventListener { for (BootstrapStateChangeListener listener: mBootstrapStateListeners) { listener.onBootstrapError(msg, details); } + } else if (EVENT_TOR_LOGS.equals(event)) { + String msg = message.getString("message"); + String type = message.getString("logType"); + for (TorLogListener listener: mLogListeners) { + listener.onLog(type, msg); + } } else if (EVENT_SETTINGS_OPEN.equals(event)) { for (BootstrapStateChangeListener listener: mBootstrapStateListeners) { listener.onSettingsRequested(); @@ -573,6 +581,10 @@ public class TorIntegrationAndroid implements BundleEventListener { void onSettingsRequested(); } + public interface TorLogListener { + void onLog(String logType, String message); + } + private @NonNull void reloadSettings() { EventDispatcher.getInstance().queryBundle(EVENT_SETTINGS_GET).then( new GeckoResult.OnValueListener<GeckoBundle, Void>() { public GeckoResult<Void> onValue(final GeckoBundle bundle) { @@ -647,4 +659,14 @@ public class TorIntegrationAndroid implements BundleEventListener { } private final HashSet<BootstrapStateChangeListener> mBootstrapStateListeners = new HashSet<>(); + + public void registerLogListener(TorLogListener listener) { + mLogListeners.add(listener); + } + + public void unregisterLogListener(TorLogListener listener) { + mLogListeners.remove(listener); + } + + private final HashSet<TorLogListener> mLogListeners = new HashSet<>(); } ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -1002,6 +1002,8 @@ export class TorProvider { Services.obs.notifyObservers(null, TorProviderTopics.HasWarnOrErr); } + Services.obs.notifyObservers({ type, msg }, TorProviderTopics.TorLog); + const date = new Date(); const maxEntries = Services.prefs.getIntPref( Preferences.MaxLogEntries, ===================================== toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs ===================================== @@ -12,6 +12,7 @@ export const TorProviderTopics = Object.freeze({ ProcessExited: "TorProcessExited", BootstrapStatus: "TorBootstrapStatus", BootstrapError: "TorBootstrapError", + TorLog: "TorLog", HasWarnOrErr: "TorLogHasWarnOrErr", BridgeChanged: "TorBridgeChanged", CircuitCredentialsMatched: "TorCircuitCredentialsMatched", ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -11,6 +11,7 @@ ChromeUtils.defineESModuleGetters(lazy, { TorConnectTopics: "resource://gre/modules/TorConnect.sys.mjs", TorSettingsTopics: "resource://gre/modules/TorSettings.sys.mjs", TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", + TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs", TorSettings: "resource://gre/modules/TorSettings.sys.mjs", }); @@ -32,6 +33,7 @@ const EmittedEvents = Object.freeze({ bootstrapProgress: "GeckoView:Tor:BootstrapProgress", bootstrapComplete: "GeckoView:Tor:BootstrapComplete", bootstrapError: "GeckoView:Tor:BootstrapError", + torLogs: "GeckoView:Tor:Logs", }); const ListenedEvents = Object.freeze({ @@ -59,6 +61,8 @@ class TorAndroidIntegrationImpl { this.#bootstrapMethodReset(); Services.prefs.addObserver(Prefs.useNewBootstrap, this); + Services.obs.addObserver(this, lazy.TorProviderTopics.TorLog); + for (const topic in lazy.TorConnectTopics) { Services.obs.addObserver(this, lazy.TorConnectTopics[topic]); } @@ -118,6 +122,13 @@ class TorAndroidIntegrationImpl { details: subj.wrappedJSObject.details ?? "", }); break; + case lazy.TorProviderTopics.TorLog: + lazy.EventDispatcher.instance.sendRequest({ + type: EmittedEvents.torLogs, + logType: subj.wrappedJSObject.type ?? "", + message: subj.wrappedJSObject.msg ?? "", + }); + break; case lazy.TorSettingsTopics.Ready: lazy.EventDispatcher.instance.sendRequest({ type: EmittedEvents.settingsReady, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9e01b1a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9e01b1a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] fixup! Bug 40925: Implemented the Security Level component
by richard (＠richard) 26 Mar '24

26 Mar '24

richard pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: ea97107e by Henry Wilkes at 2024-03-26T17:56:27+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 42214: Drop the securityLevel.properties file. - - - - - 1 changed file: - − browser/locales/en-US/chrome/browser/securityLevel.properties Changes: ===================================== browser/locales/en-US/chrome/browser/securityLevel.properties deleted ===================================== @@ -1,33 +0,0 @@ -# Generic terms -security_level = Security Level -security_level_standard = Standard -security_level_safer = Safer -security_level_safest = Safest -security_level_tooltip_standard = Security Level: Standard -security_level_tooltip_safer = Security Level: Safer -security_level_tooltip_safest = Security Level: Safest -# Shown only for custom level -security_level_custom = Custom -security_level_restore = Restore Defaults -security_level_learn_more = Learn more - -# Panel button that takes the user to the security level settings in -# about:preferences#privacy -security_level_open_settings = Settings… -security_level_change = Change… -security_level_standard_summary = All browser and website features are enabled. -security_level_safer_summary = Disables website features that are often dangerous, causing some sites to lose functionality. -security_level_safest_summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. -security_level_custom_heading = Custom security level configured -security_level_custom_summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. - -## Security level section in about:preferences#privacy -security_level_overview = Disable certain web features that can be used to attack your security and anonymity. -security_level_list_safer = At the safer setting: -security_level_list_safest = At the safest setting: -# Strings for descriptions -security_level_js_https_only = JavaScript is disabled on non-HTTPS sites. -security_level_js_disabled = JavaScript is disabled by default on all sites. -security_level_limit_typography = Some fonts and math symbols are disabled. -security_level_limit_typography_svg = Some fonts, icons, math symbols, and images are disabled. -security_level_limit_media = Audio and video (HTML5 media), and WebGL are click-to-play. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ea9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ea9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.9.0esr-13.5-1] fixup! Bug 40925: Implemented the Security Level component
by richard (＠richard) 26 Mar '24

26 Mar '24

richard pushed to branch base-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 601bf763 by Henry Wilkes at 2024-03-26T17:54:31+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 42214: Drop the securityLevel.properties file. - - - - - 1 changed file: - − browser/locales/en-US/chrome/browser/securityLevel.properties Changes: ===================================== browser/locales/en-US/chrome/browser/securityLevel.properties deleted ===================================== @@ -1,33 +0,0 @@ -# Generic terms -security_level = Security Level -security_level_standard = Standard -security_level_safer = Safer -security_level_safest = Safest -security_level_tooltip_standard = Security Level: Standard -security_level_tooltip_safer = Security Level: Safer -security_level_tooltip_safest = Security Level: Safest -# Shown only for custom level -security_level_custom = Custom -security_level_restore = Restore Defaults -security_level_learn_more = Learn more - -# Panel button that takes the user to the security level settings in -# about:preferences#privacy -security_level_open_settings = Settings… -security_level_change = Change… -security_level_standard_summary = All browser and website features are enabled. -security_level_safer_summary = Disables website features that are often dangerous, causing some sites to lose functionality. -security_level_safest_summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. -security_level_custom_heading = Custom security level configured -security_level_custom_summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. - -## Security level section in about:preferences#privacy -security_level_overview = Disable certain web features that can be used to attack your security and anonymity. -security_level_list_safer = At the safer setting: -security_level_list_safest = At the safest setting: -# Strings for descriptions -security_level_js_https_only = JavaScript is disabled on non-HTTPS sites. -security_level_js_disabled = JavaScript is disabled by default on all sites. -security_level_limit_typography = Some fonts and math symbols are disabled. -security_level_limit_typography_svg = Some fonts, icons, math symbols, and images are disabled. -security_level_limit_media = Audio and video (HTML5 media), and WebGL are click-to-play. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/601bf76… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/601bf76… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] fixup! Bug 40925: Implemented the Security Level component
by richard (＠richard) 26 Mar '24

26 Mar '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: fec131fd by Henry Wilkes at 2024-03-26T17:50:00+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 42214: Drop the securityLevel.properties file. - - - - - 1 changed file: - − browser/locales/en-US/chrome/browser/securityLevel.properties Changes: ===================================== browser/locales/en-US/chrome/browser/securityLevel.properties deleted ===================================== @@ -1,33 +0,0 @@ -# Generic terms -security_level = Security Level -security_level_standard = Standard -security_level_safer = Safer -security_level_safest = Safest -security_level_tooltip_standard = Security Level: Standard -security_level_tooltip_safer = Security Level: Safer -security_level_tooltip_safest = Security Level: Safest -# Shown only for custom level -security_level_custom = Custom -security_level_restore = Restore Defaults -security_level_learn_more = Learn more - -# Panel button that takes the user to the security level settings in -# about:preferences#privacy -security_level_open_settings = Settings… -security_level_change = Change… -security_level_standard_summary = All browser and website features are enabled. -security_level_safer_summary = Disables website features that are often dangerous, causing some sites to lose functionality. -security_level_safest_summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. -security_level_custom_heading = Custom security level configured -security_level_custom_summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. - -## Security level section in about:preferences#privacy -security_level_overview = Disable certain web features that can be used to attack your security and anonymity. -security_level_list_safer = At the safer setting: -security_level_list_safest = At the safest setting: -# Strings for descriptions -security_level_js_https_only = JavaScript is disabled on non-HTTPS sites. -security_level_js_disabled = JavaScript is disabled by default on all sites. -security_level_limit_typography = Some fonts and math symbols are disabled. -security_level_limit_typography_svg = Some fonts, icons, math symbols, and images are disabled. -security_level_limit_media = Audio and video (HTML5 media), and WebGL are click-to-play. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fec131f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fec131f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 3 commits: fixup! Bug 2176: Rebrand Firefox to TorBrowser
by richard (＠richard) 26 Mar '24

26 Mar '24

richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 1ce353d9 by Henry Wilkes at 2024-03-26T17:47:47+00:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 42466: Use the existing #trademark element from mozilla for Tor Browser's trademark statement. - - - - - 3cad3836 by Henry Wilkes at 2024-03-26T17:47:47+00:00 fixup! Tor Browser strings Bug 42466: Change trademark statement to remove "onion logo", and move it to brand.ftl. - - - - - 37b97c98 by Henry Wilkes at 2024-03-26T17:47:47+00:00 fixup! Add TorStrings module for localization Bug 42466: Remove "onion logo" from trademark statement and move it to brand.ftl. - - - - - 4 changed files: - browser/base/content/aboutDialog.xhtml - browser/base/content/aboutDialogTor.css - browser/locales/en-US/browser/tor-browser.ftl - toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl Changes: ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -20,7 +20,7 @@ data-l10n-id="aboutDialog-title" #endif role="dialog" - aria-describedby="version distribution distributionId projectDesc helpDesc trademark trademarkTor" + aria-describedby="version distribution distributionId projectDesc helpDesc trademark" > #ifdef XP_MACOSX #include macWindow.inc.xhtml @@ -150,7 +150,6 @@ <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="about-dialog-browser-license-link"></label> </hbox> <description id="trademark" data-l10n-id="trademarkInfo"></description> - <description id="trademarkTor" data-l10n-id="about-dialog-trademark-statement"></description> </vbox> </html:div> ===================================== browser/base/content/aboutDialogTor.css ===================================== @@ -18,15 +18,10 @@ } #trademark { - display: none; -} - -#trademarkTor { font-size: xx-small; text-align: center; color: #999999; - margin-top: 10px; - margin-bottom: 10px; + margin-block: 10px; } #bottomBox > hbox:not(#newBottom) { ===================================== browser/locales/en-US/browser/tor-browser.ftl ===================================== @@ -323,10 +323,6 @@ about-dialog-grow-tor-network-link = Help the Tor Network Grow! # Link text for the Tor Browser license page (about:license). about-dialog-browser-license-link = Licensing Information -# "Tor" and "The Onion Logo" are trademark names, so should not be translated (not including the quote marks, which can be localized). -# "The Tor Project, Inc." is an organisation name. -about-dialog-trademark-statement = “Tor” and “The Onion Logo” are registered trademarks of The Tor Project, Inc. - ## New tor circuit. # Shown in the File menu. ===================================== toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl ===================================== @@ -9,4 +9,6 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser -vendor-short-name = Tor Project -trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc. +# "Tor" is a trademark names, so should not be translated (not including the quote marks, which can be localized). +# "The Tor Project, Inc." is an organisation name. +trademarkInfo = “Tor” and the Tor logo are registered trademarks of The Tor Project, Inc. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/570b6c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/570b6c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41110: Avoid Fontconfig warning about "ambiguous path"
by richard (＠richard) 26 Mar '24

26 Mar '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c7092a88 by Rusty Bird at 2024-03-23T11:54:07+00:00 Bug 41110: Avoid Fontconfig warning about "ambiguous path" - - - - - 1 changed file: - projects/browser/Bundle-Data/linux/Data/fontconfig/fonts.conf Changes: ===================================== projects/browser/Bundle-Data/linux/Data/fontconfig/fonts.conf ===================================== @@ -39,7 +39,7 @@ PERFORMANCE OF THIS SOFTWARE.  - <dir>fonts</dir> + <dir prefix="cwd">fonts</dir> <!-- Accept deprecated 'mono' alias, replacing it with 'monospace' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.9.0esr-13.5-1] Bug 1886852 - Avoid registering unnecessary MessageManager listeners when SHIP is enabled, r=smaug!
by ma1 (＠ma1) 26 Mar '24

26 Mar '24

ma1 pushed to branch mullvad-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: b6e29f24 by Nika Layzell at 2024-03-26T18:25:59+01:00 Bug 1886852 - Avoid registering unnecessary MessageManager listeners when SHIP is enabled, r=smaug! Differential Revision: https://phabricator.services.mozilla.com/D205377 - - - - - 1 changed file: - browser/components/sessionstore/SessionStore.sys.mjs Changes: ===================================== browser/components/sessionstore/SessionStore.sys.mjs ===================================== @@ -1422,6 +1422,13 @@ var SessionStoreInternal = { * and thus enables communication with OOP tabs. */ receiveMessage(aMessage) { + if (Services.appinfo.sessionHistoryInParent) { + throw new Error( + `received unexpected message '${aMessage.name}' with ` + + `sessionHistoryInParent enabled` + ); + } + // If we got here, that means we're dealing with a frame message // manager message, so the target will be a <xul:browser>. var browser = aMessage.target; @@ -1600,14 +1607,14 @@ var SessionStoreInternal = { // internal data about the window. aWindow.__SSi = this._generateWindowID(); - let mm = aWindow.getGroupMessageManager("browsers"); - MESSAGES.forEach(msg => { - let listenWhenClosed = CLOSED_MESSAGES.has(msg); - mm.addMessageListener(msg, this, listenWhenClosed); - }); - - // Load the frame script after registering listeners. if (!Services.appinfo.sessionHistoryInParent) { + let mm = aWindow.getGroupMessageManager("browsers"); + MESSAGES.forEach(msg => { + let listenWhenClosed = CLOSED_MESSAGES.has(msg); + mm.addMessageListener(msg, this, listenWhenClosed); + }); + + // Load the frame script after registering listeners. mm.loadFrameScript( "chrome://browser/content/content-sessionStore.js", true, @@ -2083,8 +2090,10 @@ var SessionStoreInternal = { // Cache the window state until it is completely gone. DyingWindowCache.set(aWindow, winData); - let mm = aWindow.getGroupMessageManager("browsers"); - MESSAGES.forEach(msg => mm.removeMessageListener(msg, this)); + if (!Services.appinfo.sessionHistoryInParent) { + let mm = aWindow.getGroupMessageManager("browsers"); + MESSAGES.forEach(msg => mm.removeMessageListener(msg, this)); + } this._saveableClosedWindowData.delete(winData); delete aWindow.__SSi; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b6e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b6e… You're receiving this email because of your account on gitlab.torproject.org.

1 0