mirror of
https://github.com/neondatabase/neon.git
synced 2026-05-15 20:20:38 +00:00
4d99b6ff4d
## Problem PGLB/Neonkeeper needs to separate the concerns of connecting to compute, and authenticating to compute. Additionally, the code within `connect_to_compute` is rather messy, spending effort on recovering the authentication info after wake_compute. ## Summary of changes Split `ConnCfg` into `ConnectInfo` and `AuthInfo`. `wake_compute` only returns `ConnectInfo` and `AuthInfo` is determined separately from the `handshake`/`authenticate` process. Additionally, `ConnectInfo::connect_raw` is in-charge or establishing the TLS connection, and the `postgres_client::Config::connect_raw` is configured to use `NoTls` which will force it to skip the TLS negotiation. This should just work.
83 lines
2.1 KiB
Rust
83 lines
2.1 KiB
Rust
use std::net::IpAddr;
|
|
|
|
use postgres_protocol2::message::backend::Message;
|
|
use tokio::net::TcpStream;
|
|
use tokio::sync::mpsc;
|
|
|
|
use crate::client::SocketConfig;
|
|
use crate::codec::BackendMessage;
|
|
use crate::config::Host;
|
|
use crate::connect_raw::connect_raw;
|
|
use crate::connect_socket::connect_socket;
|
|
use crate::tls::{MakeTlsConnect, TlsConnect};
|
|
use crate::{Client, Config, Connection, Error, RawConnection};
|
|
|
|
pub async fn connect<T>(
|
|
tls: &T,
|
|
config: &Config,
|
|
) -> Result<(Client, Connection<TcpStream, T::Stream>), Error>
|
|
where
|
|
T: MakeTlsConnect<TcpStream>,
|
|
{
|
|
let hostname = match &config.host {
|
|
Host::Tcp(host) => host.as_str(),
|
|
};
|
|
|
|
let tls = tls
|
|
.make_tls_connect(hostname)
|
|
.map_err(|e| Error::tls(e.into()))?;
|
|
|
|
match connect_once(config.host_addr, &config.host, config.port, tls, config).await {
|
|
Ok((client, connection)) => Ok((client, connection)),
|
|
Err(e) => Err(e),
|
|
}
|
|
}
|
|
|
|
async fn connect_once<T>(
|
|
host_addr: Option<IpAddr>,
|
|
host: &Host,
|
|
port: u16,
|
|
tls: T,
|
|
config: &Config,
|
|
) -> Result<(Client, Connection<TcpStream, T::Stream>), Error>
|
|
where
|
|
T: TlsConnect<TcpStream>,
|
|
{
|
|
let socket = connect_socket(host_addr, host, port, config.connect_timeout).await?;
|
|
let RawConnection {
|
|
stream,
|
|
parameters,
|
|
delayed_notice,
|
|
process_id,
|
|
secret_key,
|
|
} = connect_raw(socket, tls, config).await?;
|
|
|
|
let socket_config = SocketConfig {
|
|
host_addr,
|
|
host: host.clone(),
|
|
port,
|
|
connect_timeout: config.connect_timeout,
|
|
};
|
|
|
|
let (client_tx, conn_rx) = mpsc::unbounded_channel();
|
|
let (conn_tx, client_rx) = mpsc::channel(4);
|
|
let client = Client::new(
|
|
client_tx,
|
|
client_rx,
|
|
socket_config,
|
|
config.ssl_mode,
|
|
process_id,
|
|
secret_key,
|
|
);
|
|
|
|
// delayed notices are always sent as "Async" messages.
|
|
let delayed = delayed_notice
|
|
.into_iter()
|
|
.map(|m| BackendMessage::Async(Message::NoticeResponse(m)))
|
|
.collect();
|
|
|
|
let connection = Connection::new(stream, delayed, parameters, conn_tx, conn_rx);
|
|
|
|
Ok((client, connection))
|
|
}
|