New tor-interface interface

Author: nabijaczleweli

Cargo.toml

@@ -15,7 +15,7 @@ tokio = "1.41.1"
 futures = "0.3"
 
 arti-client = { version = "^0.25", default-features = false, features = ["tokio", "rustls", "onion-service-client", "static-sqlite"] }
-tor-interface = { git = "https://github.com/nabijaczleweli/gosling", rev = "65da8990e33c674ed8abeb10b454b4a39463d81d", optional = true }
+tor-interface = { git = "https://github.com/nabijaczleweli/gosling", rev = "14f9d181f66a5df2e7b1e28b412497aedfc52d21", optional = true }
 libp2p = { version = "^0.53", default-features = false, features = ["tokio", "tcp", "tls"] }
 
 tor-rtcompat = { version = "^0.25", features = ["tokio", "rustls"] }

examples/ping-onion-tor-interface.rs

@@ -54,6 +54,7 @@ use libp2p::{
 };
 use std::error::Error;
 use std::sync::{Arc, Mutex};
+use tor_interface::tor_crypto::Ed25519PrivateKey;
 
 /// Create a transport
 /// Returns a tuple of the transport and the onion address we can instruct it to listen on
@@ -72,7 +73,7 @@ async fn onion_transport(
     let mut transport = libp2p_community_tor::TorInterfaceTransport::from_provider(
         libp2p_community_tor::AddressConversion::IpAndDns, Arc::new(Mutex::new(provider)), None)?;
 
-    let onion_listen_address = transport.add_customised_onion_service(None, 999, None, ([127, 0, 0, 1], 0u16).into()).unwrap().0;
+    let onion_listen_address = transport.add_onion_service(&Ed25519PrivateKey::generate(), 999, None, None).unwrap();
 
     let auth_upgrade = noise::Config::new(&keypair)?;
     let multiplex_upgrade = yamux::Config::default();

src/tor/mod.rs

@@ -36,7 +36,6 @@ use tokio::net::TcpListener;
 
 use std::pin::Pin;
 use std::sync::{Arc, Mutex, MutexGuard};
-use std::borrow::Cow;
 use std::net::SocketAddr;
 use std::task::{Context, Poll};
 use thiserror::Error;
@@ -134,9 +133,17 @@ impl<T: TorProvider> TorInterfaceTransport<T> {
         private_key: &Ed25519PrivateKey,
         virt_port: u16,
         authorised_clients: Option<&[X25519PublicKey]>,
+        socket_addr: Option<SocketAddr>,
     ) -> anyhow::Result<Multiaddr> {
-        let ol = self.listener_or_bootstrap(|p| p.listener(private_key, virt_port, authorised_clients))?;
-        self.add_onion_service_impl(private_key, virt_port, ol)
+        let ol = self.listener_or_bootstrap(|p| p.listener(private_key, virt_port, authorised_clients, socket_addr))?;
+        ol.set_nonblocking(true)?;
+
+        self.services.push((ol, None));
+
+        let svid = V3OnionServiceId::from_private_key(&private_key);
+        let multiaddr = svid.to_multiaddr(virt_port);
+
+        Ok(multiaddr)
     }
 
     fn listener_or_bootstrap<R, F: FnMut(&mut T) -> Result<R, tor_provider::Error>>(&mut self, mut f: F) -> Result<R, tor_provider::Error> {
@@ -151,32 +158,6 @@ impl<T: TorProvider> TorInterfaceTransport<T> {
             }
         }
     }
-
-    fn add_onion_service_impl(&mut self, private_key: &Ed25519PrivateKey, virt_port: u16, ol: OnionListener) -> anyhow::Result<Multiaddr> {
-        ol.set_nonblocking(true)?;
-
-        self.services.push((ol, None));
-
-        let svid = V3OnionServiceId::from_private_key(&private_key);
-        let multiaddr = svid.to_multiaddr(virt_port);
-
-        Ok(multiaddr)
-    }
-}
-
-impl TorInterfaceTransport<tor_interface::legacy_tor_client::LegacyTorClient> {
-    /// The generic [`add_onion_service()`] implementation uses the default configuration (known key, listening on `127.0.0.1:0`)
-    pub fn add_customised_onion_service<'pk>(
-        &mut self,
-        private_key: Option<&'pk Ed25519PrivateKey>,
-        virt_port: u16,
-        authorised_clients: Option<&[X25519PublicKey]>,
-        socket_addr: SocketAddr,
-    ) -> anyhow::Result<(Multiaddr, Cow<'pk, Ed25519PrivateKey>)> {
-        let (genpk, ol) = self.listener_or_bootstrap(|p| p.customised_listener(private_key, virt_port, authorised_clients, socket_addr))?;
-        let private_key = private_key.map(Cow::Borrowed).or(genpk.map(Cow::Owned)).unwrap_or_else(|| unreachable!());
-        self.add_onion_service_impl(&private_key, virt_port, ol).map(|ma| (ma, private_key))
-    }
 }
 
 trait HsIdExt {