fix hangs on authenticate

databendlabs · Mar 3, 2022 · 670358a · 670358a
1 parent c9e9360
commit 670358a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/query/Cargo.toml b/query/Cargo.toml
@@ -53,7 +53,7 @@ common-tracing = { path = "../common/tracing" }
 
 # Github dependencies
 cargo-license = { git = "https://github.com/datafuse-extras/cargo-license", rev = "f1ce4a2" }
-msql-srv = { git = "https://github.com/datafuse-extras/msql-srv", rev = "70aa0b2" }
+msql-srv = { git = "https://github.com/flaneur2020/msql-srv", rev = "6134ff" }
 sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "472f5b6" }
 
 # Crates.io dependencies

diff --git a/query/src/servers/mysql/mysql_interactive_worker.rs b/query/src/servers/mysql/mysql_interactive_worker.rs
@@ -55,7 +55,7 @@ pub struct InteractiveWorker<W: std::io::Write> {
 }
 
 #[async_trait::async_trait]
-impl<W: std::io::Write + Send> AsyncMysqlShim<W> for InteractiveWorker<W> {
+impl<W: std::io::Write + Send + Sync> AsyncMysqlShim<W> for InteractiveWorker<W> {
     type Error = ErrorCode;
 
     fn version(&self) -> &str {
@@ -78,34 +78,33 @@ impl<W: std::io::Write + Send> AsyncMysqlShim<W> for InteractiveWorker<W> {
         self.salt
     }
 
-    fn authenticate(
+    async fn authenticate(
         &self,
         _auth_plugin: &str,
         username: &[u8],
         salt: &[u8],
         auth_data: &[u8],
     ) -> bool {
         let username = String::from_utf8_lossy(username);
-        let info = CertifiedInfo::create(&username, auth_data, &self.client_addr);
+        let client_addr = self.client_addr.clone();
+        let info = CertifiedInfo::create(&username, auth_data, &client_addr);
 
         let authenticate = self.base.authenticate(salt, info);
-        futures::executor::block_on(async move {
-            match authenticate.await {
-                Ok(res) => res,
-                Err(failure) => {
-                    tracing::error!(
-                        "MySQL handler authenticate failed, \
+        match authenticate.await {
+            Ok(res) => res,
+            Err(failure) => {
+                tracing::error!(
+                    "MySQL handler authenticate failed, \
                         user_name: {}, \
                         client_address: {}, \
                         failure_cause: {}",
-                        username,
-                        self.client_addr,
-                        failure
-                    );
-                    false
-                }
+                    username,
+                    client_addr,
+                    failure
+                );
+                false
             }
-        })
+        }
     }
 
     async fn on_prepare<'a>(
@@ -215,9 +214,10 @@ impl<W: std::io::Write> InteractiveWorkerBase<W> {
         let client_ip = info.user_client_address.split(':').collect::<Vec<_>>()[0];
 
         let ctx = self.session.create_query_context().await?;
-        let user_info = user_manager
+        let user_info_res = user_manager
             .get_user_with_client_ip(&ctx.get_tenant(), user_name, client_ip)
-            .await?;
+            .await;
+        let user_info = user_info_res?;
 
         let authed = user_info.auth_info.auth_mysql(&info.user_password, salt)?;
         if authed {