2019-01-30 11:36:00 +01:00
|
|
|
// 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.
|
|
|
|
|
Integrate identity keys with libp2p-noise for authentication. (#1027)
* Integrate use of identity keys into libp2p-noise.
In order to make libp2p-noise usable with a `Swarm`, which requires a
`Transport::Output` that is a pair of a peer ID and an implementation
of `StreamMuxer`, it is necessary to bridge the gap between static
DH public keys and public identity keys from which peer IDs are derived.
Because the DH static keys and the identity keys need not be
related, it is thus generally necessary that the public identity keys are
exchanged as part of the Noise handshake, which the Noise protocol
accomodates for through the use of handshake message payloads.
The implementation of the existing (IK, IX, XX) handshake patterns is thus
changed to send the public identity keys in the handshake payloads.
Additionally, to facilitate the use of any identity keypair with Noise
handshakes, the static DH public keys are signed using the identity
keypairs and the signatures sent alongside the public identity key
in handshake payloads, unless the static DH public key is "linked"
to the public identity key by other means, e.g. when an Ed25519 identity
keypair is (re)used as an X25519 keypair.
* libp2p-noise doesn't build for wasm.
Thus the development transport needs to be still constructed with secio
for transport security when building for wasm.
* Documentation tweaks.
* For consistency, avoid wildcard enum imports.
* For consistency, avoid wildcard enum imports.
* Slightly simplify io::handshake::State::finish.
* Simplify creation of 2-byte arrays.
* Remove unnecessary cast and obey 100 char line limit.
* Update protocols/noise/src/protocol.rs
Co-Authored-By: romanb <romanb@users.noreply.github.com>
* Address more review comments.
* Cosmetics
* Cosmetics
* Give authentic DH keypairs a distinct type.
This has a couple of advantages:
* Signing the DH public key only needs to happen once, before
creating a `NoiseConfig` for an authenticated handshake.
* The identity keypair only needs to be borrowed and can be
dropped if it is not used further outside of the Noise
protocol, since it is no longer needed during Noise handshakes.
* It is explicit in the construction of a `NoiseConfig` for
a handshake pattern, whether it operates with a plain `Keypair`
or a keypair that is authentic w.r.t. a public identity key
and future handshake patterns may be built with either.
* The function signatures for constructing `NoiseConfig`s for
handshake patterns are simplified and a few unnecessary trait
bounds removed.
* Post-merge corrections.
* Add note on experimental status of libp2p-noise.
2019-05-07 10:22:42 +02:00
|
|
|
//! Noise protocol I/O.
|
|
|
|
|
|
|
|
pub mod handshake;
|
|
|
|
|
2019-11-19 11:18:16 +01:00
|
|
|
use futures::ready;
|
2019-10-03 23:40:14 +02:00
|
|
|
use futures::prelude::*;
|
2019-01-30 11:36:00 +01:00
|
|
|
use log::{debug, trace};
|
|
|
|
use snow;
|
2020-02-13 12:38:33 +01:00
|
|
|
use std::{cmp::min, fmt, io, pin::Pin, ops::DerefMut, task::{Context, Poll}};
|
2019-01-30 11:36:00 +01:00
|
|
|
|
2020-02-13 12:38:33 +01:00
|
|
|
/// Max. size of a noise package.
|
2019-01-30 11:36:00 +01:00
|
|
|
const MAX_NOISE_PKG_LEN: usize = 65535;
|
2020-02-13 12:38:33 +01:00
|
|
|
/// Extra space given to the encryption buffer to hold key material.
|
|
|
|
const EXTRA_ENCRYPT_SPACE: usize = 1024;
|
|
|
|
/// Max. output buffer size before forcing a flush.
|
|
|
|
const MAX_WRITE_BUF_LEN: usize = MAX_NOISE_PKG_LEN - EXTRA_ENCRYPT_SPACE;
|
2019-01-30 11:36:00 +01:00
|
|
|
|
2020-02-13 12:38:33 +01:00
|
|
|
static_assertions::const_assert! {
|
|
|
|
MAX_WRITE_BUF_LEN + EXTRA_ENCRYPT_SPACE <= MAX_NOISE_PKG_LEN
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
|
2019-10-28 18:04:01 +01:00
|
|
|
/// A passthrough enum for the two kinds of state machines in `snow`
|
|
|
|
pub(crate) enum SnowState {
|
|
|
|
Transport(snow::TransportState),
|
|
|
|
Handshake(snow::HandshakeState)
|
|
|
|
}
|
|
|
|
|
|
|
|
impl SnowState {
|
2019-11-01 17:34:50 +01:00
|
|
|
pub fn read_message(&mut self, message: &[u8], payload: &mut [u8]) -> Result<usize, snow::Error> {
|
2019-10-28 18:04:01 +01:00
|
|
|
match self {
|
|
|
|
SnowState::Handshake(session) => session.read_message(message, payload),
|
|
|
|
SnowState::Transport(session) => session.read_message(message, payload),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-01 17:34:50 +01:00
|
|
|
pub fn write_message(&mut self, message: &[u8], payload: &mut [u8]) -> Result<usize, snow::Error> {
|
2019-10-28 18:04:01 +01:00
|
|
|
match self {
|
|
|
|
SnowState::Handshake(session) => session.write_message(message, payload),
|
|
|
|
SnowState::Transport(session) => session.write_message(message, payload),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_remote_static(&self) -> Option<&[u8]> {
|
|
|
|
match self {
|
|
|
|
SnowState::Handshake(session) => session.get_remote_static(),
|
|
|
|
SnowState::Transport(session) => session.get_remote_static(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-01 17:34:50 +01:00
|
|
|
pub fn into_transport_mode(self) -> Result<snow::TransportState, snow::Error> {
|
2019-10-28 18:04:01 +01:00
|
|
|
match self {
|
|
|
|
SnowState::Handshake(session) => session.into_transport_mode(),
|
2019-11-01 17:34:50 +01:00
|
|
|
SnowState::Transport(_) => Err(snow::Error::State(snow::error::StateProblem::HandshakeAlreadyFinished)),
|
2019-10-28 18:04:01 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-30 11:36:00 +01:00
|
|
|
/// A noise session to a remote.
|
2019-04-10 17:54:24 +02:00
|
|
|
///
|
|
|
|
/// `T` is the type of the underlying I/O resource.
|
2019-01-30 11:36:00 +01:00
|
|
|
pub struct NoiseOutput<T> {
|
|
|
|
io: T,
|
2019-10-28 18:04:01 +01:00
|
|
|
session: SnowState,
|
2019-01-30 11:36:00 +01:00
|
|
|
read_state: ReadState,
|
2020-02-13 12:38:33 +01:00
|
|
|
write_state: WriteState,
|
|
|
|
read_buffer: Vec<u8>,
|
|
|
|
write_buffer: Vec<u8>,
|
|
|
|
decrypt_buffer: Vec<u8>,
|
|
|
|
encrypt_buffer: Vec<u8>
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> fmt::Debug for NoiseOutput<T> {
|
2019-02-11 14:58:15 +01:00
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
2019-01-30 11:36:00 +01:00
|
|
|
f.debug_struct("NoiseOutput")
|
|
|
|
.field("read_state", &self.read_state)
|
|
|
|
.field("write_state", &self.write_state)
|
|
|
|
.finish()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> NoiseOutput<T> {
|
2019-10-28 18:04:01 +01:00
|
|
|
fn new(io: T, session: SnowState) -> Self {
|
2019-01-30 11:36:00 +01:00
|
|
|
NoiseOutput {
|
2019-10-28 18:04:01 +01:00
|
|
|
io,
|
|
|
|
session,
|
2019-01-30 11:36:00 +01:00
|
|
|
read_state: ReadState::Init,
|
2020-02-13 12:38:33 +01:00
|
|
|
write_state: WriteState::Init,
|
|
|
|
read_buffer: Vec::new(),
|
|
|
|
write_buffer: Vec::new(),
|
|
|
|
decrypt_buffer: Vec::new(),
|
|
|
|
encrypt_buffer: Vec::new()
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// The various states of reading a noise session transitions through.
|
|
|
|
#[derive(Debug)]
|
|
|
|
enum ReadState {
|
|
|
|
/// initial state
|
|
|
|
Init,
|
2019-04-10 17:54:24 +02:00
|
|
|
/// read frame length
|
|
|
|
ReadLen { buf: [u8; 2], off: usize },
|
2019-01-30 11:36:00 +01:00
|
|
|
/// read encrypted frame data
|
|
|
|
ReadData { len: usize, off: usize },
|
|
|
|
/// copy decrypted frame data
|
|
|
|
CopyData { len: usize, off: usize },
|
|
|
|
/// end of file has been reached (terminal state)
|
|
|
|
/// The associated result signals if the EOF was unexpected or not.
|
|
|
|
Eof(Result<(), ()>),
|
|
|
|
/// decryption error (terminal state)
|
|
|
|
DecErr
|
|
|
|
}
|
|
|
|
|
|
|
|
/// The various states of writing a noise session transitions through.
|
|
|
|
#[derive(Debug)]
|
|
|
|
enum WriteState {
|
|
|
|
/// initial state
|
|
|
|
Init,
|
|
|
|
/// accumulate write data
|
|
|
|
BufferData { off: usize },
|
|
|
|
/// write frame length
|
2019-04-10 17:54:24 +02:00
|
|
|
WriteLen { len: usize, buf: [u8; 2], off: usize },
|
2019-01-30 11:36:00 +01:00
|
|
|
/// write out encrypted data
|
|
|
|
WriteData { len: usize, off: usize },
|
|
|
|
/// end of file has been reached (terminal state)
|
|
|
|
Eof,
|
|
|
|
/// encryption error (terminal state)
|
|
|
|
EncErr
|
|
|
|
}
|
|
|
|
|
2019-10-03 23:40:14 +02:00
|
|
|
impl<T: AsyncRead + Unpin> AsyncRead for NoiseOutput<T> {
|
2020-02-13 12:38:33 +01:00
|
|
|
fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context, buf: &mut [u8]) -> Poll<io::Result<usize>> {
|
2019-10-03 23:40:14 +02:00
|
|
|
let mut this = self.deref_mut();
|
2019-01-30 11:36:00 +01:00
|
|
|
loop {
|
2019-10-03 23:40:14 +02:00
|
|
|
trace!("read state: {:?}", this.read_state);
|
|
|
|
match this.read_state {
|
2019-01-30 11:36:00 +01:00
|
|
|
ReadState::Init => {
|
2019-10-03 23:40:14 +02:00
|
|
|
this.read_state = ReadState::ReadLen { buf: [0, 0], off: 0 };
|
2019-04-10 17:54:24 +02:00
|
|
|
}
|
|
|
|
ReadState::ReadLen { mut buf, mut off } => {
|
2019-10-03 23:40:14 +02:00
|
|
|
let n = match read_frame_len(&mut this.io, cx, &mut buf, &mut off) {
|
|
|
|
Poll::Ready(Ok(Some(n))) => n,
|
|
|
|
Poll::Ready(Ok(None)) => {
|
2019-01-30 11:36:00 +01:00
|
|
|
trace!("read: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
this.read_state = ReadState::Eof(Ok(()));
|
|
|
|
return Poll::Ready(Ok(0))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
Poll::Ready(Err(e)) => {
|
|
|
|
return Poll::Ready(Err(e))
|
|
|
|
}
|
|
|
|
Poll::Pending => {
|
|
|
|
this.read_state = ReadState::ReadLen { buf, off };
|
|
|
|
return Poll::Pending;
|
2019-04-10 17:54:24 +02:00
|
|
|
}
|
2019-01-30 11:36:00 +01:00
|
|
|
};
|
|
|
|
trace!("read: next frame len = {}", n);
|
|
|
|
if n == 0 {
|
|
|
|
trace!("read: empty frame");
|
2019-10-03 23:40:14 +02:00
|
|
|
this.read_state = ReadState::Init;
|
2019-01-30 11:36:00 +01:00
|
|
|
continue
|
|
|
|
}
|
2020-02-13 12:38:33 +01:00
|
|
|
this.read_buffer.resize(usize::from(n), 0u8);
|
2019-10-03 23:40:14 +02:00
|
|
|
this.read_state = ReadState::ReadData { len: usize::from(n), off: 0 }
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
ReadState::ReadData { len, ref mut off } => {
|
2020-02-13 12:38:33 +01:00
|
|
|
let n = {
|
|
|
|
let f = Pin::new(&mut this.io).poll_read(cx, &mut this.read_buffer[*off .. len]);
|
|
|
|
match ready!(f) {
|
|
|
|
Ok(n) => n,
|
|
|
|
Err(e) => return Poll::Ready(Err(e)),
|
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
};
|
2019-01-30 11:36:00 +01:00
|
|
|
trace!("read: read {}/{} bytes", *off + n, len);
|
|
|
|
if n == 0 {
|
|
|
|
trace!("read: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
this.read_state = ReadState::Eof(Err(()));
|
|
|
|
return Poll::Ready(Err(io::ErrorKind::UnexpectedEof.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
*off += n;
|
|
|
|
if len == *off {
|
|
|
|
trace!("read: decrypting {} bytes", len);
|
2020-02-13 12:38:33 +01:00
|
|
|
this.decrypt_buffer.resize(len, 0u8);
|
|
|
|
if let Ok(n) = this.session.read_message(&this.read_buffer, &mut this.decrypt_buffer) {
|
2019-01-30 11:36:00 +01:00
|
|
|
trace!("read: payload len = {} bytes", n);
|
2019-10-03 23:40:14 +02:00
|
|
|
this.read_state = ReadState::CopyData { len: n, off: 0 }
|
2019-01-30 11:36:00 +01:00
|
|
|
} else {
|
|
|
|
debug!("decryption error");
|
2019-10-03 23:40:14 +02:00
|
|
|
this.read_state = ReadState::DecErr;
|
|
|
|
return Poll::Ready(Err(io::ErrorKind::InvalidData.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ReadState::CopyData { len, ref mut off } => {
|
2020-02-13 12:38:33 +01:00
|
|
|
let n = min(len - *off, buf.len());
|
|
|
|
buf[.. n].copy_from_slice(&this.decrypt_buffer[*off .. *off + n]);
|
2019-01-30 11:36:00 +01:00
|
|
|
trace!("read: copied {}/{} bytes", *off + n, len);
|
|
|
|
*off += n;
|
|
|
|
if len == *off {
|
2019-10-03 23:40:14 +02:00
|
|
|
this.read_state = ReadState::ReadLen { buf: [0, 0], off: 0 };
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
return Poll::Ready(Ok(n))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
ReadState::Eof(Ok(())) => {
|
|
|
|
trace!("read: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
return Poll::Ready(Ok(0))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
ReadState::Eof(Err(())) => {
|
|
|
|
trace!("read: eof (unexpected)");
|
2019-10-03 23:40:14 +02:00
|
|
|
return Poll::Ready(Err(io::ErrorKind::UnexpectedEof.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
ReadState::DecErr => return Poll::Ready(Err(io::ErrorKind::InvalidData.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-03 23:40:14 +02:00
|
|
|
impl<T: AsyncWrite + Unpin> AsyncWrite for NoiseOutput<T> {
|
2020-02-13 12:38:33 +01:00
|
|
|
fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context, buf: &[u8]) -> Poll<io::Result<usize>> {
|
2019-10-03 23:40:14 +02:00
|
|
|
let mut this = self.deref_mut();
|
2019-01-30 11:36:00 +01:00
|
|
|
loop {
|
2019-10-03 23:40:14 +02:00
|
|
|
trace!("write state: {:?}", this.write_state);
|
|
|
|
match this.write_state {
|
2019-01-30 11:36:00 +01:00
|
|
|
WriteState::Init => {
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::BufferData { off: 0 }
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
WriteState::BufferData { ref mut off } => {
|
2020-02-13 12:38:33 +01:00
|
|
|
let n = min(MAX_WRITE_BUF_LEN, off.saturating_add(buf.len()));
|
|
|
|
this.write_buffer.resize(n, 0u8);
|
|
|
|
let n = min(MAX_WRITE_BUF_LEN - *off, buf.len());
|
|
|
|
this.write_buffer[*off .. *off + n].copy_from_slice(&buf[.. n]);
|
2019-01-30 11:36:00 +01:00
|
|
|
trace!("write: buffered {} bytes", *off + n);
|
|
|
|
*off += n;
|
|
|
|
if *off == MAX_WRITE_BUF_LEN {
|
|
|
|
trace!("write: encrypting {} bytes", *off);
|
2020-02-13 12:38:33 +01:00
|
|
|
this.encrypt_buffer.resize(MAX_WRITE_BUF_LEN + EXTRA_ENCRYPT_SPACE, 0u8);
|
|
|
|
match this.session.write_message(&this.write_buffer, &mut this.encrypt_buffer) {
|
2019-10-03 23:40:14 +02:00
|
|
|
Ok(n) => {
|
|
|
|
trace!("write: cipher text len = {} bytes", n);
|
|
|
|
this.write_state = WriteState::WriteLen {
|
|
|
|
len: n,
|
|
|
|
buf: u16::to_be_bytes(n as u16),
|
|
|
|
off: 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(e) => {
|
|
|
|
debug!("encryption error: {:?}", e);
|
|
|
|
this.write_state = WriteState::EncErr;
|
|
|
|
return Poll::Ready(Err(io::ErrorKind::InvalidData.into()))
|
2019-04-10 17:54:24 +02:00
|
|
|
}
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
return Poll::Ready(Ok(n))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
2019-04-10 17:54:24 +02:00
|
|
|
WriteState::WriteLen { len, mut buf, mut off } => {
|
|
|
|
trace!("write: writing len ({}, {:?}, {}/2)", len, buf, off);
|
2019-10-03 23:40:14 +02:00
|
|
|
match write_frame_len(&mut this.io, cx, &mut buf, &mut off) {
|
|
|
|
Poll::Ready(Ok(true)) => (),
|
|
|
|
Poll::Ready(Ok(false)) => {
|
2019-04-10 17:54:24 +02:00
|
|
|
trace!("write: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::Eof;
|
|
|
|
return Poll::Ready(Err(io::ErrorKind::WriteZero.into()))
|
|
|
|
}
|
|
|
|
Poll::Ready(Err(e)) => {
|
|
|
|
return Poll::Ready(Err(e))
|
|
|
|
}
|
|
|
|
Poll::Pending => {
|
|
|
|
this.write_state = WriteState::WriteLen{ len, buf, off };
|
|
|
|
|
|
|
|
return Poll::Pending
|
2019-04-10 17:54:24 +02:00
|
|
|
}
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::WriteData { len, off: 0 }
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
WriteState::WriteData { len, ref mut off } => {
|
2020-02-13 12:38:33 +01:00
|
|
|
let n = {
|
|
|
|
let f = Pin::new(&mut this.io).poll_write(cx, &this.encrypt_buffer[*off .. len]);
|
|
|
|
match ready!(f) {
|
|
|
|
Ok(n) => n,
|
|
|
|
Err(e) => return Poll::Ready(Err(e))
|
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
};
|
2019-01-30 11:36:00 +01:00
|
|
|
trace!("write: wrote {}/{} bytes", *off + n, len);
|
|
|
|
if n == 0 {
|
|
|
|
trace!("write: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::Eof;
|
|
|
|
return Poll::Ready(Err(io::ErrorKind::WriteZero.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
*off += n;
|
|
|
|
if len == *off {
|
|
|
|
trace!("write: finished writing {} bytes", len);
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::Init
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
WriteState::Eof => {
|
|
|
|
trace!("write: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
return Poll::Ready(Err(io::ErrorKind::WriteZero.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
WriteState::EncErr => return Poll::Ready(Err(io::ErrorKind::InvalidData.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-13 12:38:33 +01:00
|
|
|
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
|
2019-10-03 23:40:14 +02:00
|
|
|
let mut this = self.deref_mut();
|
2019-01-30 11:36:00 +01:00
|
|
|
loop {
|
2019-10-03 23:40:14 +02:00
|
|
|
match this.write_state {
|
2020-02-13 12:38:33 +01:00
|
|
|
WriteState::Init => {
|
|
|
|
return Pin::new(&mut this.io).poll_flush(cx)
|
|
|
|
}
|
2019-01-30 11:36:00 +01:00
|
|
|
WriteState::BufferData { off } => {
|
|
|
|
trace!("flush: encrypting {} bytes", off);
|
2020-02-13 12:38:33 +01:00
|
|
|
this.encrypt_buffer.resize(off + EXTRA_ENCRYPT_SPACE, 0u8);
|
|
|
|
match this.session.write_message(&this.write_buffer[.. off], &mut this.encrypt_buffer) {
|
2019-10-03 23:40:14 +02:00
|
|
|
Ok(n) => {
|
|
|
|
trace!("flush: cipher text len = {} bytes", n);
|
|
|
|
this.write_state = WriteState::WriteLen {
|
|
|
|
len: n,
|
|
|
|
buf: u16::to_be_bytes(n as u16),
|
|
|
|
off: 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(e) => {
|
|
|
|
debug!("encryption error: {:?}", e);
|
|
|
|
this.write_state = WriteState::EncErr;
|
|
|
|
return Poll::Ready(Err(io::ErrorKind::InvalidData.into()))
|
2019-04-10 17:54:24 +02:00
|
|
|
}
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
2019-04-10 17:54:24 +02:00
|
|
|
WriteState::WriteLen { len, mut buf, mut off } => {
|
|
|
|
trace!("flush: writing len ({}, {:?}, {}/2)", len, buf, off);
|
2019-10-03 23:40:14 +02:00
|
|
|
match write_frame_len(&mut this.io, cx, &mut buf, &mut off) {
|
|
|
|
Poll::Ready(Ok(true)) => (),
|
|
|
|
Poll::Ready(Ok(false)) => {
|
2019-04-10 17:54:24 +02:00
|
|
|
trace!("write: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::Eof;
|
|
|
|
return Poll::Ready(Err(io::ErrorKind::WriteZero.into()))
|
2019-04-10 17:54:24 +02:00
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
Poll::Ready(Err(e)) => {
|
|
|
|
return Poll::Ready(Err(e))
|
|
|
|
}
|
|
|
|
Poll::Pending => {
|
|
|
|
this.write_state = WriteState::WriteLen { len, buf, off };
|
|
|
|
return Poll::Pending
|
2019-04-10 17:54:24 +02:00
|
|
|
}
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::WriteData { len, off: 0 }
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
WriteState::WriteData { len, ref mut off } => {
|
2020-02-13 12:38:33 +01:00
|
|
|
let n = {
|
|
|
|
let f = Pin::new(&mut this.io).poll_write(cx, &this.encrypt_buffer[*off .. len]);
|
|
|
|
match ready!(f) {
|
|
|
|
Ok(n) => n,
|
|
|
|
Err(e) => return Poll::Ready(Err(e)),
|
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
};
|
2019-01-30 11:36:00 +01:00
|
|
|
trace!("flush: wrote {}/{} bytes", *off + n, len);
|
|
|
|
if n == 0 {
|
|
|
|
trace!("flush: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::Eof;
|
|
|
|
return Poll::Ready(Err(io::ErrorKind::WriteZero.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
*off += n;
|
|
|
|
if len == *off {
|
|
|
|
trace!("flush: finished writing {} bytes", len);
|
2019-10-03 23:40:14 +02:00
|
|
|
this.write_state = WriteState::Init;
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
WriteState::Eof => {
|
|
|
|
trace!("flush: eof");
|
2019-10-03 23:40:14 +02:00
|
|
|
return Poll::Ready(Err(io::ErrorKind::WriteZero.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
2019-10-03 23:40:14 +02:00
|
|
|
WriteState::EncErr => return Poll::Ready(Err(io::ErrorKind::InvalidData.into()))
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-13 12:38:33 +01:00
|
|
|
fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>>{
|
2019-12-11 17:42:24 +01:00
|
|
|
ready!(self.as_mut().poll_flush(cx))?;
|
2019-10-03 23:40:14 +02:00
|
|
|
Pin::new(&mut self.io).poll_close(cx)
|
2019-05-10 11:26:18 +02:00
|
|
|
}
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
|
2019-04-10 17:54:24 +02:00
|
|
|
/// Read 2 bytes as frame length from the given source into the given buffer.
|
2019-01-30 11:36:00 +01:00
|
|
|
///
|
2019-04-10 17:54:24 +02:00
|
|
|
/// Panics if `off >= 2`.
|
|
|
|
///
|
2020-01-24 15:18:45 +01:00
|
|
|
/// When [`Poll::Pending`] is returned, the given buffer and offset
|
2019-04-10 17:54:24 +02:00
|
|
|
/// may have been updated (i.e. a byte may have been read) and must be preserved
|
|
|
|
/// for the next invocation.
|
Integrate identity keys with libp2p-noise for authentication. (#1027)
* Integrate use of identity keys into libp2p-noise.
In order to make libp2p-noise usable with a `Swarm`, which requires a
`Transport::Output` that is a pair of a peer ID and an implementation
of `StreamMuxer`, it is necessary to bridge the gap between static
DH public keys and public identity keys from which peer IDs are derived.
Because the DH static keys and the identity keys need not be
related, it is thus generally necessary that the public identity keys are
exchanged as part of the Noise handshake, which the Noise protocol
accomodates for through the use of handshake message payloads.
The implementation of the existing (IK, IX, XX) handshake patterns is thus
changed to send the public identity keys in the handshake payloads.
Additionally, to facilitate the use of any identity keypair with Noise
handshakes, the static DH public keys are signed using the identity
keypairs and the signatures sent alongside the public identity key
in handshake payloads, unless the static DH public key is "linked"
to the public identity key by other means, e.g. when an Ed25519 identity
keypair is (re)used as an X25519 keypair.
* libp2p-noise doesn't build for wasm.
Thus the development transport needs to be still constructed with secio
for transport security when building for wasm.
* Documentation tweaks.
* For consistency, avoid wildcard enum imports.
* For consistency, avoid wildcard enum imports.
* Slightly simplify io::handshake::State::finish.
* Simplify creation of 2-byte arrays.
* Remove unnecessary cast and obey 100 char line limit.
* Update protocols/noise/src/protocol.rs
Co-Authored-By: romanb <romanb@users.noreply.github.com>
* Address more review comments.
* Cosmetics
* Cosmetics
* Give authentic DH keypairs a distinct type.
This has a couple of advantages:
* Signing the DH public key only needs to happen once, before
creating a `NoiseConfig` for an authenticated handshake.
* The identity keypair only needs to be borrowed and can be
dropped if it is not used further outside of the Noise
protocol, since it is no longer needed during Noise handshakes.
* It is explicit in the construction of a `NoiseConfig` for
a handshake pattern, whether it operates with a plain `Keypair`
or a keypair that is authentic w.r.t. a public identity key
and future handshake patterns may be built with either.
* The function signatures for constructing `NoiseConfig`s for
handshake patterns are simplified and a few unnecessary trait
bounds removed.
* Post-merge corrections.
* Add note on experimental status of libp2p-noise.
2019-05-07 10:22:42 +02:00
|
|
|
///
|
|
|
|
/// Returns `None` if EOF has been encountered.
|
2019-10-03 23:40:14 +02:00
|
|
|
fn read_frame_len<R: AsyncRead + Unpin>(
|
|
|
|
mut io: &mut R,
|
|
|
|
cx: &mut Context<'_>,
|
|
|
|
buf: &mut [u8; 2],
|
|
|
|
off: &mut usize,
|
2020-02-13 12:38:33 +01:00
|
|
|
) -> Poll<io::Result<Option<u16>>> {
|
2019-01-30 11:36:00 +01:00
|
|
|
loop {
|
2019-10-03 23:40:14 +02:00
|
|
|
match ready!(Pin::new(&mut io).poll_read(cx, &mut buf[*off ..])) {
|
|
|
|
Ok(n) => {
|
|
|
|
if n == 0 {
|
|
|
|
return Poll::Ready(Ok(None));
|
|
|
|
}
|
|
|
|
*off += n;
|
|
|
|
if *off == 2 {
|
|
|
|
return Poll::Ready(Ok(Some(u16::from_be_bytes(*buf))));
|
|
|
|
}
|
|
|
|
},
|
|
|
|
Err(e) => {
|
|
|
|
return Poll::Ready(Err(e));
|
|
|
|
},
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-10 17:54:24 +02:00
|
|
|
/// Write 2 bytes as frame length from the given buffer into the given sink.
|
|
|
|
///
|
|
|
|
/// Panics if `off >= 2`.
|
2019-01-30 11:36:00 +01:00
|
|
|
///
|
2020-01-24 15:18:45 +01:00
|
|
|
/// When [`Poll::Pending`] is returned, the given offset
|
2019-04-10 17:54:24 +02:00
|
|
|
/// may have been updated (i.e. a byte may have been written) and must
|
|
|
|
/// be preserved for the next invocation.
|
Integrate identity keys with libp2p-noise for authentication. (#1027)
* Integrate use of identity keys into libp2p-noise.
In order to make libp2p-noise usable with a `Swarm`, which requires a
`Transport::Output` that is a pair of a peer ID and an implementation
of `StreamMuxer`, it is necessary to bridge the gap between static
DH public keys and public identity keys from which peer IDs are derived.
Because the DH static keys and the identity keys need not be
related, it is thus generally necessary that the public identity keys are
exchanged as part of the Noise handshake, which the Noise protocol
accomodates for through the use of handshake message payloads.
The implementation of the existing (IK, IX, XX) handshake patterns is thus
changed to send the public identity keys in the handshake payloads.
Additionally, to facilitate the use of any identity keypair with Noise
handshakes, the static DH public keys are signed using the identity
keypairs and the signatures sent alongside the public identity key
in handshake payloads, unless the static DH public key is "linked"
to the public identity key by other means, e.g. when an Ed25519 identity
keypair is (re)used as an X25519 keypair.
* libp2p-noise doesn't build for wasm.
Thus the development transport needs to be still constructed with secio
for transport security when building for wasm.
* Documentation tweaks.
* For consistency, avoid wildcard enum imports.
* For consistency, avoid wildcard enum imports.
* Slightly simplify io::handshake::State::finish.
* Simplify creation of 2-byte arrays.
* Remove unnecessary cast and obey 100 char line limit.
* Update protocols/noise/src/protocol.rs
Co-Authored-By: romanb <romanb@users.noreply.github.com>
* Address more review comments.
* Cosmetics
* Cosmetics
* Give authentic DH keypairs a distinct type.
This has a couple of advantages:
* Signing the DH public key only needs to happen once, before
creating a `NoiseConfig` for an authenticated handshake.
* The identity keypair only needs to be borrowed and can be
dropped if it is not used further outside of the Noise
protocol, since it is no longer needed during Noise handshakes.
* It is explicit in the construction of a `NoiseConfig` for
a handshake pattern, whether it operates with a plain `Keypair`
or a keypair that is authentic w.r.t. a public identity key
and future handshake patterns may be built with either.
* The function signatures for constructing `NoiseConfig`s for
handshake patterns are simplified and a few unnecessary trait
bounds removed.
* Post-merge corrections.
* Add note on experimental status of libp2p-noise.
2019-05-07 10:22:42 +02:00
|
|
|
///
|
|
|
|
/// Returns `false` if EOF has been encountered.
|
2019-10-03 23:40:14 +02:00
|
|
|
fn write_frame_len<W: AsyncWrite + Unpin>(
|
|
|
|
mut io: &mut W,
|
|
|
|
cx: &mut Context<'_>,
|
|
|
|
buf: &[u8; 2],
|
|
|
|
off: &mut usize,
|
2020-02-13 12:38:33 +01:00
|
|
|
) -> Poll<io::Result<bool>> {
|
2019-01-30 11:36:00 +01:00
|
|
|
loop {
|
2019-10-03 23:40:14 +02:00
|
|
|
match ready!(Pin::new(&mut io).poll_write(cx, &buf[*off ..])) {
|
|
|
|
Ok(n) => {
|
|
|
|
if n == 0 {
|
|
|
|
return Poll::Ready(Ok(false))
|
|
|
|
}
|
|
|
|
*off += n;
|
|
|
|
if *off == 2 {
|
|
|
|
return Poll::Ready(Ok(true))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(e) => {
|
|
|
|
return Poll::Ready(Err(e));
|
|
|
|
}
|
2019-01-30 11:36:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|