mirror of
https://github.com/fluencelabs/rust-libp2p
synced 2025-05-17 21:31:20 +00:00
* Rework the transport upgrade API. ALthough transport upgrades must follow a specific pattern in order fot the resulting transport to be usable with a `Network` or `Swarm`, that pattern is currently not well reflected in the transport upgrade API. Rather, transport upgrades are rather laborious and involve non-trivial code duplication. This commit introduces a `transport::upgrade::Builder` that is obtained from `Transport::upgrade`. The `Builder` encodes the previously implicit rules for transport upgrades: 1. Authentication upgrades must happen first. 2. Any number of upgrades may follow. 3. A multiplexer upgrade must happen last. Since multiplexing is the last (regular) transport upgrade (because that upgrade yields a `StreamMuxer` which is no longer a `AsyncRead` / `AsyncWrite` resource, which the upgrade process is based on), the upgrade starts with `Transport::upgrade` and ends with `Builder::multiplex`, which drops back down to the `Transport`, providing a fluent API. Authentication and multiplexer upgrades must furthermore adhere to a minimal contract w.r.t their outputs: 1. An authentication upgrade is given an (async) I/O resource `C` and must produce a pair `(I, D)` where `I: ConnectionInfo` and `D` is a new (async) I/O resource `D`. 2. A multiplexer upgrade is given an (async) I/O resource `C` and must produce a `M: StreamMuxer`. To that end, two changes to the `secio` and `noise` protocols have been made: 1. The `secio` upgrade now outputs a pair of `(PeerId, SecioOutput)`. The former implements `ConnectionInfo` and the latter `AsyncRead` / `AsyncWrite`, fulfilling the `Builder` contract. 2. A new `NoiseAuthenticated` upgrade has been added that wraps around any noise upgrade (i.e. `NoiseConfig`) and has an output of `(PeerId, NoiseOutput)`, i.e. it checks if the `RemoteIdentity` from the handshake output is an `IdentityKey`, failing if that is not the case. This is the standard upgrade procedure one wants for integrating noise with libp2p-core/swarm. * Cleanup * Add a new integration test. * Add missing license.
203 lines
7.8 KiB
Rust
203 lines
7.8 KiB
Rust
// Copyright 2019 Parity Technologies (UK) Ltd.
|
|
//
|
|
// 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.
|
|
|
|
use futures::{future::{self, Either}, prelude::*};
|
|
use libp2p_core::identity;
|
|
use libp2p_core::upgrade::{self, Negotiated, apply_inbound, apply_outbound};
|
|
use libp2p_core::transport::{Transport, ListenerEvent};
|
|
use libp2p_noise::{Keypair, X25519, NoiseConfig, RemoteIdentity, NoiseError, NoiseOutput};
|
|
use libp2p_tcp::{TcpConfig, TcpTransStream};
|
|
use log::info;
|
|
use quickcheck::QuickCheck;
|
|
use tokio::{self, io};
|
|
|
|
#[allow(dead_code)]
|
|
fn core_upgrade_compat() {
|
|
// Tests API compaibility with the libp2p-core upgrade API,
|
|
// i.e. if it compiles, the "test" is considered a success.
|
|
let id_keys = identity::Keypair::generate_ed25519();
|
|
let dh_keys = Keypair::<X25519>::new().into_authentic(&id_keys).unwrap();
|
|
let noise = NoiseConfig::xx(dh_keys).into_authenticated();
|
|
let _ = TcpConfig::new().upgrade().authenticate(noise);
|
|
}
|
|
|
|
#[test]
|
|
fn xx() {
|
|
let _ = env_logger::try_init();
|
|
fn prop(message: Vec<u8>) -> bool {
|
|
let server_id = identity::Keypair::generate_ed25519();
|
|
let client_id = identity::Keypair::generate_ed25519();
|
|
|
|
let server_id_public = server_id.public();
|
|
let client_id_public = client_id.public();
|
|
|
|
let server_dh = Keypair::<X25519>::new().into_authentic(&server_id).unwrap();
|
|
let server_transport = TcpConfig::new()
|
|
.and_then(move |output, endpoint| {
|
|
upgrade::apply(output, NoiseConfig::xx(server_dh), endpoint)
|
|
})
|
|
.and_then(move |out, _| expect_identity(out, &client_id_public));
|
|
|
|
let client_dh = Keypair::<X25519>::new().into_authentic(&client_id).unwrap();
|
|
let client_transport = TcpConfig::new()
|
|
.and_then(move |output, endpoint| {
|
|
upgrade::apply(output, NoiseConfig::xx(client_dh), endpoint)
|
|
})
|
|
.and_then(move |out, _| expect_identity(out, &server_id_public));
|
|
|
|
run(server_transport, client_transport, message);
|
|
true
|
|
}
|
|
QuickCheck::new().max_tests(30).quickcheck(prop as fn(Vec<u8>) -> bool)
|
|
}
|
|
|
|
#[test]
|
|
fn ix() {
|
|
let _ = env_logger::try_init();
|
|
fn prop(message: Vec<u8>) -> bool {
|
|
let server_id = identity::Keypair::generate_ed25519();
|
|
let client_id = identity::Keypair::generate_ed25519();
|
|
|
|
let server_id_public = server_id.public();
|
|
let client_id_public = client_id.public();
|
|
|
|
let server_dh = Keypair::<X25519>::new().into_authentic(&server_id).unwrap();
|
|
let server_transport = TcpConfig::new()
|
|
.and_then(move |output, endpoint| {
|
|
upgrade::apply(output, NoiseConfig::ix(server_dh), endpoint)
|
|
})
|
|
.and_then(move |out, _| expect_identity(out, &client_id_public));
|
|
|
|
let client_dh = Keypair::<X25519>::new().into_authentic(&client_id).unwrap();
|
|
let client_transport = TcpConfig::new()
|
|
.and_then(move |output, endpoint| {
|
|
upgrade::apply(output, NoiseConfig::ix(client_dh), endpoint)
|
|
})
|
|
.and_then(move |out, _| expect_identity(out, &server_id_public));
|
|
|
|
run(server_transport, client_transport, message);
|
|
true
|
|
}
|
|
QuickCheck::new().max_tests(30).quickcheck(prop as fn(Vec<u8>) -> bool)
|
|
}
|
|
|
|
#[test]
|
|
fn ik_xx() {
|
|
let _ = env_logger::try_init();
|
|
fn prop(message: Vec<u8>) -> bool {
|
|
let server_id = identity::Keypair::generate_ed25519();
|
|
let server_id_public = server_id.public();
|
|
|
|
let client_id = identity::Keypair::generate_ed25519();
|
|
let client_id_public = client_id.public();
|
|
|
|
let server_dh = Keypair::<X25519>::new().into_authentic(&server_id).unwrap();
|
|
let server_dh_public = server_dh.public().clone();
|
|
let server_transport = TcpConfig::new()
|
|
.and_then(move |output, endpoint| {
|
|
if endpoint.is_listener() {
|
|
Either::A(apply_inbound(output, NoiseConfig::ik_listener(server_dh)))
|
|
} else {
|
|
Either::B(apply_outbound(output, NoiseConfig::xx(server_dh)))
|
|
}
|
|
})
|
|
.and_then(move |out, _| expect_identity(out, &client_id_public));
|
|
|
|
let client_dh = Keypair::<X25519>::new().into_authentic(&client_id).unwrap();
|
|
let server_id_public2 = server_id_public.clone();
|
|
let client_transport = TcpConfig::new()
|
|
.and_then(move |output, endpoint| {
|
|
if endpoint.is_dialer() {
|
|
Either::A(apply_outbound(output,
|
|
NoiseConfig::ik_dialer(client_dh, server_id_public, server_dh_public)))
|
|
} else {
|
|
Either::B(apply_inbound(output, NoiseConfig::xx(client_dh)))
|
|
}
|
|
})
|
|
.and_then(move |out, _| expect_identity(out, &server_id_public2));
|
|
|
|
run(server_transport, client_transport, message);
|
|
true
|
|
}
|
|
QuickCheck::new().max_tests(30).quickcheck(prop as fn(Vec<u8>) -> bool)
|
|
}
|
|
|
|
type Output = (RemoteIdentity<X25519>, NoiseOutput<Negotiated<TcpTransStream>>);
|
|
|
|
fn run<T, U>(server_transport: T, client_transport: U, message1: Vec<u8>)
|
|
where
|
|
T: Transport<Output = Output>,
|
|
T::Dial: Send + 'static,
|
|
T::Listener: Send + 'static,
|
|
T::ListenerUpgrade: Send + 'static,
|
|
U: Transport<Output = Output>,
|
|
U::Dial: Send + 'static,
|
|
U::Listener: Send + 'static,
|
|
U::ListenerUpgrade: Send + 'static,
|
|
{
|
|
let message2 = message1.clone();
|
|
|
|
let mut server = server_transport
|
|
.listen_on("/ip4/127.0.0.1/tcp/0".parse().unwrap())
|
|
.unwrap();
|
|
|
|
let server_address = server.by_ref().wait()
|
|
.next()
|
|
.expect("some event")
|
|
.expect("no error")
|
|
.into_new_address()
|
|
.expect("listen address");
|
|
|
|
let server = server.take(1)
|
|
.filter_map(ListenerEvent::into_upgrade)
|
|
.and_then(|client| client.0)
|
|
.map_err(|e| panic!("server error: {}", e))
|
|
.and_then(|(_, client)| {
|
|
info!("server: reading message");
|
|
io::read_to_end(client, Vec::new())
|
|
})
|
|
.for_each(move |msg| {
|
|
assert_eq!(msg.1, message1);
|
|
Ok(())
|
|
});
|
|
|
|
let client = client_transport.dial(server_address.clone()).unwrap()
|
|
.map_err(|e| panic!("client error: {}", e))
|
|
.and_then(move |(_, server)| {
|
|
io::write_all(server, message2).and_then(|(client, _)| io::flush(client))
|
|
})
|
|
.map(|_| ());
|
|
|
|
let future = client.join(server)
|
|
.map_err(|e| panic!("{:?}", e))
|
|
.map(|_| ());
|
|
|
|
tokio::run(future)
|
|
}
|
|
|
|
fn expect_identity(output: Output, pk: &identity::PublicKey)
|
|
-> impl Future<Item = Output, Error = NoiseError>
|
|
{
|
|
match output.0 {
|
|
RemoteIdentity::IdentityKey(ref k) if k == pk => future::ok(output),
|
|
_ => panic!("Unexpected remote identity")
|
|
}
|
|
}
|