Skip to content

make auth_plugin_for_username async. #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2022
Merged

make auth_plugin_for_username async. #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mysql/examples/serve_auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ impl<W: io::Write + Send> AsyncMysqlShim<W> for Backend {
"mysql_native_password"
}

fn auth_plugin_for_username(&self, _user: &[u8]) -> &str {
async fn auth_plugin_for_username(&self, _user: &[u8]) -> &str {
"mysql_native_password"
}

Expand Down
12 changes: 8 additions & 4 deletions mysql/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ pub use crate::resultset::{InitWriter, QueryResultWriter, RowWriter, StatementMe
pub use crate::value::{ToMysqlValue, Value, ValueInner};

const SCRAMBLE_SIZE: usize = 20;
const MYSQL_NATIVE_PASSWORD: &str = "mysql_native_password";

#[async_trait]
/// Implementors of this async-trait can be used to drive a MySQL-compatible database backend.
Expand All @@ -114,12 +115,12 @@ pub trait AsyncMysqlShim<W: Write + Send> {

/// get auth plugin
fn default_auth_plugin(&self) -> &str {
"mysql_native_password"
MYSQL_NATIVE_PASSWORD
}

/// get auth plugin
fn auth_plugin_for_username(&self, _user: &[u8]) -> &str {
"mysql_native_password"
async fn auth_plugin_for_username(&self, _user: &[u8]) -> &str {
MYSQL_NATIVE_PASSWORD
}

/// Default salt(scramble) for auth plugin
Expand Down Expand Up @@ -354,7 +355,10 @@ impl<B: AsyncMysqlShim<Cursor<Vec<u8>>> + Send + Sync, S: AsyncRead + AsyncWrite

self.client_capabilities = handshake.capabilities;
let mut auth_response = handshake.auth_response.clone();
let auth_plugin_expect = self.shim.auth_plugin_for_username(&handshake.username);
let auth_plugin_expect = self
.shim
.auth_plugin_for_username(&handshake.username)
.await;

// auth switch
if !auth_plugin_expect.is_empty()
Expand Down