fix(mysql): support cleartext password auth option (#2499)
This commit is contained in:
1 parent
cabe89a19b
commit
21cec24e75
12 files changed
+187
-1
No files matched your search
@@ -952,6 +952,14 @@ fn is_dbx_handled_mysql_url_param(key: &str) -> bool {
|
||||
)
|
||||
}
|
||||
|
||||
fn is_mysql_cleartext_password_param(key: &str) -> bool {
|
||||
matches!(key.to_ascii_lowercase().as_str(), "allowcleartextpasswords" | "enable_cleartext_plugin")
|
||||
}
|
||||
|
||||
fn mysql_url_param_value_is_true(value: &str) -> bool {
|
||||
matches!(value.trim().to_ascii_lowercase().as_str(), "true" | "1" | "yes" | "on")
|
||||
}
|
||||
|
||||
/// Strips the database path from a `mysql://[user[:pass]@]host[:port][/path]`
|
||||
/// URL, returning only the scheme and authority. Used so mysql_async does not
|
||||
/// send the database as the schema during the MySQL handshake (StarRocks would
|
||||
@@ -975,6 +983,7 @@ fn mysql_async_url(url: &str) -> Cow<'_, str> {
|
||||
let mut filtered: Vec<String> = Vec::new();
|
||||
let mut changed = false;
|
||||
let mut has_catalog = false;
|
||||
let mut enable_cleartext_plugin = false;
|
||||
for segment in query.split('&') {
|
||||
let segment = segment.trim();
|
||||
if segment.is_empty() {
|
||||
@@ -989,6 +998,11 @@ fn mysql_async_url(url: &str) -> Cow<'_, str> {
|
||||
if key.eq_ignore_ascii_case("catalog") {
|
||||
has_catalog = true;
|
||||
}
|
||||
if is_mysql_cleartext_password_param(key) {
|
||||
changed = true;
|
||||
enable_cleartext_plugin |= mysql_url_param_value_is_true(value);
|
||||
continue;
|
||||
}
|
||||
if is_dbx_handled_mysql_url_param(key) {
|
||||
changed = true;
|
||||
continue;
|
||||
@@ -1017,6 +1031,9 @@ fn mysql_async_url(url: &str) -> Cow<'_, str> {
|
||||
}
|
||||
filtered.push(segment.to_string());
|
||||
}
|
||||
if enable_cleartext_plugin {
|
||||
filtered.push("enable_cleartext_plugin=true".to_string());
|
||||
}
|
||||
|
||||
// When a catalog is configured, the database in the URL path must not be
|
||||
// sent as the schema during the MySQL handshake. Strip the path so mysql_async
|
||||
@@ -3710,6 +3727,24 @@ UNIQUE KEY(`tenant_id`, `name``part`)
|
||||
assert_eq!(mysql_async_url(url).as_ref(), "mysql://host:3306/db?require_ssl=true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_async_url_normalizes_cleartext_password_auth_alias() {
|
||||
let url = "mysql://host:3306/db?allowCleartextPasswords=true&charset=utf8mb4";
|
||||
assert_eq!(mysql_async_url(url).as_ref(), "mysql://host:3306/db?enable_cleartext_plugin=true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_async_url_deduplicates_cleartext_password_auth_params() {
|
||||
let url = "mysql://host:3306/db?allowCleartextPasswords=true&enable_cleartext_plugin=true&require_ssl=true";
|
||||
assert_eq!(mysql_async_url(url).as_ref(), "mysql://host:3306/db?require_ssl=true&enable_cleartext_plugin=true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_async_url_omits_disabled_cleartext_password_auth_params() {
|
||||
let url = "mysql://host:3306/db?allowCleartextPasswords=false&enable_cleartext_plugin=&require_ssl=true";
|
||||
assert_eq!(mysql_async_url(url).as_ref(), "mysql://host:3306/db?require_ssl=true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_async_url_strips_go_and_timezone_compat_params() {
|
||||
let url = "mysql://host:3306/db?charset=utf8mb4&parseTime=True&loc=Local&connectionTimeZone=Asia%2FShanghai&forceConnectionTimeZoneToSession=true&require_ssl=true";
|
||||
|
||||
@@ -1216,9 +1216,30 @@ fn normalize_bare_mysql_url_params(value: &str) -> String {
|
||||
.join("&")
|
||||
}
|
||||
|
||||
fn is_mysql_cleartext_password_param(key: &str) -> bool {
|
||||
matches!(key.to_ascii_lowercase().as_str(), "allowcleartextpasswords" | "enable_cleartext_plugin")
|
||||
}
|
||||
|
||||
fn mysql_url_param_value_is_true(value: &str) -> bool {
|
||||
matches!(value.trim().to_ascii_lowercase().as_str(), "true" | "1" | "yes" | "on")
|
||||
}
|
||||
|
||||
fn normalize_mysql_url_params(value: &str, force_tls: bool, accept_invalid_certs: bool) -> String {
|
||||
let value = value.trim_start_matches('?');
|
||||
let mut parts: Vec<String> = value.split('&').filter(|part| !part.is_empty()).map(str::to_string).collect();
|
||||
let enable_cleartext_plugin = parts.iter().any(|part| {
|
||||
let Some((key, value)) = part.split_once('=') else {
|
||||
return false;
|
||||
};
|
||||
is_mysql_cleartext_password_param(key.trim()) && mysql_url_param_value_is_true(value)
|
||||
});
|
||||
|
||||
parts.retain(|part| {
|
||||
let Some((key, _)) = part.split_once('=') else {
|
||||
return true;
|
||||
};
|
||||
!is_mysql_cleartext_password_param(key.trim())
|
||||
});
|
||||
|
||||
if force_tls {
|
||||
parts.retain(|part| {
|
||||
@@ -1242,6 +1263,9 @@ fn normalize_mysql_url_params(value: &str, force_tls: bool, accept_invalid_certs
|
||||
if !parts.iter().any(|part| url_param_key_is(part, "charset")) {
|
||||
parts.push("charset=utf8mb4".to_string());
|
||||
}
|
||||
if enable_cleartext_plugin {
|
||||
parts.push("enable_cleartext_plugin=true".to_string());
|
||||
}
|
||||
|
||||
parts.join("&")
|
||||
}
|
||||
@@ -2086,6 +2110,51 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_cleartext_password_auth_alias_normalizes_to_driver_param() {
|
||||
let mut config = mysql_config("root", "secret", Some("test"));
|
||||
config.url_params = Some("allowCleartextPasswords=true".to_string());
|
||||
|
||||
assert_eq!(
|
||||
config.connection_url(),
|
||||
"mysql://root:secret@10.1.2.3:2883/test?ssl-mode=preferred&charset=utf8mb4&enable_cleartext_plugin=true"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_cleartext_password_auth_keeps_canonical_driver_param() {
|
||||
let mut config = mysql_config("root", "secret", Some("test"));
|
||||
config.url_params = Some("enable_cleartext_plugin=true".to_string());
|
||||
|
||||
assert_eq!(
|
||||
config.connection_url(),
|
||||
"mysql://root:secret@10.1.2.3:2883/test?ssl-mode=preferred&charset=utf8mb4&enable_cleartext_plugin=true"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_cleartext_password_auth_deduplicates_aliases() {
|
||||
let mut config = mysql_config("root", "secret", Some("test"));
|
||||
config.url_params =
|
||||
Some("allowCleartextPasswords=true&enable_cleartext_plugin=true&charset=utf8mb4".to_string());
|
||||
|
||||
assert_eq!(
|
||||
config.connection_url(),
|
||||
"mysql://root:secret@10.1.2.3:2883/test?ssl-mode=preferred&charset=utf8mb4&enable_cleartext_plugin=true"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_cleartext_password_auth_omits_disabled_values() {
|
||||
let mut config = mysql_config("root", "secret", Some("test"));
|
||||
config.url_params = Some("allowCleartextPasswords=false&enable_cleartext_plugin=&charset=utf8mb4".to_string());
|
||||
|
||||
assert_eq!(
|
||||
config.connection_url(),
|
||||
"mysql://root:secret@10.1.2.3:2883/test?ssl-mode=preferred&charset=utf8mb4"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mysql_tls_switch_requires_ssl_without_strict_certificate_checks_by_default() {
|
||||
let mut config = mysql_config("root", "secret", Some("test"));
|
||||
|
||||
Reference in new issue
Block a user