From d0ebcc3b5a2ad43bad2026da760eae22c4887226 Mon Sep 17 00:00:00 2001 From: shuiyisong <113876041+shuiyisong@users.noreply.github.com> Date: Wed, 21 Dec 2022 17:58:43 +0800 Subject: [PATCH] chore: open userinfo constructor (#774) --- src/servers/src/auth.rs | 5 +---- src/servers/src/auth/user_provider.rs | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/servers/src/auth.rs b/src/servers/src/auth.rs index 8e79e9926f..f787c3fed9 100644 --- a/src/servers/src/auth.rs +++ b/src/servers/src/auth.rs @@ -69,7 +69,6 @@ impl UserInfo { &self.username } - #[cfg(test)] pub fn new(username: impl Into) -> Self { Self { username: username.into(), @@ -165,9 +164,7 @@ pub mod test { Password::PlainText(password) => { if username == "greptime" { if password == "greptime" { - return Ok(UserInfo { - username: "greptime".to_string(), - }); + return Ok(UserInfo::new("greptime")); } else { return super::UserPasswordMismatchSnafu { username: username.to_string(), diff --git a/src/servers/src/auth/user_provider.rs b/src/servers/src/auth/user_provider.rs index 9ff7a1a53a..f58dbb4853 100644 --- a/src/servers/src/auth/user_provider.rs +++ b/src/servers/src/auth/user_provider.rs @@ -113,9 +113,7 @@ impl UserProvider for StaticUserProvider { match input_pwd { Password::PlainText(pwd) => { return if save_pwd == pwd.as_bytes() { - Ok(UserInfo { - username: username.to_string(), - }) + Ok(UserInfo::new(username)) } else { UserPasswordMismatchSnafu { username: username.to_string(), @@ -152,7 +150,7 @@ fn auth_mysql( } let candidate_stage_2 = sha1_one(&xor_result); if candidate_stage_2 == hash_stage_2 { - Ok(UserInfo { username }) + Ok(UserInfo::new(username)) } else { UserPasswordMismatchSnafu { username }.fail() }