08b4020534
* `Connection` is now parameterized over the stream type, which can be
any `AsyncRead + AsyncWrite`.
* The `TlsMode` enum is now a trait, and `NoTls`, `PreferTls`, and
`RequireTls` are types implementing that trait.
* The `TlsConnect` trait no longer involves trait objects, and returns
channel binding info alongside the stream type rather than requiring
the stream to implement an additional trait.
* The `connect` free function and `ConnectParams` type is gone in favor
of a `Builder` type. It takes a pre-connected stream rather than
automatically opening a TCP or Unix socket connection.
Notably, we no longer have any dependency on the Tokio runtime. We do
use the `tokio-codec` and `tokio-io` crates, but those don't actually
depend on mio/tokio-reactor/etc. This means we can work with other
futures-based networking stacks.
We will almost certainly add back a convenience API that offers
something akin to the old logic to open a TCP/Unix connection
automatically but that will be worked out in a follow up PR.
75 lines
2.3 KiB
Rust
75 lines
2.3 KiB
Rust
use futures::{Future, Stream};
|
|
use openssl::ssl::{SslConnector, SslMethod};
|
|
use tokio::net::TcpStream;
|
|
use tokio::runtime::current_thread::Runtime;
|
|
use tokio_postgres::{self, PreferTls, RequireTls, TlsMode};
|
|
|
|
use TlsConnector;
|
|
|
|
fn smoke_test<T>(builder: &tokio_postgres::Builder, tls: T)
|
|
where
|
|
T: TlsMode<TcpStream>,
|
|
T::Stream: 'static,
|
|
{
|
|
let mut runtime = Runtime::new().unwrap();
|
|
|
|
let handshake = TcpStream::connect(&"127.0.0.1:5433".parse().unwrap())
|
|
.map_err(|e| panic!("{}", e))
|
|
.and_then(|s| builder.connect(s, tls));
|
|
let (mut client, connection) = runtime.block_on(handshake).unwrap();
|
|
let connection = connection.map_err(|e| panic!("{}", e));
|
|
runtime.spawn(connection);
|
|
|
|
let prepare = client.prepare("SELECT 1::INT4");
|
|
let statement = runtime.block_on(prepare).unwrap();
|
|
let select = client.query(&statement, &[]).collect().map(|rows| {
|
|
assert_eq!(rows.len(), 1);
|
|
assert_eq!(rows[0].get::<_, i32>(0), 1);
|
|
});
|
|
runtime.block_on(select).unwrap();
|
|
|
|
drop(statement);
|
|
drop(client);
|
|
runtime.run().unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn require() {
|
|
let mut builder = SslConnector::builder(SslMethod::tls()).unwrap();
|
|
builder.set_ca_file("../test/server.crt").unwrap();
|
|
let ctx = builder.build();
|
|
smoke_test(
|
|
tokio_postgres::Builder::new()
|
|
.user("ssl_user")
|
|
.database("postgres"),
|
|
RequireTls(TlsConnector::new(ctx.configure().unwrap(), "localhost")),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn prefer() {
|
|
let mut builder = SslConnector::builder(SslMethod::tls()).unwrap();
|
|
builder.set_ca_file("../test/server.crt").unwrap();
|
|
let ctx = builder.build();
|
|
smoke_test(
|
|
tokio_postgres::Builder::new()
|
|
.user("ssl_user")
|
|
.database("postgres"),
|
|
PreferTls(TlsConnector::new(ctx.configure().unwrap(), "localhost")),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn scram_user() {
|
|
let mut builder = SslConnector::builder(SslMethod::tls()).unwrap();
|
|
builder.set_ca_file("../test/server.crt").unwrap();
|
|
let ctx = builder.build();
|
|
smoke_test(
|
|
tokio_postgres::Builder::new()
|
|
.user("scram_user")
|
|
.password("password")
|
|
.database("postgres"),
|
|
RequireTls(TlsConnector::new(ctx.configure().unwrap(), "localhost")),
|
|
);
|
|
}
|