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(clipboard): keep @-prefixed non-ASCII text verbatim

zipg507b6d355f22
diff --git a/crates/dbx-core/src/data/grid_clipboard_guard.rs b/crates/dbx-core/src/data/grid_clipboard_guard.rs
index bfe851a219..940e29a404 100644
--- a/crates/dbx-core/src/data/grid_clipboard_guard.rs
+++ b/crates/dbx-core/src/data/grid_clipboard_guard.rs
@@ -82,6 +82,12 @@ fn is_spreadsheet_extractor(extractor: DataGridExtractorId) -> bool {
/// (drivers deliver DECIMAL/NUMERIC/BIGINT as strings) are also left alone: the shared
/// [`needs_formula_guard`] predicate exempts whole-string numeric literals, so a
/// copied `-1` stays `-1` while `-2+1+cmd|…` stays neutralized.
+///
+/// Text that starts with `@` but is not followed by an ASCII token is left alone too:
+/// `@` only forms an Excel expression when an ASCII name, reference, number or operator
+/// follows it (`@WEBSERVICE("…")`, `@SUM(1)`, `@A1` are all still neutralized), while
+/// `@冯十二` -- the shape Oracle data commonly has -- cannot evaluate and must reach the
+/// clipboard verbatim instead of gaining a visible apostrophe.
pub fn neutralize_spreadsheet_formulas(mut request: DataGridExtractRequest) -> DataGridExtractRequest {
if !is_spreadsheet_extractor(request.extractor) {
return request;
@@ -268,6 +274,35 @@ mod tests {
assert_eq!(result.text, "-1.23");
}
+ #[test]
+ fn at_sign_before_non_ascii_text_is_copied_verbatim() {
+ // 回归:Oracle 文本列里 `@` 开头的值(`@冯十二`)复制整列时曾被写成 `'@冯十二`。
+ // `@` 后没有 ASCII 记号时 Excel 里没有可求值的表达式;`@` + ASCII 记号
+ // (函数调用、引用、数字)仍是公式执行面,必须继续中和。
+ for extractor in [DataGridExtractorId::Tsv, DataGridExtractorId::Csv, DataGridExtractorId::PipeSeparated] {
+ let out = neutralize(
+ extractor,
+ vec![vec![json!("@冯十二"), json!("@"), json!("@张三@李四"), json!("@SUM(1)"), json!("@A1")]],
+ );
+ assert_eq!(out[0], json!("@冯十二"), "extractor {extractor:?}");
+ assert_eq!(out[1], json!("@"), "extractor {extractor:?}");
+ assert_eq!(out[2], json!("@张三@李四"), "extractor {extractor:?}");
+ assert_eq!(out[3], json!("'@SUM(1)"), "extractor {extractor:?}");
+ assert_eq!(out[4], json!("'@A1"), "extractor {extractor:?}");
+ }
+ }
+
+ #[test]
+ fn grid_tsv_copy_of_an_at_prefixed_text_stays_verbatim() {
+ // 端到端:复现反馈的整列复制形态(多格复制 → TSV),`@冯十二` 必须原样输出。
+ let guarded = neutralize_spreadsheet_formulas(request(
+ DataGridExtractorId::Tsv,
+ vec![vec![json!("张三1")], vec![json!("@冯十二")]],
+ ));
+ let result = dbx_sql::data_grid_extractors::extract_data_grid_selection(guarded).expect("TSV extraction");
+ assert_eq!(result.text, "张三1\n@冯十二");
+ }
+
#[test]
fn spreadsheet_headers_are_neutralized() {
for extractor in [DataGridExtractorId::TsvWithHeaders, DataGridExtractorId::CsvWithHeaders] {
diff --git a/crates/dbx-formats/src/csv_export.rs b/crates/dbx-formats/src/csv_export.rs
index 5b529276aa..7e9d538e2f 100644
--- a/crates/dbx-formats/src/csv_export.rs
+++ b/crates/dbx-formats/src/csv_export.rs
@@ -37,6 +37,9 @@ pub fn default_csv_null_literal() -> String {
/// 表格应用按公式执行(数据外泄)。DataGrip 导出 CSV 时采用同一惯例。
/// 数值列不受影响(Number 分支不走文本路径)。
///
+/// `@` 只在后面跟着 ASCII 记号时才触发(见 [`at_sign_begins_excel_formula`]):
+/// `@冯十二` 这类 `@` + 非 ASCII 文本没有可执行的公式面,加 `'` 只会污染内容。
+///
/// 前缀的写入/剥离必须保持每单元格一次的对称对:[`push_formula_guard`] 与
/// [`strip_formula_guard`]。guard 绝不能放进 [`push_csv_escaped_content`] 这类
/// 片段级写入路径——serde_json 的 `Display` 会把对象/数组拆成多个片段经
@@ -47,17 +50,33 @@ const FORMULA_TRIGGER_BYTES: &[u8] = b"=+-@\t\r";
const EXCEL_SIGNIFICANT_DIGIT_LIMIT: usize = 15;
/// 文本是否需要公式中和:跳过前导空格(OWASP 标注的 `" =cmd"` 前导空白绕过)
-/// 后,首字节是触发字符即命中;唯一例外是 `-` 开头且**整串**构成 Excel 可无损
-/// 解析的十进制字面量的文本(见 [`is_excel_exact_decimal_literal`])。
+/// 后,首字节是触发字符即命中;例外有两个:
+/// - `-` 开头且**整串**构成 Excel 可无损解析的十进制字面量(见
+/// [`is_excel_exact_decimal_literal`]);
+/// - `@` 开头但后面不是 ASCII 记号,在 Excel 里没有可求值的表达式(见
+/// [`at_sign_begins_excel_formula`])。
pub fn needs_formula_guard(value: &str) -> bool {
let rest = value.trim_start_matches(' ');
match rest.as_bytes().first() {
Some(b'-') if is_excel_exact_decimal_literal(&rest[1..]) => false,
+ Some(b'@') if !at_sign_begins_excel_formula(&rest[1..]) => false,
Some(byte) if FORMULA_TRIGGER_BYTES.contains(byte) => true,
_ => false,
}
}
+/// `@` 之后是否还有 ASCII 记号:Excel 的 `@`(AppleWorks 兼容触发符,现代 Excel
+/// 里是隐式交集运算符)要绑定到 ASCII 的函数名、单元格引用、数字或运算符才构成
+/// 可求值的表达式——`=@WEBSERVICE("https://evil")` 会真的发起请求,`@SUM(1)`、
+/// `@A1` 也都会求值,这些值必须继续中和。
+///
+/// 反过来,`@` 后直接跟非 ASCII 文本(Oracle 里 `@冯十二` 这类 `@` 开头的文本很
+/// 常见)或 `@` 后字符串就结束时,`@` 没有可绑定的记号,Excel 最多落到 `#NAME?`,
+/// 不存在公式执行面;此时前置 `'` 只会污染导出文件和复制内容,而不提供任何防护。
+fn at_sign_begins_excel_formula(rest: &str) -> bool {
+ rest.as_bytes().first().is_some_and(u8::is_ascii)
+}
+
/// 整串是否为 Excel 能原样保留的十进制字面量:`[+-]? 数字 [. 数字]`(无指数
/// 记法、无千分位、无空白),有效数字不超过 15 位。
///
@@ -751,6 +770,41 @@ mod tests {
);
}
+ #[test]
+ fn at_sign_before_non_ascii_text_keeps_its_plain_form() {
+ // 回归:`@` + 非 ASCII 文本(Oracle 里 `@冯十二` 这类)曾被当成公式触发符
+ // 写成 `'@冯十二`。`@` 后没有 ASCII 记号时 Excel 没有可求值的表达式;
+ // `@` 后跟着 ASCII 记号的形态(函数调用、引用、数字)仍是公式面,继续守卫。
+ let out = format_csv(
+ &["v".to_string()],
+ &[
+ vec![json!("@冯十二")],
+ vec![json!("@张三@李四")],
+ vec![json!("@")],
+ vec![json!("@🐴")],
+ vec![json!("@ 冯十二")],
+ vec![json!("@WEBSERVICE(\"https://evil\")")],
+ vec![json!("@SUM(1)")],
+ vec![json!("@A1")],
+ ],
+ );
+ assert_eq!(
+ out,
+ concat!(
+ "\"v\"\n",
+ "\"@冯十二\"\n",
+ "\"@张三@李四\"\n",
+ "\"@\"\n",
+ "\"@🐴\"\n",
+ // `@` 后是 ASCII 空格,仍按触发符处理(保守)
+ "\"'@ 冯十二\"\n",
+ "\"'@WEBSERVICE(\"\"https://evil\"\")\"\n",
+ "\"'@SUM(1)\"\n",
+ "\"'@A1\""
+ )
+ );
+ }
+
#[test]
fn negative_decimal_text_cells_keep_their_plain_numeric_form() {
// 回归:DECIMAL/NUMERIC/BIGINT 负值以文本下发(PG numeric、MySQL DECIMAL