- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! Adding issue and merge request templates
by morgan (＠morgan) 25 Feb '25

25 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 61b37c2e by Morgan at 2025-02-25T13:36:48+00:00 fixup! Adding issue and merge request templates include Bugzilla as potential source of backports - - - - - 1 changed file: - .gitlab/issue_templates/Backport.md Changes: ===================================== .gitlab/issue_templates/Backport.md ===================================== @@ -1,23 +1,26 @@  ## Backport Patchset ### Book-keeping -#### Gitlab Issue(s) +#### Issue(s) - tor-browser#12345 - mullvad-browser#123 +- https://bugzilla.mozilla.org/show_bug.cgi?id=1234567 #### Merge Request(s) - tor-browser!123 #### Target Channels +- [ ] Alpha - [ ] Stable - [ ] Legacy View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/61b37c2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/61b37c2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! Adding issue and merge request templates
by morgan (＠morgan) 25 Feb '25

25 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6df481f4 by Morgan at 2025-02-25T13:35:38+00:00 fixup! Adding issue and merge request templates include Bugzilla as potential source of backports - - - - - 1 changed file: - .gitlab/issue_templates/Backport.md Changes: ===================================== .gitlab/issue_templates/Backport.md ===================================== @@ -2,22 +2,24 @@ Title: Backport tor-browser#12345: Title of Issue -This is an issue for tracking back-porting a patch-set (e.g. from Alpha to Stable) +This is an issue for tracking back-porting a patch-set (e.g. from Alpha to Stable or from Mozilla Rapid-Release to Alpha) --> ## Backport Patchset ### Book-keeping -#### Gitlab Issue(s) +#### Issue(s) - tor-browser#12345 - mullvad-browser#123 +- https://bugzilla.mozilla.org/show_bug.cgi?id=1234567 #### Merge Request(s) - tor-browser!123 #### Target Channels +- [ ] Alpha - [ ] Stable - [ ] Legacy View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6df481f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6df481f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.7.0esr-14.5-1] fixup! MB 188: Customize Gitlab Issue and Merge templates
by morgan (＠morgan) 25 Feb '25

25 Feb '25

morgan pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 420b63df by Morgan at 2025-02-25T13:34:22+00:00 fixup! MB 188: Customize Gitlab Issue and Merge templates include Bugzilla as potential source of backports - - - - - 1 changed file: - .gitlab/issue_templates/Backport.md Changes: ===================================== .gitlab/issue_templates/Backport.md ===================================== @@ -1,23 +1,26 @@  ## Backport Patchset ### Book-keeping -#### Gitlab Issue(s) +#### Issue(s) - tor-browser#12345 - mullvad-browser#123 +- https://bugzilla.mozilla.org/show_bug.cgi?id=1234567 #### Merge Request(s) - mullvad-browser!123 #### Target Channels +- [ ] Alpha - [ ] Stable ### Notes View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/420… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/420… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_128_8_0esr_BUILD1
by ma1 (＠ma1) 25 Feb '25

25 Feb '25

ma1 pushed new tag FIREFOX_128_8_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-128.8.0esr-14.0-1
by ma1 (＠ma1) 25 Feb '25

25 Feb '25

ma1 pushed new branch tor-browser-128.8.0esr-14.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] Pushed new branch base-browser-128.8.0esr-14.0-1
by ma1 (＠ma1) 25 Feb '25

25 Feb '25

ma1 pushed new branch base-browser-128.8.0esr-14.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/mullvad-browser][mullvad-browser-128.7.0esr-14.5-1] fixup! MB 213: Customize the search engines list
by morgan (＠morgan) 24 Feb '25

24 Feb '25

morgan pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: b4851e25 by Pier Angelo Vendrame at 2025-02-24T17:14:27+01:00 fixup! MB 213: Customize the search engines list MB 395: Make Leta the default search engine. - - - - - 1 changed file: - toolkit/components/search/content/mullvadBrowserSearchEngines.json Changes: ===================================== toolkit/components/search/content/mullvadBrowserSearchEngines.json ===================================== @@ -1,48 +1,48 @@ [ { - "aliases": ["duckduckgo", "ddg"], - "name": "DuckDuckGo", + "aliases": ["mullvad-leta", "leta", "mullvad", "ml"], + "name": "Mullvad Leta", "urls": { "search": { - "base": "https://duckduckgo.com/", + "base": "https://leta.mullvad.net/", "params": [], "searchTermParamName": "q" } }, - "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", - "identifier": "ddg", + "id": "ee88d691-6d7a-4adb-9fec-5a205565505a", + "identifier": "mullvad-leta", "recordType": "engine", "orderHint": 100, "variants": [] }, { - "aliases": ["ddg-html", "duckduckgohtml", "ddgh"], - "name": "DuckDuckGo (HTML)", + "aliases": ["duckduckgo", "ddg"], + "name": "DuckDuckGo", "urls": { "search": { - "base": "https://html.duckduckgo.com/html/", + "base": "https://duckduckgo.com/", "params": [], "searchTermParamName": "q" } }, - "id": "98d8c84b-7455-431d-98b9-890e7bcc0041", - "identifier": "ddg-html", + "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", + "identifier": "ddg", "recordType": "engine", "orderHint": 90, "variants": [] }, { - "aliases": ["mullvad-leta", "leta", "mullvad", "ml"], - "name": "Mullvad Leta", + "aliases": ["ddg-html", "duckduckgohtml", "ddgh"], + "name": "DuckDuckGo (HTML)", "urls": { "search": { - "base": "https://leta.mullvad.net/", + "base": "https://html.duckduckgo.com/html/", "params": [], "searchTermParamName": "q" } }, - "id": "ee88d691-6d7a-4adb-9fec-5a205565505a", - "identifier": "mullvad-leta", + "id": "98d8c84b-7455-431d-98b9-890e7bcc0041", + "identifier": "ddg-html", "recordType": "engine", "orderHint": 80, "variants": [] View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b48… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/b48… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! TB 42669: [android] Use custom no-op app-services
by Dan Ballard (＠dan) 20 Feb '25

20 Feb '25

Dan Ballard pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 4b5dd7c9 by clairehurst at 2025-02-20T14:14:29-07:00 fixup! TB 42669: [android] Use custom no-op app-services - - - - - 1 changed file: - tools/geckoview/build-fenix.sh Changes: ===================================== tools/geckoview/build-fenix.sh ===================================== @@ -6,8 +6,6 @@ VARIANT=$3 source android-env.sh -export NIMBUS_FML=$DEV_ROOT/mobile/android/fenix/app/nimbus-fml - cd $DEV_ROOT/mobile/android/fenix MOZCONFIG=mozconfig-android-$ARCH $GRADLE_HOME/bin/gradle --no-daemon -Dorg.gradle.jvmargs=-Xmx20g -PdisableOptimization assemble$VARIANT tools/tba-sign-devbuilds.sh View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4b5dd7c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4b5dd7c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! fixup! [android] Modify build system
by Dan Ballard (＠dan) 20 Feb '25

20 Feb '25

Dan Ballard pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 8cee8bc2 by Dan Ballard at 2025-02-20T18:24:27+00:00 fixup! fixup! [android] Modify build system bug 42669: fenix dir missing from nimbusFml path - - - - - 1 changed file: - mobile/android/fenix/app/build.gradle Changes: ===================================== mobile/android/fenix/app/build.gradle ===================================== @@ -315,7 +315,7 @@ android.applicationVariants.configureEach { variant -> if (project.hasProperty("disableTor")) { disableTor = project.getProperty("disableTor") } - System.setProperty("nimbusFml", "${topsrcdir}/mobile/android/tools/nimbus-fml") + System.setProperty("nimbusFml", "${topsrcdir}/mobile/android/fenix/tools/nimbus-fml") println("----------------------------------------------") println("Variant name: " + variant.name) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8cee8bc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8cee8bc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 3 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by morgan (＠morgan) 20 Feb '25

20 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 8e663084 by Henry Wilkes at 2025-02-20T17:30:12+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43328: Improve the Tor log dialog. - - - - - 0cc2f849 by Henry Wilkes at 2025-02-20T17:38:02+00:00 fixup! TB 40933: Add tor-launcher functionality TB 43328: Make getLog return the LogEntry data. - - - - - 21c61532 by Henry Wilkes at 2025-02-20T17:38:03+00:00 fixup! Tor Browser strings TB 43328: Improve the Tor log. - - - - - 5 changed files: - browser/components/torpreferences/content/torLogDialog.js - browser/components/torpreferences/content/torLogDialog.xhtml - browser/components/torpreferences/content/torPreferences.css - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/components/torpreferences/content/torLogDialog.js ===================================== @@ -4,20 +4,18 @@ const { setTimeout, clearTimeout } = ChromeUtils.importESModule( "resource://gre/modules/Timer.sys.mjs" ); -const { TorProviderBuilder } = ChromeUtils.importESModule( +const { TorProviderBuilder, TorProviderTopics } = ChromeUtils.importESModule( "resource://gre/modules/TorProviderBuilder.sys.mjs" ); -window.addEventListener( - "DOMContentLoaded", - () => { +const gTorLogDialog = { + init() { const dialog = document.getElementById("torPreferences-torLog-dialog"); const copyLogButton = dialog.getButton("extra1"); copyLogButton.setAttribute("data-l10n-id", "tor-log-dialog-copy-button"); - const logText = document.getElementById( - "torPreferences-torDialog-textarea" - ); + this._logTable = document.getElementById("tor-log-table"); + this._logBody = document.getElementById("tor-log-body"); let restoreButtonTimeout = null; copyLogButton.addEventListener("command", () => { @@ -25,7 +23,14 @@ window.addEventListener( let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService( Ci.nsIClipboardHelper ); - clipboard.copyString(logText.value); + // The copied text should match the text content the user would get if + // they hand-selected the entire table. + clipboard.copyString( + Array.from( + this._logTable.querySelectorAll("td"), + el => el.textContent + ).join("\n") + ); copyLogButton.setAttribute( "data-l10n-id", @@ -47,13 +52,79 @@ window.addEventListener( }, RESTORE_TIME); }); + // Intercept the copy event. + // NOTE: We attach this to the window rather than the _logTable because if + // the whole table is selected it will not receive the "copy" event. + window.addEventListener("copy", event => { + event.preventDefault(); + event.clipboardData.setData( + "text", + // By default the selected text will insert "\n\t" between the <td> + // elements, which separates the timestamp from the message column. + // We drop this "\t" character, to just keep the "\n". + window.getSelection().toString().replace(/^\t/gm, "") + ); + }); + // A waiting state should not be needed at this point. // Also, we probably cannot even arrive here if the provider failed to // initialize, otherwise we could use a try/catch, and write the exception // text in the logs, instead. - TorProviderBuilder.build().then( - provider => (logText.value = provider.getLog()) - ); + TorProviderBuilder.build().then(provider => { + Services.obs.addObserver(this, TorProviderTopics.TorLog); + window.addEventListener( + "unload", + () => { + Services.obs.removeObserver(this, TorProviderTopics.TorLog); + }, + { once: true } + ); + + for (const logEntry of provider.getLog()) { + this.addLogEntry(logEntry, true); + } + // Set the initial scroll to the bottom. + this._logTable.scrollTo({ + top: this._logTable.scrollTopMax, + behaviour: "instant", + }); + }); + }, + + observe(subject, topic) { + if (topic === TorProviderTopics.TorLog) { + this.addLogEntry(subject.wrappedJSObject, false); + } + }, + + addLogEntry(logEntry, initial) { + const timeEl = document.createElement("td"); + timeEl.textContent = logEntry.timestamp; + timeEl.classList.add("time"); + const messageEl = document.createElement("td"); + messageEl.textContent = `[${logEntry.type}] ${logEntry.msg}`; + messageEl.classList.add("message"); + + const row = document.createElement("tr"); + row.append(timeEl, messageEl); + + // If this is a new entry, and we are currently scrolled to the bottom (with + // a 6px allowance) we keep the scroll position at the bottom to "follow" + // the updates. + const scrollToBottom = + !initial && this._logTable.scrollTop >= this._logTable.scrollTopMax - 6; + + this._logBody.append(row); + if (scrollToBottom) { + this._logTable.scrollTo({ top: this._logTable.scrollTopMax }); + } + }, +}; + +window.addEventListener( + "DOMContentLoaded", + () => { + gTorLogDialog.init(); }, { once: true } ); ===================================== browser/components/torpreferences/content/torLogDialog.xhtml ===================================== @@ -23,10 +23,33 @@ <script src="chrome://browser/content/torpreferences/torLogDialog.js" /> - <html:textarea - id="torPreferences-torDialog-textarea" - multiline="true" - readonly="true" - /> +  + <html:table + id="tor-log-table" + role="table" + data-l10n-id="tor-log-dialog-table" + tabindex="0" + ><html:tbody id="tor-log-body" lang="en" dir="ltr"></html:tbody + ></html:table> </dialog> </window> ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -1058,12 +1058,39 @@ groupbox#torPreferences-bridges-group textarea { } /* Tor logs dialog */ -textarea#torPreferences-torDialog-textarea { +#tor-log-table { flex: 1 0 auto; - font-family: monospace; - font-size: 0.8em; - white-space: pre; overflow: auto; - /* 10 lines */ min-height: 20em; + height: 20em; + display: flex; + flex-direction: column; + padding: var(--space-small); + margin-block-end: 4px; + border: 1px solid var(--in-content-box-border-color); + border-radius: var(--border-radius-small); + font-size: var(--font-size-small); +} + +#tor-log-body, +#tor-log-table tr { + display: contents; +} + +#tor-log-table td { + flex: 0 0 auto; + padding: 0; +} + +#tor-log-table td.time { + color: var(--text-color-deemphasized); + margin-block-end: var(--space-xsmall); +} + +#tor-log-table td.message { + overflow-wrap: anywhere; +} + +#tor-log-table tr:not(:last-of-type) td.message { + margin-block-end: var(--space-medium); } ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -512,14 +512,12 @@ export class TorProvider { } /** - * Returns captured log message as a text string (one message per line). + * Returns captured log messages. * - * @returns {string} The logs we collected from the tor daemon so far + * @returns {LogEntry[]} The logs we collected from the tor daemon so far. */ getLog() { - return this.#logs - .map(logObj => `${logObj.timestamp} [${logObj.type}] ${logObj.msg}`) - .join(TorLauncherUtil.isWindows ? "\r\n" : "\n"); + return structuredClone(this.#logs); } /** ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -423,6 +423,9 @@ tor-view-log-button = View log… # "log" is a noun, referring to the recorded text output of the Tor process. tor-log-dialog-title = .title = Tor log +# The screen-reader name for the Tor log table. Should match the dialog title. +tor-log-dialog-table = + .aria-label = { tor-log-dialog-title.title } # "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 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8aa4f8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8aa4f8… You're receiving this email because of your account on gitlab.torproject.org.

1 0