transports/onion: Add dial-only implementation of Transport

CHANGELOG.md

@@ -31,6 +31,7 @@
 - [`libp2p-wasm-ext` CHANGELOG](transports/wasm-ext/CHANGELOG.md)
 - [`libp2p-websocket` CHANGELOG](transports/websocket/CHANGELOG.md)
 - [`libp2p-tls` CHANGELOG](transports/tls/CHANGELOG.md)
+- [`libp2p-onion` CHANGELOG](transports/onion/CHANGELOG.md)
 
 ## Multiplexers
 
@@ -45,8 +46,9 @@
 
 # `libp2p` facade crate
 
-# 0.50.0 - [unreleased]
+# 0.50.0 [unreleased]
 
+- New `libp2p-onion` crate. See [PR 2899].
 - Introduce [`libp2p-tls` `v0.1.0-alpha`](transports/tls/CHANGELOG.md#010-alpha). See [PR 2945].
 - Introduce [`libp2p-quic` `v0.7.0-alpha`](transports/quic/CHANGELOG.md#070-alpha). See [PR 2289].
 - Remove deprecated features: `tcp-tokio`, `mdns-tokio`, `dns-tokio`, `tcp-async-io`, `mdns-async-io`, `dns-async-std`.
@@ -82,6 +84,7 @@
   - Update to [`libp2p-websocket` `v0.40.0`](transports/websocket/CHANGELOG.md#0400).
   - Update to [`libp2p-yamux` `v0.42.0`](muxers/yamux/CHANGELOG.md#0420).
 
+[PR 2899]: https://github.com/libp2p/rust-libp2p/pull/2899
 [PR 2945]: https://github.com/libp2p/rust-libp2p/pull/2945
 [PR 3001]: https://github.com/libp2p/rust-libp2p/pull/3001
 [PR 2945]: https://github.com/libp2p/rust-libp2p/pull/2945

Cargo.toml

@@ -26,6 +26,9 @@ full = [
     "metrics",
     "mplex",
     "noise",
+    "onion",
+    "onion-native-tls",
+    "onion-rustls",
     "ping",
     "plaintext",
     "pnet",
@@ -49,7 +52,7 @@ full = [
     "yamux",
 ]
 
-async-std = ["libp2p-swarm/async-std", "libp2p-mdns?/async-io", "libp2p-tcp?/async-io", "libp2p-dns?/async-std", "libp2p-quic?/async-std"]
+async-std = ["libp2p-swarm/async-std", "libp2p-mdns?/async-io", "libp2p-tcp?/async-io", "libp2p-dns?/async-std", "libp2p-quic?/async-std", "libp2p-onion?/async-std"]
 autonat = ["dep:libp2p-autonat"]
 dcutr = ["dep:libp2p-dcutr", "libp2p-metrics?/dcutr"]
 deflate = ["dep:libp2p-deflate"]
@@ -65,6 +68,9 @@ tls = ["dep:libp2p-tls"]
 metrics = ["dep:libp2p-metrics"]
 mplex = ["dep:libp2p-mplex"]
 noise = ["dep:libp2p-noise"]
+onion = ["dep:libp2p-onion"]
+onion-native-tls = ["dep:libp2p-onion", "libp2p-onion?/native-tls"]
+onion-rustls = ["dep:libp2p-onion", "libp2p-onion?/rustls"]
 ping = ["dep:libp2p-ping", "libp2p-metrics?/ping"]
 plaintext = ["dep:libp2p-plaintext"]
 pnet = ["dep:libp2p-pnet"]
@@ -76,7 +82,7 @@ rsa = ["libp2p-core/rsa"]
 secp256k1 = ["libp2p-core/secp256k1"]
 serde = ["libp2p-core/serde", "libp2p-kad?/serde", "libp2p-gossipsub?/serde"]
 tcp = ["dep:libp2p-tcp"]
-tokio = ["libp2p-swarm/tokio", "libp2p-mdns?/tokio", "libp2p-tcp?/tokio", "libp2p-dns?/tokio", "libp2p-quic?/tokio", "libp2p-webrtc?/tokio"]
+tokio = ["libp2p-swarm/tokio", "libp2p-mdns?/tokio", "libp2p-tcp?/tokio", "libp2p-dns?/tokio", "libp2p-quic?/tokio", "libp2p-webrtc?/tokio", "libp2p-onion?/tokio"]
 uds = ["dep:libp2p-uds"]
 wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen", "getrandom/js"]
 wasm-ext = ["dep:libp2p-wasm-ext"]
@@ -85,6 +91,7 @@ webrtc = ["dep:libp2p-webrtc", "libp2p-webrtc?/pem"]
 websocket = ["dep:libp2p-websocket"]
 yamux = ["dep:libp2p-yamux"]
 
+
 [dependencies]
 bytes = "1"
 futures = "0.3.1"
@@ -120,6 +127,7 @@ smallvec = "1.6.1"
 libp2p-deflate = { version = "0.38.0", path = "transports/deflate", optional = true }
 libp2p-dns = { version = "0.38.0", path = "transports/dns", optional = true }
 libp2p-mdns = { version = "0.42.0", path = "protocols/mdns", optional = true }
+libp2p-onion = { version = "0.1.0-alpha", path = "transports/onion", default-features = false, optional = true }
 libp2p-quic = { version = "0.7.0-alpha", path = "transports/quic", optional = true }
 libp2p-tcp = { version = "0.38.0", path = "transports/tcp", optional = true }
 libp2p-tls = { version = "0.1.0-alpha", path = "transports/tls", optional = true }
@@ -139,37 +147,39 @@ tokio = { version = "1.15", features = ["io-util", "io-std", "macros", "rt", "rt
 [workspace]
 members = [
     "core",
+    "misc/keygen",
     "misc/metrics",
     "misc/multistream-select",
-    "misc/rw-stream-sink",
-    "misc/keygen",
     "misc/prost-codec",
     "misc/quickcheck-ext",
+    "misc/rw-stream-sink",
     "muxers/mplex",
-    "muxers/yamux",
     "muxers/test-harness",
-    "protocols/dcutr",
+    "muxers/yamux",
     "protocols/autonat",
+    "protocols/dcutr",
     "protocols/floodsub",
     "protocols/gossipsub",
-    "protocols/rendezvous",
     "protocols/identify",
     "protocols/kad",
     "protocols/mdns",
     "protocols/ping",
     "protocols/relay",
+    "protocols/rendezvous",
     "protocols/request-response",
     "swarm",
     "swarm-derive",
     "transports/deflate",
     "transports/dns",
     "transports/noise",
-    "transports/tls",
+    "transports/onion",
     "transports/plaintext",
     "transports/pnet",
     "transports/quic",
     "transports/tcp",
+    "transports/tls",
     "transports/uds",
+    "transports/wasm-ext",
     "transports/websocket",
     "transports/wasm-ext",
     "transports/webrtc"
@@ -195,6 +205,10 @@ required-features = ["full"]
 name = "ipfs-private"
 required-features = ["full"]
 
+[[example]]
+name = "ping-onion"
+required-features = ["full"]
+
 [[example]]
 name = "ipfs-kad"
 required-features = ["full"]

deny.toml

@@ -78,6 +78,8 @@ exceptions = [
     { allow = ["ISC", "MIT", "OpenSSL"], name = "ring" },
     # libp2p is not re-distributing unicode tables data by itself 
     { allow = ["MIT", "Apache-2.0", "Unicode-DFS-2016"], name = "unicode-ident" },
+    # libp2p is not re-distributing unicode tables data by iteself
+    { allow = ["Unicode-DFS-2016"], name = "tinystr"},
 ]
 
 # Some crates don't have (easily) machine readable licensing information,
@@ -88,6 +90,11 @@ name = "ring"
 expression = "ISC AND MIT AND OpenSSL"
 license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
 
+[[licenses.clarify]]
+name = "bounded-vec-deque"
+expression = "GPL-3.0 OR BSD-3-Clause"
+license-files = [{ path = "LICENSE", hash = 0x40145f22 }]
+
 [licenses.private]
 # If true, ignores workspace crates that aren't published, or are only
 # published to private registries

examples/README.md

@@ -48,6 +48,12 @@ A set of examples showcasing how to use rust-libp2p.
 
   Tutorial on how to overcome firewalls and NATs with libp2p’s hole punching mechanism.
 
+## Special transports
+
+- [Ping over Onion](ping-onion.rs)
+
+  Client counterpart to normal ping, that routes traffic over Tor.
+
 ## Integration into a larger application
 
 - [File sharing application](./file-sharing.rs)

examples/ping-onion.rs

@@ -0,0 +1,120 @@
+// 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::prelude::*;
+use libp2p::onion::AddressConversion;
+use libp2p::swarm::{keep_alive, Swarm, SwarmEvent};
+use libp2p::{
+    core::upgrade, identity, mplex, noise, onion, ping, yamux, Multiaddr, NetworkBehaviour, PeerId,
+    Transport,
+};
+use std::error::Error;
+
+async fn onion_transport(
+    keypair: identity::Keypair,
+) -> Result<
+    libp2p_core::transport::Boxed<(PeerId, libp2p_core::muxing::StreamMuxerBox)>,
+    Box<dyn Error>,
+> {
+    use std::time::Duration;
+
+    let transport = onion::AsyncStdNativeTlsOnionTransport::bootstrapped()
+        .await?
+        .with_address_conversion(AddressConversion::IpAndDns);
+    Ok(transport
+        .upgrade(upgrade::Version::V1)
+        .authenticate(
+            noise::NoiseAuthenticated::xx(&keypair)
+                .expect("Signing libp2p-noise static DH keypair failed."),
+        )
+        .multiplex(upgrade::SelectUpgrade::new(
+            yamux::YamuxConfig::default(),
+            mplex::MplexConfig::default(),
+        ))
+        .timeout(Duration::from_secs(20))
+        .boxed())
+}
+
+#[async_std::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    let addr = std::env::args().nth(1).expect("no multiaddr given");
+    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_transport(local_key).await?;
+
+    let mut swarm = Swarm::new(transport, Behaviour::default(), local_peer_id);
+
+    // Dial the peer identified by the multi-address given as the second
+    // command-line argument, if any.
+    let remote: Multiaddr = addr.parse()?;
+    swarm.dial(remote)?;
+    println!("Dialed {}", addr);
+
+    loop {
+        match swarm.select_next_some().await {
+            SwarmEvent::ConnectionEstablished { endpoint, .. } => {
+                let endpoint_addr = endpoint.get_remote_address();
+                println!("Connection established to {:?}", endpoint_addr);
+            }
+            SwarmEvent::OutgoingConnectionError { error, .. } => {
+                println!("Error establishing outgoing connection: {:?}", error)
+            }
+            SwarmEvent::Behaviour(event) => println!("{:?}", event),
+            _ => {}
+        }
+    }
+}
+
+/// Our network behaviour.
+///
+/// For illustrative purposes, this includes the [`KeepAlive`](behaviour::KeepAlive) behaviour so a continuous sequence of
+/// pings can be observed.
+#[derive(NetworkBehaviour, Default)]
+struct Behaviour {
+    keep_alive: keep_alive::Behaviour,
+    ping: ping::Behaviour,
+}

src/lib.rs

@@ -84,6 +84,11 @@ pub use libp2p_mplex as mplex;
 #[cfg(feature = "noise")]
 #[doc(inline)]
 pub use libp2p_noise as noise;
+#[cfg(feature = "onion")]
+#[cfg_attr(docsrs, doc(cfg(feature = "onion")))]
+#[cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))]
+#[doc(inline)]
+pub use libp2p_onion as onion;
 #[cfg(feature = "ping")]
 #[doc(inline)]
 pub use libp2p_ping as ping;

transports/onion/CHANGELOG.md

@@ -0,0 +1,6 @@
+# 0.37.0 - [unreleased]
+
+- Initial Implementation. See [PR 2899].
+
+[PR 2899]: https://github.com/libp2p/rust-libp2p/pull/2899
+

transports/onion/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "libp2p-onion"
+version = "0.1.0-alpha"
+edition = "2021"
+license = "MIT"
+resolver = "2"
+
+[dependencies]
+arti-client = { version = "0.7", default-features = false }
+async-std-crate = { package = "async-std", version = "1", optional = true, default-features = false }
+futures = "0.3"
+libp2p-core = { version = "0.38", path = "../../core" }
+thiserror = "1"
+tokio-crate = { package = "tokio", version = "1", optional = true, default-features = false }
+tor-rtcompat = "0.7"
+
+[dev-dependencies]
+libp2p = { version = "0.50", path = "../../" }
+tokio-crate = { package = "tokio", version = "1", features = ["rt", "macros"] }
+async-std-crate = { package = "async-std", version = "1", features = ["attributes"] }
+
+[features]
+tokio = ["arti-client/tokio", "dep:tokio-crate"]
+async-std = ["arti-client/async-std", "dep:async-std-crate"]
+native-tls = ["arti-client/native-tls"]
+rustls = ["arti-client/rustls"]
+
+[package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
+rustc-args = ["--cfg", "docsrs"]