fix(driver): decode percent encoded password for flightsql

databendlabs · May 18, 2023 · dbc43f4 · dbc43f4
1 parent 7869956
commit dbc43f4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -16,7 +16,7 @@ chrono = { version = "0.4.24", default-features = false, features = ["clock"] }
 clap = { version = "4.1.0", features = ["derive", "env"] }
 comfy-table = "6.1.4"
 csv = "1.2.1"
-databend-driver = { path = "../driver", version = "0.2.23", features = ["rustls", "flight-sql"] }
+databend-driver = { path = "../driver", version = "0.2.24", features = ["rustls", "flight-sql"] }
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 humantime-serde = "1.1.1"
 indicatif = "0.17.3"

diff --git a/driver/Cargo.toml b/driver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "databend-driver"
-version = "0.2.23"
+version = "0.2.24"
 edition = "2021"
 license = "Apache-2.0"
 description = "Databend Driver for Rust"
@@ -24,6 +24,7 @@ chrono = { version = "0.4.24", default-features = false, features = ["clock"] }
 databend-client = { version = "0.1.16", path = "../core" }
 dyn-clone = "1.0.11"
 http = "0.2.9"
+percent-encoding = "2.2.0"
 serde = { version = "1.0.160", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.96", default-features = false, features = ["std"] }
 tokio = { version = "1.27.0", features = ["macros"] }

diff --git a/driver/src/flight_sql.rs b/driver/src/flight_sql.rs
@@ -23,6 +23,7 @@ use arrow_flight::utils::flight_data_to_arrow_batch;
 use arrow_flight::{sql::client::FlightSqlServiceClient, FlightData};
 use arrow_schema::SchemaRef as ArrowSchemaRef;
 use async_trait::async_trait;
+use percent_encoding::percent_decode_str;
 use tokio::sync::Mutex;
 use tokio_stream::{Stream, StreamExt};
 use tonic::transport::{Channel, ClientTlsConfig, Endpoint};
@@ -247,7 +248,9 @@ impl Args {
             None => format!("{}://{}:{}", scheme, host, port),
         };
         args.user = u.username().to_string();
-        args.password = u.password().unwrap_or_default().to_string();
+        args.password = percent_decode_str(u.password().unwrap_or_default())
+            .decode_utf8_lossy()
+            .to_string();
         Ok(args)
     }
 }