rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-04 12:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

proxy: decode username and password (#6700)

Browse Source 
## Problem

usernames and passwords can be URL 'percent' encoded in the connection
string URL provided by serverless driver.

## Summary of changes

Decode the parameters when getting conn info
This commit is contained in:
Conrad Ludgate
2024-02-09 19:22:23 +00:00
committed by GitHub
parent ca818c8bd7
commit cbd3a32d4d
8 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
proxy/src/serverless/sql_over_http.rs
View File

@@ -100,6 +100,8 @@ pub enum ConnInfoError {
InvalidDbName,
#[error("missing username")]
MissingUsername,
#[error("invalid username: {0}")]
InvalidUsername(#[from] std::string::FromUtf8Error),
#[error("missing password")]
MissingPassword,
#[error("missing hostname")]
@@ -134,7 +136,7 @@ fn get_conn_info(
let dbname = url_path.next().ok_or(ConnInfoError::InvalidDbName)?;
let username = RoleName::from(connection_url.username());
let username = RoleName::from(urlencoding::decode(connection_url.username())?);
if username.is_empty() {
return Err(ConnInfoError::MissingUsername);
}
@@ -143,6 +145,7 @@ fn get_conn_info(
let password = connection_url
.password()
.ok_or(ConnInfoError::MissingPassword)?;
let password = urlencoding::decode_binary(password.as_bytes());
let hostname = connection_url
.host_str()
@@ -172,7 +175,10 @@ fn get_conn_info(
Ok(ConnInfo {
user_info,
dbname: dbname.into(),
password: password.into(),
password: match password {
std::borrow::Cow::Borrowed(b) => b.into(),
std::borrow::Cow::Owned(b) => b.into(),
},
})
}