wip server
This commit is contained in:
parent
41c26ee63a
commit
4cc374fd4c
@ -45,10 +45,13 @@ where
|
||||
type Output = io::Result<TlsStream<IO>>;
|
||||
|
||||
#[inline]
|
||||
fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
|
||||
if let MidHandshake::Handshaking(stream) = &mut *self {
|
||||
fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
|
||||
let this = self.get_mut();
|
||||
|
||||
if let MidHandshake::Handshaking(stream) = this {
|
||||
let eof = !stream.state.readable();
|
||||
let (io, session) = stream.get_mut();
|
||||
let mut stream = Stream::new(io, session);
|
||||
let mut stream = Stream::new(io, session).set_eof(eof);
|
||||
|
||||
if stream.session.is_handshaking() {
|
||||
try_ready!(stream.complete_io(cx));
|
||||
@ -59,7 +62,7 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
match mem::replace(&mut *self, MidHandshake::End) {
|
||||
match mem::replace(this, MidHandshake::End) {
|
||||
MidHandshake::Handshaking(stream) => Poll::Ready(Ok(stream)),
|
||||
#[cfg(feature = "early-data")]
|
||||
MidHandshake::EarlyData(stream) => Poll::Ready(Ok(stream)),
|
||||
@ -83,7 +86,8 @@ where
|
||||
TlsState::EarlyData => {
|
||||
let this = self.get_mut();
|
||||
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session);
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable());
|
||||
let (pos, data) = &mut this.early_data;
|
||||
|
||||
// complete handshake
|
||||
@ -107,7 +111,8 @@ where
|
||||
}
|
||||
TlsState::Stream | TlsState::WriteShutdown => {
|
||||
let this = self.get_mut();
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session);
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable());
|
||||
|
||||
match stream.poll_read(cx, buf) {
|
||||
Poll::Ready(Ok(0)) => {
|
||||
@ -136,9 +141,10 @@ impl<IO> AsyncWrite for TlsStream<IO>
|
||||
where
|
||||
IO: AsyncRead + AsyncWrite + Unpin,
|
||||
{
|
||||
fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context, buf: &[u8]) -> Poll<io::Result<usize>> {
|
||||
fn poll_write(self: Pin<&mut Self>, cx: &mut Context, buf: &[u8]) -> Poll<io::Result<usize>> {
|
||||
let this = self.get_mut();
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session);
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable());
|
||||
|
||||
match this.state {
|
||||
#[cfg(feature = "early-data")]
|
||||
@ -174,9 +180,11 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
|
||||
fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
|
||||
let this = self.get_mut();
|
||||
Stream::new(&mut this.io, &mut this.session).poll_flush(cx)
|
||||
Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable())
|
||||
.poll_flush(cx)
|
||||
}
|
||||
|
||||
fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
|
||||
@ -186,7 +194,8 @@ where
|
||||
}
|
||||
|
||||
let this = self.get_mut();
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session);
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable());
|
||||
try_ready!(stream.poll_flush(cx));
|
||||
Pin::new(&mut this.io).poll_close(cx)
|
||||
}
|
||||
|
@ -3,7 +3,7 @@
|
||||
use std::pin::Pin;
|
||||
use std::task::Poll;
|
||||
use std::marker::Unpin;
|
||||
use std::io::{ self, Read, Write };
|
||||
use std::io::{ self, Read };
|
||||
use rustls::Session;
|
||||
use rustls::WriteV;
|
||||
use futures::task::Context;
|
||||
|
41
src/lib.rs
41
src/lib.rs
@ -12,7 +12,7 @@ macro_rules! try_ready {
|
||||
|
||||
pub mod client;
|
||||
mod common;
|
||||
// pub mod server;
|
||||
pub mod server;
|
||||
|
||||
use common::Stream;
|
||||
use std::pin::Pin;
|
||||
@ -25,7 +25,7 @@ use std::{io, mem};
|
||||
use webpki::DNSNameRef;
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub enum TlsState {
|
||||
enum TlsState {
|
||||
#[cfg(feature = "early-data")]
|
||||
EarlyData,
|
||||
Stream,
|
||||
@ -35,26 +35,33 @@ pub enum TlsState {
|
||||
}
|
||||
|
||||
impl TlsState {
|
||||
pub(crate) fn shutdown_read(&mut self) {
|
||||
fn shutdown_read(&mut self) {
|
||||
match *self {
|
||||
TlsState::WriteShutdown | TlsState::FullyShutdown => *self = TlsState::FullyShutdown,
|
||||
_ => *self = TlsState::ReadShutdown,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn shutdown_write(&mut self) {
|
||||
fn shutdown_write(&mut self) {
|
||||
match *self {
|
||||
TlsState::ReadShutdown | TlsState::FullyShutdown => *self = TlsState::FullyShutdown,
|
||||
_ => *self = TlsState::WriteShutdown,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn writeable(&self) -> bool {
|
||||
fn writeable(&self) -> bool {
|
||||
match *self {
|
||||
TlsState::WriteShutdown | TlsState::FullyShutdown => false,
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
|
||||
fn readable(self) -> bool {
|
||||
match self {
|
||||
TlsState::ReadShutdown | TlsState::FullyShutdown => false,
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A wrapper around a `rustls::ClientConfig`, providing an async `connect` method.
|
||||
@ -65,7 +72,6 @@ pub struct TlsConnector {
|
||||
early_data: bool,
|
||||
}
|
||||
|
||||
/*
|
||||
/// A wrapper around a `rustls::ServerConfig`, providing an async `accept` method.
|
||||
#[derive(Clone)]
|
||||
pub struct TlsAcceptor {
|
||||
@ -170,32 +176,31 @@ impl TlsAcceptor {
|
||||
}
|
||||
}
|
||||
|
||||
/// Future returned from `ClientConfigExt::connect_async` which will resolve
|
||||
/// Future returned from `TlsConnector::connect` which will resolve
|
||||
/// once the connection handshake has finished.
|
||||
pub struct Connect<IO>(client::MidHandshake<IO>);
|
||||
|
||||
/// Future returned from `ServerConfigExt::accept_async` which will resolve
|
||||
/// Future returned from `TlsAcceptor::accept` which will resolve
|
||||
/// once the accept handshake has finished.
|
||||
pub struct Accept<IO>(server::MidHandshake<IO>);
|
||||
|
||||
impl<IO: AsyncRead + AsyncWrite> Future for Connect<IO> {
|
||||
type Item = client::TlsStream<IO>;
|
||||
type Error = io::Error;
|
||||
impl<IO: AsyncRead + AsyncWrite + Unpin> Future for Connect<IO> {
|
||||
type Output = io::Result<client::TlsStream<IO>>;
|
||||
|
||||
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
|
||||
self.0.poll()
|
||||
fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
|
||||
Pin::new(&mut self.0).poll(cx)
|
||||
}
|
||||
}
|
||||
|
||||
impl<IO: AsyncRead + AsyncWrite> Future for Accept<IO> {
|
||||
type Item = server::TlsStream<IO>;
|
||||
type Error = io::Error;
|
||||
impl<IO: AsyncRead + AsyncWrite + Unpin> Future for Accept<IO> {
|
||||
type Output = io::Result<server::TlsStream<IO>>;
|
||||
|
||||
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
|
||||
self.0.poll()
|
||||
fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
|
||||
Pin::new(&mut self.0).poll(cx)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
#[cfg(feature = "early-data")]
|
||||
#[cfg(test)]
|
||||
mod test_0rtt;
|
||||
|
114
src/server.rs
114
src/server.rs
@ -34,100 +34,102 @@ impl<IO> TlsStream<IO> {
|
||||
|
||||
impl<IO> Future for MidHandshake<IO>
|
||||
where
|
||||
IO: AsyncRead + AsyncWrite,
|
||||
IO: AsyncRead + AsyncWrite + Unpin,
|
||||
{
|
||||
type Item = TlsStream<IO>;
|
||||
type Error = io::Error;
|
||||
type Output = io::Result<TlsStream<IO>>;
|
||||
|
||||
#[inline]
|
||||
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
|
||||
if let MidHandshake::Handshaking(stream) = self {
|
||||
fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
|
||||
let this = self.get_mut();
|
||||
|
||||
if let MidHandshake::Handshaking(stream) = this {
|
||||
let eof = !stream.state.readable();
|
||||
let (io, session) = stream.get_mut();
|
||||
let mut stream = Stream::new(io, session);
|
||||
let mut stream = Stream::new(io, session).set_eof(eof);
|
||||
|
||||
if stream.session.is_handshaking() {
|
||||
try_nb!(stream.complete_io());
|
||||
try_ready!(stream.complete_io(cx));
|
||||
}
|
||||
|
||||
if stream.session.wants_write() {
|
||||
try_nb!(stream.complete_io());
|
||||
try_ready!(stream.complete_io(cx));
|
||||
}
|
||||
}
|
||||
|
||||
match mem::replace(self, MidHandshake::End) {
|
||||
MidHandshake::Handshaking(stream) => Ok(Async::Ready(stream)),
|
||||
match mem::replace(this, MidHandshake::End) {
|
||||
MidHandshake::Handshaking(stream) => Poll::Ready(Ok(stream)),
|
||||
MidHandshake::End => panic!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<IO> io::Read for TlsStream<IO>
|
||||
impl<IO> AsyncRead for TlsStream<IO>
|
||||
where
|
||||
IO: AsyncRead + AsyncWrite,
|
||||
IO: AsyncRead + AsyncWrite + Unpin,
|
||||
{
|
||||
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
||||
let mut stream = Stream::new(&mut self.io, &mut self.session);
|
||||
unsafe fn initializer(&self) -> Initializer {
|
||||
// TODO
|
||||
Initializer::nop()
|
||||
}
|
||||
|
||||
match self.state {
|
||||
TlsState::Stream | TlsState::WriteShutdown => match stream.read(buf) {
|
||||
Ok(0) => {
|
||||
self.state.shutdown_read();
|
||||
Ok(0)
|
||||
fn poll_read(self: Pin<&mut Self>, cx: &mut Context, buf: &mut [u8]) -> Poll<io::Result<usize>> {
|
||||
let this = self.get_mut();
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable());
|
||||
|
||||
match this.state {
|
||||
TlsState::Stream | TlsState::WriteShutdown => match stream.poll_read(cx, buf) {
|
||||
Poll::Ready(Ok(0)) => {
|
||||
this.state.shutdown_read();
|
||||
Poll::Ready(Ok(0))
|
||||
}
|
||||
Ok(n) => Ok(n),
|
||||
Err(ref e) if e.kind() == io::ErrorKind::ConnectionAborted => {
|
||||
self.state.shutdown_read();
|
||||
if self.state.writeable() {
|
||||
Poll::Ready(Ok(n)) => Poll::Ready(Ok(n)),
|
||||
Poll::Ready(Err(ref err)) if err.kind() == io::ErrorKind::ConnectionAborted => {
|
||||
this.state.shutdown_read();
|
||||
if this.state.writeable() {
|
||||
stream.session.send_close_notify();
|
||||
self.state.shutdown_write();
|
||||
this.state.shutdown_write();
|
||||
}
|
||||
Ok(0)
|
||||
Poll::Ready(Ok(0))
|
||||
}
|
||||
Err(e) => Err(e),
|
||||
Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
|
||||
Poll::Pending => Poll::Pending
|
||||
},
|
||||
TlsState::ReadShutdown | TlsState::FullyShutdown => Ok(0),
|
||||
TlsState::ReadShutdown | TlsState::FullyShutdown => Poll::Ready(Ok(0)),
|
||||
#[cfg(feature = "early-data")]
|
||||
s => unreachable!("server TLS can not hit this state: {:?}", s),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<IO> io::Write for TlsStream<IO>
|
||||
where
|
||||
IO: AsyncRead + AsyncWrite,
|
||||
{
|
||||
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
||||
let mut stream = Stream::new(&mut self.io, &mut self.session);
|
||||
stream.write(buf)
|
||||
}
|
||||
|
||||
fn flush(&mut self) -> io::Result<()> {
|
||||
Stream::new(&mut self.io, &mut self.session).flush()?;
|
||||
self.io.flush()
|
||||
}
|
||||
}
|
||||
|
||||
impl<IO> AsyncRead for TlsStream<IO>
|
||||
where
|
||||
IO: AsyncRead + AsyncWrite,
|
||||
{
|
||||
unsafe fn prepare_uninitialized_buffer(&self, _: &mut [u8]) -> bool {
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
impl<IO> AsyncWrite for TlsStream<IO>
|
||||
where
|
||||
IO: AsyncRead + AsyncWrite,
|
||||
IO: AsyncRead + AsyncWrite + Unpin,
|
||||
{
|
||||
fn shutdown(&mut self) -> Poll<(), io::Error> {
|
||||
fn poll_write(self: Pin<&mut Self>, cx: &mut Context, buf: &[u8]) -> Poll<io::Result<usize>> {
|
||||
let this = self.get_mut();
|
||||
Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable())
|
||||
.poll_write(cx, buf)
|
||||
}
|
||||
|
||||
fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
|
||||
let this = self.get_mut();
|
||||
Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable())
|
||||
.poll_flush(cx)
|
||||
}
|
||||
|
||||
fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
|
||||
if self.state.writeable() {
|
||||
self.session.send_close_notify();
|
||||
self.state.shutdown_write();
|
||||
}
|
||||
|
||||
let mut stream = Stream::new(&mut self.io, &mut self.session);
|
||||
try_nb!(stream.complete_io());
|
||||
stream.io.shutdown()
|
||||
let this = self.get_mut();
|
||||
let mut stream = Stream::new(&mut this.io, &mut this.session)
|
||||
.set_eof(!this.state.readable());
|
||||
try_ready!(stream.complete_io(cx));
|
||||
Pin::new(&mut this.io).poll_close(cx)
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user