Fix db console for password/username/database with special characters

elan-ev · Aug 8, 2022 · 3e04c50 · 3e04c50
1 parent ef6ea6a
commit 3e04c50
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -46,6 +46,7 @@ p256 = { version = "0.11", features = ["jwk"] }
 p384 = { version = "0.11", features = ["jwk"] }
 paste = "1"
 pem = "1"
+percent-encoding = "2.1.0"
 postgres-types = { version = "0.2.2", features = ["derive", "array-impls"] }
 rand = "0.8.4"
 reinda = "0.2"

diff --git a/backend/src/db/cmd.rs b/backend/src/db/cmd.rs
@@ -131,13 +131,15 @@ async fn run_script(db: &Db, script_path: &Path) -> Result<()> {
 }
 
 fn console(config: &DbConfig) -> Result<Never> {
+    let encode = |s| percent_encoding::utf8_percent_encode(s, percent_encoding::NON_ALPHANUMERIC);
+
     let connection_uri = format!(
         "postgresql://{}:{}@{}:{}/{}",
-        config.user,
-        config.password.expose_secret(),
+        encode(&config.user),
+        encode(&config.password.expose_secret()),
         config.host,
         config.port,
-        config.database,
+        encode(&config.database),
     );
     let error = Command::new("psql").arg(connection_uri).exec();
     let message = match error.kind() {