- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-153.1.0esr-16.0-1] fixup! [android] Disable features and functionality
by Dan Ballard (＠dan) 19 Aug '26

19 Aug '26

Dan Ballard pushed to branch tor-browser-153.1.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: c222060e by Dan Ballard at 2026-08-19T12:10:20-07:00 fixup! [android] Disable features and functionality TB44921: Disable google lens feature - - - - - 2 changed files: - mobile/android/fenix/app/nimbus.fml.yaml - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Changes: ===================================== mobile/android/fenix/app/nimbus.fml.yaml ===================================== @@ -1261,7 +1261,7 @@ features: enabled: false - channel: nightly value: - enabled: true + enabled: false voice-search-in-display-mode: description: Controls whether the voice search entry point is shown in the display-mode browser toolbar. ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -3206,7 +3206,7 @@ class Settings( */ var googleLensIntegrationUserEnabled by booleanPreference( key = appContext.getPreferenceKey(R.string.pref_key_google_lens_integration_user_enabled), - default = true, + default = false, ) /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c222060… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c222060… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.1.0esr-16.0-1] fixup! TB 44806: Implement the tor integration in Rust.
by Pier Angelo Vendrame (＠pierov) 19 Aug '26

19 Aug '26

Pier Angelo Vendrame pushed to branch tor-browser-153.1.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 6407d484 by Elena at 2026-08-19T19:37:53+02:00 fixup! TB 44806: Implement the tor integration in Rust. TB 44930: Implement the commands on the Rust control port Add a way to add a handler for when connections are closed. - - - - - 6 changed files: - toolkit/components/tor-integration/test/xpcshell/head.js - toolkit/components/tor-integration/test/xpcshell/test_control_port.js - toolkit/components/tor-integration/torITorService.idl - toolkit/components/tor-integration/tor_provider/src/ctor/control_port/control_port.rs - toolkit/components/tor-integration/tor_service/src/control_port.rs - toolkit/components/tor-launcher/TorControlPort.sys.mjs Changes: ===================================== toolkit/components/tor-integration/test/xpcshell/head.js ===================================== @@ -190,10 +190,7 @@ class ControlPortClient { } else { throw new Error("Unknown server protocol"); } - const receiver = { - onAsyncMessage: message => this.onAsyncMessage(message), - }; - this.#controlPort.start(receiver); + this.#controlPort.start(this); } sendCommand(command) { @@ -216,4 +213,6 @@ class ControlPortClient { onAsyncMessage(_message) { Assert.ok(false, "This test does not use async notifications."); } + + onClosed() {} } ===================================== toolkit/components/tor-integration/test/xpcshell/test_control_port.js ===================================== @@ -67,18 +67,27 @@ add_task(async function test_invalidSyntax() { class ControlPortClientAsyncNotification extends ControlPortClient { notificationPromise; #resolve; + closedPromise; + #closedResolve; constructor(server) { super(server); - const { promise, resolve } = Promise.withResolvers(); - this.notificationPromise = promise; - this.#resolve = resolve; + this.notificationPromise = new Promise( + resolve => (this.#resolve = resolve) + ); + this.closedPromise = new Promise( + resolve => (this.#closedResolve = resolve) + ); } onAsyncMessage(message) { Assert.equal(message, "650-Test\r\n650 notification"); this.#resolve(); } + + onClosed() { + this.#closedResolve(); + } } add_task(async function test_asyncNotification() { @@ -91,6 +100,7 @@ add_task(async function test_asyncNotification() { await cp.notificationPromise; cp.close(); server.close(); + await cp.closedPromise; }); }); ===================================== toolkit/components/tor-integration/torITorService.idl ===================================== @@ -8,6 +8,7 @@ [scriptable, uuid(4b250614-968a-412f-9191-9ffd9d4bd001)] interface torITorControlPortReceiver : nsISupports { void onAsyncMessage(in ACString message); + void onClosed(); }; [scriptable, uuid(1389d157-4695-43a2-a7d8-538aaa350766)] ===================================== toolkit/components/tor-integration/tor_provider/src/ctor/control_port/control_port.rs ===================================== @@ -5,7 +5,7 @@ use bytes::Bytes; use std::{ - cell::Cell, + cell::{Cell, RefCell}, rc::{Rc, Weak}, }; @@ -25,6 +25,7 @@ struct ControlPortInner { socket: Rc<dyn ControlSocket>, writer: Rc<CommandWriter>, message_pump: Rc<MessagePump>, + close_handler: RefCell<Option<Box<dyn FnOnce()>>>, closed: Cell<bool>, } @@ -41,6 +42,7 @@ impl ControlPortInner { Self::make_data_cb(weak_self.clone()), Self::make_async_failure_cb(weak_self.clone()), ), + close_handler: RefCell::new(None), closed: Cell::new(false), }); cp.message_pump.start().inspect_err(|_| { @@ -140,7 +142,22 @@ impl ControlPortInner { } self.reply_dispatcher.fail_all(ReplyError::ConnectionClosed); self.reply_dispatcher.set_async_handler(None); - self.socket.close() + let res = self.socket.close(); + let handler = self.close_handler.borrow_mut().take(); + if let Some(h) = handler { + h(); + } + res + } + + fn set_close_handler(&self, cb: Box<dyn FnOnce()>) { + if self.closed.get() { + // This should never happen in reality, but let's just call the + // callback if it does to make sure the callback is always called. + cb(); + return; + } + *self.close_handler.borrow_mut() = Some(cb); } } @@ -183,4 +200,9 @@ impl ControlPort { pub fn close(&self) -> Result<(), ControlSocketError> { self.0.close() } + + #[inline] + pub fn set_close_handler(&self, cb: Box<dyn FnOnce()>) { + self.0.set_close_handler(cb); + } } ===================================== toolkit/components/tor-integration/tor_service/src/control_port.rs ===================================== @@ -37,6 +37,7 @@ impl ControlPortXpcom { xpcom_method!(start => Start(receiver: *const torITorControlPortReceiver)); pub fn start(&self, receiver: &torITorControlPortReceiver) -> Result<(), nsresult> { let receiver = RefPtr::new(receiver); + let receiver2 = receiver.clone(); self.control_port .set_async_handler(Some(Box::new(move |reply| { let mut buf = Vec::new(); @@ -58,6 +59,11 @@ impl ControlPortXpcom { // pass nsCStrings created in Rust to C++. unsafe { receiver.OnAsyncMessage(&*as_str) }; }))); + self.control_port.set_close_handler(Box::new(move || { + // Safety: call to an XPCOM method of our interface that we crafted + // to make sure it was exposed on Rust bindings. + unsafe { receiver2.OnClosed() }; + })); Ok(()) } ===================================== toolkit/components/tor-launcher/TorControlPort.sys.mjs ===================================== @@ -565,6 +565,9 @@ export class TorController { onAsyncMessage(message) { self.#handleNotification(message); }, + onClosed() { + self.onClosed(); + }, }; this.#socket.start(receiver); return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6407d48… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6407d48… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/torbrowser-launcher][screenshot] Use GitHub mirror for AppStream screenshot
by asciiwolf (＠asciiwolf) 19 Aug '26

19 Aug '26

asciiwolf pushed to branch screenshot at The Tor Project / Applications / torbrowser-launcher Commits: bb3601eb by AsciiWolf at 2026-08-19T18:06:24+02:00 Use GitHub mirror for AppStream screenshot Workarounds issues with Tor Project GitLab returning error 403 - - - - - 1 changed file: - share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml Changes: ===================================== share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml ===================================== @@ -45,7 +45,7 @@ </description> <screenshots> <screenshot type="default"> - <image>https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/raw/ma…</image> + <image>https://raw.githubusercontent.com/torproject/torbrowser-launcher/main/scree…</image> <caption>Window to change Tor Browser Launcher settings</caption> <caption xml:lang="ar">نافذة لتغيير إعدادات مشغّل متصفّح تور</caption> <caption xml:lang="cs">Okno pro změnu nastavení Spouštěče Prohlížeče Tor</caption> View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch screenshot
by asciiwolf (＠asciiwolf) 19 Aug '26

19 Aug '26

asciiwolf pushed new branch screenshot at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/s… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.1.0esr-16.0-1] fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in...
by henry (＠henry) 19 Aug '26

19 Aug '26

henry pushed to branch tor-browser-153.1.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 1c6d5d63 by Henry Wilkes at 2026-08-19T14:50:36+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 45226: Make a stylelint exception for "Your bridges". - - - - - 1 changed file: - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -138,6 +138,8 @@ tor-bridges-display { padding: var(--space-large); @media not ((prefers-contrast) or (forced-colors)) { + /* Use direct colours until we get a better token. tor-browser#45194. */ + /* stylelint-disable-next-line stylelint-plugin-mozilla/no-base-design-tokens */ background-color: light-dark(var(--color-gray-0), var(--color-gray-90)); } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1c6d5d6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1c6d5d6… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.1.0esr-16.0-1] 6 commits: fixup! TB 44806: Implement the tor integration in Rust.
by Pier Angelo Vendrame (＠pierov) 19 Aug '26

19 Aug '26

Pier Angelo Vendrame pushed to branch tor-browser-153.1.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 3fcf8e84 by Elena at 2026-08-19T10:58:03+02:00 fixup! TB 44806: Implement the tor integration in Rust. TB 44930: Implement the commands on the Rust control port Rename ITor... interfaces to torITor... The prefix is basically a namespace, and really few interfaces do not have one, so add that prefix also to our interfaces. - - - - - 15498d90 by Elena at 2026-08-19T11:09:16+02:00 fixup! TB 44806: Implement the tor integration in Rust. TB 44930: Implement the commands on the Rust control port Make it possible to remove the async event handler. That will help when cleaning stuff up, to make sure not to keep any circular reference around. - - - - - 0e880d8f by Elena at 2026-08-19T11:09:19+02:00 fixup! TB 44806: Implement the tor integration in Rust. TB 44930: Implement the commands on the Rust control port Stop exposing ReplyFactory to the crate. That should remain an internal type. Instead, we can expose a "make_reply" test utility, to create one reply at once. That will be enough. - - - - - 491ab443 by Elena at 2026-08-19T11:09:19+02:00 fixup! TB 44806: Implement the tor integration in Rust. TB 44930: Implement the commands on the Rust control port Do not add missing CRLF at the control port. We will be building commands, no need to really include the logic to add missing CRLF. Instead, catch malformed commands during development. - - - - - 8a46afe3 by Elena at 2026-08-19T11:11:03+02:00 fixup! TB 44806: Implement the tor integration in Rust. TB 44930: Implement the commands on the Rust control port Reorder some methods. - - - - - 81b76447 by Elena at 2026-08-19T11:11:05+02:00 fixup! TB 44806: Implement the tor integration in Rust. TB 44930: Implement the commands on the Rust control port Remove ambiguity on the connection closed error. - - - - - 12 changed files: - toolkit/components/tor-integration/TorService.h - toolkit/components/tor-integration/components.conf - toolkit/components/tor-integration/moz.build - toolkit/components/tor-integration/ITorService.idl → toolkit/components/tor-integration/torITorService.idl - toolkit/components/tor-integration/tor_provider/src/ctor/control_port/control_port.rs - toolkit/components/tor-integration/tor_provider/src/ctor/control_port/error.rs - toolkit/components/tor-integration/tor_provider/src/ctor/reply_parser/dispatcher.rs - toolkit/components/tor-integration/tor_provider/src/ctor/reply_parser/mod.rs - toolkit/components/tor-integration/tor_provider/src/ctor/reply_parser/test_utils.rs - toolkit/components/tor-integration/tor_service/src/control_port.rs - toolkit/components/tor-integration/tor_service/src/service.rs - tools/lint/eslint/eslint-plugin-mozilla/lib/services.json Changes: ===================================== toolkit/components/tor-integration/TorService.h ===================================== @@ -7,17 +7,17 @@ #include "nsCOMPtr.h" -#include "ITorService.h" +#include "torITorService.h" // Inspired by // toolkit/components/extensions/storage/ExtensionStorageComponents.h. // Implemented in Rust -extern "C" nsresult NewTorServiceImpl(ITorService** aResult); +extern "C" nsresult NewTorServiceImpl(torITorService** aResult); namespace torproject { -already_AddRefed<ITorService> NewTorService() { - nsCOMPtr<ITorService> service; +already_AddRefed<torITorService> NewTorService() { + nsCOMPtr<torITorService> service; nsresult rv = NewTorServiceImpl(getter_AddRefs(service)); if (NS_WARN_IF(NS_FAILED(rv))) { return nullptr; ===================================== toolkit/components/tor-integration/components.conf ===================================== @@ -6,7 +6,7 @@ Classes = [ { 'cid': '{2537313c-e120-408c-a2f6-86e6e1bdf899}', 'contract_ids': ['@torproject.org/tor-service;1'], - 'interfaces': ['ITorService'], + 'interfaces': ['torITorService'], 'constructor': 'torproject::NewTorService', 'headers': ['torproject/TorService.h'], 'js_name': 'tor', ===================================== toolkit/components/tor-integration/moz.build ===================================== @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. XPIDL_MODULE = "tor" -XPIDL_SOURCES += ["ITorService.idl"] +XPIDL_SOURCES += ["torITorService.idl"] XPCOM_MANIFESTS += [ "components.conf", ] ===================================== toolkit/components/tor-integration/ITorService.idl → toolkit/components/tor-integration/torITorService.idl ===================================== @@ -6,27 +6,27 @@ #include "nsIFile.idl" [scriptable, uuid(4b250614-968a-412f-9191-9ffd9d4bd001)] -interface ITorControlPortReceiver : nsISupports { +interface torITorControlPortReceiver : nsISupports { void onAsyncMessage(in ACString message); }; [scriptable, uuid(1389d157-4695-43a2-a7d8-538aaa350766)] -interface ITorMessageHandler : nsISupports { +interface torITorMessageHandler : nsISupports { void onMessage(in ACString message); void onError(in ACString error); }; // TODO: Remove once we have a provider. [scriptable, uuid(f56d710e-5650-4b8c-8d31-279f360003ee)] -interface ITorControlPort : nsISupports { - void start(in ITorControlPortReceiver receiver); - void sendCommand(in ACString command, in ITorMessageHandler handler); +interface torITorControlPort : nsISupports { + void start(in torITorControlPortReceiver receiver); + void sendCommand(in ACString command, in torITorMessageHandler handler); void close(); }; [scriptable, uuid(2537313c-e120-408c-a2f6-86e6e1bdf899)] -interface ITorService : nsISupports { +interface torITorService : nsISupports { // For development purposes... - ITorControlPort createControlPort(in ACString host, in long port); - ITorControlPort createControlPortIPC(in nsIFile socket); + torITorControlPort createControlPort(in ACString host, in long port); + torITorControlPort createControlPortIPC(in nsIFile socket); }; ===================================== toolkit/components/tor-integration/tor_provider/src/ctor/control_port/control_port.rs ===================================== @@ -3,7 +3,7 @@ // <http://opensource.org/licenses/MIT>, at your option. This file may not be // copied, modified, or distributed except according to those terms. -use bytes::{BufMut, Bytes, BytesMut}; +use bytes::Bytes; use std::{ cell::Cell, rc::{Rc, Weak}, @@ -79,35 +79,22 @@ impl ControlPortInner { } } - fn close(&self) -> Result<(), ControlSocketError> { - if self.closed.replace(true) { - return Ok(()); - } - self.reply_dispatcher.fail_all(ReplyError::ConnectionClosed); - self.socket.close() - } - - fn set_async_handler(&self, cb: Box<dyn Fn(Reply)>) { - self.reply_dispatcher.set_async_handler(cb); - } - fn send_command( self: &Rc<Self>, - mut command: Bytes, + command: Bytes, handler: Box<dyn FnOnce(Result<Reply, ControlPortError>)>, ) { if self.closed.get() { - handler(Err(ControlPortError::ConnectionError( - ControlSocketError::ConnectionClosed, + handler(Err(ControlPortError::ProtocolError( + ReplyError::ConnectionClosed, ))); return; } - if !command.ends_with(b"\r\n") { - let mut buf = BytesMut::from(command); - buf.put(&b"\r\n"[..]); - command = buf.freeze(); - } + debug_assert!( + command.ends_with(b"\r\n"), + "Commands are expected to end with CRLF." + ); // The callback is going to be called before other commands are sent, // therefore it is safe to queue the callback at this point, as next @@ -128,14 +115,33 @@ impl ControlPortInner { handler(r.map_err(|e| ControlPortError::ProtocolError(e))); })); } - Err(e) => { - handler(Err(ControlPortError::from(e))); + Err(ControlSocketError::ConnectionClosed) => { + handler(Err(ControlPortError::ProtocolError( + ReplyError::ConnectionClosed, + ))); + this.async_failure(); + } + Err(ControlSocketError::ImplementationError(rv)) => { + handler(Err(ControlPortError::ConnectionError(rv))); this.async_failure(); } } }), ); } + + fn set_async_handler(&self, cb: Option<Box<dyn Fn(Reply)>>) { + self.reply_dispatcher.set_async_handler(cb); + } + + fn close(&self) -> Result<(), ControlSocketError> { + if self.closed.replace(true) { + return Ok(()); + } + self.reply_dispatcher.fail_all(ReplyError::ConnectionClosed); + self.reply_dispatcher.set_async_handler(None); + self.socket.close() + } } impl Drop for ControlPortInner { @@ -157,11 +163,6 @@ impl ControlPort { Ok(Self(ControlPortInner::new(Rc::from(socket))?)) } - #[inline] - pub fn close(&self) -> Result<(), ControlSocketError> { - self.0.close() - } - // TODO: Keep only the methods speicifc to commands and remove this one // (tor-browser#44930). #[inline] @@ -174,7 +175,12 @@ impl ControlPort { } #[inline] - pub fn set_async_handler(&self, cb: Box<dyn Fn(Reply)>) { + pub fn set_async_handler(&self, cb: Option<Box<dyn Fn(Reply)>>) { self.0.set_async_handler(cb); } + + #[inline] + pub fn close(&self) -> Result<(), ControlSocketError> { + self.0.close() + } } ===================================== toolkit/components/tor-integration/tor_provider/src/ctor/control_port/error.rs ===================================== @@ -5,14 +5,12 @@ use thiserror::Error; -use super::super::{ControlSocketError, ReplyError}; +use crate::ctor::ReplyError; #[derive(Error, Debug, Clone, PartialEq, Eq)] pub enum ControlPortError { - #[error("connection error")] - ConnectionError(#[from] ControlSocketError), - #[error("protocol violation")] + #[error("connection error: {0:#x}")] + ConnectionError(u32), + #[error("protocol violation: {0}")] ProtocolError(#[from] ReplyError), - #[error("unsuccessful command ({code}): {message}")] - TorError { code: u16, message: String }, } ===================================== toolkit/components/tor-integration/tor_provider/src/ctor/reply_parser/dispatcher.rs ===================================== @@ -56,9 +56,9 @@ impl ReplyDispatcher { } /// Register the handler for async notifications. - pub fn set_async_handler(&self, cb: Box<dyn Fn(Reply)>) { + pub fn set_async_handler(&self, cb: Option<Box<dyn Fn(Reply)>>) { // Reentrancy safety: we do not use the handler yet. - *self.async_handler.borrow_mut() = Some(Rc::from(cb)) + *self.async_handler.borrow_mut() = cb.map(|cb| Rc::from(cb)); } /// Feed data to parse. @@ -290,7 +290,7 @@ mod tests { let dispatcher = ReplyDispatcher::new(); let notification_called = Rc::new(Cell::new(false)); let notification_called2 = notification_called.clone(); - dispatcher.set_async_handler(Box::new(move |r| { + dispatcher.set_async_handler(Some(Box::new(move |r| { assert_eq!( *r.end_line(), EndReplyLine { @@ -299,7 +299,7 @@ mod tests { } ); notification_called2.set(true); - })); + }))); let reply_called = Rc::new(Cell::new(false)); let reply_called2 = reply_called.clone(); dispatcher.push_callback(Box::new(move |_| { @@ -323,12 +323,12 @@ mod tests { #[test] fn async_replace_handler() { let dispatcher = ReplyDispatcher::new(); - dispatcher.set_async_handler(Box::new(move |_| { + dispatcher.set_async_handler(Some(Box::new(move |_| { unreachable!("This handler should never be called, as it has been replaced."); - })); + }))); let called = Rc::new(Cell::new(false)); let c = called.clone(); - dispatcher.set_async_handler(Box::new(move |r| { + dispatcher.set_async_handler(Some(Box::new(move |r| { assert_eq!( *r.end_line(), EndReplyLine { @@ -337,7 +337,7 @@ mod tests { } ); c.set(true); - })); + }))); assert!(!called.get()); dispatcher .feed(&Bytes::from_static(b"650 Notification\r\n")) @@ -345,6 +345,18 @@ mod tests { assert!(called.get()); } + #[test] + fn async_remove_handler() { + let dispatcher = ReplyDispatcher::new(); + dispatcher.set_async_handler(Some(Box::new(move |_| { + unreachable!("This handler should never be called, as it has been replaced."); + }))); + dispatcher.set_async_handler(None); + dispatcher + .feed(&Bytes::from_static(b"650 Notification\r\n")) + .unwrap(); + } + #[test] fn sync_async_single_feed() { let dispatcher = ReplyDispatcher::new(); @@ -356,7 +368,7 @@ mod tests { })); let async_called = Rc::new(Cell::new(false)); let ac = async_called.clone(); - dispatcher.set_async_handler(Box::new(move |r| { + dispatcher.set_async_handler(Some(Box::new(move |r| { assert_eq!( *r.end_line(), EndReplyLine { @@ -365,7 +377,7 @@ mod tests { } ); ac.set(true); - })); + }))); dispatcher .feed(&Bytes::from_static(b"250 OK\r\n650 Notification\r\n")) .unwrap(); @@ -450,13 +462,13 @@ mod tests { let notifications = Rc::new(Cell::new(0)); let n = notifications.clone(); let d = dispatcher.clone(); - dispatcher.set_async_handler(Box::new(move |_| { + dispatcher.set_async_handler(Some(Box::new(move |_| { n.set(n.get() + 1); if n.get() < 2 { d.feed(&Bytes::from_static(b"650 Notification 2\r\n")) .unwrap(); } - })); + }))); dispatcher .feed(&Bytes::from_static(b"650 Notification 1\r\n")) .unwrap(); @@ -514,9 +526,9 @@ mod tests { #[test] fn error_propagation() { let dispatcher = ReplyDispatcher::new(); - dispatcher.set_async_handler(Box::new(|_| { + dispatcher.set_async_handler(Some(Box::new(|_| { unreachable!("Errors should not be propagated to the async handler."); - })); + }))); let first = Rc::new(Cell::new(false)); let f = first.clone(); let second = Rc::new(Cell::new(false)); ===================================== toolkit/components/tor-integration/tor_provider/src/ctor/reply_parser/mod.rs ===================================== @@ -15,6 +15,8 @@ mod test_utils; pub use dispatcher::ReplyDispatcher; pub use error::ReplyError; -pub(crate) use factory::ReplyFactory; pub use line::{DetailReplyLine, EndReplyLine}; pub use reply::Reply; + +#[cfg(test)] +pub(crate) use test_utils::make_reply; ===================================== toolkit/components/tor-integration/tor_provider/src/ctor/reply_parser/test_utils.rs ===================================== @@ -6,10 +6,19 @@ use bytes::Bytes; use super::{ + factory::ReplyFactory, line::{DetailReplyLine, EndReplyLine}, reply::Reply, }; +pub(crate) fn make_reply(data: &'static [u8]) -> Reply { + let mut factory = ReplyFactory::default(); + let mut replies = factory.build(&Bytes::from_static(data)).unwrap(); + assert_eq!(replies.len(), 1); + assert!(!factory.has_pending_data()); + replies.pop_front().unwrap() +} + pub(super) fn check_250_ok(reply: &Reply, has_details: bool) { assert_eq!(reply.has_details(), has_details); assert_eq!( ===================================== toolkit/components/tor-integration/tor_service/src/control_port.rs ===================================== @@ -2,18 +2,20 @@ * 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/. */ -use bytes::Bytes; use nserror::nsresult; use nserror::{NS_ERROR_NOT_CONNECTED, NS_OK}; use nsstring::{nsACString, nsCString}; -use tor_provider::ctor::ControlPort; -use tor_provider::ctor::ControlSocketError; -use xpcom::interfaces::{nsIFile, ITorControlPort, ITorControlPortReceiver, ITorMessageHandler}; +use tor_provider::ctor::{ControlPort, ControlSocketError}; +use xpcom::interfaces::{nsIFile, torITorControlPortReceiver, torITorMessageHandler}; use xpcom::RefPtr; +// Actually used, but the compiler does not detect it. +#[allow(unused)] +use xpcom::interfaces::torITorControlPort; + use super::control_socket::ControlSocketXpcom; -#[xpcom(implement(ITorControlPort), atomic)] +#[xpcom(implement(torITorControlPort), atomic)] pub struct ControlPortXpcom { control_port: ControlPort, } @@ -32,42 +34,46 @@ impl ControlPortXpcom { Ok(Self::allocate(InitControlPortXpcom { control_port })) } - xpcom_method!(start => Start(receiver: *const ITorControlPortReceiver)); - pub fn start(&self, receiver: &ITorControlPortReceiver) -> Result<(), nsresult> { + xpcom_method!(start => Start(receiver: *const torITorControlPortReceiver)); + pub fn start(&self, receiver: &torITorControlPortReceiver) -> Result<(), nsresult> { let receiver = RefPtr::new(receiver); - self.control_port.set_async_handler(Box::new(move |reply| { - let mut buf = Vec::new(); - if let Err(e) = reply.write_to(&mut buf) { - log::error!( - "Cannot convert the reply to the raw message: {}.", - e.to_string() - ); - return; - } - if buf.ends_with(b"\r\n") { - buf.truncate(buf.len() - 2); - } - // These conversions re-use the buffer, Gecko uses the same - // allocator for Rust and C++ (see the nsstring crate). - let as_str = nsCString::from(buf); - // Safety: call to an XPCOM method that we expect to be exposed on - // Rust. As per the documentation in nsstring, it is safe to pass - // nsCStrings created in Rust to C++. - unsafe { receiver.OnAsyncMessage(&*as_str) }; - })); + self.control_port + .set_async_handler(Some(Box::new(move |reply| { + let mut buf = Vec::new(); + if let Err(e) = reply.write_to(&mut buf) { + log::error!( + "Cannot convert the reply to the raw message: {}.", + e.to_string() + ); + return; + } + if buf.ends_with(b"\r\n") { + buf.truncate(buf.len() - 2); + } + // These conversions re-use the buffer, Gecko uses the same + // allocator for Rust and C++ (see the nsstring crate). + let as_str = nsCString::from(buf); + // Safety: call to an XPCOM method that we expect to be exposed + // on Rust. As per the documentation in nsstring, it is safe to + // pass nsCStrings created in Rust to C++. + unsafe { receiver.OnAsyncMessage(&*as_str) }; + }))); Ok(()) } - xpcom_method!(send_command => SendCommand(command: *const nsACString, handler: *const ITorMessageHandler)); + xpcom_method!(send_command => SendCommand(command: *const nsACString, handler: *const torITorMessageHandler)); pub fn send_command( &self, command: &nsACString, - handler: &ITorMessageHandler, + handler: &torITorMessageHandler, ) -> Result<(), nsresult> { - let command = Bytes::copy_from_slice(&command[..]); + let mut command = command.to_vec(); + if !command.ends_with(b"\r\n") { + command.extend_from_slice(b"\r\n"); + } let handler = RefPtr::new(handler); self.control_port.send_command( - command, + command.into(), Box::new(move |reply| { let mut buf = Vec::new(); let reply = match reply { ===================================== toolkit/components/tor-integration/tor_service/src/service.rs ===================================== @@ -4,12 +4,16 @@ use nserror::{nsresult, NS_ERROR_NULL_POINTER, NS_OK}; use nsstring::nsACString; -use xpcom::interfaces::{nsIFile, ITorControlPort, ITorService}; +use xpcom::interfaces::{nsIFile, torITorControlPort}; use xpcom::RefPtr; use super::control_port::ControlPortXpcom; -#[xpcom(implement(ITorService), atomic)] +// Actually used, but the compiler does not detect it. +#[allow(unused)] +use xpcom::interfaces::torITorService; + +#[xpcom(implement(torITorService), atomic)] struct TorService {} impl TorService { @@ -17,31 +21,31 @@ impl TorService { TorService::allocate(InitTorService {}) } - xpcom_method!(create_control_port => CreateControlPort(host: *const nsACString, port: i32, out: *mut *const ITorControlPort)); + xpcom_method!(create_control_port => CreateControlPort(host: *const nsACString, port: i32, out: *mut *const torITorControlPort)); fn create_control_port( &self, host: &nsACString, port: i32, - out: *mut *const ITorControlPort, + out: *mut *const torITorControlPort, ) -> Result<(), nsresult> { if out.is_null() { return Err(NS_ERROR_NULL_POINTER); } - let cp = RefPtr::new(ControlPortXpcom::new_tcp(host, port)?.coerce::<ITorControlPort>()); + let cp = RefPtr::new(ControlPortXpcom::new_tcp(host, port)?.coerce::<torITorControlPort>()); cp.forget(unsafe { &mut *out }); Ok(()) } - xpcom_method!(create_control_port_ipc => CreateControlPortIPC(socket: *const nsIFile, out: *mut *const ITorControlPort)); + xpcom_method!(create_control_port_ipc => CreateControlPortIPC(socket: *const nsIFile, out: *mut *const torITorControlPort)); fn create_control_port_ipc( &self, socket: &nsIFile, - out: *mut *const ITorControlPort, + out: *mut *const torITorControlPort, ) -> Result<(), nsresult> { if out.is_null() { return Err(NS_ERROR_NULL_POINTER); } - let cp = RefPtr::new(ControlPortXpcom::new_ipc(socket)?.coerce::<ITorControlPort>()); + let cp = RefPtr::new(ControlPortXpcom::new_ipc(socket)?.coerce::<torITorControlPort>()); cp.forget(unsafe { &mut *out }); Ok(()) } @@ -49,11 +53,11 @@ impl TorService { // See toolkit/components/extensions/storage/webext_storage_bridge/src/lib.rs. #[no_mangle] -pub unsafe extern "C" fn NewTorServiceImpl(result: *mut *const ITorService) -> nsresult { +pub unsafe extern "C" fn NewTorServiceImpl(result: *mut *const torITorService) -> nsresult { if result.is_null() { return NS_ERROR_NULL_POINTER; } let service = TorService::new(); - RefPtr::new(service.coerce::<ITorService>()).forget(&mut *result); + RefPtr::new(service.coerce::<torITorService>()).forget(&mut *result); NS_OK } ===================================== tools/lint/eslint/eslint-plugin-mozilla/lib/services.json ===================================== @@ -59,5 +59,5 @@ "nsIXULAppInfo": "appinfo", "nsIXULRuntime": "appinfo", "nsIXULStore": "xulStore", - "ITorService": "tor" + "torITorService": "tor" } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/14bc2a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/14bc2a… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_NIGHTLY_155_END
by Pier Angelo Vendrame (＠pierov) 19 Aug '26

19 Aug '26

Pier Angelo Vendrame pushed new tag FIREFOX_NIGHTLY_155_END at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/FIREF… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_NIGHTLY_155_END
by Pier Angelo Vendrame (＠pierov) 19 Aug '26

19 Aug '26

Pier Angelo Vendrame pushed new tag FIREFOX_NIGHTLY_155_END at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_N… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-153.1.0esr-16.0-1] 2 commits: fixup! BB 42728: Modify ./mach lint to skip unused linters
by Pier Angelo Vendrame (＠pierov) 19 Aug '26

19 Aug '26

Pier Angelo Vendrame pushed to branch mullvad-browser-153.1.0esr-16.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 952a78d0 by Beatriz Rizental at 2026-08-19T10:55:00+02:00 fixup! BB 42728: Modify ./mach lint to skip unused linters Bug 45224: Enable Rust linters - - - - - 7644d3f4 by Beatriz Rizental at 2026-08-19T10:55:10+02:00 fixup! BB 41916: Letterboxing preferences UI Fix lints - - - - - 2 changed files: - browser/components/preferences/config/letterboxing.mjs - python/mozlint/mozlint/cli.py Changes: ===================================== browser/components/preferences/config/letterboxing.mjs ===================================== @@ -78,7 +78,8 @@ Preferences.addSetting({ SettingGroupManager.registerGroups({ letterboxing: { l10nId: "letterboxing-settings-group", - supportPage: "tor-manual:features__fingerprinting-protections___letterboxing", + supportPage: + "tor-manual:features__fingerprinting-protections___letterboxing", headingLevel: 2, items: [ { ===================================== python/mozlint/mozlint/cli.py ===================================== @@ -25,7 +25,6 @@ INACTIVE_LINTERS = [ "android-javadoc", "android-lint", "android-test", - "clippy", "codespell", "condprof-addons", "file-perm", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/bc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/bc… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.1.0esr-16.0-1] 3 commits: fixup! BB 42728: Modify ./mach lint to skip unused linters
by Pier Angelo Vendrame (＠pierov) 19 Aug '26

19 Aug '26

Pier Angelo Vendrame pushed to branch tor-browser-153.1.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: d0f160ff by Beatriz Rizental at 2026-08-19T09:42:41+02:00 fixup! BB 42728: Modify ./mach lint to skip unused linters Bug 45224: Enable Rust linters - - - - - d5978a68 by Beatriz Rizental at 2026-08-19T09:42:41+02:00 fixup! TB 44806: Implement the tor integration in Rust. Bug 45224: Enable Rust linters - - - - - 14bc2a35 by Beatriz Rizental at 2026-08-19T09:42:41+02:00 fixup! BB 41916: Letterboxing preferences UI Fix lints - - - - - 4 changed files: - browser/components/preferences/config/letterboxing.mjs - python/mozlint/mozlint/cli.py - toolkit/components/tor-integration/tor_provider/src/ctor/reply_parser/factory.rs - toolkit/components/tor-integration/tor_service/src/control_socket.rs Changes: ===================================== browser/components/preferences/config/letterboxing.mjs ===================================== @@ -78,7 +78,8 @@ Preferences.addSetting({ SettingGroupManager.registerGroups({ letterboxing: { l10nId: "letterboxing-settings-group", - supportPage: "tor-manual:features__fingerprinting-protections___letterboxing", + supportPage: + "tor-manual:features__fingerprinting-protections___letterboxing", headingLevel: 2, items: [ { ===================================== python/mozlint/mozlint/cli.py ===================================== @@ -25,7 +25,6 @@ INACTIVE_LINTERS = [ "android-javadoc", "android-lint", "android-test", - "clippy", "codespell", "condprof-addons", "file-perm", ===================================== toolkit/components/tor-integration/tor_provider/src/ctor/reply_parser/factory.rs ===================================== @@ -424,7 +424,9 @@ mod tests { assert!(!factory.has_pending_data()); assert_eq!( - factory.build(&Bytes::from_static(b"250 OK\r\nA\r\n")).unwrap_err(), + factory + .build(&Bytes::from_static(b"250 OK\r\nA\r\n")) + .unwrap_err(), ReplyError::LineTooShort, ); assert!(!factory.has_pending_data()); ===================================== toolkit/components/tor-integration/tor_service/src/control_socket.rs ===================================== @@ -11,7 +11,11 @@ use nserror::{ NS_ERROR_FAILURE, NS_ERROR_INVALID_ARG, NS_ERROR_NOT_AVAILABLE, NS_ERROR_UNEXPECTED, NS_OK, }; use nsstring::nsACString; -use std::{cell::{Cell, RefCell}, ffi::c_char, ptr::null}; +use std::{ + cell::{Cell, RefCell}, + ffi::c_char, + ptr::null, +}; use thin_vec::ThinVec; use tor_provider::ctor::{ControlSocket, ControlSocketError}; use xpcom::interfaces::{ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4bd151… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4bd151… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0