Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(plugins): use lexical keyword boundaries in plan sql checks

jearhe3a44507ad2fb
diff --git a/crates/dbx-sql/src/query_execution_sql.rs b/crates/dbx-sql/src/query_execution_sql.rs
index 313b1288c8..32c4c1b0f9 100644
--- a/crates/dbx-sql/src/query_execution_sql.rs
+++ b/crates/dbx-sql/src/query_execution_sql.rs
@@ -230,9 +230,22 @@ fn strip_trailing_semicolons(sql: &str) -> String {
fn is_safe_explain_source(sql: &str) -> bool {
let source = strip_sql_comments(sql).trim_start().to_lowercase();
- ["select", "with", "table", "values"].iter().any(|keyword| {
- source == *keyword || source.starts_with(&format!("{keyword} ")) || source.starts_with(&format!("{keyword}\n"))
- })
+ ["select", "with", "table", "values"].iter().any(|keyword| starts_with_explain_keyword_boundary(&source, keyword))
+}
+
+fn starts_with_explain_keyword_boundary(source: &str, keyword: &str) -> bool {
+ let Some(remainder) = source.strip_prefix(keyword) else {
+ return false;
+ };
+
+ match remainder.chars().next() {
+ None => true,
+ Some(character) if character.is_ascii_alphanumeric() || matches!(character, '_' | '$') => false,
+ // The safety gate permits ASCII whitespace and punctuation after the
+ // leading keyword, but fails closed for non-ASCII continuation chars.
+ Some(character) if character.is_ascii() => true,
+ Some(_) => false,
+ }
}
fn is_safe_oracle_explain_dml_source(sql: &str) -> bool {
@@ -1060,6 +1073,45 @@ mod tests {
);
}
+ #[test]
+ fn builds_postgres_explain_sql_for_keyword_boundaries() {
+ for sql in [
+ "SELECT* FROM users",
+ "SELECT\t* FROM users",
+ "SELECT(1)",
+ "VALUES(1)",
+ "SELECT\r\n*\r\nFROM users",
+ "TABLE users",
+ ] {
+ assert_eq!(
+ build_explain_sql(ExplainSqlOptions {
+ database_type: Some(DatabaseType::Postgres),
+ format: None,
+ analyze: None,
+ sql: sql.to_string(),
+ }),
+ ExplainSqlBuildResult { ok: true, sql: Some(format!("EXPLAIN (FORMAT JSON) {sql}")), reason: None },
+ "expected safe EXPLAIN source: {sql:?}"
+ );
+ }
+ }
+
+ #[test]
+ fn rejects_explain_keyword_identifier_prefixes() {
+ for sql in ["SELECTED", "SELECT_foo", "SELECT$foo", "SELECT1", "VALUES_foo", "VALUES1"] {
+ assert_eq!(
+ build_explain_sql(ExplainSqlOptions {
+ database_type: Some(DatabaseType::Postgres),
+ format: None,
+ analyze: None,
+ sql: sql.to_string(),
+ }),
+ ExplainSqlBuildResult { ok: false, sql: None, reason: Some("unsafe".to_string()) },
+ "expected unsafe EXPLAIN source: {sql:?}"
+ );
+ }
+ }
+
#[test]
fn builds_postgres_analyze_explain_sql() {
let result = build_explain_sql(ExplainSqlOptions {