2 files changed
+104
-16
No files matched your search
@@ -1,7 +1,7 @@
|
||||
use serde_json::Value;
|
||||
|
||||
use crate::connection::{AppState, PoolKind};
|
||||
use crate::query_execution_sql::{is_safe_dameng_autotrace_sql, is_safe_explain_sql};
|
||||
use crate::query_execution_sql::{is_safe_dameng_autotrace_sql, is_safe_explain_sql_for_database};
|
||||
|
||||
pub async fn get_agent_explain_info_core(
|
||||
state: &AppState,
|
||||
@@ -12,12 +12,12 @@ pub async fn get_agent_explain_info_core(
|
||||
mode: Option<&str>,
|
||||
) -> Result<String, String> {
|
||||
let mode = mode.unwrap_or("explain");
|
||||
let safe = if mode.eq_ignore_ascii_case("autotrace") {
|
||||
is_safe_dameng_autotrace_sql(sql)
|
||||
} else {
|
||||
is_safe_explain_sql(sql)
|
||||
let (database_type, timeout_secs) = {
|
||||
let configs = state.configs.read().await;
|
||||
let config = configs.get(connection_id).ok_or_else(|| "Connection config not found".to_string())?;
|
||||
(config.db_type, config.query_timeout_secs)
|
||||
};
|
||||
if !safe {
|
||||
if !is_safe_agent_explain_sql(sql, mode, database_type) {
|
||||
return Err("unsafe".to_string());
|
||||
}
|
||||
|
||||
@@ -33,11 +33,6 @@ pub async fn get_agent_explain_info_core(
|
||||
}
|
||||
};
|
||||
|
||||
let timeout_secs = {
|
||||
let configs = state.configs.read().await;
|
||||
configs.get(connection_id).ok_or_else(|| "Connection config not found".to_string())?.query_timeout_secs
|
||||
};
|
||||
|
||||
let params = serde_json::json!({
|
||||
"sql": sql,
|
||||
"database": database.unwrap_or_default(),
|
||||
@@ -50,6 +45,14 @@ pub async fn get_agent_explain_info_core(
|
||||
decode_agent_explain_result(result)
|
||||
}
|
||||
|
||||
fn is_safe_agent_explain_sql(sql: &str, mode: &str, database_type: crate::models::connection::DatabaseType) -> bool {
|
||||
if mode.eq_ignore_ascii_case("autotrace") {
|
||||
is_safe_dameng_autotrace_sql(sql)
|
||||
} else {
|
||||
is_safe_explain_sql_for_database(sql, Some(database_type))
|
||||
}
|
||||
}
|
||||
|
||||
fn decode_agent_explain_result(result: Value) -> Result<String, String> {
|
||||
match result {
|
||||
Value::String(plan) => Ok(plan),
|
||||
@@ -61,6 +64,17 @@ fn decode_agent_explain_result(result: Value) -> Result<String, String> {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::models::connection::DatabaseType;
|
||||
|
||||
#[test]
|
||||
fn allows_oracle_dml_explain_without_relaxing_autotrace() {
|
||||
let update = "UPDATE AA_PAY_VOUCHER_TEMP t SET t.AGENCY_ID = '1'";
|
||||
|
||||
assert!(is_safe_agent_explain_sql(update, "explain", DatabaseType::Oracle));
|
||||
assert!(!is_safe_agent_explain_sql(update, "autotrace", DatabaseType::Oracle));
|
||||
assert!(!is_safe_agent_explain_sql(update, "explain", DatabaseType::Dameng));
|
||||
assert!(!is_safe_agent_explain_sql("DROP TABLE AA_PAY_VOUCHER_TEMP", "explain", DatabaseType::Oracle));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn decodes_string_and_object_agent_explain_results() {
|
||||
|
||||
Reference in new issue
Block a user