feat(cli, asb): Whonix and Tails support

libp2p-rendezvous-server/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 anyhow = "1"
 futures = { workspace = true }
 libp2p = { workspace = true, default-features = false, features = ["rendezvous", "tcp", "yamux", "dns", "noise", "ping", "websocket", "tokio", "macros"] }
-libp2p-tor = { path = "../libp2p-tor", features = ["listen-onion-service"] }
+libp2p-tor = { path = "../libp2p-tor", features = ["listen-onion-service", "legacy-tor-provider"] }
 tokio = { workspace = true, features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs", "net", "io-util"] }
 tor-hsservice = { workspace = true }
 tracing = { workspace = true, features = ["attributes"] }

libp2p-tor/Cargo.toml

@@ -15,6 +15,8 @@ thiserror = { workspace = true }
 tokio = { workspace = true }
 
 arti-client = { workspace = true, features = ["tokio", "rustls", "onion-service-client", "static-sqlite"] }
+# tor-interface = { git = "https://github.com/nabijaczleweli/gosling", rev = "32988e5770c12f1b48b865c158509473123eae90", optional = true }
+tor-interface = { path = "../tor-interface", optional = true }
 libp2p = { workspace = true, features = ["tokio", "tcp", "tls"] }
 
 data-encoding = { version = "2.6.0" }
@@ -37,11 +39,18 @@ listen-onion-service = [
   "dep:tor-cell",
   "dep:tor-proto",
 ]
+arti-client-tor-provider = ["tor-interface", "tor-interface/arti-client-tor-provider"]
+legacy-tor-provider      = ["tor-interface", "tor-interface/legacy-tor-provider"]
+mock-tor-provider        = ["tor-interface", "tor-interface/mock-tor-provider"]
 
 [[example]]
 name = "ping-onion"
 required-features = ["listen-onion-service"]
 
+[[example]]
+name = "ping-onion-tor-interface"
+required-features = ["tor-interface"]
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]

libp2p-tor/README.md

@@ -43,6 +43,13 @@ let mut transport = libp2p_tor::TorTransport::bootstrapped().await?;
 // we have achieved tor connection
 let _conn = transport.dial(address)?.await?;
 ```
+```rust
+let address = "/dns/www.torproject.org/tcp/1000".parse()?;
+let mut provider = libp2p_tor_interface::tor_interface::/* whichever one you want */;
+let mut transport = libp2p_tor_interface::TorInterfaceTransport::from_provider(Default::default(), Arc::new(Mutex::new(provider)), None);
+// we have achieved tor connection
+let _conn = transport.dial(address)?.await?;
+```
 
 ### About
 

libp2p-tor/examples/ping-onion-tor-interface.rs

@@ -0,0 +1,146 @@
+// Copyright 2022 Hannes Furmans
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+//! Ping-Onion example
+//!
+//! See ../src/tutorial.rs for a step-by-step guide building the example below.
+//!
+//! This example requires two seperate computers, one of which has to be reachable from the
+//! internet.
+//!
+//! On the first computer run:
+//! ```sh
+//! cargo run --example ping
+//! ```
+//!
+//! It will print the PeerId and the listening addresses, e.g. `Listening on
+//! "/ip4/0.0.0.0/tcp/24915"`
+//!
+//! Make sure that the first computer is reachable under one of these ip addresses and port.
+//!
+//! On the second computer run:
+//! ```sh
+//! cargo run --example ping-onion -- /ip4/123.45.67.89/tcp/24915
+//! ```
+//!
+//! The two nodes establish a connection, negotiate the ping protocol
+//! and begin pinging each other over Tor.
+
+use futures::StreamExt;
+use libp2p::core::upgrade::Version;
+use libp2p::Transport;
+use libp2p::{
+    core::muxing::StreamMuxerBox,
+    identity, noise,
+    swarm::{NetworkBehaviour, SwarmEvent},
+    yamux, Multiaddr, PeerId, SwarmBuilder,
+};
+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
+async fn onion_transport(
+    keypair: identity::Keypair,
+) -> Result<
+    (
+        libp2p::core::transport::Boxed<(PeerId, libp2p::core::muxing::StreamMuxerBox)>,
+        Multiaddr,
+    ),
+    Box<dyn Error>,
+> {
+    let provider = libp2p_community_tor::tor_interface::legacy_tor_client::LegacyTorClient::new(
+        libp2p_community_tor::tor_interface::legacy_tor_client::LegacyTorClientConfig::system_from_environment().expect("Configure $TOR_... to talk to"))?;
+
+    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_onion_service(&Ed25519PrivateKey::generate(), 999, None, None).unwrap();
+
+    let auth_upgrade = noise::Config::new(&keypair)?;
+    let multiplex_upgrade = yamux::Config::default();
+
+    let transport = transport
+        .boxed()
+        .upgrade(Version::V1)
+        .authenticate(auth_upgrade)
+        .multiplex(multiplex_upgrade)
+        .map(|(peer, muxer), _| (peer, StreamMuxerBox::new(muxer)))
+        .boxed();
+
+    Ok((transport, onion_listen_address))
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    tracing_subscriber::fmt::init();
+
+    let local_key = identity::Keypair::generate_ed25519();
+    let local_peer_id = PeerId::from(local_key.public());
+
+    println!("Local peer id: {local_peer_id}");
+
+    let (transport, onion_listen_address) = onion_transport(local_key).await?;
+
+    let mut swarm = SwarmBuilder::with_new_identity()
+        .with_tokio()
+        .with_other_transport(|_| transport)
+        .unwrap()
+        .with_behaviour(|_| Behaviour {
+            ping: libp2p::ping::Behaviour::default(),
+        })
+        .unwrap()
+        .build();
+
+    // Dial the peer identified by the multi-address given as the second
+    // command-line argument, if any.
+    if let Some(addr) = std::env::args().nth(1) {
+        let remote: Multiaddr = addr.parse()?;
+        swarm.dial(remote)?;
+        println!("Dialed {addr}")
+    } else {
+        // If we are not dialing, we need to listen
+        // Tell the swarm to listen on a specific onion address
+        swarm.listen_on(onion_listen_address).unwrap();
+    }
+
+    loop {
+        match swarm.select_next_some().await {
+            SwarmEvent::ConnectionEstablished {
+                endpoint, peer_id, ..
+            } => {
+                println!("Connection established with {peer_id} on {endpoint:?}");
+            }
+            SwarmEvent::OutgoingConnectionError { peer_id, error, .. } => {
+                println!("Outgoing connection error with {peer_id:?}: {error:?}");
+            }
+            SwarmEvent::NewListenAddr { address, .. } => println!("Listening on {address:?}"),
+            SwarmEvent::Behaviour(event) => println!("{event:?}"),
+            _ => {}
+        }
+    }
+}
+
+/// Our network behaviour.
+#[derive(NetworkBehaviour)]
+struct Behaviour {
+    ping: libp2p::ping::Behaviour,
+}