Introduce helper module in tokio-boring tests
This commit is contained in:
parent
3d7ff0a5c0
commit
0a2013a6d5
|
|
@ -1,11 +1,12 @@
|
|||
use boring::ssl::{SslAcceptor, SslConnector, SslFiletype, SslMethod};
|
||||
use boring::ssl::{SslConnector, SslMethod};
|
||||
use futures::future;
|
||||
use std::future::Future;
|
||||
use std::net::{SocketAddr, ToSocketAddrs};
|
||||
use std::pin::Pin;
|
||||
use tokio::io::{AsyncReadExt, AsyncWrite, AsyncWriteExt};
|
||||
use tokio::net::{TcpListener, TcpStream};
|
||||
use tokio_boring::{HandshakeError, SslStream};
|
||||
use std::net::ToSocketAddrs;
|
||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||
use tokio::net::TcpStream;
|
||||
|
||||
mod common;
|
||||
|
||||
use self::common::{connect, create_server, with_trivial_client_server_exchange};
|
||||
|
||||
#[tokio::test]
|
||||
async fn google() {
|
||||
|
|
@ -33,75 +34,14 @@ async fn google() {
|
|||
assert!(response.ends_with("</html>") || response.ends_with("</HTML>"));
|
||||
}
|
||||
|
||||
fn create_server() -> (
|
||||
impl Future<Output = Result<SslStream<TcpStream>, HandshakeError<TcpStream>>>,
|
||||
SocketAddr,
|
||||
) {
|
||||
let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
|
||||
listener.set_nonblocking(true).unwrap();
|
||||
|
||||
let listener = TcpListener::from_std(listener).unwrap();
|
||||
let addr = listener.local_addr().unwrap();
|
||||
|
||||
let server = async move {
|
||||
let mut acceptor = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
|
||||
acceptor
|
||||
.set_private_key_file("tests/key.pem", SslFiletype::PEM)
|
||||
.unwrap();
|
||||
acceptor
|
||||
.set_certificate_chain_file("tests/cert.pem")
|
||||
.unwrap();
|
||||
let acceptor = acceptor.build();
|
||||
|
||||
let stream = listener.accept().await.unwrap().0;
|
||||
|
||||
tokio_boring::accept(&acceptor, stream).await
|
||||
};
|
||||
|
||||
(server, addr)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn server() {
|
||||
let (stream, addr) = create_server();
|
||||
|
||||
let server = async {
|
||||
let mut stream = stream.await.unwrap();
|
||||
let mut buf = [0; 4];
|
||||
stream.read_exact(&mut buf).await.unwrap();
|
||||
assert_eq!(&buf, b"asdf");
|
||||
|
||||
stream.write_all(b"jkl;").await.unwrap();
|
||||
|
||||
future::poll_fn(|ctx| Pin::new(&mut stream).poll_shutdown(ctx))
|
||||
.await
|
||||
.unwrap();
|
||||
};
|
||||
|
||||
let client = async {
|
||||
let mut connector = SslConnector::builder(SslMethod::tls()).unwrap();
|
||||
connector.set_ca_file("tests/cert.pem").unwrap();
|
||||
let config = connector.build().configure().unwrap();
|
||||
|
||||
let stream = TcpStream::connect(&addr).await.unwrap();
|
||||
let mut stream = tokio_boring::connect(config, "localhost", stream)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
stream.write_all(b"asdf").await.unwrap();
|
||||
|
||||
let mut buf = vec![];
|
||||
stream.read_to_end(&mut buf).await.unwrap();
|
||||
assert_eq!(buf, b"jkl;");
|
||||
};
|
||||
|
||||
future::join(server, client).await;
|
||||
with_trivial_client_server_exchange(|_| ()).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn handshake_error() {
|
||||
let (stream, addr) = create_server();
|
||||
let (stream, addr) = create_server(|_| ());
|
||||
|
||||
let server = async {
|
||||
let err = stream.await.unwrap_err();
|
||||
|
|
@ -110,13 +50,7 @@ async fn handshake_error() {
|
|||
};
|
||||
|
||||
let client = async {
|
||||
let connector = SslConnector::builder(SslMethod::tls()).unwrap();
|
||||
let config = connector.build().configure().unwrap();
|
||||
let stream = TcpStream::connect(&addr).await.unwrap();
|
||||
|
||||
let err = tokio_boring::connect(config, "localhost", stream)
|
||||
.await
|
||||
.unwrap_err();
|
||||
let err = connect(addr, |_| Ok(())).await.unwrap_err();
|
||||
|
||||
assert!(err.into_source_stream().is_some());
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,96 @@
|
|||
#![allow(dead_code)]
|
||||
|
||||
use boring::error::ErrorStack;
|
||||
use boring::ssl::{
|
||||
SslAcceptor, SslAcceptorBuilder, SslConnector, SslConnectorBuilder, SslFiletype, SslMethod,
|
||||
};
|
||||
use futures::future::{self, Future};
|
||||
use std::net::SocketAddr;
|
||||
use std::pin::Pin;
|
||||
use tokio::io::{AsyncReadExt, AsyncWrite, AsyncWriteExt};
|
||||
use tokio::net::{TcpListener, TcpStream};
|
||||
use tokio_boring::{HandshakeError, SslStream};
|
||||
|
||||
pub(crate) fn create_server(
|
||||
setup: impl FnOnce(&mut SslAcceptorBuilder),
|
||||
) -> (
|
||||
impl Future<Output = Result<SslStream<TcpStream>, HandshakeError<TcpStream>>>,
|
||||
SocketAddr,
|
||||
) {
|
||||
let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
|
||||
listener.set_nonblocking(true).unwrap();
|
||||
|
||||
let listener = TcpListener::from_std(listener).unwrap();
|
||||
let addr = listener.local_addr().unwrap();
|
||||
|
||||
let server = async move {
|
||||
let mut acceptor = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
|
||||
|
||||
acceptor
|
||||
.set_private_key_file("tests/key.pem", SslFiletype::PEM)
|
||||
.unwrap();
|
||||
|
||||
acceptor
|
||||
.set_certificate_chain_file("tests/cert.pem")
|
||||
.unwrap();
|
||||
|
||||
setup(&mut acceptor);
|
||||
|
||||
let acceptor = acceptor.build();
|
||||
|
||||
let stream = listener.accept().await.unwrap().0;
|
||||
|
||||
tokio_boring::accept(&acceptor, stream).await
|
||||
};
|
||||
|
||||
(server, addr)
|
||||
}
|
||||
|
||||
pub(crate) async fn connect(
|
||||
addr: SocketAddr,
|
||||
setup: impl FnOnce(&mut SslConnectorBuilder) -> Result<(), ErrorStack>,
|
||||
) -> Result<SslStream<TcpStream>, HandshakeError<TcpStream>> {
|
||||
let mut connector = SslConnector::builder(SslMethod::tls()).unwrap();
|
||||
|
||||
setup(&mut connector).unwrap();
|
||||
|
||||
let config = connector.build().configure().unwrap();
|
||||
|
||||
let stream = TcpStream::connect(&addr).await.unwrap();
|
||||
|
||||
tokio_boring::connect(config, "localhost", stream).await
|
||||
}
|
||||
|
||||
pub(crate) async fn with_trivial_client_server_exchange(
|
||||
server_setup: impl FnOnce(&mut SslAcceptorBuilder),
|
||||
) {
|
||||
let (stream, addr) = create_server(server_setup);
|
||||
|
||||
let server = async {
|
||||
let mut stream = stream.await.unwrap();
|
||||
let mut buf = [0; 4];
|
||||
stream.read_exact(&mut buf).await.unwrap();
|
||||
assert_eq!(&buf, b"asdf");
|
||||
|
||||
stream.write_all(b"jkl;").await.unwrap();
|
||||
|
||||
future::poll_fn(|ctx| Pin::new(&mut stream).poll_shutdown(ctx))
|
||||
.await
|
||||
.unwrap();
|
||||
};
|
||||
|
||||
let client = async {
|
||||
let mut stream = connect(addr, |builder| builder.set_ca_file("tests/cert.pem"))
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
stream.write_all(b"asdf").await.unwrap();
|
||||
|
||||
let mut buf = vec![];
|
||||
stream.read_to_end(&mut buf).await.unwrap();
|
||||
assert_eq!(buf, b"jkl;");
|
||||
};
|
||||
|
||||
future::join(server, client).await;
|
||||
}
|
||||
Loading…
Reference in New Issue