itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-12-29 21:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: correctly handle percent-encoded socket as host for postgres URI

Browse Source
This commit is contained in:
Dana Marcuse 2020-09-17 13:21:22 -04:00 committed by Ryan Leckey
parent 7b1b8c12ba
commit d97014f620
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sqlx-core/src/postgres/options/parse.rs
View File

@ -14,7 +14,11 @@ impl FromStr for PgConnectOptions {
let mut options = Self::default();
if let Some(host) = url.host_str() {
options = options.host(host);
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() {
@ -174,3 +178,20 @@ fn it_parses_password_with_non_ascii_chars_correctly() {
assert_eq!(Some("p@ssw0rd".into()), opts.password);
}
#[test]
fn it_parses_socket_correctly_percent_encoded() {
let uri = "postgres://%2Fvar%2Flib%2Fpostgres/database";
let opts = PgConnectOptions::from_str(uri).unwrap();
assert_eq!(Some("/var/lib/postgres/".into()), opts.socket);
}
#[test]
fn it_parses_socket_correctly_with_username_percent_encoded() {
let uri = "postgres://some_user@%2Fvar%2Flib%2Fpostgres/database";
let opts = PgConnectOptions::from_str(uri).unwrap();
assert_eq!("some_user", opts.username);
assert_eq!(Some("/var/lib/postgres/".into()), opts.socket);
assert_eq!(Some("database"), opts.database.as_deref());
}