mirror of
https://github.com/launchbadge/sqlx.git
synced 2025-12-31 05:40:58 +00:00
* use native-tls API * Add client cert and key to MySQL connector * Add client ssl tests for PostgreSQL * Add client ssl tests for MariaDB and MySQL * Adapt GA tests * Fix RUSTFLAGS to run all tests * Remove containers to free the DB port before running SSL auth tests * Fix CI bad naming * Use docker-compose down to remove also the network * Fix main rebase * Stop trying to stop service using docker-compose, simply use docker cmd * Fix RUSTFLAGS for Postgres * Name the Docker images for MariaDB and MySQL so we can stop them using their name * Add the exception for mysql 5.7 not supporting compatible TLS version with RusTLS * Rebase fixes * Set correctly tls struct (fix merge) * Handle Elliptic Curve variant for private key * Fix tests suite * Fix features in CI * Add tests for Postgres 15 + rebase * Python tests: fix exception for MySQL 5.7 + remove unneeded for loops * CI: run SSL tests only when building with TLS support --------- Co-authored-by: Barry Simons <linuxuser586@gmail.com>
245 lines
7.5 KiB
Rust
245 lines
7.5 KiB
Rust
use crate::error::Error;
|
|
use crate::PgConnectOptions;
|
|
use sqlx_core::percent_encoding::percent_decode_str;
|
|
use sqlx_core::Url;
|
|
use std::net::IpAddr;
|
|
use std::str::FromStr;
|
|
|
|
impl PgConnectOptions {
|
|
pub(crate) fn parse_from_url(url: &Url) -> Result<Self, Error> {
|
|
let mut options = Self::new_without_pgpass();
|
|
|
|
if let Some(host) = url.host_str() {
|
|
let host_decoded = percent_decode_str(host);
|
|
options = match host_decoded.clone().next() {
|
|
Some(b'/') => options.socket(&*host_decoded.decode_utf8().map_err(Error::config)?),
|
|
_ => options.host(host),
|
|
}
|
|
}
|
|
|
|
if let Some(port) = url.port() {
|
|
options = options.port(port);
|
|
}
|
|
|
|
let username = url.username();
|
|
if !username.is_empty() {
|
|
options = options.username(
|
|
&*percent_decode_str(username)
|
|
.decode_utf8()
|
|
.map_err(Error::config)?,
|
|
);
|
|
}
|
|
|
|
if let Some(password) = url.password() {
|
|
options = options.password(
|
|
&*percent_decode_str(password)
|
|
.decode_utf8()
|
|
.map_err(Error::config)?,
|
|
);
|
|
}
|
|
|
|
let path = url.path().trim_start_matches('/');
|
|
if !path.is_empty() {
|
|
options = options.database(path);
|
|
}
|
|
|
|
for (key, value) in url.query_pairs().into_iter() {
|
|
match &*key {
|
|
"sslmode" | "ssl-mode" => {
|
|
options = options.ssl_mode(value.parse().map_err(Error::config)?);
|
|
}
|
|
|
|
"sslrootcert" | "ssl-root-cert" | "ssl-ca" => {
|
|
options = options.ssl_root_cert(&*value);
|
|
}
|
|
|
|
"sslcert" | "ssl-cert" => options = options.ssl_client_cert(&*value),
|
|
|
|
"sslkey" | "ssl-key" => options = options.ssl_client_key(&*value),
|
|
|
|
"statement-cache-capacity" => {
|
|
options =
|
|
options.statement_cache_capacity(value.parse().map_err(Error::config)?);
|
|
}
|
|
|
|
"host" => {
|
|
if value.starts_with("/") {
|
|
options = options.socket(&*value);
|
|
} else {
|
|
options = options.host(&*value);
|
|
}
|
|
}
|
|
|
|
"hostaddr" => {
|
|
value.parse::<IpAddr>().map_err(Error::config)?;
|
|
options = options.host(&*value)
|
|
}
|
|
|
|
"port" => options = options.port(value.parse().map_err(Error::config)?),
|
|
|
|
"dbname" => options = options.database(&*value),
|
|
|
|
"user" => options = options.username(&*value),
|
|
|
|
"password" => options = options.password(&*value),
|
|
|
|
"application_name" => options = options.application_name(&*value),
|
|
|
|
"options" => {
|
|
if let Some(options) = options.options.as_mut() {
|
|
options.push(' ');
|
|
options.push_str(&*value);
|
|
} else {
|
|
options.options = Some(value.to_string());
|
|
}
|
|
}
|
|
|
|
k if k.starts_with("options[") => {
|
|
if let Some(key) = k.strip_prefix("options[").unwrap().strip_suffix(']') {
|
|
options = options.options([(key, &*value)]);
|
|
}
|
|
}
|
|
|
|
_ => tracing::warn!(%key, %value, "ignoring unrecognized connect parameter"),
|
|
}
|
|
}
|
|
|
|
let options = options.apply_pgpass();
|
|
|
|
Ok(options)
|
|
}
|
|
}
|
|
|
|
impl FromStr for PgConnectOptions {
|
|
type Err = Error;
|
|
|
|
fn from_str(s: &str) -> Result<Self, Error> {
|
|
let url: Url = s.parse().map_err(Error::config)?;
|
|
|
|
Self::parse_from_url(&url)
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_socket_correctly_from_parameter() {
|
|
let url = "postgres:///?host=/var/run/postgres/";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(Some("/var/run/postgres/".into()), opts.socket);
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_host_correctly_from_parameter() {
|
|
let url = "postgres:///?host=google.database.com";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(None, opts.socket);
|
|
assert_eq!("google.database.com", &opts.host);
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_hostaddr_correctly_from_parameter() {
|
|
let url = "postgres:///?hostaddr=8.8.8.8";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(None, opts.socket);
|
|
assert_eq!("8.8.8.8", &opts.host);
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_port_correctly_from_parameter() {
|
|
let url = "postgres:///?port=1234";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(None, opts.socket);
|
|
assert_eq!(1234, opts.port);
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_dbname_correctly_from_parameter() {
|
|
let url = "postgres:///?dbname=some_db";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(None, opts.socket);
|
|
assert_eq!(Some("some_db"), opts.database.as_deref());
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_user_correctly_from_parameter() {
|
|
let url = "postgres:///?user=some_user";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(None, opts.socket);
|
|
assert_eq!("some_user", opts.username);
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_password_correctly_from_parameter() {
|
|
let url = "postgres:///?password=some_pass";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(None, opts.socket);
|
|
assert_eq!(Some("some_pass"), opts.password.as_deref());
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_application_name_correctly_from_parameter() {
|
|
let url = "postgres:///?application_name=some_name";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(Some("some_name"), opts.application_name.as_deref());
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_username_with_at_sign_correctly() {
|
|
let url = "postgres://user@hostname:password@hostname:5432/database";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!("user@hostname", &opts.username);
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_password_with_non_ascii_chars_correctly() {
|
|
let url = "postgres://username:p@ssw0rd@hostname:5432/database";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(Some("p@ssw0rd".into()), opts.password);
|
|
}
|
|
|
|
#[test]
|
|
fn it_parses_socket_correctly_percent_encoded() {
|
|
let url = "postgres://%2Fvar%2Flib%2Fpostgres/database";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(Some("/var/lib/postgres/".into()), opts.socket);
|
|
}
|
|
#[test]
|
|
fn it_parses_socket_correctly_with_username_percent_encoded() {
|
|
let url = "postgres://some_user@%2Fvar%2Flib%2Fpostgres/database";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!("some_user", opts.username);
|
|
assert_eq!(Some("/var/lib/postgres/".into()), opts.socket);
|
|
assert_eq!(Some("database"), opts.database.as_deref());
|
|
}
|
|
#[test]
|
|
fn it_parses_libpq_options_correctly() {
|
|
let url = "postgres:///?options=-c%20synchronous_commit%3Doff%20--search_path%3Dpostgres";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(
|
|
Some("-c synchronous_commit=off --search_path=postgres".into()),
|
|
opts.options
|
|
);
|
|
}
|
|
#[test]
|
|
fn it_parses_sqlx_options_correctly() {
|
|
let url = "postgres:///?options[synchronous_commit]=off&options[search_path]=postgres";
|
|
let opts = PgConnectOptions::from_str(url).unwrap();
|
|
|
|
assert_eq!(
|
|
Some("-c synchronous_commit=off -c search_path=postgres".into()),
|
|
opts.options
|
|
);
|
|
}
|