- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 6dfea410 by Pier Angelo Vendrame at 2023-04-04T18:32:53+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41709: Reimplement the failure logic for TorProtocolService.sendCommand sendCommand tries to send a command forever every 250ms in case of failure. That is bad because some async code branch might be stuck in it forever. We should have a number of maximum attempts and increase the delay after which we try again. - - - - - 2 changed files: - toolkit/components/tor-launcher/TorMonitorService.jsm - toolkit/components/tor-launcher/TorProtocolService.jsm Changes: ===================================== toolkit/components/tor-launcher/TorMonitorService.jsm ===================================== @@ -233,8 +233,8 @@ const TorMonitorService = { // FIXME: TorProcess is misleading here. We should use a topic related // to having a control port connection, instead. + logger.info(`Notifying ${TorTopics.ProcessIsReady}`); Services.obs.notifyObservers(null, TorTopics.ProcessIsReady); - logger.info(`Notified ${TorTopics.ProcessIsReady}`); // We reset this here hoping that _shutDownEventMonitor can interrupt // the current monitor, either by calling clearTimeout and preventing it ===================================== toolkit/components/tor-launcher/TorProtocolService.jsm ===================================== @@ -220,49 +220,29 @@ const TorProtocolService = { // Executes a command on the control port. // Return a reply object or null if a fatal error occurs. async sendCommand(cmd, args) { - let conn, reply; - const maxAttempts = 2; - for (let attempt = 0; !reply && attempt < maxAttempts; attempt++) { - try { - conn = await this._getConnection(); - try { - if (conn) { - reply = await conn.sendCommand(cmd + (args ? " " + args : "")); - if (reply) { - // Return for reuse. - this._returnConnection(); - } else { - // Connection is bad. - logger.warn( - "sendCommand returned an empty response, taking the connection as broken and closing it." - ); - this._closeConnection(); - } - } - } catch (e) { - logger.error(`Cannot send the command ${cmd}`, e); - this._closeConnection(); - } - } catch (e) { - logger.error("Cannot get a connection to the control port", e); + const maxTimeout = 1000; + let leftConnAttempts = 5; + let timeout = 250; + let reply; + while (leftConnAttempts-- > 0) { + const response = await this._trySend(cmd, args, leftConnAttempts == 0); + if (response.connected) { + reply = response.reply; + break; } - } - - // We failed to acquire the controller after multiple attempts. - // Try again after some time. - if (!conn) { - logger.info( - "sendCommand: Acquiring control connection failed", + // We failed to acquire the controller after multiple attempts. + // Try again after some time. + logger.warn( + "sendCommand: Acquiring control connection failed, trying again later.", cmd, args ); - return new Promise(resolve => - setTimeout(() => { - resolve(this.sendCommand(cmd, args)); - }, 250) - ); + await new Promise(resolve => setTimeout(() => resolve(), timeout)); + timeout = Math.min(2 * timeout, maxTimeout); } + // We sent the command, but we still got an empty response. + // Something must be busted elsewhere. if (!reply) { throw new Error(`${cmd} sent an empty response`); } @@ -590,6 +570,48 @@ const TorProtocolService = { } }, + async _trySend(cmd, args, rethrow) { + let connected = false; + let reply; + let leftAttempts = 2; + while (leftAttempts-- > 0) { + let conn; + try { + conn = await this._getConnection(); + } catch (e) { + logger.error("Cannot get a connection to the control port", e); + if (leftAttempts == 0 && rethrow) { + throw e; + } + } + if (!conn) { + continue; + } + // If we _ever_ got a connection, the caller should not try again + connected = true; + try { + reply = await conn.sendCommand(cmd + (args ? " " + args : "")); + if (reply) { + // Return for reuse. + this._returnConnection(); + } else { + // Connection is bad. + logger.warn( + "sendCommand returned an empty response, taking the connection as broken and closing it." + ); + this._closeConnection(); + } + } catch (e) { + logger.error(`Cannot send the command ${cmd}`, e); + this._closeConnection(); + if (leftAttempts == 0 && rethrow) { + throw e; + } + } + } + return { connected, reply }; + }, + // Opens an authenticated connection, sets it to this._controlConnection, and // return it. async _getConnection() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6dfea41… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6dfea41… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 9 commits: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: b786f2f7 by Henry Wilkes at 2023-04-04T14:21:36+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41600 - Remove old circuit display. - - - - - fdaa4267 by Henry Wilkes at 2023-04-04T14:21:37+01:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 41600 - Remove extensions.torbutton.display_circuit since it will no longer be used. It also could not work as intended before because after disabling and re-enabling, all the circuits and browser credentials that were established whilst it was switched off would have been lost and were not recovered. - - - - - 5b4f215b by Henry Wilkes at 2023-04-04T14:21:37+01:00 fixup! Bring back old Firefox onboarding Bug 41600 - We remove the additions for "controlCenter", i.e. the site identity panel, since the tor circuit display no longer lies within it, so our tour no longer uses it. - - - - - f4781831 by Henry Wilkes at 2023-04-04T14:21:38+01:00 fixup! Bug 26961: New user onboarding. Bug 41600 - Change circuit display tour to use new button and panel. This also fixes the "See My Path" button, which was broken before. - - - - - 0b850ee8 by Henry Wilkes at 2023-04-04T14:21:38+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41600 - Add API to domain-isolator to get the stored SOCKS username and password for a given domain and user context ID. Also get rid of unused newCircuitForUserContextId. Also remove the return statement from tor-control-port's watchEvent since addNotificationCallback does not return a value. - - - - - 230f3584 by Henry Wilkes at 2023-04-04T14:21:39+01:00 fixup! Bug 40925: Implemented the Security Level component Add cui-widget-panel class to the panel, which gives it the correct font. - - - - - 03df4bba by Henry Wilkes at 2023-04-04T14:21:39+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41600 - Update the SVG fetch update script for fetching bridge emojis and annotations, which we will also use for the flag emojis in the tor circuit display. We also: + Placed the bridgemoji files in a sub-directory. + Added a generation note to the generated files/directory. + Split the bridge emoji list into an external file, which we fetch in connectionPane.js so that the generating file is less fragile to a change in the javascript. + Store the locale emoji annotations using the string hex value as the key, rather than the emoji string sequence. This keeps it in line with the SVG file names, and removes ambiguity about whether the emoji character sequence includes the emoji variant selector U+FE0F or not. - - - - - ba01849e by Henry Wilkes at 2023-04-04T14:22:11+01:00 fixup! Add TorStrings module for localization Bug 41600 - Add new strings for the circuit display. - - - - - 4998fba1 by Henry Wilkes at 2023-04-04T14:22:12+01:00 Bug 41600 - Add a tor circuit display panel. - - - - - 30 changed files: - browser/app/profile/000-tor-browser.js - browser/base/content/browser.js - browser/base/content/browser.xhtml - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/controlcenter/content/identityPanel.inc.xhtml - browser/components/moz.build - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1eb.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d23d3f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d23d3f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Bug 40926: Implemented the New Identity feature
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: adbf9acf by Pier Angelo Vendrame at 2023-04-04T09:51:56+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 41711: Wait for the new window when doing new identity (cherry picked from commit d23d3f2cf3cc5cb1d9895108b67489314501dd20) - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -57,6 +57,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { ); const consoleOptions = { maxLogLevel: "info", + maxLogLevelPref: "browser.new_identity.log_level", prefix: "NewIdentity", }; return new ConsoleAPI(consoleOptions); @@ -68,12 +69,11 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { class NewIdentityImpl { async run() { - logger.debug("Disabling JS"); this.disableAllJS(); await this.clearState(); - this.broadcast(); - this.openNewWindow(); + await this.openNewWindow(); this.closeOldWindow(); + this.broadcast(); } // Disable JS (as a defense-in-depth measure) @@ -389,7 +389,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { logger.info("Calling the clearDataService"); const flags = Services.clearData.CLEAR_ALL ^ Services.clearData.CLEAR_PASSWORDS; - return new Promise((resolve, reject) => { + return new Promise(resolve => { Services.clearData.deleteData(flags, { onDataDeleted(code) { if (code !== Cr.NS_OK) { @@ -425,11 +425,16 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { openNewWindow() { logger.info("Opening a new window"); - // Open a new window with the default homepage - // We could pass {private: true} but we do not because we enforce - // browser.privatebrowsing.autostart = true. - // What about users that change settings? - OpenBrowserWindow(); + return new Promise(resolve => { + // Open a new window with the default homepage + // We could pass {private: true} but we do not because we enforce + // browser.privatebrowsing.autostart = true. + // What about users that change settings? + const win = OpenBrowserWindow(); + // 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 }); + }); } closeOldWindow() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adbf9ac… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adbf9ac… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] MB 159: Change remaining privacy-browser references to mullvad-browser
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build Commits: 1cc88d39 by Pier Angelo Vendrame at 2023-04-04T10:06:30+02:00 MB 159: Change remaining privacy-browser references to mullvad-browser Also, while we are at it, switch the git repo to HTTPS. - - - - - 1 changed file: - projects/firefox/config Changes: ===================================== projects/firefox/config ===================================== @@ -76,14 +76,14 @@ targets: tag_gpg_id: 0 mullvadbrowser: - git_url: git@gitlab.torproject.org:tpo/applications/privacy-browser.git + git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: branding_directory_prefix: 'mb' firefox_platform_version: 102.9.0 browser_series: '12.0' browser_branch: '[% c("var/browser_series") %]-2' browser_build: 1 - gitlab_project: https://gitlab.torproject.org/tpo/applications/privacy-browser + gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser linux-x86_64: var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… 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-102.10.0esr-12.0-1
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed new branch base-browser-102.10.0esr-12.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 branch base-browser-102.10.0esr-12.5-1
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed new branch base-browser-102.10.0esr-12.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] Pushed new branch tor-browser-102.10.0esr-12.5-1
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed new branch tor-browser-102.10.0esr-12.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] Pushed new tag FIREFOX_102_10_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed new tag FIREFOX_102_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/tor-browser] Pushed new branch tor-browser-102.10.0esr-12.0-1
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed new branch tor-browser-102.10.0esr-12.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][tor-browser-102.9.0esr-12.5-1] fixup! Bug 40926: Implemented the New Identity feature
by Pier Angelo Vendrame (＠pierov) 04 Apr '23

04 Apr '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d23d3f2c by Pier Angelo Vendrame at 2023-04-03T16:41:24+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 41711: Wait for the new window when doing new identity - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -57,6 +57,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { ); const consoleOptions = { maxLogLevel: "info", + maxLogLevelPref: "browser.new_identity.log_level", prefix: "NewIdentity", }; return new ConsoleAPI(consoleOptions); @@ -68,12 +69,11 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { class NewIdentityImpl { async run() { - logger.debug("Disabling JS"); this.disableAllJS(); await this.clearState(); - this.broadcast(); - this.openNewWindow(); + await this.openNewWindow(); this.closeOldWindow(); + this.broadcast(); } // Disable JS (as a defense-in-depth measure) @@ -389,7 +389,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { logger.info("Calling the clearDataService"); const flags = Services.clearData.CLEAR_ALL ^ Services.clearData.CLEAR_PASSWORDS; - return new Promise((resolve, reject) => { + return new Promise(resolve => { Services.clearData.deleteData(flags, { onDataDeleted(code) { if (code !== Cr.NS_OK) { @@ -425,11 +425,16 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { openNewWindow() { logger.info("Opening a new window"); - // Open a new window with the default homepage - // We could pass {private: true} but we do not because we enforce - // browser.privatebrowsing.autostart = true. - // What about users that change settings? - OpenBrowserWindow(); + return new Promise(resolve => { + // Open a new window with the default homepage + // We could pass {private: true} but we do not because we enforce + // browser.privatebrowsing.autostart = true. + // What about users that change settings? + const win = OpenBrowserWindow(); + // 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 }); + }); } closeOldWindow() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d23d3f2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d23d3f2… 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-12.0.4-build1
by Richard Pospesel (＠richard) 03 Apr '23

03 Apr '23

Richard Pospesel pushed new tag mb-12.0.4-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 branch maint-12.0-mullvad
by Richard Pospesel (＠richard) 03 Apr '23

03 Apr '23

Richard Pospesel pushed new branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mai… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Bug 23247: Communicating security expectations for .onion
by Pier Angelo Vendrame (＠pierov) 31 Mar '23

31 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 31088582 by cypherpunks1 at 2023-03-31T09:49:11-08:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 41533: Fix onion detection on the page info window - - - - - 1 changed file: - browser/base/content/pageinfo/security.js Changes: ===================================== browser/base/content/pageinfo/security.js ===================================== @@ -66,7 +66,12 @@ var security = { Ci.nsIWebProgressListener.STATE_LOADED_MIXED_DISPLAY_CONTENT); var isEV = ui.state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL; var isOnion = false; - const hostName = this.windowInfo.hostName; + let hostName; + try { + hostName = Services.eTLD.getBaseDomain(this.uri); + } catch (e) { + hostName = this.windowInfo.hostName; + } if (hostName && hostName.endsWith(".onion")) { isOnion = true; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3108858… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3108858… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 31 Mar '23

31 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 50201d24 by Pier Angelo Vendrame at 2023-03-31T17:43:49+02:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 40501: High CPU load after tor exits unexpectedly When a peers (tor) disconnects, Firefox seems to keep the stream open, and return 0 on available, rather than throwing. So, as a matter of fact, we had a while trying to read 0 bytes without any pause in _readLine, hence the 100% CPU usage. - - - - - 1 changed file: - toolkit/torbutton/modules/tor-control-port.js Changes: ===================================== toolkit/torbutton/modules/tor-control-port.js ===================================== @@ -135,6 +135,18 @@ class AsyncSocket { this.inputQueue.push({ onInputStreamReady: stream => { try { + if (!this.scriptableInputStream.available()) { + // This means EOF, but not closed yet. However, arriving at EOF + // should be an error condition for us, since we are in a socket, + // and EOF should mean peer disconnected. + // If the stream has been closed, this function itself should + // throw. + reject( + new Error("onInputStreamReady called without available bytes.") + ); + return; + } + // read our string from input stream let str = this.scriptableInputStream.read( this.scriptableInputStream.available() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/50201d2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/50201d2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40835: Download jessie faketime packages from http://archive.debian.org
by boklm (＠boklm) 30 Mar '23

30 Mar '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 1afcf429 by Nicolas Vigier at 2023-03-30T14:07:24+02:00 Bug 40835: Download jessie faketime packages from http://archive.debian.org - - - - - 1 changed file: - projects/container-image/config Changes: ===================================== projects/container-image/config ===================================== @@ -87,9 +87,9 @@ input_files: - project: mmdebstrap-image target: - '[% c("var/container/suite") %]-[% c("var/container/arch") %]' - - URL: http://deb.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd64.deb + - URL: http://archive.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd6… sha256sum: 19b2a01a2fae7e6d5a8b741fc0bc626451cb4c2cc884ee79f1136dd3c2c26213 enable: '[% c("var/container/suite") == "jessie" %]' - - URL: http://deb.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_amd64… + - URL: http://archive.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_a… sha256sum: 82747d5815b226cfed7f6f9a751bf8c20d457f3ba786add6017d6904dea4fdb4 enable: '[% c("var/container/suite") == "jessie" %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40835: Download jessie faketime packages from http://archive.debian.org
by boklm (＠boklm) 30 Mar '23

30 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a9039721 by Nicolas Vigier at 2023-03-30T13:52:40+02:00 Bug 40835: Download jessie faketime packages from http://archive.debian.org - - - - - 1 changed file: - projects/container-image/config Changes: ===================================== projects/container-image/config ===================================== @@ -87,9 +87,9 @@ input_files: - project: mmdebstrap-image target: - '[% c("var/container/suite") %]-[% c("var/container/arch") %]' - - URL: http://deb.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd64.deb + - URL: http://archive.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd6… sha256sum: 19b2a01a2fae7e6d5a8b741fc0bc626451cb4c2cc884ee79f1136dd3c2c26213 enable: '[% c("var/container/suite") == "jessie" %]' - - URL: http://deb.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_amd64… + - URL: http://archive.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_a… sha256sum: 82747d5815b226cfed7f6f9a751bf8c20d457f3ba786add6017d6904dea4fdb4 enable: '[% c("var/container/suite") == "jessie" %]' 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-build][maint-12.0] Bug 40822: --disable-reloc-section on NSIS stubs.
by Pier Angelo Vendrame (＠pierov) 30 Mar '23

30 Mar '23

Pier Angelo Vendrame pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 1044b8c7 by Pier Angelo Vendrame at 2023-03-30T09:30:10+02:00 Bug 40822: --disable-reloc-section on NSIS stubs. Out binutils version adds the reloc sections by default, but NSIS does not work with them. So, we need to pass a flag to disable them, otherwise users with mandatory ASLR turned on will not be able to install Tor Browser. - - - - - 3 changed files: - projects/nsis/build - projects/nsis/config - + projects/nsis/no-reloc-section.diff Changes: ===================================== projects/nsis/build ===================================== @@ -13,6 +13,12 @@ cd /var/tmp/build/nsis-[% c('version') %]-src # only valid for the Windows linker. Therefore we add it using a patch # to the cross-compilation part only. Still needed as of 3.06.1, see: #40090. patch -p1 < $rootdir/no-insert-timestamp.patch +# tor-browser-build#40822: NSIS adds a flag to tell it supports ASLR, but it +# does so only to pass MS certifications. According to the NSIS forums, they +# intended not to ship the .reloc to save space. But, according to the bug +# tracker, binutils 2.36 started adding a .reloc section by default, and we need +# to disable it with this patch. +patch -p1 < $rootdir/no-reloc-section.diff [% IF c("var/windows-x86_64") %] # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp ===================================== projects/nsis/config ===================================== @@ -24,6 +24,7 @@ input_files: URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' sha256sum: a85270ad5386182abecb2470e3d7e9bec9fe4efd95210b13551cb386830d1e87 - filename: no-insert-timestamp.patch + - filename: no-reloc-section.diff - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: zlib ===================================== projects/nsis/no-reloc-section.diff ===================================== @@ -0,0 +1,14 @@ +diff -Naur nsis-3.08-orig/SCons/Config/gnu nsis-3.08-src/SCons/Config/gnu +--- nsis-3.08-orig/SCons/Config/gnu 2023-03-23 09:22:46.315471779 +0100 ++++ nsis-3.08-src/SCons/Config/gnu 2023-03-23 09:24:05.260933879 +0100 +@@ -103,6 +103,10 @@ + stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align + stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file + ++# https://sourceforge.net/p/nsis/bugs/1283/?limit=25#e303, ++# https://sourceforge.net/p/nsis/bugs/1283/?limit=25#e303/e90f ++stub_env.Append(LINKFLAGS = ['-Wl,--disable-reloc-section']) ++ + conf = FlagsConfigure(stub_env) + conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns') # GCC 10: Don't generate msvcrt!memmove calls (bug #1248) + conf.Finish() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9bdd279c by Pier Angelo Vendrame at 2023-03-29T20:21:32+02:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 41704: Immediately return on remoteSettings.pollChanges - - - - - 2 changed files: - services/settings/remote-settings.js - services/settings/servicesSettings.manifest Changes: ===================================== services/settings/remote-settings.js ===================================== @@ -200,12 +200,17 @@ function remoteSettingsFunction() { full = false, } = {}) => { // When running in full mode, we ignore last polling status. - if (full) { + if (full || AppConstants.BASE_BROWSER_VERSION) { gPrefs.clearUserPref(PREF_SETTINGS_SERVER_BACKOFF); gPrefs.clearUserPref(PREF_SETTINGS_LAST_UPDATE); gPrefs.clearUserPref(PREF_SETTINGS_LAST_ETAG); } + if (AppConstants.BASE_BROWSER_VERSION) { + // tor-browser#41704: pollChanges is always online, so do not allow it. + return; + } + let pollTelemetryArgs = { source: TELEMETRY_SOURCE_POLL, trigger, ===================================== services/settings/servicesSettings.manifest ===================================== @@ -4,4 +4,4 @@ resource services-settings resource://gre/modules/services-settings/ # Schedule polling of remote settings changes # (default 24H, max 72H) # see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ff… -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 +# category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9bdd279… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9bdd279… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 285a88a1 by Pier Angelo Vendrame at 2023-03-29T19:46:17+02:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 41704: Immediately return on remoteSettings.pollChanges - - - - - 2 changed files: - services/settings/remote-settings.js - services/settings/servicesSettings.manifest Changes: ===================================== services/settings/remote-settings.js ===================================== @@ -200,12 +200,17 @@ function remoteSettingsFunction() { full = false, } = {}) => { // When running in full mode, we ignore last polling status. - if (full) { + if (full || AppConstants.BASE_BROWSER_VERSION) { gPrefs.clearUserPref(PREF_SETTINGS_SERVER_BACKOFF); gPrefs.clearUserPref(PREF_SETTINGS_LAST_UPDATE); gPrefs.clearUserPref(PREF_SETTINGS_LAST_ETAG); } + if (AppConstants.BASE_BROWSER_VERSION) { + // tor-browser#41704: pollChanges is always online, so do not allow it. + return; + } + let pollTelemetryArgs = { source: TELEMETRY_SOURCE_POLL, trigger, ===================================== services/settings/servicesSettings.manifest ===================================== @@ -4,4 +4,4 @@ resource services-settings resource://gre/modules/services-settings/ # Schedule polling of remote settings changes # (default 24H, max 72H) # see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ff… -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 +# category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/285a88a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/285a88a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 0a920be1 by Pier Angelo Vendrame at 2023-03-29T17:47:40+02:00 fixup! Add TorStrings module for localization Restore the letterbox warning for 12.0 - - - - - 1 changed file: - toolkit/torbutton/chrome/locale/en-US/torbutton.properties Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.properties ===================================== @@ -115,3 +115,8 @@ torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It # Preferences for mobile: these strings are still referenced, but we should # check whether this feature is still used torbutton.security_settings.menu.title = Security Settings + +# The notification that appears when maximizing the browser with letterboxing disabled +# TODO: This string is not needed as of 12.5a5, and has a replacement in Base Browser! +# To be removed when 12.0 will not need new updates. +torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a920be… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a920be… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] 4 commits: fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 2ffae0ac by Pier Angelo Vendrame at 2023-03-29T16:58:54+02:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module Bug 41698 - - - - - 59f56195 by Pier Angelo Vendrame at 2023-03-29T16:58:55+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 41698: Reword the recommendation badges in about:addons We need to add a new commit for all base browser strings - - - - - 6f98fb4c by Pier Angelo Vendrame at 2023-03-29T16:58:55+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - a825810a by Pier Angelo Vendrame at 2023-03-29T16:58:55+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 - - - - - 3 changed files: - browser/locales/en-US/browser/languageNotification.ftl - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== browser/locales/en-US/browser/languageNotification.ftl ===================================== @@ -2,6 +2,13 @@ # 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/. +# These strings are used by the Base Browser part of the changeset, not only for +# the language notification. +# TODO: Rename this file to make this clearer + + +## Language notification + # $language is the language Tor Browser is displayed in (already translated) language-notification-label-system = { -brand-short-name } has set your display language to { $language } based on your system’s language. # This is shown when the system language is not supported, so we fall back to another language instead. @@ -9,6 +16,15 @@ language-notification-label-system = { -brand-short-name } has set your display language-notification-label = { -brand-short-name } has set your display language to { $language }. language-notification-button = Change Language… + +## Fullscreen/maximization notification shown when letterboxing is disabled + basebrowser-rfp-maximize-warning-message = Maximizing the browser window can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave browser windows in their original default size. basebrowser-rfp-restore-window-size-button-label = Restore basebrowser-rfp-restore-window-size-button-ak = R + + +## Tooltip for the about:addons recommended badge + +basebrowser-addon-badge-recommended = Mozilla only recommends extensions that meet their standards for security and performance +basebrowser-addon-badge-verified = Mozilla has reviewed this extension to meet their standards for security and performance ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -24,6 +24,8 @@ <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl"> + <link rel="localization" href="browser/languageNotification.ftl"/> +  <script defer src="chrome://mozapps/content/extensions/aboutaddonsCommon.js"></script> <script defer src="chrome://mozapps/content/extensions/abuse-reports.js"></script> @@ -153,7 +155,6 @@ is="support-link" support-page="add-on-badges" utmcontent="promoted-addon-badge" - data-l10n-id="addon-badge-recommended2" hidden> </a> <a class="addon-badge addon-badge-line" @@ -167,7 +168,6 @@ is="support-link" support-page="add-on-badges" utmcontent="promoted-addon-badge" - data-l10n-id="addon-badge-verified2" hidden> </a> <a class="addon-badge addon-badge-private-browsing-allowed" ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -4885,6 +4885,29 @@ async function initialize() { ); } } + + // At the moment we need to do this, because Weblate still does not support + // attributes in Fluent. + const [recommended, verified] = await document.l10n.formatValues([ + { id: "basebrowser-addon-badge-recommended" }, + { id: "basebrowser-addon-badge-verified" }, + ]); + + importTemplate("card"); + _templates.card.content + .querySelector(".addon-badge-recommended") + .setAttribute("title", recommended); + _templates.card.content + .querySelector(".addon-badge-verified") + .setAttribute("title", verified); + + // We also update any template copy that has already been created. + for (const badge of document.querySelectorAll(".addon-badge-recommended")) { + badge.setAttribute("title", recommended); + } + for (const badge of document.querySelectorAll(".addon-badge-verified")) { + badge.setAttribute("title", verified); + } } window.promiseInitialized = new Promise(resolve => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9e31ce… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9e31ce… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 4 commits: fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9b87c73a by Pier Angelo Vendrame at 2023-03-29T16:56:32+02:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module Bug 41698 - - - - - 071ef206 by Pier Angelo Vendrame at 2023-03-29T16:56:49+02:00 fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages Bug 41698: Reword the recommendation badges in about:addons We need to add a new commit for all base browser strings - - - - - 35133d69 by Pier Angelo Vendrame at 2023-03-29T16:56:49+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 663cd8e2 by Pier Angelo Vendrame at 2023-03-29T16:56:50+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 - - - - - 3 changed files: - browser/locales/en-US/browser/languageNotification.ftl - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== browser/locales/en-US/browser/languageNotification.ftl ===================================== @@ -2,6 +2,13 @@ # 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/. +# These strings are used by the Base Browser part of the changeset, not only for +# the language notification. +# TODO: Rename this file to make this clearer + + +## Language notification + # $language is the language Tor Browser is displayed in (already translated) language-notification-label-system = { -brand-short-name } has set your display language to { $language } based on your system’s language. # This is shown when the system language is not supported, so we fall back to another language instead. @@ -9,6 +16,15 @@ language-notification-label-system = { -brand-short-name } has set your display language-notification-label = { -brand-short-name } has set your display language to { $language }. language-notification-button = Change Language… + +## Fullscreen/maximization notification shown when letterboxing is disabled + basebrowser-rfp-maximize-warning-message = Maximizing the browser window can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave browser windows in their original default size. basebrowser-rfp-restore-window-size-button-label = Restore basebrowser-rfp-restore-window-size-button-ak = R + + +## Tooltip for the about:addons recommended badge + +basebrowser-addon-badge-recommended = Mozilla only recommends extensions that meet their standards for security and performance +basebrowser-addon-badge-verified = Mozilla has reviewed this extension to meet their standards for security and performance ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -24,6 +24,8 @@ <link rel="localization" href="toolkit/about/aboutAddons.ftl"> <link rel="localization" href="toolkit/about/abuseReports.ftl"> + <link rel="localization" href="browser/languageNotification.ftl"/> +  <script defer src="chrome://mozapps/content/extensions/aboutaddonsCommon.js"></script> <script defer src="chrome://mozapps/content/extensions/abuse-reports.js"></script> @@ -153,7 +155,6 @@ is="support-link" support-page="add-on-badges" utmcontent="promoted-addon-badge" - data-l10n-id="addon-badge-recommended2" hidden> </a> <a class="addon-badge addon-badge-line" @@ -167,7 +168,6 @@ is="support-link" support-page="add-on-badges" utmcontent="promoted-addon-badge" - data-l10n-id="addon-badge-verified2" hidden> </a> <a class="addon-badge addon-badge-private-browsing-allowed" ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -4885,6 +4885,29 @@ async function initialize() { ); } } + + // At the moment we need to do this, because Weblate still does not support + // attributes in Fluent. + const [recommended, verified] = await document.l10n.formatValues([ + { id: "basebrowser-addon-badge-recommended" }, + { id: "basebrowser-addon-badge-verified" }, + ]); + + importTemplate("card"); + _templates.card.content + .querySelector(".addon-badge-recommended") + .setAttribute("title", recommended); + _templates.card.content + .querySelector(".addon-badge-verified") + .setAttribute("title", verified); + + // We also update any template copy that has already been created. + for (const badge of document.querySelectorAll(".addon-badge-recommended")) { + badge.setAttribute("title", recommended); + } + for (const badge of document.querySelectorAll(".addon-badge-verified")) { + badge.setAttribute("title", verified); + } } window.promiseInitialized = new Promise(resolve => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5a1faa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5a1faa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] 2 commits: Bug 41631: Prevent weird initial window dimensions caused by subpixel computations
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4ad8902a by hackademix at 2023-03-29T15:14:42+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 9e31ce5b by hackademix at 2023-03-29T15:15:03+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 2 changed files: - browser/locales/en-US/browser/languageNotification.ftl - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/locales/en-US/browser/languageNotification.ftl ===================================== @@ -8,3 +8,7 @@ language-notification-label-system = { -brand-short-name } has set your display # $language is the language Tor Browser is displayed in (already translated). language-notification-label = { -brand-short-name } has set your display language to { $language }. language-notification-button = Change Language… + +basebrowser-rfp-maximize-warning-message = Maximizing the browser window can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave browser windows in their original default size. +basebrowser-rfp-restore-window-size-button-label = Restore +basebrowser-rfp-restore-window-size-button-ak = R ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -22,16 +22,110 @@ const kPrefLetterboxingTesting = "privacy.resistFingerprinting.letterboxing.testing"; const kTopicDOMWindowOpened = "domwindowopened"; -var logConsole; -function log(msg) { - if (!logConsole) { - logConsole = console.createInstance({ - prefix: "RFPHelper.jsm", - maxLogLevelPref: "privacy.resistFingerprinting.jsmloglevel", - }); +const kPrefResizeWarnings = "privacy.resistFingerprinting.resizeWarnings"; + +XPCOMUtils.defineLazyGetter(this, "logConsole", () => + console.createInstance({ + prefix: "RFPHelper.jsm", + maxLogLevelPref: "privacy.resistFingerprinting.jsmloglevel", + }) +); + +function log(...args) { + logConsole.log(...args); +} + +function forEachWindow(callback) { + const windowList = Services.wm.getEnumerator("navigator:browser"); + while (windowList.hasMoreElements()) { + const win = windowList.getNext(); + if (win.gBrowser && !win.closed) { + try { + callback(win); + } catch (e) { + logConsole.error(e); + } + } + } +} + + +async function windowResizeHandler(aEvent) { + if (RFPHelper.letterboxingEnabled) { + return; + } + if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + return; + } + + const window = aEvent.currentTarget; + + // Wait for end of execution queue to ensure we have correct windowState. + await new Promise(resolve => window.setTimeout(resolve, 0)); + switch (window.windowState) { + case window.STATE_MAXIMIZED: + case window.STATE_FULLSCREEN: + break; + default: + return; + } + + // Do not add another notification if one is already showing. + const kNotificationName = "rfp-window-resize-notification"; + let box = window.gNotificationBox; + if (box.getNotificationWithValue(kNotificationName)) { + return; } - logConsole.log(msg); + // Rate-limit showing our notification if needed. + if (Date.now() - (windowResizeHandler.timestamp || 0) < 1000) { + return; + } + windowResizeHandler.timestamp = Date.now(); + + const decreaseWarningsCount = () => { + const currentCount = Services.prefs.getIntPref(kPrefResizeWarnings); + if (currentCount > 0) { + Services.prefs.setIntPref(kPrefResizeWarnings, currentCount - 1); + } + }; + + const [label, accessKey] = await window.document.l10n.formatValues([ + { id: "basebrowser-rfp-restore-window-size-button-label" }, + { id: "basebrowser-rfp-restore-window-size-button-ak" }, + ]); + + const buttons = [ + { + label, + accessKey, + popup: null, + callback() { + // reset notification timer to work-around resize race conditions + windowResizeHandler.timestamp = Date.now(); + // restore the original (rounded) size we had stored on window startup + let { _rfpOriginalSize } = window; + window.setTimeout(() => { + window.resizeTo(_rfpOriginalSize.width, _rfpOriginalSize.height); + }, 0); + }, + }, + ]; + + box.appendNotification( + kNotificationName, + { + label: { "l10n-id": "basebrowser-rfp-maximize-warning-message" }, + priority: box.PRIORITY_WARNING_LOW, + eventCallback(event) { + if (event === "dismissed") { + // user manually dismissed the notification + decreaseWarningsCount(); + } + }, + }, + buttons + ); } class _RFPHelper { @@ -158,7 +252,11 @@ class _RFPHelper { _handleResistFingerprintingChanged() { if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) { this._addRFPObservers(); + Services.ww.registerNotification(this); + forEachWindow(win => this._attachWindow(win)); } else { + forEachWindow(win => this._detachWindow(win)); + Services.ww.unregisterNotification(this); this._removeRFPObservers(); } } @@ -295,13 +393,11 @@ class _RFPHelper { } _handleLetterboxingPrefChanged() { - if (Services.prefs.getBoolPref(kPrefLetterboxing, false)) { - Services.ww.registerNotification(this); - this._attachAllWindows(); - } else { - this._detachAllWindows(); - Services.ww.unregisterNotification(this); - } + this.letterboxingEnabled = Services.prefs.getBoolPref( + kPrefLetterboxing, + false + ); + forEachWindow(win => this._updateSizeForTabsInWindow(win)); } // The function to parse the dimension set from the pref value. The pref value @@ -402,11 +498,13 @@ class _RFPHelper { let logPrefix = `_roundContentSize[${Math.random()}]`; log(logPrefix); let win = aBrowser.ownerGlobal; + let browserContainer = aBrowser .getTabBrowser() .getBrowserContainer(aBrowser); let browserParent = aBrowser.parentElement; browserParent.classList.remove("exclude-letterboxing"); + let [ [contentWidth, contentHeight], [parentWidth, parentHeight], @@ -419,6 +517,27 @@ 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; + + 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)." : "." @@ -437,6 +556,16 @@ class _RFPHelper { }); let result; + + 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; + } + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. @@ -554,7 +683,6 @@ class _RFPHelper { _updateSizeForTabsInWindow(aWindow) { let tabBrowser = aWindow.gBrowser; - tabBrowser.tabpanels?.classList.add("letterboxing"); for (let tab of tabBrowser.tabs) { @@ -564,10 +692,18 @@ class _RFPHelper { // we need to add this class late because otherwise new windows get maximized 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); + } }); } _attachWindow(aWindow) { + aWindow.addEventListener("sizemodechange", windowResizeHandler); aWindow.gBrowser.addTabsProgressListener(this); aWindow.addEventListener("TabOpen", this); const resizeObserver = (aWindow._rfpResizeObserver = new aWindow.ResizeObserver( @@ -585,19 +721,7 @@ class _RFPHelper { this._updateSizeForTabsInWindow(aWindow); } - _attachAllWindows() { - let windowList = Services.wm.getEnumerator("navigator:browser"); - while (windowList.hasMoreElements()) { - let win = windowList.getNext(); - - if (win.closed || !win.gBrowser) { - continue; - } - - this._attachWindow(win); - } - } _detachWindow(aWindow) { let tabBrowser = aWindow.gBrowser; @@ -614,20 +738,7 @@ class _RFPHelper { let browser = tab.linkedBrowser; this._resetContentSize(browser); } - } - - _detachAllWindows() { - let windowList = Services.wm.getEnumerator("navigator:browser"); - - while (windowList.hasMoreElements()) { - let win = windowList.getNext(); - - if (win.closed || !win.gBrowser) { - continue; - } - - this._detachWindow(win); - } + aWindow.removeEventListener("sizemodechange", windowResizeHandler); } _handleDOMWindowOpened(win) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f23c4f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f23c4f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 29 Mar '23

29 Mar '23

Richard Pospesel pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f23c4fda by Richard Pospesel at 2023-03-29T11:38:31+00:00 fixup! Firefox preference overrides. Bug 41701: Reporting an extension does not work - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -452,6 +452,9 @@ pref("browser.discovery.enabled", false); pref("extensions.webextensions.restrictedDomains", ""); // Don't give Mozilla-recommended third-party extensions special privileges. pref("extensions.postDownloadThirdPartyPrompt", false); +// tor-browser#41701: Reporting an extension does not work +// disable extension reporting since the request goes to Mozilla and is rejected anyway (HTTP 400) +pref("extensions.abuseReport.enabled", false); // We are already providing the languages we support in multi-lingual packages. // Therefore, do not allow download of additional language packs. They are not a // privacy/security threat, we are disabling them for UX reasons. See bug 41377. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f23c4fd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f23c4fd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 29 Mar '23

29 Mar '23

Richard Pospesel pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5a1faa00 by Richard Pospesel at 2023-03-29T11:35:07+00:00 fixup! Firefox preference overrides. Bug 41701: Reporting an extension does not work - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -448,6 +448,9 @@ pref("browser.discovery.enabled", false); pref("extensions.webextensions.restrictedDomains", ""); // Don't give Mozilla-recommended third-party extensions special privileges. pref("extensions.postDownloadThirdPartyPrompt", false); +// tor-browser#41701: Reporting an extension does not work +// disable extension reporting since the request goes to Mozilla and is rejected anyway (HTTP 400) +pref("extensions.abuseReport.enabled", false); // We are already providing the languages we support in multi-lingual packages. // Therefore, do not allow download of additional language packs. They are not a // privacy/security threat, we are disabling them for UX reasons. See bug 41377. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5a1faa0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5a1faa0… You're receiving this email because of your account on gitlab.torproject.org.

1 0