按审计结论清理冗余(不改变行为):
1. as_text:17 个 host 模块各自复制同一函数(两种措辞),合并为
crate::host::as_text(统一 "{label} needs text",无测试依赖旧措辞)
2. catalog.rs:extract_fm_field / extract_nested_by / extract_fm_list /
yaml_escape 与 knowledge::util 逐字相同,改为直接引用
3. view/mod.rs:handle 29 臂 + handle_debug 5 臂折叠成两张路由表
(Notebook/Debug/Action 三种处理器),每臂原本重复同一 api_debug_post 包装
实测:
- cargo build 零警告;cargo test --release 605 passed / 0 failed
- view 服务实测:GET / → 200;POST /api/debug/continue → 200(真实响应
{"error":"unknown session"});POST /api/nope → 405
行数:view/mod.rs -99(168 删 69 增);src 合计由 53,276 降至约 53,000
(as_text 18 文件各约 6 行、catalog 4 函数约 70 行)
期间发现并修正一处真实风险:路由臂分布在两个 handler(handle / handle_debug),
首次只替换了一个导致 debug 路由 405;已按 handler 分别建表并由实测覆盖。
63 lines
1.5 KiB
Rust
63 lines
1.5 KiB
Rust
//! Digest / HMAC host primitives for Mid M3 (`lib/hash`).
|
|
|
|
use crate::host::as_text;
|
|
use hmac::{Hmac, Mac};
|
|
use md5::Md5;
|
|
use sha1::Sha1;
|
|
use sha2::{Digest, Sha256};
|
|
|
|
use crate::value::Value;
|
|
|
|
type HmacSha256 = Hmac<Sha256>;
|
|
|
|
|
|
fn to_hex(bytes: &[u8]) -> String {
|
|
bytes.iter().map(|b| format!("{b:02x}")).collect()
|
|
}
|
|
|
|
pub fn sha256(text: &Value) -> Result<Value, String> {
|
|
let t = as_text(text, "text")?;
|
|
let mut h = Sha256::new();
|
|
h.update(t.as_bytes());
|
|
Ok(Value::Text(to_hex(&h.finalize())))
|
|
}
|
|
|
|
pub fn sha1(text: &Value) -> Result<Value, String> {
|
|
let t = as_text(text, "text")?;
|
|
let mut h = Sha1::new();
|
|
h.update(t.as_bytes());
|
|
Ok(Value::Text(to_hex(&h.finalize())))
|
|
}
|
|
|
|
pub fn md5(text: &Value) -> Result<Value, String> {
|
|
let t = as_text(text, "text")?;
|
|
let mut h = Md5::new();
|
|
h.update(t.as_bytes());
|
|
Ok(Value::Text(to_hex(&h.finalize())))
|
|
}
|
|
|
|
pub fn hmac_sha256(key: &Value, text: &Value) -> Result<Value, String> {
|
|
let k = as_text(key, "key")?;
|
|
let t = as_text(text, "text")?;
|
|
let mut mac =
|
|
HmacSha256::new_from_slice(k.as_bytes()).map_err(|e| format!("hmac_sha256: {e}"))?;
|
|
mac.update(t.as_bytes());
|
|
Ok(Value::Text(to_hex(&mac.finalize().into_bytes())))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn sha256_empty() {
|
|
let v = sha256(&Value::Text("".into())).unwrap();
|
|
assert_eq!(
|
|
v,
|
|
Value::Text(
|
|
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855".into()
|
|
)
|
|
);
|
|
}
|
|
}
|