diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f7b411..ccafa28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,16 @@ ### Added +- **M1 `()` 内调用语法**:`加(1)` / `加(1, 2)` / `加(加(1 2), 10)` / `加一 号(31)`(callee 可含空格,解决 D8)/ `txt.str_trim(" x ")`。`)` 是参数终止符,逗号可选,支持嵌套。括号形参数值按表达式解析,空格形(`> f k=v`)仍按文本,`source=print(2+2)` 不受影响。 + ### Fixed +- `加(31)` 曾被解析成 `unknown function 加(31`(末个位置实参吞掉 `)`)。 + ### Changed +- **精简**:删除 `plugins/web-rust-archive/`(14,235 行 Rust,非 workspace 成员、默认不构建;Go `libweb` 已取代)。Git 历史仍可追溯。 + ## v1.5.2 — 2026-10-18 ### Highlights diff --git a/Cargo.toml b/Cargo.toml index eb09a97..da42106 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,8 +63,8 @@ members = [ "plugins/linalg", "crates/marqdo-wasm", ] -# Official web plugin is Go (`plugins/web/`); Rust sources kept as -# `plugins/web-rust-archive/` for reference (not a workspace member). +# Official web plugin is Go (`plugins/web/`). The legacy Rust web plugin was +# deleted from the tree (see CHANGELOG); git history keeps it if ever needed. resolver = "2" [dev-dependencies] diff --git a/doc/design/ext-web-go-rewrite.md b/doc/design/ext-web-go-rewrite.md index fa9f5fc..03d2e44 100644 --- a/doc/design/ext-web-go-rewrite.md +++ b/doc/design/ext-web-go-rewrite.md @@ -347,7 +347,8 @@ plugins/web/ # Go module(替换原 Rust crate) scripts/build-web-plugin.sh # go build -buildmode=c-shared -o …/libweb.so ``` -原 Rust 源码:`plugins/web-rust-archive/`(**已移出 Cargo workspace**;参考用,默认不构建)。 +原 Rust 源码:曾置于 `plugins/web-rust-archive/`(已移出 Cargo workspace,参考用); +该目录已于 v1.6 精简时从工作树移除,历史保留在 git 中。 ### 9.2 产物与解析 diff --git a/plugins/web-rust-archive/Cargo.toml b/plugins/web-rust-archive/Cargo.toml deleted file mode 100644 index c232ed3..0000000 --- a/plugins/web-rust-archive/Cargo.toml +++ /dev/null @@ -1,32 +0,0 @@ -[package] -name = "marqdo_plugin_web" -version = "0.1.0" -edition = "2021" -license = "Apache-2.0" -description = "Marqdo web plugin (ABI v2) — HTTP, SQLite, page assemble" -publish = false - -[lib] -name = "web" -crate-type = ["cdylib"] - -[dependencies] -serde = { version = "1", features = ["derive"] } -serde_json = "1" -tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "sync", "time", "signal"] } -axum = { version = "0.8", features = ["ws", "json", "query", "multipart"] } -tower-http = { version = "0.6", features = ["fs", "cors", "compression-gzip", "limit", "set-header", "trace", "propagate-header"] } -rusqlite = { version = "0.32", features = ["bundled"] } -tokio-tungstenite = "0.24" -futures-util = "0.3" -argon2 = "0.5" -getrandom = "0.2" -pulldown-cmark = "0.12" -postgres = { version = "0.19", features = ["with-serde_json-1"] } -redis = { version = "0.27", default-features = true } -ureq = { version = "=2.9.7", default-features = false, features = ["tls"] } -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream", "json"] } -bytes = "1" -hmac = "0.12" -sha2 = "0.10" -hex = "0.4" diff --git a/plugins/web-rust-archive/README.md b/plugins/web-rust-archive/README.md deleted file mode 100644 index cc5100e..0000000 --- a/plugins/web-rust-archive/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# web-rust-archive - -Former Rust/axum implementation of the Marqdo web plugin (`marqdo_plugin_web`). - -**Status (W-G13):** archived reference only. The official plugin is Go under -[`plugins/web/`](../web/). This crate is **not** a Cargo workspace member and is -not built by CI or `marqdo ext add web`. - -Do not evolve features here — see [ext-web-go-rewrite.md](../../doc/design/ext-web-go-rewrite.md) C5 / ADR 0004. diff --git a/plugins/web-rust-archive/src/assets.rs b/plugins/web-rust-archive/src/assets.rs deleted file mode 100644 index 2c84979..0000000 --- a/plugins/web-rust-archive/src/assets.rs +++ /dev/null @@ -1,607 +0,0 @@ -//! Site icons, `` link/script assembly, and image HTML assembly. -//! Tables stay data; assembly is a function — 配置即数据、装配即函数. - -use serde_json::{json, Map, Value}; -use std::path::{Path, PathBuf}; - -use crate::table::normalize_ref; - -#[derive(Clone, Debug)] -pub struct HeadLink { - pub rel: String, - pub href: String, - pub type_: String, - pub sizes: String, - pub media: String, - pub as_: String, - pub crossorigin: String, - /// When `Some(true)`, emit `defer` on classic scripts (not modules). - pub defer: Option, - pub async_: bool, - /// Query `?v=` bump for cache busting. - pub version: String, -} - -#[derive(Clone, Debug)] -pub struct IconRoute { - pub url: String, - pub path: PathBuf, - pub content_type: String, -} - -fn cell_str(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -fn pick<'a>(m: &'a Map, keys: &[&str]) -> Option<&'a Value> { - keys.iter().find_map(|k| m.get(*k)) -} - -fn cell_boolish(v: &Value) -> Option { - match v { - Value::Bool(b) => Some(*b), - Value::Number(n) => Some(n.as_i64().unwrap_or(0) != 0), - Value::String(s) => { - let s = s.trim(); - if s.is_empty() { - return None; - } - if matches!( - s, - "1" | "true" | "True" | "yes" | "on" | "真" | "是" - ) { - Some(true) - } else if matches!( - s, - "0" | "false" | "False" | "no" | "off" | "假" | "否" - ) { - Some(false) - } else { - None - } - } - _ => None, - } -} - -fn row_bool(m: &Map, keys: &[&str]) -> Option { - pick(m, keys).and_then(cell_boolish) -} - -fn row_str(m: &Map, keys: &[&str]) -> String { - pick(m, keys) - .map(|v| normalize_ref(&cell_str(v))) - .unwrap_or_default() - .trim() - .to_string() -} - -/// Append `?v=` / `&v=` for cache busting. -pub fn href_with_version(href: &str, version: &str) -> String { - let version = version.trim(); - if version.is_empty() { - return href.to_string(); - } - if href.contains('?') { - format!("{href}&v={version}") - } else { - format!("{href}?v={version}") - } -} - -fn esc(s: &str) -> String { - s.replace('&', "&") - .replace('<', "<") - .replace('>', ">") - .replace('"', """) -} - -/// Infer Content-Type from file extension. -pub fn mime_for_path(path: &str) -> &'static str { - let lower = path.to_ascii_lowercase(); - if lower.ends_with(".ico") { - "image/x-icon" - } else if lower.ends_with(".png") { - "image/png" - } else if lower.ends_with(".svg") { - "image/svg+xml" - } else if lower.ends_with(".webp") { - "image/webp" - } else if lower.ends_with(".jpg") || lower.ends_with(".jpeg") { - "image/jpeg" - } else if lower.ends_with(".gif") { - "image/gif" - } else if lower.ends_with(".webmanifest") || lower.ends_with(".json") { - "application/manifest+json" - } else if lower.ends_with(".css") { - "text/css; charset=utf-8" - } else if lower.ends_with(".js") || lower.ends_with(".mjs") { - "text/javascript; charset=utf-8" - } else { - "application/octet-stream" - } -} - -fn rows_of(table: &Value) -> Vec> { - match table { - Value::Array(a) => a - .iter() - .filter_map(|v| v.as_object().cloned()) - .collect(), - Value::Object(m) => { - // Columnar GFM: { 关系: […], 地址: […] } - let keys: Vec = m.keys().cloned().collect(); - if keys.is_empty() { - return Vec::new(); - } - let len = m - .values() - .filter_map(|v| v.as_array().map(|a| a.len())) - .max() - .unwrap_or(0); - if len == 0 { - return vec![m.clone()]; - } - let mut out = Vec::with_capacity(len); - for i in 0..len { - let mut row = Map::new(); - for k in &keys { - if let Some(Value::Array(a)) = m.get(k) { - row.insert(k.clone(), a.get(i).cloned().unwrap_or(Value::Null)); - } else if i == 0 { - row.insert(k.clone(), m.get(k).cloned().unwrap_or(Value::Null)); - } - } - out.push(row); - } - out - } - _ => Vec::new(), - } -} - -/// Normalize a Head resource table → list of HeadLink. -pub fn as_head_links(table: &Value) -> Vec { - let mut out = Vec::new(); - for m in rows_of(table) { - let rel = row_str(&m, &["关系", "rel", "Rel"]); - let href = row_str( - &m, - &["地址", "href", "src", "url", "Href", "Src", "URL"], - ); - if href.is_empty() { - continue; - } - let rel = if rel.is_empty() { - "stylesheet".into() - } else { - rel - }; - out.push(HeadLink { - rel, - href, - type_: row_str(&m, &["类型", "type", "Type"]), - sizes: row_str(&m, &["尺寸", "sizes", "Sizes"]), - media: row_str(&m, &["媒体", "media", "Media"]), - as_: row_str(&m, &["作为", "as", "As"]), - crossorigin: row_str(&m, &["跨域", "crossorigin", "crossOrigin"]), - defer: row_bool(&m, &["推迟", "defer", "Defer"]), - async_: row_bool(&m, &["异步", "async", "Async"]).unwrap_or(false), - version: row_str(&m, &["版本", "version", "Version", "v"]), - }); - } - out -} - -pub fn head_links_to_json(links: &[HeadLink]) -> Value { - Value::Array( - links - .iter() - .map(|l| { - let mut o = json!({ - "rel": l.rel, - "href": l.href, - "type": l.type_, - "sizes": l.sizes, - "media": l.media, - "as": l.as_, - "crossorigin": l.crossorigin, - "async": l.async_, - "version": l.version, - }); - if let Some(d) = l.defer { - o.as_object_mut() - .unwrap() - .insert("defer".into(), json!(d)); - } - o - }) - .collect(), - ) -} - -pub fn head_links_from_json(v: &Value) -> Vec { - let Some(arr) = v.as_array() else { - return as_head_links(v); - }; - let mut out = Vec::new(); - for item in arr { - let Some(m) = item.as_object() else { - continue; - }; - let href = row_str(m, &["href", "src", "url", "地址"]); - if href.is_empty() { - continue; - } - out.push(HeadLink { - rel: row_str(m, &["rel", "关系"]), - href, - type_: row_str(m, &["type", "类型"]), - sizes: row_str(m, &["sizes", "尺寸"]), - media: row_str(m, &["media", "媒体"]), - as_: row_str(m, &["as", "作为"]), - crossorigin: row_str(m, &["crossorigin", "跨域"]), - defer: row_bool(m, &["defer", "推迟"]), - async_: row_bool(m, &["async", "异步"]).unwrap_or(false), - version: row_str(m, &["version", "版本", "v"]), - }); - } - out -} - -/// Render HeadLink list to HTML (link / script tags). -pub fn render_head_links(links: &[HeadLink]) -> String { - render_head_links_with_version(links, "") -} - -pub fn render_head_links_with_version(links: &[HeadLink], asset_version: &str) -> String { - let mut s = String::new(); - for l in links { - let rel = l.rel.trim().to_ascii_lowercase(); - let ver = if !l.version.trim().is_empty() { - l.version.as_str() - } else { - asset_version - }; - let href = href_with_version(&l.href, ver); - if rel == "script" || rel == "module" { - let mut tag = String::from("", esc(&href))); - s.push_str(&tag); - continue; - } - let mut tag = format!(""); - s.push_str(&tag); - } - s -} - -/// Module-level preview: assemble head table → HTML string. -pub fn make_head_html(table: &Value) -> String { - render_head_links(&as_head_links(table)) -} - -/// Normalize icons table → (icons json array, site_head links, file routes). -pub fn normalize_icons(table: &Value) -> (Value, Vec, Vec) { - let mut icons = Vec::new(); - let mut head = Vec::new(); - let mut routes = Vec::new(); - let mut saw_favicon_url = false; - - for m in rows_of(table) { - let path = row_str(&m, &["路径", "path", "file", "Path"]); - let mut rel = row_str(&m, &["关系", "rel", "Rel"]); - if rel.is_empty() { - rel = "icon".into(); - } - let mut type_ = row_str(&m, &["类型", "type", "Type"]); - let sizes = row_str(&m, &["尺寸", "sizes", "Sizes"]); - let mut url = row_str(&m, &["地址", "url", "href", "Href", "URL"]); - - if type_.is_empty() && !path.is_empty() { - type_ = mime_for_path(&path).to_string(); - } - if url.is_empty() { - if !path.is_empty() { - let name = Path::new(&path) - .file_name() - .and_then(|s| s.to_str()) - .unwrap_or("icon"); - let lower = path.to_ascii_lowercase(); - if rel.to_ascii_lowercase().contains("icon") && lower.ends_with(".ico") { - url = "/favicon.ico".into(); - } else { - url = format!("/icons/{name}"); - } - } else { - continue; - } - } - if url == "/favicon.ico" { - saw_favicon_url = true; - } - - icons.push(json!({ - "path": path, - "rel": rel, - "type": type_, - "sizes": sizes, - "url": url, - })); - - if !url.is_empty() { - head.push(HeadLink { - rel: rel.clone(), - href: url.clone(), - type_: type_.clone(), - sizes: sizes.clone(), - media: String::new(), - as_: String::new(), - crossorigin: String::new(), - defer: None, - async_: false, - version: String::new(), - }); - } - - if !path.is_empty() && !url.is_empty() { - routes.push(IconRoute { - url: url.clone(), - path: PathBuf::from(&path), - content_type: if type_.is_empty() { - mime_for_path(&path).to_string() - } else { - type_.clone() - }, - }); - } - } - - // Ensure browser default path if we have an icon file but no /favicon.ico. - if !saw_favicon_url { - if let Some(first) = icons.iter().find(|v| { - v.get("rel") - .and_then(|r| r.as_str()) - .map(|r| r.to_ascii_lowercase().contains("icon")) - .unwrap_or(false) - && v.get("path") - .and_then(|p| p.as_str()) - .map(|p| !p.is_empty()) - .unwrap_or(false) - }) { - let path = first.get("path").and_then(|v| v.as_str()).unwrap_or(""); - let type_ = first - .get("type") - .and_then(|v| v.as_str()) - .unwrap_or_else(|| mime_for_path(path)); - routes.push(IconRoute { - url: "/favicon.ico".into(), - path: PathBuf::from(path), - content_type: type_.to_string(), - }); - head.insert( - 0, - HeadLink { - rel: "icon".into(), - href: "/favicon.ico".into(), - type_: type_.to_string(), - sizes: first - .get("sizes") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(), - media: String::new(), - as_: String::new(), - crossorigin: String::new(), - defer: None, - async_: false, - version: String::new(), - }, - ); - } - } - - (Value::Array(icons), head, routes) -} - -/// Convention: if static_dir has favicon.ico|png|svg and icons empty, register defaults. -pub fn convention_favicon(static_dir: &Path) -> Option<(Vec, Vec)> { - for name in ["favicon.ico", "favicon.png", "favicon.svg"] { - let p = static_dir.join(name); - if p.is_file() { - let ct = mime_for_path(name).to_string(); - let head = vec![HeadLink { - rel: "icon".into(), - href: "/favicon.ico".into(), - type_: ct.clone(), - sizes: String::new(), - media: String::new(), - as_: String::new(), - crossorigin: String::new(), - defer: None, - async_: false, - version: String::new(), - }]; - let routes = vec![IconRoute { - url: "/favicon.ico".into(), - path: p, - content_type: ct, - }]; - return Some((head, routes)); - } - } - None -} - -/// Merge site_head into a page value (dedupe by href+rel). -pub fn merge_site_head(page: &mut Value, site_head: &[HeadLink]) { - if site_head.is_empty() { - return; - } - let obj = match page.as_object_mut() { - Some(o) => o, - None => return, - }; - let mut existing = obj - .get("head") - .map(head_links_from_json) - .unwrap_or_default(); - for link in site_head { - let dup = existing.iter().any(|e| { - e.href == link.href && e.rel.eq_ignore_ascii_case(&link.rel) - }); - if !dup { - existing.push(link.clone()); - } - } - obj.insert("head".into(), head_links_to_json(&existing)); -} - -/// GFM image table → HTML fragment. -pub fn make_images_html(table: &Value) -> String { - let mut figures = String::new(); - for m in rows_of(table) { - let src = row_str(&m, &["源", "src", "Src", "url", "URL"]); - if src.is_empty() { - continue; - } - let alt = row_str(&m, &["替代", "alt", "Alt"]); - let title = row_str(&m, &["标题", "title", "Title"]); - let class = row_str(&m, &["类", "class", "Class"]); - let href = row_str(&m, &["链接", "href", "link", "Href", "Link"]); - let width = row_str(&m, &["宽度", "width", "Width"]); - let height = row_str(&m, &["高度", "height", "Height"]); - let mut loading = row_str(&m, &["加载", "loading", "Loading"]); - if loading.is_empty() { - loading = "lazy".into(); - } - let caption = row_str(&m, &["图注", "caption", "Caption"]); - - let mut img = format!("\"{}\"",", esc(&loading))); - - let inner = if href.is_empty() { - img - } else { - format!("{}", esc(&href), img) - }; - - let fig_class = if class.is_empty() { - "mq-img".into() - } else { - format!("mq-img {}", class) - }; - figures.push_str(&format!("
{}", fig_class, inner)); - if !caption.is_empty() { - figures.push_str(&format!("
{}
", esc(&caption))); - } - figures.push_str("
"); - } - if figures.is_empty() { - return String::new(); - } - format!("
{figures}
") -} - -#[cfg(test)] -mod tests { - use super::*; - use serde_json::json; - - #[test] - fn images_basic() { - let t = json!([ - {"源": "/a.png", "替代": "A", "类": "logo", "加载": "eager"} - ]); - let h = make_images_html(&t); - assert!(h.contains("mq-images")); - assert!(h.contains("src=\"/a.png\"")); - assert!(h.contains("loading=\"eager\"")); - assert!(h.contains("class=\"mq-img logo\"")); - } - - #[test] - fn head_script_and_icon() { - let t = json!([ - {"关系": "icon", "地址": "/favicon.ico", "类型": "image/x-icon"}, - {"关系": "script", "地址": "/static/a.js"} - ]); - let h = make_head_html(&t); - assert!(h.contains("rel=\"icon\"")); - assert!(h.contains("")); - assert!(!h.contains(" defer"), "{h}"); - } - - #[test] - fn head_script_defer_async_version() { - let t = json!([ - {"关系": "script", "地址": "/static/a.js", "推迟": true, "版本": "3"}, - {"关系": "module", "地址": "/static/b.js", "版本": "9"}, - {"关系": "stylesheet", "地址": "/static/t.css", "版本": "1"}, - ]); - let h = make_head_html(&t); - assert!(h.contains(""), "{h}"); - assert!(h.contains("type=\"module\""), "{h}"); - assert!(h.contains("src=\"/static/b.js?v=9\""), "{h}"); - assert!(h.contains("href=\"/static/t.css?v=1\""), "{h}"); - } - - #[test] - fn head_asset_version_fallback() { - let links = as_head_links(&json!([ - {"关系": "script", "地址": "/static/a.js", "推迟": "真"}, - ])); - let h = render_head_links_with_version(&links, "2026-09-04"); - assert!( - h.contains(""), - "{h}" - ); - } -} diff --git a/plugins/web-rust-archive/src/cache.rs b/plugins/web-rust-archive/src/cache.rs deleted file mode 100644 index d093cea..0000000 --- a/plugins/web-rust-archive/src/cache.rs +++ /dev/null @@ -1,242 +0,0 @@ -//! `# cache` — Redis or in-process memory (design ext-web-drivers). - -use serde_json::{json, Value}; -use std::collections::HashMap; -use std::sync::Mutex; -use std::time::{SystemTime, UNIX_EPOCH}; - -struct Entry { - value: String, - /// Absolute expiry unix secs; `None` = no TTL. - exp: Option, -} - -struct MemStore { - data: HashMap, -} - -enum Backend { - Memory(MemStore), - /// Redis URL — connections opened per call (simple; enough for W4). - RedisUrl(String), -} - -static HANDLES: Mutex>> = Mutex::new(None); - -fn now() -> u64 { - SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|d| d.as_secs()) - .unwrap_or(0) -} - -fn with_map(f: impl FnOnce(&mut HashMap) -> T) -> T { - let mut g = HANDLES.lock().unwrap_or_else(|e| e.into_inner()); - let m = g.get_or_insert_with(HashMap::new); - f(m) -} - -fn is_memory(url: &str) -> bool { - let u = url.trim().to_ascii_lowercase(); - u.is_empty() || u == "memory:" || u == "memory://" || u.starts_with("memory:") -} - -fn is_redis(url: &str) -> bool { - let u = url.trim().to_ascii_lowercase(); - u.starts_with("redis://") || u.starts_with("rediss://") -} - -/// Open (or reuse) a cache handle. Returns `{ _type, url }`. -pub fn open(url: &str) -> Result { - let url = if url.trim().is_empty() { - "memory:" - } else { - url.trim() - }; - if !is_memory(url) && !is_redis(url) { - return Err(format!( - "cache url must be `memory:` or `redis://…`, got `{url}`" - )); - } - with_map(|m| { - if !m.contains_key(url) { - let backend = if is_memory(url) { - Backend::Memory(MemStore { - data: HashMap::new(), - }) - } else { - Backend::RedisUrl(url.to_string()) - }; - m.insert(url.to_string(), backend); - } - }); - Ok(json!({ "_type": "cache", "url": url })) -} - -fn prune_mem(store: &mut MemStore) { - let t = now(); - store.data.retain(|_, e| e.exp.map(|x| x > t).unwrap_or(true)); -} - -fn with_backend(url: &str, f: impl FnOnce(&mut Backend) -> Result) -> Result { - with_map(|m| { - let b = m - .get_mut(url) - .ok_or_else(|| format!("cache `{url}` not opened — call cache.new first"))?; - f(b) - }) -} - -pub fn get(url: &str, key: &str) -> Result { - with_backend(url, |b| match b { - Backend::Memory(store) => { - prune_mem(store); - match store.data.get(key) { - Some(e) => Ok(json!({ "ok": true, "value": e.value })), - None => Ok(json!({ "ok": false })), - } - } - Backend::RedisUrl(u) => redis_get(u, key), - }) -} - -pub fn set(url: &str, key: &str, value: &str, ttl_sec: Option) -> Result { - with_backend(url, |b| match b { - Backend::Memory(store) => { - prune_mem(store); - let exp = ttl_sec.filter(|t| *t > 0).map(|t| now() + t); - store.data.insert( - key.to_string(), - Entry { - value: value.to_string(), - exp, - }, - ); - Ok(json!({ "ok": true })) - } - Backend::RedisUrl(u) => redis_set(u, key, value, ttl_sec), - }) -} - -pub fn del(url: &str, key: &str) -> Result { - with_backend(url, |b| match b { - Backend::Memory(store) => { - let ok = store.data.remove(key).is_some(); - Ok(json!({ "ok": ok })) - } - Backend::RedisUrl(u) => redis_del(u, key), - }) -} - -pub fn exists(url: &str, key: &str) -> Result { - with_backend(url, |b| match b { - Backend::Memory(store) => { - prune_mem(store); - Ok(json!({ "ok": store.data.contains_key(key) })) - } - Backend::RedisUrl(u) => redis_exists(u, key), - }) -} - -pub fn ttl(url: &str, key: &str) -> Result { - with_backend(url, |b| match b { - Backend::Memory(store) => { - prune_mem(store); - match store.data.get(key) { - Some(e) => { - let left = match e.exp { - Some(x) => x.saturating_sub(now()) as i64, - None => -1, - }; - Ok(json!({ "ok": true, "ttl": left })) - } - None => Ok(json!({ "ok": false, "ttl": -2 })), - } - } - Backend::RedisUrl(u) => redis_ttl(u, key), - }) -} - -fn redis_get(url: &str, key: &str) -> Result { - let client = redis::Client::open(url).map_err(|e| e.to_string())?; - let mut con = client.get_connection().map_err(|e| e.to_string())?; - let v: Option = redis::cmd("GET") - .arg(key) - .query(&mut con) - .map_err(|e| e.to_string())?; - match v { - Some(s) => Ok(json!({ "ok": true, "value": s })), - None => Ok(json!({ "ok": false })), - } -} - -fn redis_set(url: &str, key: &str, value: &str, ttl_sec: Option) -> Result { - let client = redis::Client::open(url).map_err(|e| e.to_string())?; - let mut con = client.get_connection().map_err(|e| e.to_string())?; - match ttl_sec.filter(|t| *t > 0) { - Some(t) => { - redis::cmd("SETEX") - .arg(key) - .arg(t) - .arg(value) - .query::<()>(&mut con) - .map_err(|e| e.to_string())?; - } - None => { - redis::cmd("SET") - .arg(key) - .arg(value) - .query::<()>(&mut con) - .map_err(|e| e.to_string())?; - } - } - Ok(json!({ "ok": true })) -} - -fn redis_del(url: &str, key: &str) -> Result { - let client = redis::Client::open(url).map_err(|e| e.to_string())?; - let mut con = client.get_connection().map_err(|e| e.to_string())?; - let n: i64 = redis::cmd("DEL") - .arg(key) - .query(&mut con) - .map_err(|e| e.to_string())?; - Ok(json!({ "ok": n > 0 })) -} - -fn redis_exists(url: &str, key: &str) -> Result { - let client = redis::Client::open(url).map_err(|e| e.to_string())?; - let mut con = client.get_connection().map_err(|e| e.to_string())?; - let n: i64 = redis::cmd("EXISTS") - .arg(key) - .query(&mut con) - .map_err(|e| e.to_string())?; - Ok(json!({ "ok": n > 0 })) -} - -fn redis_ttl(url: &str, key: &str) -> Result { - let client = redis::Client::open(url).map_err(|e| e.to_string())?; - let mut con = client.get_connection().map_err(|e| e.to_string())?; - let t: i64 = redis::cmd("TTL") - .arg(key) - .query(&mut con) - .map_err(|e| e.to_string())?; - Ok(json!({ "ok": t >= -1, "ttl": t })) -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn memory_roundtrip() { - let url = "memory:test-cache"; - open(url).unwrap(); - set(url, "a", "1", Some(60)).unwrap(); - let g = get(url, "a").unwrap(); - assert_eq!(g["ok"], true); - assert_eq!(g["value"], "1"); - assert_eq!(exists(url, "a").unwrap()["ok"], true); - del(url, "a").unwrap(); - assert_eq!(get(url, "a").unwrap()["ok"], false); - } -} diff --git a/plugins/web-rust-archive/src/compose.rs b/plugins/web-rust-archive/src/compose.rs deleted file mode 100644 index c3fc609..0000000 --- a/plugins/web-rust-archive/src/compose.rs +++ /dev/null @@ -1,248 +0,0 @@ -//! Page assemble: compose_components / compose_main. - -use serde_json::{json, Map, Value}; - -use crate::table::{ - as_bind, as_compose, as_css_named, bind_table_name, normalize_ref, normalize_slot, - parse_site_path, SitePath, -}; - -pub fn compose_components( - page: &Value, - layout: &Value, - mut call_lib: impl FnMut(&str) -> Result, -) -> Result { - let mut obj = page.as_object().cloned().unwrap_or_default(); - let rows = as_compose(layout); - let mut css = obj - .get("styles_css") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - let mut slot_class = obj - .get("slot_class") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - let mut parts = Map::new(); - let mut compose_out = Vec::new(); - - for row in rows.as_array().cloned().unwrap_or_default() { - let src_raw = row.get("src").and_then(|v| v.as_str()).unwrap_or(""); - let style_raw = row.get("style").and_then(|v| v.as_str()).unwrap_or(""); - if src_raw.is_empty() { - continue; - } - let (name, bind_table) = match parse_site_path(src_raw) { - SitePath::LibMember { lib, member } => { - let t = call_lib(&format!("{lib}.{member}"))?; - (member, t) - } - SitePath::Plain(s) => { - let t = call_lib(&format!("{s}.{s}"))?; - (s, t) - } - SitePath::DbField { .. } => { - return Err(format!("component cell cannot be a db field: {src_raw}")); - } - }; - let slot = normalize_slot(&name); - let style_name = if style_raw.is_empty() { - String::new() - } else { - match parse_site_path(style_raw) { - SitePath::LibMember { lib, member } => { - let st = call_lib(&format!("{lib}.{member}"))?; - css.push_str(&as_css_named(&member, &st)); - member - } - SitePath::Plain(s) => s, - SitePath::DbField { .. } => normalize_ref(style_raw), - } - }; - let binds = as_bind(&bind_table); - match slot.as_str() { - "nav" => obj.insert("nav".into(), binds.clone()), - "sidebar" => obj.insert("sidebar".into(), binds.clone()), - "footer" => obj.insert("footer".into(), binds.clone()), - _ => obj.insert("main".into(), binds.clone()), - }; - if !style_name.is_empty() { - slot_class.insert(slot.clone(), json!(style_name)); - } - compose_out.push(json!({ "src": name, "style": style_name, "slot": slot })); - - let mut part = Map::new(); - part.insert("_type".into(), json!("page")); - part.insert("slot".into(), json!(slot)); - part.insert("fragment".into(), json!(slot)); - match slot.as_str() { - "nav" => { - part.insert("nav".into(), binds); - } - "sidebar" => { - part.insert("sidebar".into(), binds); - } - "footer" => { - part.insert("footer".into(), binds); - } - _ => { - part.insert("main".into(), binds); - } - } - parts.insert(name, Value::Object(part)); - } - - obj.insert("compose".into(), Value::Array(compose_out)); - if !css.is_empty() { - obj.insert("styles_css".into(), json!(css)); - } - if !slot_class.is_empty() { - obj.insert("slot_class".into(), Value::Object(slot_class)); - } - if !parts.is_empty() { - obj.insert("parts".into(), Value::Object(parts)); - } - Ok(Value::Object(obj)) -} - -pub fn compose_main( - page: &Value, - main_table: &Value, - mut call_lib: impl FnMut(&str) -> Result, -) -> Result { - let mut obj = page.as_object().cloned().unwrap_or_default(); - let raw = as_bind(main_table); - let arr = raw.as_array().cloned().unwrap_or_default(); - let mut binds = Vec::new(); - let mut css = obj - .get("styles_css") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - - for b in arr { - let front = b - .get("front") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - let back_raw = b.get("back").and_then(|v| v.as_str()).unwrap_or(""); - let css_raw = b.get("css").and_then(|v| v.as_str()).unwrap_or(""); - - let back = match parse_site_path(back_raw) { - SitePath::DbField { table, field } => format!("{table}.{field}"), - SitePath::Plain(s) => s, - SitePath::LibMember { lib, member } => { - // Try a module member (e.g. `theme.hero`); if the lib is unknown, - // treat `a.b` as a DB field `a.b` (table `a`, column `b`). - match call_lib(&format!("{lib}.{member}")) { - Ok(v) => match v { - Value::String(s) => s, - other => other.to_string(), - }, - Err(_) => format!("{lib}.{member}"), - } - } - }; - let css_name = match parse_site_path(css_raw) { - SitePath::LibMember { lib, member } => { - let st = call_lib(&format!("{lib}.{member}"))?; - css.push_str(&as_css_named(&member, &st)); - member - } - SitePath::Plain(s) => s, - SitePath::DbField { .. } => normalize_ref(css_raw), - }; - binds.push(json!({ "front": front, "back": back, "css": css_name })); - } - - if let Some(t) = bind_table_name(&binds) { - obj.insert("table".into(), json!(t)); - } - obj.insert("main".into(), Value::Array(binds.clone())); - if !css.is_empty() { - obj.insert("styles_css".into(), json!(css)); - } - - let mut parts = obj - .get("parts") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - let mut part = Map::new(); - part.insert("_type".into(), json!("page")); - part.insert("slot".into(), json!("main")); - part.insert("fragment".into(), json!("main")); - part.insert("main".into(), Value::Array(binds)); - if let Some(intro) = obj.get("intro") { - part.insert("intro".into(), intro.clone()); - } - parts.insert("index".into(), Value::Object(part)); - obj.insert("parts".into(), Value::Object(parts)); - Ok(Value::Object(obj)) -} - -/// Embed a form into the page main slot (`form_id` → POST `/_form/{id}`). -/// -/// Optional `form_target` (CSS id / `#id`) mounts the form **inside** intro HTML -/// at that element instead of appending a sibling `.site-form` (GAP-11). -pub fn compose_form( - page: &Value, - form: &Value, - form_id: &str, - form_target: Option<&str>, -) -> Result { - let id = form_id.trim(); - if id.is_empty() { - return Err("compose_form requires non-empty `id`".into()); - } - let mut obj = page.as_object().cloned().unwrap_or_default(); - let mut frm = form.clone(); - if let Some(m) = frm.as_object_mut() { - // Quieter meta when sitting inside a page shell. - m.entry("show_meta".to_string()).or_insert(json!(false)); - if !m.contains_key("title") { - m.insert("title".into(), json!(id)); - } - } - obj.insert("form_id".into(), json!(id)); - obj.insert("form".into(), frm.clone()); - let target = form_target - .map(str::trim) - .filter(|s| !s.is_empty()) - .map(|s| s.to_string()); - if let Some(ref t) = target { - obj.insert("form_target".into(), json!(t)); - } else { - obj.remove("form_target"); - } - let mut forms = obj - .get("forms") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - forms.insert(id.to_string(), frm.clone()); - obj.insert("forms".into(), Value::Object(forms)); - - let mut parts = obj - .get("parts") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - let mut part = Map::new(); - part.insert("_type".into(), json!("page")); - part.insert("slot".into(), json!("main")); - part.insert("fragment".into(), json!("main")); - part.insert("form_id".into(), json!(id)); - part.insert("form".into(), frm); - if let Some(ref t) = target { - part.insert("form_target".into(), json!(t)); - } - if let Some(intro) = obj.get("intro") { - part.insert("intro".into(), intro.clone()); - } - parts.insert(format!("form_{id}"), Value::Object(part)); - obj.insert("parts".into(), Value::Object(parts)); - Ok(Value::Object(obj)) -} diff --git a/plugins/web-rust-archive/src/db.rs b/plugins/web-rust-archive/src/db.rs deleted file mode 100644 index 5251c21..0000000 --- a/plugins/web-rust-archive/src/db.rs +++ /dev/null @@ -1,1257 +0,0 @@ -//! SQLite helpers for `# db` CRUD and W2 data-layer capabilities. -//! -//! - **连接池**:进程级 `Pool` 复用连接(WAL + busy_timeout + foreign_keys), -//! 避免每请求重连与并发写 `database is locked`。 -//! - **事务**:`begin` 把连接从池中借出并独占,`commit` / `rollback` 后归还。 -//! - **查询表达力**:where 支持 OR 组、`in` / `between` / `is null`。 -//! - **分页**:`select` 支持 `offset`,返回 `{rows, total}`。 - -use rusqlite::{types::ValueRef, Connection, OptionalExtension, params_from_iter}; -use serde_json::{json, Map, Value}; -use std::collections::HashMap; -use std::path::PathBuf; -use std::sync::{Arc, Mutex}; - -/// Process-wide pool: url → shared connection. Connections are reused across -/// calls instead of reopening per request. -static POOL: Mutex>>>> = Mutex::new(None); - -/// Process-wide active transactions: txn id → (url, borrowed connection). -static TXNS: Mutex>)>>> = - Mutex::new(None); - -/// Reset pools (used between listens / tests). -#[allow(dead_code)] -pub fn reset_pool() { - let mut p = POOL.lock().unwrap_or_else(|e| e.into_inner()); - *p = Some(HashMap::new()); - let mut t = TXNS.lock().unwrap_or_else(|e| e.into_inner()); - *t = Some(HashMap::new()); -} - -fn next_txn_id() -> String { - use std::time::{SystemTime, UNIX_EPOCH}; - let nanos = SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|d| d.subsec_nanos()) - .unwrap_or(0); - let pid = std::process::id(); - static COUNTER: Mutex = Mutex::new(0x243f_6a88_85a3_08d3); - let mut c = COUNTER.lock().unwrap_or_else(|e| e.into_inner()); - let mut x = *c; - x ^= x << 13; - x ^= x >> 7; - x ^= x << 17; - *c = x; - format!("txn-{pid:x}{nanos:x}{x:x}") -} - -/// Open (or reuse) a pooled connection. WAL + busy_timeout + foreign_keys are -/// applied once per physical connection. -fn pooled(url: &str) -> Result>, String> { - let mut guard = POOL.lock().unwrap_or_else(|e| e.into_inner()); - let pool = guard.get_or_insert_with(HashMap::new); - if let Some(c) = pool.get(url) { - return Ok(c.clone()); - } - let conn = open_conn(url)?; - let arc = Arc::new(Mutex::new(conn)); - pool.insert(url.to_string(), arc.clone()); - Ok(arc) -} - -/// Open a fresh physical connection to `url`, creating parent dirs as needed. -fn open_conn(url: &str) -> Result { - let path = url - .strip_prefix("sqlite:") - .or_else(|| url.strip_prefix("SQLITE:")) - .unwrap_or(url); - if let Some(parent) = PathBuf::from(path).parent() { - if !parent.as_os_str().is_empty() { - std::fs::create_dir_all(parent).map_err(|e| e.to_string())?; - } - } - let conn = Connection::open(path).map_err(|e| e.to_string())?; - conn.execute_batch( - "PRAGMA foreign_keys = ON; - PRAGMA journal_mode = WAL; - PRAGMA busy_timeout = 5000;", - ) - .map_err(|e| e.to_string())?; - Ok(conn) -} - -/// Borrow a connection for a single statement. If `txn_id` is set, the txn's -/// borrowed connection is used (transactional reads/writes); otherwise the pool. -fn conn_for<'a>( - url: &str, - txn_id: Option<&'a str>, -) -> Result>, String> { - if let Some(tid) = txn_id { - let guard = TXNS.lock().unwrap_or_else(|e| e.into_inner()); - match guard.as_ref().and_then(|m| m.get(tid)) { - Some((_, c)) => Ok(c.clone()), - None => Err(format!("unknown transaction `{tid}`")), - } - } else { - pooled(url) - } -} - -fn ident(s: &str) -> Result<&str, String> { - let s = s.trim(); - if s.is_empty() - || !s - .chars() - .all(|c| c.is_ascii_alphanumeric() || c == '_') - { - return Err(format!("bad identifier `{s}`")); - } - Ok(s) -} - -fn sql_type(t: &str) -> &'static str { - match t.trim().to_ascii_lowercase().as_str() { - "int" | "integer" => "INTEGER", - "real" | "float" | "double" => "REAL", - "blob" => "BLOB", - "timestamp" | "datetime" | "timestamptz" | "审计" => "TEXT", - _ => "TEXT", - } -} - -/// Parse `posts.id` / `posts(id)` / `posts` → (`posts`, `id`). -fn parse_fk(raw: &str) -> Result<(String, String), String> { - let s = raw.trim(); - if s.is_empty() { - return Err("empty foreign key".into()); - } - if let Some((t, rest)) = s.split_once('(') { - let col = rest.trim().trim_end_matches(')').trim(); - let t = ident(t)?.to_string(); - let col = if col.is_empty() { - "id".into() - } else { - ident(col)?.to_string() - }; - return Ok((t, col)); - } - if let Some((t, c)) = s.split_once('.') { - return Ok((ident(t)?.to_string(), ident(c)?.to_string())); - } - Ok((ident(s)?.to_string(), "id".into())) -} - -fn utc_now_iso() -> String { - use std::time::{SystemTime, UNIX_EPOCH}; - let secs = SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|d| d.as_secs()) - .unwrap_or(0); - // Keep it SQL-friendly ISO without extra deps. - let days = secs / 86400; - let tod = secs % 86400; - let h = tod / 3600; - let m = (tod % 3600) / 60; - let s = tod % 60; - // Civil date from days since 1970-01-01 (Howard Hinnant algorithm). - let z = days as i64 + 719468; - let era = if z >= 0 { z } else { z - 146096 } / 146097; - let doe = (z - era * 146097) as u64; - let yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365; - let y = yoe as i64 + era * 400; - let doy = doe - (365 * yoe + yoe / 4 - yoe / 100); - let mp = (5 * doy + 2) / 153; - let d = doy - (153 * mp + 2) / 5 + 1; - let mo = if mp < 10 { mp + 3 } else { mp - 9 }; - let y = if mo <= 2 { y + 1 } else { y }; - format!("{y:04}-{mo:02}-{d:02}T{h:02}:{m:02}:{s:02}Z") -} - -/// Column names present on `table` (SQLite). -fn column_names(url: &str, table: &str, txn_id: Option<&str>) -> Result, String> { - let table = ident(table)?; - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let sql = format!("PRAGMA table_info(\"{table}\")"); - let mut stmt = c.prepare(&sql).map_err(|e| e.to_string())?; - let rows = stmt - .query_map([], |row| row.get::<_, String>(1)) - .map_err(|e| e.to_string())?; - let mut out = Vec::new(); - for r in rows { - out.push(r.map_err(|e| e.to_string())?); - } - Ok(out) -} - -fn cell_str(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -fn to_sql(v: &Value) -> rusqlite::types::Value { - match v { - Value::Null => rusqlite::types::Value::Null, - Value::Bool(b) => rusqlite::types::Value::Integer(if *b { 1 } else { 0 }), - Value::Number(n) => { - if let Some(i) = n.as_i64() { - rusqlite::types::Value::Integer(i) - } else if let Some(f) = n.as_f64() { - rusqlite::types::Value::Real(f) - } else { - rusqlite::types::Value::Text(n.to_string()) - } - } - Value::String(s) => { - let t = s.trim(); - if let Ok(i) = t.parse::() { - rusqlite::types::Value::Integer(i) - } else if let Ok(f) = t.parse::() { - if !t.contains('e') && !t.contains('E') && t.contains('.') { - rusqlite::types::Value::Real(f) - } else { - rusqlite::types::Value::Text(s.clone()) - } - } else { - rusqlite::types::Value::Text(s.clone()) - } - } - other => rusqlite::types::Value::Text(other.to_string()), - } -} - -fn from_sql(v: ValueRef<'_>) -> Value { - match v { - ValueRef::Null => Value::Null, - ValueRef::Integer(i) => json!(i), - ValueRef::Real(f) => json!(f), - ValueRef::Text(t) => Value::String(String::from_utf8_lossy(t).into_owned()), - ValueRef::Blob(b) => Value::String(format!("blob:{}b", b.len())), - } -} - -/// `fields` = list of {name,type,nullable?} or columnar schema table already normalized. -pub fn init(url: &str, table: &str, fields: &Value) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::init(url, table, fields); - } - let table = ident(table)?; - let cols = crate::table::as_fields(fields); - let arr = cols.as_array().ok_or("fields must be a list")?; - if arr.is_empty() { - return Err("empty fields".into()); - } - let mut parts = Vec::new(); - let mut has_pk = false; - let mut index_sql = Vec::new(); - for c in arr { - let name = c - .get("name") - .or_else(|| c.get("字段")) - .map(cell_str) - .unwrap_or_default(); - let name = ident(&name)?; - let ty = c - .get("type") - .or_else(|| c.get("类型")) - .map(cell_str) - .unwrap_or_else(|| "text".into()); - let nullable = c - .get("nullable") - .or_else(|| c.get("可空")) - .and_then(|v| match v { - Value::Bool(b) => Some(*b), - Value::String(s) => Some(matches!(s.as_str(), "true" | "True" | "1" | "是" | "可")), - _ => None, - }) - .unwrap_or(true); - let unique = c - .get("unique") - .or_else(|| c.get("唯一")) - .and_then(|v| match v { - Value::Bool(b) => Some(*b), - Value::String(s) => { - Some(matches!(s.as_str(), "true" | "True" | "1" | "yes" | "是" | "唯一")) - } - _ => None, - }) - .unwrap_or(false); - let index = c - .get("index") - .or_else(|| c.get("索引")) - .and_then(|v| match v { - Value::Bool(b) => Some(*b), - Value::String(s) => { - Some(matches!(s.as_str(), "true" | "True" | "1" | "yes" | "是" | "索引")) - } - _ => None, - }) - .unwrap_or(false); - let mut col = format!("\"{name}\" {}", sql_type(&ty)); - if name == "id" && !has_pk { - col.push_str(" PRIMARY KEY"); - if sql_type(&ty) == "INTEGER" { - col.push_str(" AUTOINCREMENT"); - } - has_pk = true; - } else if !nullable { - col.push_str(" NOT NULL"); - } - if unique && name != "id" { - col.push_str(" UNIQUE"); - } - let fk_raw = c - .get("fk") - .or_else(|| c.get("外键")) - .map(cell_str) - .unwrap_or_default(); - if !fk_raw.is_empty() { - let (ref_table, ref_col) = parse_fk(&fk_raw)?; - col.push_str(&format!(" REFERENCES \"{ref_table}\"(\"{ref_col}\")")); - } - parts.push(col); - if (index || unique) && name != "id" { - let kind = if unique { "UNIQUE " } else { "" }; - index_sql.push(format!( - "CREATE {kind}INDEX IF NOT EXISTS \"idx_{table}_{name}\" ON \"{table}\" (\"{name}\")" - )); - } - } - let sql = format!( - "CREATE TABLE IF NOT EXISTS \"{table}\" ({})", - parts.join(", ") - ); - let conn = pooled(url)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.execute_batch(&sql).map_err(|e| e.to_string())?; - for stmt in index_sql { - c.execute_batch(&stmt).map_err(|e| e.to_string())?; - } - Ok(json!({ "_type": "db_table", "name": table, "url": url })) -} - -pub fn insert(url: &str, table: &str, rows: &Value, txn_id: Option<&str>) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::insert(url, table, rows, txn_id); - } - let table = ident(table)?; - let cols_present = column_names(url, table, txn_id)?; - let has_created = cols_present.iter().any(|c| c == "created_at"); - let has_updated = cols_present.iter().any(|c| c == "updated_at"); - let rows = crate::table::as_rows(rows); - let arr = rows.as_array().ok_or("rows must be a list")?; - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let mut n = 0i64; - let now = utc_now_iso(); - for row in arr { - let obj = row.as_object().ok_or("row must be a map")?; - let mut cols = Vec::new(); - let mut placeholders = Vec::new(); - let mut vals = Vec::new(); - let mut seen_created = false; - let mut seen_updated = false; - for (k, v) in obj { - if k == "@" || k == "行" || k == "row" { - continue; - } - let _ = ident(k)?; - if k == "created_at" { - seen_created = true; - } - if k == "updated_at" { - seen_updated = true; - } - cols.push(format!("\"{k}\"")); - placeholders.push("?"); - vals.push(to_sql(v)); - } - if has_created && !seen_created { - cols.push("\"created_at\"".into()); - placeholders.push("?"); - vals.push(rusqlite::types::Value::Text(now.clone())); - } - if has_updated && !seen_updated { - cols.push("\"updated_at\"".into()); - placeholders.push("?"); - vals.push(rusqlite::types::Value::Text(now.clone())); - } - if cols.is_empty() { - continue; - } - let sql = format!( - "INSERT INTO \"{table}\" ({}) VALUES ({})", - cols.join(", "), - placeholders.join(", ") - ); - c.execute(&sql, params_from_iter(vals.iter().cloned())) - .map_err(|e| e.to_string())?; - n += 1; - } - Ok(json!({ "ok": true, "inserted": n })) -} - -fn skip_where_key(k: &str) -> bool { - matches!(k, "@" | "行" | "row") || k.starts_with('_') -} - -fn where_op(raw: &str) -> Result<&'static str, String> { - match raw.trim().to_ascii_lowercase().as_str() { - "" | "=" | "eq" | "==" | "等于" => Ok("="), - "!=" | "<>" | "ne" | "不等于" => Ok("!="), - ">" | "gt" | "大于" => Ok(">"), - ">=" | "gte" | "大于等于" => Ok(">="), - "<" | "lt" | "小于" => Ok("<"), - "<=" | "lte" | "小于等于" => Ok("<="), - "like" | "contains" | "包含" | "匹配" => Ok("LIKE"), - "in" | "在" => Ok("IN"), - "between" | "介于" | "在之间" => Ok("BETWEEN"), - "is null" | "isnull" | "为空" | "空" => Ok("IS NULL"), - other => Err(format!("unsupported where op `{other}`")), - } -} - -/// One parsed filter clause: column, op, bound values, and whether the clause -/// joins the previous one with `OR` (false ⇒ AND). -struct Clause { - expr: String, - vals: Vec, - or: bool, -} - -fn in_values(v: &Value) -> Vec { - match v { - Value::Array(a) => a.iter().map(to_sql).collect(), - Value::String(s) => s - .split(',') - .map(|p| to_sql(&Value::String(p.trim().to_string()))) - .collect(), - other => vec![to_sql(other)], - } -} - -fn between_values(v: &Value) -> Result, String> { - match v { - Value::Array(a) if a.len() == 2 => Ok(vec![to_sql(&a[0]), to_sql(&a[1])]), - Value::String(s) => { - let mut it = s.split(','); - let lo = it.next().unwrap_or("").trim().to_string(); - let hi = it.next().unwrap_or("").trim().to_string(); - Ok(vec![ - to_sql(&Value::String(lo)), - to_sql(&Value::String(hi)), - ]) - } - _ => Err("between expects two bounds (\"lo,hi\" or [lo,hi])".into()), - } -} - -/// Parse a filter table row into a `Clause`. -fn clause_from_row(m: &Map) -> Result, String> { - let field = m - .get("field") - .or_else(|| m.get("字段")) - .or_else(|| m.get("列")) - .map(cell_str) - .unwrap_or_default(); - if field.is_empty() { - return Ok(None); - } - let col = ident(&field)?; - let op = where_op( - &m.get("op") - .or_else(|| m.get("操作")) - .map(cell_str) - .unwrap_or_default(), - )?; - let val = m - .get("value") - .or_else(|| m.get("值")) - .cloned() - .unwrap_or(Value::Null); - let or = m - .get("or") - .or_else(|| m.get("或")) - .and_then(|v| match v { - Value::Bool(b) => Some(*b), - Value::String(s) => Some(matches!(s.trim().to_ascii_lowercase().as_str(), "1" | "true" | "是" | "or" | "或者")), - _ => None, - }) - .unwrap_or(false); - - let (expr, vals) = match op { - "IS NULL" => (format!("\"{col}\" IS NULL"), vec![]), - "IN" => { - let vs = in_values(&val); - let ph: Vec<&str> = vs.iter().map(|_| "?").collect(); - ( - format!("\"{col}\" IN ({})", ph.join(", ")), - vs, - ) - } - "BETWEEN" => { - let vs = between_values(&val)?; - (format!("\"{col}\" BETWEEN ? AND ?"), vs) - } - _ => (format!("\"{col}\" {op} ?"), vec![to_sql(&val)]), - }; - Ok(Some(Clause { expr, vals, or })) -} - -/// Parse simple filters: map of column→value (AND `=`), or rows -/// `{field|字段, op|操作|=, value|值, or|或?}` / `{列, 值}`. -/// Supports `in` / `between` / `is null` and OR groups via the `或` column. -/// -/// GFM tables reach the plugin in columnar form (`{字段:[…], 值:[…]}`), so the -/// value is first normalized via `as_rows` into a row list. -fn parse_where(where_v: Option<&Value>) -> Result<(Vec, Vec), String> { - let mut clauses: Vec = Vec::new(); - let Some(w) = where_v else { - return Ok((vec![], vec![])); - }; - // Normalize GFM tables (columnar object) into row arrays; a single map - // (column→value filter) becomes a one-element row list. - let w = crate::table::as_rows(w); - match &w { - Value::Null => {} - Value::Array(arr) => { - for item in arr { - match item { - Value::Object(m) => { - let field = m - .get("field") - .or_else(|| m.get("字段")) - .or_else(|| m.get("列")) - .map(cell_str) - .unwrap_or_default(); - if !field.is_empty() - && (m.contains_key("value") - || m.contains_key("值") - || m.contains_key("op") - || m.contains_key("操作")) - { - if let Some(cl) = clause_from_row(m)? { - clauses.push(cl); - } - } else { - for (k, v) in m { - if skip_where_key(k) { - continue; - } - let col = ident(k)?; - clauses.push(Clause { - expr: format!("\"{col}\" = ?"), - vals: vec![to_sql(v)], - or: false, - }); - } - } - } - other => { - return Err(format!( - "where must be a map or filter table, got {}", - match other { - Value::String(_) => "string", - Value::Number(_) => "number", - Value::Bool(_) => "bool", - _ => "value", - } - )); - } - } - } - } - other => { - return Err(format!( - "where must be a map or filter table, got {}", - match other { - Value::String(_) => "string", - Value::Number(_) => "number", - Value::Bool(_) => "bool", - _ => "value", - } - )); - } - } - // Assemble: AND by default, OR where the clause is marked. - let mut exprs = Vec::new(); - let mut vals = Vec::new(); - let mut group: Vec = Vec::new(); - for cl in clauses { - if cl.or { - group.push(cl.expr); - } else { - if !group.is_empty() { - exprs.push(format!("({})", group.join(" OR "))); - group.clear(); - } - group.push(cl.expr); - } - vals.extend(cl.vals); - } - if !group.is_empty() { - exprs.push(format!("({})", group.join(" OR "))); - } - Ok((exprs, vals)) -} - -pub fn select( - url: &str, - table: &str, - limit: i64, - where_v: Option<&Value>, -) -> Result { - select_order(url, table, limit, where_v, None, None, None) -} - -/// Like `select`, with an optional `ORDER BY`, `OFFSET` and a transaction. -/// -/// - `order` is a column name, optionally prefixed with `-` for descending -/// (`"created_at"`, `"-created_at"`). Comma-separated lists are allowed. -/// - `offset` (页偏移/跳过) enables pagination: `LIMIT … OFFSET …`. -/// - When `offset` is provided, the result carries `total` (row count without -/// limit/offset) so pages can render `上一页 / 下一页`. -/// - `txn_id` routes the read through an open transaction (事务内一致性读). -pub fn select_order( - url: &str, - table: &str, - limit: i64, - where_v: Option<&Value>, - order: Option<&str>, - offset: Option, - txn_id: Option<&str>, -) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::select_order(url, table, limit, where_v, order, offset, txn_id); - } - let table = ident(table)?; - let (exprs, mut vals) = parse_where(where_v)?; - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let mut sql = format!("SELECT * FROM \"{table}\""); - let where_sql = if exprs.is_empty() { - String::new() - } else { - format!(" WHERE {}", exprs.join(" AND ")) - }; - sql.push_str(&where_sql); - if let Some(order) = order { - let order = order.trim(); - if !order.is_empty() { - let parts: Vec<&str> = order - .split(',') - .map(|p| p.trim()) - .filter(|p| !p.is_empty()) - .collect(); - let mut order_exprs = Vec::new(); - for part in parts { - let (col, dir) = match part.strip_prefix('-') { - Some(col) => (col, " DESC"), - None => (part, ""), - }; - order_exprs.push(format!("\"{}\"{}", ident(col)?, dir)); - } - if !order_exprs.is_empty() { - sql.push_str(" ORDER BY "); - sql.push_str(&order_exprs.join(", ")); - } - } - } - sql.push_str(&format!(" LIMIT ?{}", vals.len() + 1)); - vals.push(rusqlite::types::Value::Integer(limit)); - if let Some(off) = offset { - if off > 0 { - sql.push_str(&format!(" OFFSET ?{}", vals.len() + 1)); - vals.push(rusqlite::types::Value::Integer(off)); - } - } - let rows = query_rows(&c, &sql, &vals)?; - - // Total count (ignoring limit/offset) for pagination. - let total = if offset.is_some() { - let (_exprs2, where_vals) = parse_where(where_v)?; - let n_where = where_vals.len(); - let count_sql = format!("SELECT COUNT(*) FROM \"{table}\"{where_sql}"); - count_rows(&c, &count_sql, &vals[..n_where]).unwrap_or(rows.len() as i64) - } else { - rows.len() as i64 - }; - - if offset.is_some() { - Ok(json!({ "rows": rows, "total": total })) - } else { - Ok(json!({ "rows": rows })) - } -} - -/// Run `SELECT …` and collect rows as a list of column→value maps. -fn query_rows( - c: &Connection, - sql: &str, - vals: &[rusqlite::types::Value], -) -> Result, String> { - let mut stmt = c.prepare(sql).map_err(|e| e.to_string())?; - let names: Vec = (0..stmt.column_count()) - .map(|i| stmt.column_name(i).unwrap_or("?").to_string()) - .collect(); - let mut rows_iter = stmt - .query(params_from_iter(vals.iter().cloned())) - .map_err(|e| e.to_string())?; - let mut rows = Vec::new(); - while let Some(r) = rows_iter.next().map_err(|e| e.to_string())? { - let mut m = Map::new(); - for (i, name) in names.iter().enumerate() { - m.insert(name.clone(), from_sql(r.get_ref(i).map_err(|e| e.to_string())?)); - } - rows.push(Value::Object(m)); - } - Ok(rows) -} - -/// Run `SELECT COUNT(*) …` and return the scalar. -fn count_rows( - c: &Connection, - sql: &str, - vals: &[rusqlite::types::Value], -) -> Result { - c.query_row(sql, params_from_iter(vals.iter().cloned()), |r| r.get(0)) - .map_err(|e| e.to_string()) -} - -pub fn get(url: &str, table: &str, id: &str, txn_id: Option<&str>) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::get(url, table, id, txn_id); - } - - let table = ident(table)?; - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let sql = format!("SELECT * FROM \"{table}\" WHERE \"id\" = ?1 LIMIT 1"); - let mut stmt = c.prepare(&sql).map_err(|e| e.to_string())?; - let names: Vec = (0..stmt.column_count()) - .map(|i| stmt.column_name(i).unwrap_or("?").to_string()) - .collect(); - let row = stmt - .query_row(rusqlite::params![id], |r| { - let mut m = Map::new(); - for (i, name) in names.iter().enumerate() { - m.insert(name.clone(), from_sql(r.get_ref(i)?)); - } - Ok(Value::Object(m)) - }) - .optional() - .map_err(|e| e.to_string())?; - Ok(row.unwrap_or(Value::Null)) -} - -pub fn update( - url: &str, - table: &str, - id: &str, - row: &Value, - txn_id: Option<&str>, -) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::update(url, table, id, row, txn_id); - } - - let table = ident(table)?; - let cols_present = column_names(url, table, txn_id)?; - let has_updated = cols_present.iter().any(|c| c == "updated_at"); - let obj = row.as_object().ok_or("row must be a map")?; - let mut sets = Vec::new(); - let mut vals = Vec::new(); - let mut seen_updated = false; - for (k, v) in obj { - if k == "id" { - continue; - } - let _ = ident(k)?; - if k == "updated_at" { - seen_updated = true; - } - sets.push(format!("\"{k}\" = ?")); - vals.push(to_sql(v)); - } - if has_updated && !seen_updated { - sets.push("\"updated_at\" = ?".into()); - vals.push(rusqlite::types::Value::Text(utc_now_iso())); - } - if sets.is_empty() { - return Err("nothing to update".into()); - } - vals.push(rusqlite::types::Value::Text(id.to_string())); - let sql = format!( - "UPDATE \"{table}\" SET {} WHERE \"id\" = ?", - sets.join(", ") - ); - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let n = c - .execute(&sql, params_from_iter(vals.iter().cloned())) - .map_err(|e| e.to_string())?; - Ok(json!({ "ok": true, "updated": n })) -} - -pub fn delete(url: &str, table: &str, id: &str, txn_id: Option<&str>) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::delete(url, table, id, txn_id); - } - - let table = ident(table)?; - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let sql = format!("DELETE FROM \"{table}\" WHERE \"id\" = ?1"); - let n = c - .execute(&sql, rusqlite::params![id]) - .map_err(|e| e.to_string())?; - Ok(json!({ "ok": true, "deleted": n })) -} - -pub fn exec(url: &str, sql: &str, args: Option<&Value>, txn_id: Option<&str>) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::exec(url, sql, args, txn_id); - } - - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let vals: Vec = match args { - Some(Value::Array(a)) => a.iter().map(to_sql).collect(), - _ => Vec::new(), - }; - let n = c - .execute(sql, params_from_iter(vals.iter().cloned())) - .map_err(|e| e.to_string())?; - Ok(json!({ "ok": true, "changes": n })) -} - -/// Run a `SELECT …` and return the result set (count / join / group / subquery). -/// Bare SQL — the result carries `{ rows, count }`. -pub fn query(url: &str, sql: &str, args: Option<&Value>, txn_id: Option<&str>) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::query(url, sql, args, txn_id); - } - - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let vals: Vec = match args { - Some(Value::Array(a)) => a.iter().map(to_sql).collect(), - _ => Vec::new(), - }; - let rows = query_rows(&c, sql, &vals)?; - Ok(json!({ "rows": rows, "count": rows.len() })) -} - -/// Count rows matching a `where` filter (aggregation helper). -pub fn count(url: &str, table: &str, where_v: Option<&Value>, txn_id: Option<&str>) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::count(url, table, where_v, txn_id); - } - - let table = ident(table)?; - let (exprs, vals) = parse_where(where_v)?; - let conn = conn_for(url, txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let mut sql = format!("SELECT COUNT(*) FROM \"{table}\""); - if !exprs.is_empty() { - sql.push_str(&format!(" WHERE {}", exprs.join(" AND "))); - } - let n = count_rows(&c, &sql, &vals)?; - Ok(json!({ "count": n })) -} - -/// Begin a transaction. Borrows the pooled connection exclusively and records -/// it under a fresh txn id; returns `{ txn, url }` for `commit` / `rollback`. -pub fn begin(url: &str) -> Result { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::begin(url); - } - - let conn = pooled(url)?; - { - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.execute_batch("BEGIN IMMEDIATE").map_err(|e| e.to_string())?; - } - let id = next_txn_id(); - { - let mut guard = TXNS.lock().unwrap_or_else(|e| e.into_inner()); - guard - .get_or_insert_with(HashMap::new) - .insert(id.clone(), (url.to_string(), conn)); - } - Ok(json!({ "_type": "txn", "txn": id, "url": url, "事务": id, "地址": url })) -} - -/// Commit a transaction and return its connection to the pool. -pub fn commit(txn_id: &str) -> Result { - if txn_id.starts_with("pg-txn-") { - return crate::db_pg::commit(txn_id); - } - - let (_, conn) = take_txn(txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.execute_batch("COMMIT").map_err(|e| e.to_string())?; - Ok(json!({ "ok": true })) -} - -/// Roll back a transaction and return its connection to the pool. -pub fn rollback(txn_id: &str) -> Result { - if txn_id.starts_with("pg-txn-") { - return crate::db_pg::rollback(txn_id); - } - - let (_, conn) = take_txn(txn_id)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.execute_batch("ROLLBACK").map_err(|e| e.to_string())?; - Ok(json!({ "ok": true })) -} - -/// Remove a txn from the registry, returning its connection for reuse. -fn take_txn(txn_id: &str) -> Result<(String, Arc>), String> { - let mut guard = TXNS.lock().unwrap_or_else(|e| e.into_inner()); - guard - .as_mut() - .and_then(|m| m.remove(txn_id)) - .ok_or_else(|| format!("unknown transaction `{txn_id}`")) -} - -pub fn list_tables(url: &str) -> Result, String> { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::list_tables(url); - } - - let conn = pooled(url)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let mut stmt = c - .prepare( - "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name NOT LIKE '_marqdo%' ORDER BY name", - ) - .map_err(|e| e.to_string())?; - let rows = stmt - .query_map([], |r| r.get::<_, String>(0)) - .map_err(|e| e.to_string())? - .collect::, _>>() - .map_err(|e| e.to_string())?; - Ok(rows) -} - -#[derive(Debug, Clone)] -pub struct ColumnInfo { - pub name: String, - pub sql_type: String, - pub notnull: bool, - pub pk: bool, -} - -/// `PRAGMA table_info` → column metadata for admin forms. -pub fn table_info(url: &str, table: &str) -> Result, String> { - if crate::db_pg::is_postgres(url) { - return crate::db_pg::table_info(url, table); - } - - let table = ident(table)?; - let conn = pooled(url)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let sql = format!("PRAGMA table_info(\"{table}\")"); - let mut stmt = c.prepare(&sql).map_err(|e| e.to_string())?; - let rows = stmt - .query_map([], |r| { - Ok(ColumnInfo { - name: r.get::<_, String>(1)?, - sql_type: r.get::<_, String>(2).unwrap_or_else(|_| "TEXT".into()), - notnull: r.get::<_, i64>(3).unwrap_or(0) != 0, - pk: r.get::<_, i64>(5).unwrap_or(0) != 0, - }) - }) - .map_err(|e| e.to_string())? - .collect::, _>>() - .map_err(|e| e.to_string())?; - Ok(rows) -} - -/// Apply versioned SQL steps. Table `_marqdo_migrations` tracks applied versions. -/// -/// `steps` is a list of `{version|版本, sql|SQL}` (GFM columnar tables ok via `as_rows`). -pub fn migrate(url: &str, steps: &Value) -> Result { - if crate::db_pg::is_postgres(url) { - return Err( - "db.migrate is SQLite-only in this wave (use postgres migration tooling)".into(), - ); - } - let rows = crate::table::as_rows(steps); - let arr = rows.as_array().ok_or("migrate steps must be a list")?; - let mut parsed: Vec<(i64, String)> = Vec::new(); - for row in arr { - let obj = row.as_object().ok_or("migrate step must be a map")?; - let ver = obj - .get("version") - .or_else(|| obj.get("版本")) - .or_else(|| obj.get("ver")) - .ok_or("migrate step missing `version`/`版本`")?; - let version = match ver { - Value::Number(n) => n - .as_i64() - .ok_or_else(|| "migrate version must be an integer".to_string())?, - Value::String(s) => s - .trim() - .parse::() - .map_err(|_| format!("bad migrate version `{s}`"))?, - _ => return Err("migrate version must be an integer".into()), - }; - if version <= 0 { - return Err(format!("migrate version must be positive, got {version}")); - } - let sql = obj - .get("sql") - .or_else(|| obj.get("SQL")) - .or_else(|| obj.get("Sql")) - .map(cell_str) - .unwrap_or_default(); - if sql.trim().is_empty() { - return Err(format!("migrate version {version} has empty SQL")); - } - parsed.push((version, sql)); - } - parsed.sort_by_key(|(v, _)| *v); - for w in parsed.windows(2) { - if w[0].0 == w[1].0 { - return Err(format!("duplicate migrate version {}", w[0].0)); - } - } - - let conn = pooled(url)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.execute_batch( - "CREATE TABLE IF NOT EXISTS \"_marqdo_migrations\" ( - version INTEGER PRIMARY KEY, - applied_at TEXT NOT NULL - )", - ) - .map_err(|e| e.to_string())?; - let current: i64 = c - .query_row( - "SELECT COALESCE(MAX(version), 0) FROM \"_marqdo_migrations\"", - [], - |r| r.get(0), - ) - .unwrap_or(0); - let mut applied = Vec::new(); - for (version, sql) in parsed { - if version <= current { - continue; - } - c.execute_batch("BEGIN IMMEDIATE") - .map_err(|e| e.to_string())?; - match c.execute_batch(&sql) { - Ok(()) => { - if let Err(e) = c.execute( - "INSERT INTO \"_marqdo_migrations\" (version, applied_at) VALUES (?1, datetime('now'))", - rusqlite::params![version], - ) { - let _ = c.execute_batch("ROLLBACK"); - return Err(e.to_string()); - } - c.execute_batch("COMMIT").map_err(|e| e.to_string())?; - applied.push(version); - } - Err(e) => { - let _ = c.execute_batch("ROLLBACK"); - return Err(format!("migrate version {version} failed: {e}")); - } - } - } - let to = applied.last().copied().unwrap_or(current); - Ok(json!({ - "ok": true, - "from": current, - "to": to, - "applied": applied, - })) -} - -fn parse_column_list(columns: &Value) -> Result, String> { - match columns { - Value::String(s) => { - let cols: Vec = s - .split(',') - .map(|p| p.trim().to_string()) - .filter(|p| !p.is_empty()) - .collect(); - if cols.is_empty() { - return Err("fts columns is empty".into()); - } - for c in &cols { - let _ = ident(c)?; - } - Ok(cols) - } - Value::Array(a) => { - let mut cols = Vec::new(); - for v in a { - let name = cell_str(v); - let _ = ident(&name)?; - cols.push(name); - } - if cols.is_empty() { - return Err("fts columns is empty".into()); - } - Ok(cols) - } - Value::Object(_) => { - let rows = crate::table::as_rows(columns); - if let Some(arr) = rows.as_array() { - let mut cols = Vec::new(); - for row in arr { - if let Some(obj) = row.as_object() { - let name = obj - .get("name") - .or_else(|| obj.get("字段")) - .or_else(|| obj.get("column")) - .or_else(|| obj.values().next()) - .map(cell_str) - .unwrap_or_default(); - if !name.is_empty() { - let _ = ident(&name)?; - cols.push(name); - } - } else { - let name = cell_str(row); - if !name.is_empty() { - let _ = ident(&name)?; - cols.push(name); - } - } - } - if cols.is_empty() { - return Err("fts columns is empty".into()); - } - return Ok(cols); - } - Err("fts columns must be a list or CSV string".into()) - } - _ => Err("fts columns must be a list or CSV string".into()), - } -} - -/// Create an FTS5 virtual table synced to `table` via content= + triggers. -pub fn fts_create( - url: &str, - table: &str, - columns: &Value, - name: Option<&str>, -) -> Result { - if crate::db_pg::is_postgres(url) { - return Err("db.fts is SQLite-only in this wave".into()); - } - let table = ident(table)?; - let cols = parse_column_list(columns)?; - let fts = match name { - Some(n) if !n.trim().is_empty() => ident(n.trim())?.to_string(), - _ => format!("{table}_fts"), - }; - let col_sql = cols - .iter() - .map(|c| format!("\"{c}\"")) - .collect::>() - .join(", "); - let conn = pooled(url)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - - let create = format!( - "CREATE VIRTUAL TABLE IF NOT EXISTS \"{fts}\" USING fts5({col_sql}, content=\"{table}\", content_rowid=\"id\")" - ); - c.execute_batch(&create).map_err(|e| e.to_string())?; - - let ai = format!("{fts}_ai"); - let ad = format!("{fts}_ad"); - let au = format!("{fts}_au"); - c.execute_batch(&format!( - "DROP TRIGGER IF EXISTS \"{ai}\"; - DROP TRIGGER IF EXISTS \"{ad}\"; - DROP TRIGGER IF EXISTS \"{au}\";" - )) - .map_err(|e| e.to_string())?; - - let new_cols = cols - .iter() - .map(|c| format!("new.\"{c}\"")) - .collect::>() - .join(", "); - let old_cols = cols - .iter() - .map(|c| format!("old.\"{c}\"")) - .collect::>() - .join(", "); - - c.execute_batch(&format!( - "CREATE TRIGGER \"{ai}\" AFTER INSERT ON \"{table}\" BEGIN - INSERT INTO \"{fts}\"(rowid, {col_sql}) VALUES (new.id, {new_cols}); - END; - CREATE TRIGGER \"{ad}\" AFTER DELETE ON \"{table}\" BEGIN - INSERT INTO \"{fts}\"(\"{fts}\", rowid, {col_sql}) VALUES('delete', old.id, {old_cols}); - END; - CREATE TRIGGER \"{au}\" AFTER UPDATE ON \"{table}\" BEGIN - INSERT INTO \"{fts}\"(\"{fts}\", rowid, {col_sql}) VALUES('delete', old.id, {old_cols}); - INSERT INTO \"{fts}\"(rowid, {col_sql}) VALUES (new.id, {new_cols}); - END;" - )) - .map_err(|e| e.to_string())?; - - c.execute( - &format!("INSERT INTO \"{fts}\"(\"{fts}\") VALUES('rebuild')"), - [], - ) - .map_err(|e| e.to_string())?; - - Ok(json!({ - "ok": true, - "table": table, - "fts": fts, - "columns": cols, - })) -} - -/// Full-text search against an FTS5 table created by `fts_create`. -pub fn search( - url: &str, - table: &str, - q: &str, - limit: i64, - name: Option<&str>, -) -> Result { - if crate::db_pg::is_postgres(url) { - return Err("db.search is SQLite-only in this wave".into()); - } - let table = ident(table)?; - let fts = match name { - Some(n) if !n.trim().is_empty() => ident(n.trim())?.to_string(), - _ => format!("{table}_fts"), - }; - let q = q.trim(); - if q.is_empty() { - return Ok(json!({ "rows": [], "count": 0 })); - } - let limit = if limit <= 0 { 20 } else { limit.min(500) }; - let sql = format!( - "SELECT t.*, bm25(\"{fts}\") AS rank - FROM \"{fts}\" - JOIN \"{table}\" t ON t.id = \"{fts}\".rowid - WHERE \"{fts}\" MATCH ?1 - ORDER BY rank - LIMIT ?2" - ); - let conn = pooled(url)?; - let c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let vals = vec![ - rusqlite::types::Value::Text(q.to_string()), - rusqlite::types::Value::Integer(limit), - ]; - let rows = query_rows(&c, &sql, &vals)?; - Ok(json!({ "rows": rows, "count": rows.len() })) -} diff --git a/plugins/web-rust-archive/src/db_pg.rs b/plugins/web-rust-archive/src/db_pg.rs deleted file mode 100644 index 49cc1c3..0000000 --- a/plugins/web-rust-archive/src/db_pg.rs +++ /dev/null @@ -1,676 +0,0 @@ -//! Postgres backend for `# db` (same author-facing API as SQLite). - -use crate::driver::{db_kind, rewrite_placeholders_pg, DbKind}; -use postgres::types::ToSql; -use postgres::{Client, NoTls, Row}; -use serde_json::{json, Map, Value}; -use std::collections::HashMap; -use std::sync::{Arc, Mutex}; - -static POOL: Mutex>>>> = Mutex::new(None); -static TXNS: Mutex>)>>> = Mutex::new(None); - -pub fn is_postgres(url: &str) -> bool { - matches!(db_kind(url), DbKind::Postgres) -} - -fn pooled(url: &str) -> Result>, String> { - let mut guard = POOL.lock().unwrap_or_else(|e| e.into_inner()); - let pool = guard.get_or_insert_with(HashMap::new); - if let Some(c) = pool.get(url) { - return Ok(c.clone()); - } - let client = Client::connect(url, NoTls).map_err(|e| format!("postgres connect: {e}"))?; - let arc = Arc::new(Mutex::new(client)); - pool.insert(url.to_string(), arc.clone()); - Ok(arc) -} - -fn conn_for(url: &str, txn_id: Option<&str>) -> Result>, String> { - if let Some(tid) = txn_id { - let guard = TXNS.lock().unwrap_or_else(|e| e.into_inner()); - match guard.as_ref().and_then(|m| m.get(tid)) { - Some((_, c)) => Ok(c.clone()), - None => Err(format!("unknown transaction `{tid}`")), - } - } else { - pooled(url) - } -} - -fn next_txn_id() -> String { - use std::time::{SystemTime, UNIX_EPOCH}; - let nanos = SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|d| d.subsec_nanos()) - .unwrap_or(0); - format!("pg-txn-{}-{nanos}", std::process::id()) -} - -fn ident(s: &str) -> Result<&str, String> { - let s = s.trim(); - if s.is_empty() - || !s - .chars() - .all(|c| c.is_ascii_alphanumeric() || c == '_') - { - return Err(format!("bad identifier `{s}`")); - } - Ok(s) -} - -fn cell_str(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -fn pg_type(t: &str) -> &'static str { - match t.trim().to_ascii_lowercase().as_str() { - "int" | "integer" => "INTEGER", - "real" | "float" | "double" => "DOUBLE PRECISION", - "blob" | "bytea" => "BYTEA", - "bool" | "boolean" => "BOOLEAN", - "timestamp" | "datetime" | "timestamptz" | "审计" => "TIMESTAMPTZ", - _ => "TEXT", - } -} - -fn to_pg_box(v: &Value) -> Box { - match v { - Value::Null => Box::new(None::), - Value::Bool(b) => Box::new(*b), - Value::Number(n) => { - if let Some(i) = n.as_i64() { - Box::new(i) - } else if let Some(f) = n.as_f64() { - Box::new(f) - } else { - Box::new(n.to_string()) - } - } - Value::String(s) => Box::new(s.clone()), - other => Box::new(other.to_string()), - } -} - -fn row_to_json(row: &Row) -> Value { - let mut m = Map::new(); - for (i, col) in row.columns().iter().enumerate() { - let name = col.name().to_string(); - let v: Value = if let Ok(x) = row.try_get::<_, Option>(i) { - x.map(|n| json!(n)).unwrap_or(Value::Null) - } else if let Ok(x) = row.try_get::<_, Option>(i) { - x.map(|n| json!(n)).unwrap_or(Value::Null) - } else if let Ok(x) = row.try_get::<_, Option>(i) { - x.map(|b| json!(b)).unwrap_or(Value::Null) - } else if let Ok(x) = row.try_get::<_, Option>(i) { - x.map(Value::String).unwrap_or(Value::Null) - } else { - Value::Null - }; - m.insert(name, v); - } - Value::Object(m) -} - -fn exec_sql(client: &mut Client, sql: &str, params: &[Value]) -> Result { - let sql = rewrite_placeholders_pg(sql); - let boxes: Vec> = params.iter().map(to_pg_box).collect(); - let refs: Vec<&(dyn ToSql + Sync)> = boxes - .iter() - .map(|b| b.as_ref() as &(dyn ToSql + Sync)) - .collect(); - client - .execute(sql.as_str(), refs.as_slice()) - .map_err(|e| e.to_string()) -} - -fn query_sql(client: &mut Client, sql: &str, params: &[Value]) -> Result, String> { - let sql = rewrite_placeholders_pg(sql); - let boxes: Vec> = params.iter().map(to_pg_box).collect(); - let refs: Vec<&(dyn ToSql + Sync)> = boxes - .iter() - .map(|b| b.as_ref() as &(dyn ToSql + Sync)) - .collect(); - let rows = client - .query(sql.as_str(), refs.as_slice()) - .map_err(|e| e.to_string())?; - Ok(rows.iter().map(row_to_json).collect()) -} - -/// Equality-map / filter-table → `(AND exprs with ?, vals)`. -fn parse_where_simple(where_v: Option<&Value>) -> Result<(Vec, Vec), String> { - let Some(w) = where_v else { - return Ok((vec![], vec![])); - }; - let w = crate::table::as_rows(w); - let mut exprs = Vec::new(); - let mut vals = Vec::new(); - match w { - Value::Array(arr) => { - for item in arr { - let Value::Object(m) = item else { - continue; - }; - let field = m - .get("field") - .or_else(|| m.get("字段")) - .or_else(|| m.get("列")) - .map(cell_str) - .unwrap_or_default(); - if !field.is_empty() { - let col = ident(&field)?; - let op = m - .get("op") - .or_else(|| m.get("操作")) - .map(cell_str) - .unwrap_or_else(|| "=".into()); - let op = match op.trim().to_ascii_lowercase().as_str() { - "" | "=" | "eq" | "等于" => "=", - "!=" | "<>" | "ne" | "不等于" => "!=", - ">" | "gt" | "大于" => ">", - ">=" | "gte" => ">=", - "<" | "lt" | "小于" => "<", - "<=" | "lte" => "<=", - "like" | "包含" => "LIKE", - other => return Err(format!("unsupported where op `{other}`")), - }; - let val = m - .get("value") - .or_else(|| m.get("值")) - .cloned() - .unwrap_or(Value::Null); - exprs.push(format!("\"{col}\" {op} ?")); - vals.push(val); - } else { - for (k, v) in &m { - if k == "@" || k == "行" || k == "row" || k.starts_with('_') { - continue; - } - let col = ident(k)?; - exprs.push(format!("\"{col}\" = ?")); - vals.push(v.clone()); - } - } - } - } - _ => {} - } - Ok((exprs, vals)) -} - -fn parse_fk(raw: &str) -> Result<(String, String), String> { - let s = raw.trim(); - if s.is_empty() { - return Err("empty foreign key".into()); - } - if let Some((t, rest)) = s.split_once('(') { - let col = rest.trim().trim_end_matches(')').trim(); - let t = ident(t)?.to_string(); - let col = if col.is_empty() { - "id".into() - } else { - ident(col)?.to_string() - }; - return Ok((t, col)); - } - if let Some((t, c)) = s.split_once('.') { - return Ok((ident(t)?.to_string(), ident(c)?.to_string())); - } - Ok((ident(s)?.to_string(), "id".into())) -} - -fn utc_now_iso() -> String { - use std::time::{SystemTime, UNIX_EPOCH}; - let secs = SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|d| d.as_secs()) - .unwrap_or(0); - let days = secs / 86400; - let tod = secs % 86400; - let h = tod / 3600; - let m = (tod % 3600) / 60; - let s = tod % 60; - let z = days as i64 + 719468; - let era = if z >= 0 { z } else { z - 146096 } / 146097; - let doe = (z - era * 146097) as u64; - let yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365; - let y = yoe as i64 + era * 400; - let doy = doe - (365 * yoe + yoe / 4 - yoe / 100); - let mp = (5 * doy + 2) / 153; - let d = doy - (153 * mp + 2) / 5 + 1; - let mo = if mp < 10 { mp + 3 } else { mp - 9 }; - let y = if mo <= 2 { y + 1 } else { y }; - format!("{y:04}-{mo:02}-{d:02}T{h:02}:{m:02}:{s:02}Z") -} - -fn column_names(url: &str, table: &str, txn_id: Option<&str>) -> Result, String> { - let table = ident(table)?; - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let rows = query_sql( - &mut c, - "SELECT column_name FROM information_schema.columns WHERE table_name = ? ORDER BY ordinal_position", - &[json!(table)], - )?; - Ok(rows - .into_iter() - .filter_map(|r| { - r.get("column_name") - .or_else(|| r.get("COLUMN_NAME")) - .and_then(|v| v.as_str()) - .map(|s| s.to_string()) - }) - .collect()) -} - -pub fn init(url: &str, table: &str, fields: &Value) -> Result { - let table = ident(table)?; - let cols = crate::table::as_fields(fields); - let arr = cols.as_array().ok_or("fields must be a list")?; - if arr.is_empty() { - return Err("empty fields".into()); - } - let mut parts = Vec::new(); - let mut has_pk = false; - let mut index_sql = Vec::new(); - for c in arr { - let name = c - .get("name") - .or_else(|| c.get("字段")) - .map(cell_str) - .unwrap_or_default(); - let name = ident(&name)?; - let ty = c - .get("type") - .or_else(|| c.get("类型")) - .map(cell_str) - .unwrap_or_else(|| "text".into()); - let nullable = c - .get("nullable") - .or_else(|| c.get("可空")) - .and_then(|v| match v { - Value::Bool(b) => Some(*b), - Value::String(s) => { - Some(matches!(s.as_str(), "true" | "True" | "1" | "是" | "可")) - } - _ => None, - }) - .unwrap_or(true); - let unique = c - .get("unique") - .or_else(|| c.get("唯一")) - .and_then(|v| match v { - Value::Bool(b) => Some(*b), - Value::String(s) => { - Some(matches!(s.as_str(), "true" | "True" | "1" | "yes" | "是" | "唯一")) - } - _ => None, - }) - .unwrap_or(false); - let index = c - .get("index") - .or_else(|| c.get("索引")) - .and_then(|v| match v { - Value::Bool(b) => Some(*b), - Value::String(s) => { - Some(matches!(s.as_str(), "true" | "True" | "1" | "yes" | "是" | "索引")) - } - _ => None, - }) - .unwrap_or(false); - let part = if name == "id" && !has_pk && pg_type(&ty) == "INTEGER" { - has_pk = true; - format!("\"{name}\" SERIAL PRIMARY KEY") - } else if name == "id" && !has_pk { - has_pk = true; - format!("\"{name}\" {} PRIMARY KEY", pg_type(&ty)) - } else { - let mut col = format!("\"{name}\" {}", pg_type(&ty)); - if !nullable { - col.push_str(" NOT NULL"); - } - if unique { - col.push_str(" UNIQUE"); - } - let fk_raw = c - .get("fk") - .or_else(|| c.get("外键")) - .map(cell_str) - .unwrap_or_default(); - if !fk_raw.is_empty() { - let (ref_table, ref_col) = parse_fk(&fk_raw)?; - col.push_str(&format!(" REFERENCES \"{ref_table}\"(\"{ref_col}\")")); - } - col - }; - parts.push(part); - if (index || unique) && name != "id" { - let kind = if unique { "UNIQUE " } else { "" }; - index_sql.push(format!( - "CREATE {kind}INDEX IF NOT EXISTS \"idx_{table}_{name}\" ON \"{table}\" (\"{name}\")" - )); - } - } - let sql = format!( - "CREATE TABLE IF NOT EXISTS \"{table}\" ({})", - parts.join(", ") - ); - let conn = pooled(url)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.batch_execute(&sql).map_err(|e| e.to_string())?; - for stmt in index_sql { - let _ = c.batch_execute(&stmt); - } - Ok(json!({ "_type": "db_table", "name": table, "url": url })) -} - -pub fn insert(url: &str, table: &str, rows: &Value, txn_id: Option<&str>) -> Result { - let table = ident(table)?; - let cols_present = column_names(url, table, txn_id).unwrap_or_default(); - let has_created = cols_present.iter().any(|c| c == "created_at"); - let has_updated = cols_present.iter().any(|c| c == "updated_at"); - let rows = crate::table::as_rows(rows); - let arr = rows.as_array().ok_or("rows must be a list")?; - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let mut n = 0i64; - let now = utc_now_iso(); - for row in arr { - let obj = row.as_object().ok_or("row must be a map")?; - let mut cols = Vec::new(); - let mut ph = Vec::new(); - let mut vals = Vec::new(); - let mut seen_created = false; - let mut seen_updated = false; - for (k, v) in obj { - if k == "@" || k == "行" || k == "row" { - continue; - } - let _ = ident(k)?; - if k == "created_at" { - seen_created = true; - } - if k == "updated_at" { - seen_updated = true; - } - cols.push(format!("\"{k}\"")); - ph.push("?"); - vals.push(v.clone()); - } - if has_created && !seen_created { - cols.push("\"created_at\"".into()); - ph.push("?"); - vals.push(json!(now.clone())); - } - if has_updated && !seen_updated { - cols.push("\"updated_at\"".into()); - ph.push("?"); - vals.push(json!(now.clone())); - } - if cols.is_empty() { - continue; - } - let sql = format!( - "INSERT INTO \"{table}\" ({}) VALUES ({})", - cols.join(", "), - ph.join(", ") - ); - exec_sql(&mut c, &sql, &vals)?; - n += 1; - } - Ok(json!({ "ok": true, "inserted": n })) -} - -pub fn select_order( - url: &str, - table: &str, - limit: i64, - where_v: Option<&Value>, - order: Option<&str>, - offset: Option, - txn_id: Option<&str>, -) -> Result { - let table = ident(table)?; - let (exprs, mut vals) = parse_where_simple(where_v)?; - let mut sql = format!("SELECT * FROM \"{table}\""); - let where_sql = if exprs.is_empty() { - String::new() - } else { - format!(" WHERE {}", exprs.join(" AND ")) - }; - sql.push_str(&where_sql); - if let Some(order) = order.map(str::trim).filter(|s| !s.is_empty()) { - let mut order_exprs = Vec::new(); - for part in order.split(',').map(str::trim).filter(|p| !p.is_empty()) { - let (col, dir) = match part.strip_prefix('-') { - Some(c) => (c, " DESC"), - None => (part, ""), - }; - order_exprs.push(format!("\"{}\"{}", ident(col)?, dir)); - } - if !order_exprs.is_empty() { - sql.push_str(" ORDER BY "); - sql.push_str(&order_exprs.join(", ")); - } - } - sql.push_str(" LIMIT ?"); - vals.push(json!(limit)); - if let Some(off) = offset { - if off > 0 { - sql.push_str(" OFFSET ?"); - vals.push(json!(off)); - } - } - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let rows = query_sql(&mut c, &sql, &vals)?; - if offset.is_some() { - let mut count_sql = format!("SELECT COUNT(*) AS count FROM \"{table}\""); - count_sql.push_str(&where_sql); - let count_vals: Vec = vals - .iter() - .take(exprs.len()) - .cloned() - .collect(); - let total = query_sql(&mut c, &count_sql, &count_vals)? - .first() - .and_then(|r| r.get("count")) - .and_then(|v| v.as_i64()) - .unwrap_or(rows.len() as i64); - Ok(json!({ "rows": rows, "total": total })) - } else { - Ok(json!({ "rows": rows })) - } -} - -pub fn get(url: &str, table: &str, id: &str, txn_id: Option<&str>) -> Result { - let table = ident(table)?; - let sql = format!("SELECT * FROM \"{table}\" WHERE \"id\" = ? LIMIT 1"); - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let rows = query_sql(&mut c, &sql, &[json!(id)])?; - Ok(rows.into_iter().next().unwrap_or(Value::Null)) -} - -pub fn update( - url: &str, - table: &str, - id: &str, - row: &Value, - txn_id: Option<&str>, -) -> Result { - let table = ident(table)?; - let cols_present = column_names(url, table, txn_id).unwrap_or_default(); - let has_updated = cols_present.iter().any(|c| c == "updated_at"); - let obj = row.as_object().ok_or("row must be a map")?; - let mut sets = Vec::new(); - let mut vals = Vec::new(); - let mut seen_updated = false; - for (k, v) in obj { - if k == "id" || k == "@" || k == "行" || k == "row" { - continue; - } - let _ = ident(k)?; - if k == "updated_at" { - seen_updated = true; - } - sets.push(format!("\"{k}\" = ?")); - vals.push(v.clone()); - } - if has_updated && !seen_updated { - sets.push("\"updated_at\" = ?".into()); - vals.push(json!(utc_now_iso())); - } - if sets.is_empty() { - return Ok(json!({ "ok": true, "updated": 0 })); - } - vals.push(json!(id)); - let sql = format!( - "UPDATE \"{table}\" SET {} WHERE \"id\" = ?", - sets.join(", ") - ); - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let n = exec_sql(&mut c, &sql, &vals)?; - Ok(json!({ "ok": true, "updated": n })) -} - -pub fn delete(url: &str, table: &str, id: &str, txn_id: Option<&str>) -> Result { - let table = ident(table)?; - let sql = format!("DELETE FROM \"{table}\" WHERE \"id\" = ?"); - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let n = exec_sql(&mut c, &sql, &[json!(id)])?; - Ok(json!({ "ok": true, "deleted": n })) -} - -pub fn exec(url: &str, sql: &str, args: Option<&Value>, txn_id: Option<&str>) -> Result { - let vals: Vec = match args { - Some(Value::Array(a)) => a.clone(), - _ => Vec::new(), - }; - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let n = exec_sql(&mut c, sql, &vals)?; - Ok(json!({ "ok": true, "changes": n })) -} - -pub fn query(url: &str, sql: &str, args: Option<&Value>, txn_id: Option<&str>) -> Result { - let vals: Vec = match args { - Some(Value::Array(a)) => a.clone(), - _ => Vec::new(), - }; - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let rows = query_sql(&mut c, sql, &vals)?; - Ok(json!({ "rows": rows, "count": rows.len() })) -} - -pub fn count( - url: &str, - table: &str, - where_v: Option<&Value>, - txn_id: Option<&str>, -) -> Result { - let table = ident(table)?; - let (exprs, vals) = parse_where_simple(where_v)?; - let mut sql = format!("SELECT COUNT(*) AS count FROM \"{table}\""); - if !exprs.is_empty() { - sql.push_str(&format!(" WHERE {}", exprs.join(" AND "))); - } - let conn = conn_for(url, txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let rows = query_sql(&mut c, &sql, &vals)?; - let n = rows - .first() - .and_then(|r| r.get("count")) - .and_then(|v| v.as_i64()) - .unwrap_or(0); - Ok(json!({ "count": n })) -} - -pub fn begin(url: &str) -> Result { - let conn = pooled(url)?; - { - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.batch_execute("BEGIN").map_err(|e| e.to_string())?; - } - let id = next_txn_id(); - { - let mut guard = TXNS.lock().unwrap_or_else(|e| e.into_inner()); - guard - .get_or_insert_with(HashMap::new) - .insert(id.clone(), (url.to_string(), conn)); - } - Ok(json!({ "_type": "txn", "txn": id, "url": url, "事务": id, "地址": url })) -} - -pub fn commit(txn_id: &str) -> Result { - let (_, conn) = take_txn(txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.batch_execute("COMMIT").map_err(|e| e.to_string())?; - Ok(json!({ "ok": true })) -} - -pub fn rollback(txn_id: &str) -> Result { - let (_, conn) = take_txn(txn_id)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - c.batch_execute("ROLLBACK").map_err(|e| e.to_string())?; - Ok(json!({ "ok": true })) -} - -fn take_txn(txn_id: &str) -> Result<(String, Arc>), String> { - let mut guard = TXNS.lock().unwrap_or_else(|e| e.into_inner()); - guard - .as_mut() - .and_then(|m| m.remove(txn_id)) - .ok_or_else(|| format!("unknown transaction `{txn_id}`")) -} - -pub fn list_tables(url: &str) -> Result, String> { - let conn = pooled(url)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let rows = query_sql( - &mut c, - "SELECT tablename AS name FROM pg_catalog.pg_tables WHERE schemaname = 'public' ORDER BY tablename", - &[], - )?; - Ok(rows - .iter() - .filter_map(|r| r.get("name").and_then(|v| v.as_str()).map(|s| s.to_string())) - .collect()) -} - -pub fn table_info(url: &str, table: &str) -> Result, String> { - let table = ident(table)?; - let conn = pooled(url)?; - let mut c = conn.lock().unwrap_or_else(|e| e.into_inner()); - let rows = query_sql( - &mut c, - "SELECT column_name AS name, data_type AS sql_type, \ - CASE WHEN is_nullable = 'NO' THEN true ELSE false END AS notnull \ - FROM information_schema.columns \ - WHERE table_schema = 'public' AND table_name = ? \ - ORDER BY ordinal_position", - &[json!(table)], - )?; - Ok(rows - .iter() - .map(|r| crate::db::ColumnInfo { - name: r.get("name").and_then(|v| v.as_str()).unwrap_or("").into(), - sql_type: r - .get("sql_type") - .and_then(|v| v.as_str()) - .unwrap_or("text") - .into(), - notnull: r.get("notnull").and_then(|v| v.as_bool()).unwrap_or(false), - pk: r.get("name").and_then(|v| v.as_str()) == Some("id"), - }) - .collect()) -} diff --git a/plugins/web-rust-archive/src/driver.rs b/plugins/web-rust-archive/src/driver.rs deleted file mode 100644 index c805f9b..0000000 --- a/plugins/web-rust-archive/src/driver.rs +++ /dev/null @@ -1,54 +0,0 @@ -//! Driver URL schemes for `# db` / `# cache` / `# storage` (design ext-web-drivers). - -/// Which SQL backend a `# db` URL selects. -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum DbKind { - Sqlite, - Postgres, -} - -pub fn db_kind(url: &str) -> DbKind { - let u = url.trim().to_ascii_lowercase(); - if u.starts_with("postgres://") || u.starts_with("postgresql://") { - DbKind::Postgres - } else { - DbKind::Sqlite - } -} - -/// Rewrite SQL written with `?` placeholders into Postgres `$1,$2,…` form. -pub fn rewrite_placeholders_pg(sql: &str) -> String { - let mut out = String::with_capacity(sql.len() + 8); - let mut n = 0usize; - let mut chars = sql.chars().peekable(); - while let Some(c) = chars.next() { - if c == '?' { - n += 1; - out.push('$'); - out.push_str(&n.to_string()); - } else { - out.push(c); - } - } - out -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn kind_from_url() { - assert_eq!(db_kind("sqlite:a.db"), DbKind::Sqlite); - assert_eq!(db_kind("postgres://u:p@h/db"), DbKind::Postgres); - assert_eq!(db_kind("postgresql://localhost/x"), DbKind::Postgres); - } - - #[test] - fn rewrite_qmark() { - assert_eq!( - rewrite_placeholders_pg("SELECT * FROM t WHERE a = ? AND b IN (?, ?)"), - "SELECT * FROM t WHERE a = $1 AND b IN ($2, $3)" - ); - } -} diff --git a/plugins/web-rust-archive/src/form.rs b/plugins/web-rust-archive/src/form.rs deleted file mode 100644 index bb73732..0000000 --- a/plugins/web-rust-archive/src/form.rs +++ /dev/null @@ -1,701 +0,0 @@ -//! Form fields / validate / render / submit (design §5.5). - -use serde_json::{json, Map, Value}; - -use crate::db; -use crate::table::normalize_ref; - -const FIELD_KEYS: &[&str] = &["字段", "name", "field", "列"]; -const LABEL_KEYS: &[&str] = &["标签", "label"]; -const TYPE_KEYS: &[&str] = &["类型", "type"]; -const REQ_KEYS: &[&str] = &["必填", "required"]; -const DEF_KEYS: &[&str] = &["默认", "default"]; -const RULE_FIELD_KEYS: &[&str] = &["字段", "field", "name"]; -const RULE_KEYS: &[&str] = &["规则", "rule"]; -const MSG_KEYS: &[&str] = &["消息", "message", "msg"]; - -fn cell_str(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -fn as_str_list(v: &Value) -> Vec { - match v { - Value::Array(a) => a.iter().map(cell_str).collect(), - Value::Null => Vec::new(), - other => vec![cell_str(other)], - } -} - -fn pick<'a>(m: &'a Map, keys: &[&str]) -> Option<&'a Value> { - keys.iter().find_map(|k| m.get(*k)) -} - -fn boolish(v: &Value) -> bool { - match v { - Value::Bool(b) => *b, - Value::String(s) => matches!( - s.trim(), - "1" | "true" | "True" | "yes" | "是" | "必填" | "required" - ), - Value::Number(n) => n.as_i64().unwrap_or(0) != 0, - _ => false, - } -} - -fn esc(s: &str) -> String { - s.replace('&', "&") - .replace('<', "<") - .replace('>', ">") - .replace('"', """) -} - -/// Normalize author field table → `[{name,label,type,required,default}, …]` -pub fn as_form_fields(table: &Value) -> Value { - match table { - Value::Array(rows) => { - let mut out = Vec::new(); - for row in rows { - if let Some(m) = row.as_object() { - let name = normalize_ref(&pick(m, FIELD_KEYS).map(cell_str).unwrap_or_default()); - if name.is_empty() { - continue; - } - let label = pick(m, LABEL_KEYS).map(cell_str).unwrap_or_else(|| name.clone()); - let ty = pick(m, TYPE_KEYS) - .map(cell_str) - .unwrap_or_else(|| "text".into()); - let required = pick(m, REQ_KEYS).map(boolish).unwrap_or(false); - let default = pick(m, DEF_KEYS).map(cell_str).unwrap_or_default(); - out.push(json!({ - "name": name, - "label": label, - "type": ty, - "required": required, - "default": default, - })); - } - } - Value::Array(out) - } - Value::Object(m) => { - let names = pick(m, FIELD_KEYS).map(as_str_list).unwrap_or_default(); - let labels = pick(m, LABEL_KEYS).map(as_str_list).unwrap_or_default(); - let types = pick(m, TYPE_KEYS).map(as_str_list).unwrap_or_default(); - let reqs = pick(m, REQ_KEYS).map(as_str_list).unwrap_or_default(); - let defs = pick(m, DEF_KEYS).map(as_str_list).unwrap_or_default(); - let mut out = Vec::new(); - for (i, name_raw) in names.iter().enumerate() { - let name = normalize_ref(name_raw); - if name.is_empty() { - continue; - } - let label = labels.get(i).cloned().unwrap_or_else(|| name.clone()); - let ty = types.get(i).cloned().unwrap_or_else(|| "text".into()); - let required = reqs - .get(i) - .map(|s| boolish(&Value::String(s.clone()))) - .unwrap_or(false); - let default = defs.get(i).cloned().unwrap_or_default(); - out.push(json!({ - "name": name, - "label": label, - "type": ty, - "required": required, - "default": default, - })); - } - Value::Array(out) - } - _ => json!([]), - } -} - -/// Normalize rules table → `[{field,rule,message}, …]` -pub fn as_form_rules(table: &Value) -> Value { - match table { - Value::Array(rows) => { - let mut out = Vec::new(); - for row in rows { - if let Some(m) = row.as_object() { - let field = - normalize_ref(&pick(m, RULE_FIELD_KEYS).map(cell_str).unwrap_or_default()); - let rule = pick(m, RULE_KEYS).map(cell_str).unwrap_or_default(); - if field.is_empty() || rule.is_empty() { - continue; - } - let message = pick(m, MSG_KEYS).map(cell_str).unwrap_or_default(); - out.push(json!({ "field": field, "rule": rule, "message": message })); - } - } - Value::Array(out) - } - Value::Object(m) => { - let fields = pick(m, RULE_FIELD_KEYS).map(as_str_list).unwrap_or_default(); - let rules = pick(m, RULE_KEYS).map(as_str_list).unwrap_or_default(); - let msgs = pick(m, MSG_KEYS).map(as_str_list).unwrap_or_default(); - let n = fields.len().max(rules.len()); - let mut out = Vec::new(); - for i in 0..n { - let field = normalize_ref(&fields.get(i).cloned().unwrap_or_default()); - let rule = rules.get(i).cloned().unwrap_or_default(); - if field.is_empty() || rule.is_empty() { - continue; - } - let message = msgs.get(i).cloned().unwrap_or_default(); - out.push(json!({ "field": field, "rule": rule, "message": message })); - } - Value::Array(out) - } - _ => json!([]), - } -} - -pub fn form_new(table: Option<&str>, action: &str, id: Option<&str>) -> Value { - let action = match action { - "update" | "更新" => "update", - _ => "insert", - }; - let mut m = Map::new(); - if let Some(t) = table.filter(|s| !s.is_empty()) { - m.insert("table".into(), json!(t)); - } - m.insert("action".into(), json!(action)); - if let Some(i) = id.filter(|s| !s.is_empty()) { - m.insert("id".into(), json!(i)); - } - m.insert("fields".into(), json!([])); - m.insert("rules".into(), json!([])); - m.insert("redirect".into(), json!("/")); - Value::Object(m) -} - -fn sql_type_to_input(sql_type: &str, name: &str) -> &'static str { - let t = sql_type.to_ascii_uppercase(); - if t.contains("INT") || t.contains("REAL") || t.contains("FLOAT") || t.contains("DOUBLE") { - return "number"; - } - if name == "body" || name.ends_with("_body") || name.ends_with("_text") { - return "textarea"; - } - if name.contains("email") { - return "email"; - } - if name.contains("url") || name == "href" { - return "url"; - } - "text" -} - -/// Build a form handle from live SQLite schema (admin new/edit). -/// `admin_prefix` is the mount root (default `/admin`), without trailing slash. -pub fn from_schema( - db_url: &str, - table: &str, - action: &str, - id: Option<&str>, - admin_prefix: &str, -) -> Result { - let action = match action { - "update" | "更新" => "update", - _ => "insert", - }; - let cols = db::table_info(db_url, table)?; - if cols.is_empty() { - return Err(format!("unknown table `{table}`")); - } - let mut fields = Vec::new(); - for c in &cols { - if action == "insert" && c.pk && c.name == "id" { - continue; // SERIAL / AUTOINCREMENT - } - let input = sql_type_to_input(&c.sql_type, &c.name); - let required = c.notnull || (action == "update" && c.pk); - fields.push(json!({ - "name": c.name, - "label": c.name, - "type": input, - "required": required, - "default": "", - "pk": c.pk, - })); - } - let base = admin_prefix.trim_end_matches('/'); - let table_href = format!("{base}/{table}"); - let mut form = form_new(Some(table), action, id); - if let Some(obj) = form.as_object_mut() { - obj.insert("fields".into(), Value::Array(fields)); - obj.insert("redirect".into(), json!(&table_href)); - if action == "insert" { - obj.insert("action_url".into(), json!(format!("{table_href}/new"))); - obj.insert("title".into(), json!(format!("New {table}"))); - } else if let Some(i) = id { - obj.insert( - "action_url".into(), - json!(format!("{table_href}/{i}/edit")), - ); - obj.insert("title".into(), json!(format!("Edit {table} #{i}"))); - obj.insert("id".into(), json!(i)); - } - obj.insert("cancel_href".into(), json!(&table_href)); - } - Ok(form) -} - -pub fn set_fields(form: &Value, fields: &Value) -> Value { - let mut obj = form.as_object().cloned().unwrap_or_default(); - obj.insert("fields".into(), as_form_fields(fields)); - Value::Object(obj) -} - -pub fn set_rules(form: &Value, rules: &Value) -> Value { - let mut obj = form.as_object().cloned().unwrap_or_default(); - obj.insert("rules".into(), as_form_rules(rules)); - Value::Object(obj) -} - -fn data_map(data: &Value) -> Map { - let rows = crate::table::as_rows(data); - if let Some(Value::Object(m)) = rows.as_array().and_then(|a| a.first()) { - return m.clone(); - } - match data { - Value::Object(m) => m.clone(), - _ => Map::new(), - } -} - -fn field_text(data: &Map, name: &str) -> String { - data.get(name).map(cell_str).unwrap_or_default() -} - -fn default_message(rule: &str, field: &str) -> String { - if let Some(rest) = rule.strip_prefix("min:") { - return format!("{field} must be at least {rest}"); - } - if let Some(rest) = rule.strip_prefix("max:") { - return format!("{field} must be at most {rest}"); - } - if let Some(other) = rule.strip_prefix("match:") { - return format!("{field} must match {other}"); - } - if rule.starts_with("in:") { - return format!("{field} is not an allowed value"); - } - match rule { - "required" => format!("{field} is required"), - "email" => format!("{field} must be an email"), - "url" => format!("{field} must be a URL"), - _ => format!("{field} failed `{rule}`"), - } -} - -fn check_rule(rule: &str, field: &str, data: &Map) -> Option { - let val = field_text(data, field); - let trimmed = val.trim(); - if rule == "required" { - return if trimmed.is_empty() { - Some(default_message(rule, field)) - } else { - None - }; - } - if trimmed.is_empty() { - return None; // other rules skip empty (required covers emptiness) - } - if let Some(n) = rule.strip_prefix("min:") { - if let Ok(min) = n.parse::() { - if let Ok(num) = trimmed.parse::() { - if num < min as f64 { - return Some(default_message(rule, field)); - } - } else if (trimmed.chars().count() as i64) < min { - return Some(default_message(rule, field)); - } - } - return None; - } - if let Some(n) = rule.strip_prefix("max:") { - if let Ok(max) = n.parse::() { - if let Ok(num) = trimmed.parse::() { - if num > max as f64 { - return Some(default_message(rule, field)); - } - } else if (trimmed.chars().count() as i64) > max { - return Some(default_message(rule, field)); - } - } - return None; - } - if let Some(other) = rule.strip_prefix("match:") { - let other_val = field_text(data, other); - if val != other_val { - return Some(default_message(rule, field)); - } - return None; - } - if let Some(list) = rule.strip_prefix("in:") { - let allowed: Vec<&str> = list.split(',').map(|s| s.trim()).collect(); - if !allowed.contains(&trimmed) { - return Some(default_message(rule, field)); - } - return None; - } - match rule { - "email" => { - if !(trimmed.contains('@') && trimmed.contains('.')) { - Some(default_message(rule, field)) - } else { - None - } - } - "url" => { - if !(trimmed.starts_with("http://") || trimmed.starts_with("https://")) { - Some(default_message(rule, field)) - } else { - None - } - } - _ => None, - } -} - -/// Merge field-required + author rules; return `{ok, errors:[{field,message}]}`. -pub fn validate(form: &Value, extra_rules: Option<&Value>, data: &Value) -> Value { - let data = data_map(data); - let fields = form - .get("fields") - .cloned() - .unwrap_or(json!([])); - let mut rules = form - .get("rules") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - if let Some(extra) = extra_rules { - if let Some(arr) = as_form_rules(extra).as_array() { - rules.extend(arr.clone()); - } - } - // Auto required from field table (message overridable by later explicit rules) - if let Some(arr) = fields.as_array() { - for f in arr { - let name = f.get("name").and_then(|v| v.as_str()).unwrap_or(""); - let required = f.get("required").and_then(|v| v.as_bool()).unwrap_or(false); - if required && !name.is_empty() { - let already = rules.iter().any(|r| { - r.get("field").and_then(|v| v.as_str()) == Some(name) - && r.get("rule").and_then(|v| v.as_str()) == Some("required") - }); - if !already { - rules.insert( - 0, - json!({ - "field": name, - "rule": "required", - "message": format!("{name} is required"), - }), - ); - } - } - } - } - - let mut errors = Vec::new(); - for r in &rules { - let field = r.get("field").and_then(|v| v.as_str()).unwrap_or(""); - let rule = r.get("rule").and_then(|v| v.as_str()).unwrap_or(""); - let msg = r.get("message").and_then(|v| v.as_str()).unwrap_or(""); - if field.is_empty() || rule.is_empty() { - continue; - } - if let Some(default_msg) = check_rule(rule, field, &data) { - errors.push(json!({ - "field": field, - "message": if msg.is_empty() { default_msg } else { msg.to_string() }, - })); - } - } - json!({ - "ok": errors.is_empty(), - "errors": errors, - }) -} - -/// Form markup only (no document shell) — for page main-slot embed and `/_form`. -pub fn render_body( - form: &Value, - form_id: &str, - data: Option<&Value>, - errors: Option<&Value>, - csrf: Option<&str>, -) -> String { - let fields = form - .get("fields") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let data = data.map(data_map).unwrap_or_default(); - let mut err_map = Map::new(); - if let Some(Value::Array(errs)) = errors { - for e in errs { - if let (Some(f), Some(m)) = ( - e.get("field").and_then(|v| v.as_str()), - e.get("message").and_then(|v| v.as_str()), - ) { - err_map.insert(f.to_string(), json!(m)); - } - } - } else if let Some(Value::Object(m)) = errors { - err_map = m.clone(); - } - - let action = form - .get("action") - .and_then(|v| v.as_str()) - .unwrap_or("insert"); - let table = form - .get("table") - .and_then(|v| v.as_str()) - .unwrap_or(""); - let heading = form - .get("title") - .and_then(|v| v.as_str()) - .unwrap_or(form_id); - let post_to = form - .get("action_url") - .and_then(|v| v.as_str()) - .map(|s| s.to_string()) - .unwrap_or_else(|| format!("/_form/{form_id}")); - let cancel = form - .get("cancel_href") - .and_then(|v| v.as_str()) - .unwrap_or("/"); - let row_id = form.get("id").map(cell_str).unwrap_or_default(); - let show_meta = form - .get("show_meta") - .and_then(|v| v.as_bool()) - .unwrap_or(true); - - let mut body = String::from("
"); - if show_meta { - body.push_str(&format!( - "

table={} · action={} · id={}

", - esc(table), - esc(action), - esc(heading) - )); - } - body.push_str(&format!( - "
", - esc(&post_to), - if fields.iter().any(|f| { - f.get("type") - .and_then(|v| v.as_str()) - .is_some_and(|t| t.eq_ignore_ascii_case("file")) - }) { - " enctype=\"multipart/form-data\"" - } else { - "" - } - )); - if let Some(token) = csrf.filter(|s| !s.is_empty()) { - body.push_str(&format!( - "", - esc(token) - )); - } - if action == "update" && !row_id.is_empty() { - body.push_str(&format!( - "", - esc(&row_id) - )); - } - for f in &fields { - let name = f.get("name").and_then(|v| v.as_str()).unwrap_or(""); - if name.is_empty() { - continue; - } - let label = f.get("label").and_then(|v| v.as_str()).unwrap_or(name); - let ty = f.get("type").and_then(|v| v.as_str()).unwrap_or("text"); - let required = f.get("required").and_then(|v| v.as_bool()).unwrap_or(false); - let default = f.get("default").and_then(|v| v.as_str()).unwrap_or(""); - let pk = f.get("pk").and_then(|v| v.as_bool()).unwrap_or(false); - let value = if data.contains_key(name) { - field_text(&data, name) - } else if name == "id" && !row_id.is_empty() { - row_id.clone() - } else { - default.to_string() - }; - let readonly = action == "update" && pk && name == "id"; - if readonly { - body.push_str(&format!( - "", - esc(label), - esc(&value) - )); - continue; - } - let req_attr = if required { " required" } else { "" }; - body.push_str(""); - } - body.push_str(&format!( - "
cancel
", - esc(cancel) - )); - body.push_str("
"); - body -} - -/// Standalone form document (`GET|POST /_form/{id}`). -pub fn render( - form: &Value, - form_id: &str, - data: Option<&Value>, - errors: Option<&Value>, - csrf: Option<&str>, -) -> String { - let heading = form - .get("title") - .and_then(|v| v.as_str()) - .unwrap_or(form_id); - let mut body = String::from( - r#""#, - ); - body.push_str(&format!("{}", esc(heading))); - body.push_str( - r#""#, - ); - body.push_str(&format!("

{}

", esc(heading))); - body.push_str(&render_body(form, form_id, data, errors, csrf)); - body.push_str(""); - body -} - -pub fn submit(form: &Value, data: &Value, db_url: &str) -> Result { - let action = form - .get("action") - .and_then(|v| v.as_str()) - .unwrap_or("insert"); - let mut row_map = data_map(data); - if action == "update" { - if let Some(fid) = form.get("id").map(cell_str).filter(|s| !s.is_empty()) { - if !row_map.contains_key("id") { - row_map.insert("id".to_string(), json!(fid)); - } - } - } - let data = Value::Object(row_map.clone()); - let v = validate(form, None, &data); - if !v.get("ok").and_then(|x| x.as_bool()).unwrap_or(false) { - return Ok(json!({ - "ok": false, - "errors": v.get("errors").cloned().unwrap_or(json!([])), - })); - } - let table = form - .get("table") - .and_then(|v| v.as_str()) - .ok_or_else(|| "form missing `table`".to_string())?; - let row = Value::Object(row_map); - let result = if action == "update" { - let id = form - .get("id") - .map(cell_str) - .filter(|s| !s.is_empty()) - .or_else(|| data_map(&data).get("id").map(cell_str)) - .ok_or_else(|| "update requires `id`".to_string())?; - db::update(db_url, table, &id, &row, None)? - } else { - db::insert(db_url, table, &json!([row]), None)? - }; - let redirect = form - .get("redirect") - .and_then(|v| v.as_str()) - .unwrap_or("/"); - Ok(json!({ - "ok": true, - "result": result, - "redirect": redirect, - })) -} - -#[cfg(test)] -mod tests { - use super::*; - use serde_json::json; - - #[test] - fn file_field_adds_multipart_enctype() { - let form = json!({ - "table": "x", - "fields": [ - {"name": "title", "label": "Title", "type": "text"}, - {"name": "file", "label": "File", "type": "file"}, - ] - }); - let html = render(&form, "up", None, None, None); - assert!(html.contains("enctype=\"multipart/form-data\""), "{html}"); - assert!(html.contains("type=\"file\""), "{html}"); - assert!(html.contains("name=\"file\""), "{html}"); - } -} - diff --git a/plugins/web-rust-archive/src/http.rs b/plugins/web-rust-archive/src/http.rs deleted file mode 100644 index 88f40d0..0000000 --- a/plugins/web-rust-archive/src/http.rs +++ /dev/null @@ -1,2075 +0,0 @@ -//! Blocking HTTP listen: page shell, `/_part`, `/_form`, `/admin`, optional static dir. - -use std::collections::HashMap; -use std::net::SocketAddr; -use std::path::PathBuf; -use std::sync::Arc; - -use axum::extract::{Form, Multipart, Path, Query, State}; -use axum::http::{header, HeaderValue, StatusCode}; -use axum::response::{Html, IntoResponse, Redirect, Response}; -use axum::routing::{get, post}; -use axum::Router; -use serde::Deserialize; -use serde_json::{json, Map, Value}; -use tokio::runtime::Runtime; -use tower_http::services::ServeDir; - -use crate::db; -use crate::form; -use crate::middleware::Middleware; -use crate::rate_limit; -use crate::render; -use crate::rss; -use crate::session; -use crate::sitemap; -use crate::storage; -use crate::upload; - -fn with_site_head(base: &Value, site_head: &[crate::assets::HeadLink]) -> Value { - let mut page = base.clone(); - crate::assets::merge_site_head(&mut page, site_head); - page -} - -/// Stamp session login state so nav `when=auth|guest` can filter at render time. -fn with_nav_auth(base: &Value, cookie: Option<&str>) -> Value { - let mut page = base.clone(); - let Some(obj) = page.as_object_mut() else { - return page; - }; - let user = session::session_id_from_cookie(cookie) - .and_then(|sid| session::session_get(&sid, "username")); - let logged_in = user.is_some(); - obj.insert("_logged_in".into(), json!(logged_in)); - if let Some(u) = user { - obj.insert("_nav_user".into(), u); - } else { - obj.remove("_nav_user"); - } - page -} - -fn serve_icon_file(path: PathBuf, content_type: String) -> Response { - match std::fs::read(&path) { - Ok(bytes) => { - let ct = HeaderValue::from_str(&content_type) - .unwrap_or_else(|_| HeaderValue::from_static("application/octet-stream")); - ( - StatusCode::OK, - [ - (header::CONTENT_TYPE, ct), - ( - header::CACHE_CONTROL, - HeaderValue::from_static("public, max-age=86400"), - ), - ], - bytes, - ) - .into_response() - } - Err(_) => StatusCode::NOT_FOUND.into_response(), - } -} - -#[derive(Clone)] -pub struct UploadRoute { - pub field: String, - pub storage_url: String, - pub prefix: String, - pub max_bytes: u64, - pub types: Option, -} - -#[derive(Clone)] -pub struct DownloadRoute { - pub storage_url: String, - pub disposition: String, -} - -#[derive(Clone, Copy, Debug, PartialEq, Eq)] -pub enum GateMatch { - Exact, - /// Segment-boundary prefix: `/desk` matches `/desk` and `/desk/…`, not `/desk-x`. - Prefix, -} - -#[derive(Clone, Copy, Debug, PartialEq, Eq)] -pub enum OnDeny { - Redirect, - Forbid, -} - -#[derive(Clone, Debug)] -pub struct Gate { - pub path: String, - pub roles: Vec, - pub match_mode: GateMatch, - pub on_deny: OnDeny, - pub exclude: Vec, -} - -impl Gate { - pub fn from_json(g: &Value) -> Option { - let raw = g.get("path").and_then(|v| v.as_str())?.trim(); - if raw.is_empty() { - return None; - } - let starred = raw.ends_with('*'); - let mut path = raw.trim_end_matches('*').trim_end_matches('/').to_string(); - if path.is_empty() { - path = "/".into(); - } else if !path.starts_with('/') { - path = format!("/{path}"); - } - let roles = match g.get("roles") { - Some(Value::Array(a)) => a - .iter() - .filter_map(|v| v.as_str().map(|s| s.to_ascii_lowercase())) - .collect(), - Some(Value::String(s)) => session::parse_roles_csv(s), - _ => vec!["admin".into()], - }; - let match_s = g - .get("match") - .or_else(|| g.get("匹配")) - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_ascii_lowercase(); - let match_mode = match match_s.as_str() { - "exact" | "精确" => GateMatch::Exact, - "prefix" | "前缀" => GateMatch::Prefix, - _ if starred => GateMatch::Prefix, - _ => GateMatch::Prefix, - }; - let deny_s = g - .get("on_deny") - .or_else(|| g.get("拒绝")) - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_ascii_lowercase(); - let on_deny = match deny_s.as_str() { - "redirect" | "重定向" | "login" => OnDeny::Redirect, - "forbid" | "禁止" | "403" => OnDeny::Forbid, - _ => OnDeny::Forbid, - }; - let mut exclude = Vec::new(); - if let Some(Value::Array(a)) = g.get("exclude").or_else(|| g.get("排除")) { - for v in a { - if let Some(s) = v.as_str() { - let s = s.trim(); - if !s.is_empty() { - exclude.push(s.to_string()); - } - } - } - } else if let Some(s) = g - .get("exclude") - .or_else(|| g.get("排除")) - .and_then(|v| v.as_str()) - { - for part in s.split(',') { - let part = part.trim(); - if !part.is_empty() { - exclude.push(part.to_string()); - } - } - } - Some(Gate { - path, - roles, - match_mode, - on_deny, - exclude, - }) - } -} - -#[derive(Clone)] -pub struct AppState { - page: Value, - pub db_url: Option, - admin: bool, - /// Built-in admin mount root (e.g. `/admin` or `/desk`); unused when `admin` is false. - admin_prefix: String, - /// Login form URL (GET/POST); may differ from `{admin_prefix}/login`. - login_path: String, - login_redirect: String, - logout_redirect: String, - forms: HashMap, - /// Page that owns an embedded form (for re-render on validation errors). - form_owners: HashMap, - /// Admin users table (`|用户名|密码|`) when login-gated admin is configured. - auth_users: Option, - session_ttl: u64, - cookie_secure: bool, - upload_routes: HashMap, - download_routes: HashMap, - /// Optional assembled pages for 404 / 500. - page_404: Option, - page_500: Option, - /// Default `` links from `app.icons` / static favicon convention. - site_head: Vec, -} - -impl AppState { - fn ap(&self) -> &str { - self.admin_prefix.trim_end_matches('/') - } - - fn admin_href(&self, rest: &str) -> String { - let p = self.ap(); - let rest = rest.trim().trim_start_matches('/'); - if rest.is_empty() { - p.to_string() - } else { - format!("{p}/{rest}") - } - } -} - -fn collect_page_forms( - page: &Value, - forms: &mut HashMap, - owners: &mut HashMap, -) { - if let Some(obj) = page.get("forms").and_then(|v| v.as_object()) { - for (k, v) in obj { - forms.insert(k.clone(), v.clone()); - owners.insert(k.clone(), page.clone()); - } - } - if let (Some(id), Some(f)) = ( - page.get("form_id").and_then(|v| v.as_str()), - page.get("form"), - ) { - if !id.is_empty() { - forms.insert(id.to_string(), f.clone()); - owners.insert(id.to_string(), page.clone()); - } - } -} - -pub fn listen( - page: &Value, - db_url: Option<&str>, - host: &str, - port: u16, - admin: bool, - admin_prefix: &str, - login_path: &str, - login_redirect: &str, - logout_redirect: &str, - mut forms: HashMap, - routes: HashMap, - static_dir: Option, - static_mount: &str, - auth_users: Option, - session_ttl: u64, - cookie_secure: bool, - ws_routes: HashMap, - rss_routes: HashMap, - upload_routes: HashMap, - download_routes: HashMap, - redirects: HashMap, - sitemap_routes: HashMap, - robots_body: Option, - page_404: Option, - page_500: Option, - gates: Vec, - gallery_routes: HashMap, - middleware: &Middleware, - mut site_head: Vec, - mut icon_routes: Vec, - proxy_routes: Vec<(String, crate::proxy::ProxyRoute)>, - invoke_routes: Vec<(String, crate::invoke::InvokeRoute)>, -) -> Result { - let mut form_owners = HashMap::new(); - collect_page_forms(page, &mut forms, &mut form_owners); - for p in routes.values() { - collect_page_forms(p, &mut forms, &mut form_owners); - } - session::configure(session::Config { - db_url: db_url.map(|s| s.to_string()), - ttl_sec: session_ttl, - cookie_secure, - }); - session::reset(session_ttl); - rate_limit::reset(); - - // Convention: static_dir/favicon.* → /favicon.ico when no explicit icons. - if icon_routes.is_empty() { - if let Some(dir) = static_dir.as_ref() { - if let Some((head, routes)) = crate::assets::convention_favicon(dir) { - site_head = head; - icon_routes = routes; - } - } - } - - // Resolve relative icon paths: try as-is absolute, else leave for entry_dir resolve in lib. - // (Absolute paths preferred; relative already joined in web_listen.) - - let admin_prefix = { - let mut p = admin_prefix.trim().to_string(); - if !p.starts_with('/') { - p = format!("/{p}"); - } - while p.len() > 1 && p.ends_with('/') { - p.pop(); - } - p - }; - let state = Arc::new(AppState { - page: page.clone(), - db_url: db_url.map(|s| s.to_string()), - admin, - admin_prefix: admin_prefix.clone(), - login_path: { - let lp = login_path.trim(); - if lp.is_empty() { - format!("{}/login", admin_prefix.trim_end_matches('/')) - } else { - lp.to_string() - } - }, - login_redirect: login_redirect.to_string(), - logout_redirect: logout_redirect.to_string(), - forms, - form_owners, - auth_users, - session_ttl, - cookie_secure, - upload_routes: upload_routes.clone(), - download_routes: download_routes.clone(), - page_404: page_404.clone(), - page_500: page_500.clone(), - site_head: site_head.clone(), - }); - - let mut app = Router::new() - .route("/", get(home)) - .route("/_part/{id}", get(home_part)) - .route("/_form/{id}", get(form_get).post(form_post)); - - // Built-in admin only when enabled — otherwise `/admin…` is free for author routes. - if admin { - let admin_routes = Router::new() - .route("/", get(admin_home)) - .route("/login", get(admin_login_get).post(admin_login_post)) - .route("/logout", get(admin_logout)) - .route("/{table}", get(admin_table)) - .route("/{table}/new", get(admin_new_get).post(admin_new_post)) - .route( - "/{table}/{id}/edit", - get(admin_edit_get).post(admin_edit_post), - ) - .route("/{table}/{id}/delete", get(admin_delete)); - app = app.nest(&admin_prefix, admin_routes); - } - - // Register each author route as an exact GET path + `{path}/_part/{id}`. - // Paths containing `{param}` become dynamic routes (e.g. `/post/{slug}`); - // the captured params are injected into the page before rendering. - let mut paths: Vec = routes.keys().cloned().collect(); - paths.sort(); - for path in paths { - let page = routes.get(&path).cloned().unwrap_or_default(); - let dynamic = path.contains('{'); - if dynamic { - let page_for_render = page.clone(); - app = app.route( - &path, - get(async move |State(st): State>, headers: axum::http::HeaderMap, Path(params): Path>| { - let mut p = page_for_render.clone(); - inject_params(&mut p, ¶ms); - let p = with_site_head(&p, &st.site_head); - let (_, csrf, set_cookie) = resolve_session(&headers); - let cookie = cookie_from_headers(&headers); - let p = with_nav_auth(&p, cookie); - let mut resp = Html(render::render_page(&p, st.db_url.as_deref(), Some(&csrf))).into_response(); - append_set_cookie(&mut resp, set_cookie); - resp - }), - ); - // Dynamic `{path}/_part/{id}` with the same path params. - let part_path = format!("{path}/_part/{{id}}"); - let page_for_part = page.clone(); - app = app.route( - &part_path, - get(async move |State(st): State>, Path((params, id)): Path<(HashMap, String)>| { - let mut p = page_for_part.clone(); - inject_params(&mut p, ¶ms); - render_part_from_page(&p, &id, st.db_url.as_deref()) - }), - ); - } else { - let page_for_render = page.clone(); - app = app.route( - &path, - get(async move |State(st): State>, headers: axum::http::HeaderMap| { - let (_, csrf, set_cookie) = resolve_session(&headers); - let p = with_site_head(&page_for_render, &st.site_head); - let p = with_nav_auth(&p, cookie_from_headers(&headers)); - let mut resp = Html(render::render_page(&p, st.db_url.as_deref(), Some(&csrf))) - .into_response(); - append_set_cookie(&mut resp, set_cookie); - resp - }), - ); - let part_path = format!("{path}/_part/{{id}}"); - let page_for_part = page.clone(); - app = app.route( - &part_path, - get(async move |State(st): State>, Path(id): Path| { - render_part_from_page(&page_for_part, &id, st.db_url.as_deref()) - }), - ); - } - } - - // WebSocket endpoints (`ws://…/{path}`). - let mut ws_paths: Vec = ws_routes.keys().cloned().collect(); - ws_paths.sort(); - for path in ws_paths { - let mode = ws_routes - .get(&path) - .copied() - .unwrap_or(crate::ws_hub::WsMode::Echo); - let route_path = path.clone(); - app = app.route( - &path, - axum::routing::get(move |ws: axum::extract::WebSocketUpgrade| { - ws_upgrade(ws, mode, route_path.clone()) - }), - ); - } - - let mut rss_paths: Vec = rss_routes.keys().cloned().collect(); - rss_paths.sort(); - for path in rss_paths { - let cfg = rss_routes.get(&path).cloned().unwrap_or_default(); - let route_path = path.clone(); - app = app.route( - &path, - get(move |State(st): State>| { - let cfg = cfg.clone(); - let route_path = route_path.clone(); - async move { rss_feed(&st, &route_path, &cfg) } - }), - ); - } - - let mut upload_paths: Vec = upload_routes.keys().cloned().collect(); - upload_paths.sort(); - for path in upload_paths { - let route_path = path.clone(); - app = app.route( - &path, - post(move |State(st): State>, headers: axum::http::HeaderMap, multipart: Multipart| { - let route_path = route_path.clone(); - async move { upload_post(st, headers, route_path, multipart).await } - }), - ); - } - - let mut download_paths: Vec = download_routes.keys().cloned().collect(); - download_paths.sort(); - for path in download_paths { - let route_path = path.clone(); - app = app.route( - &path, - get(move |State(st): State>, headers: axum::http::HeaderMap, Path(params): Path>| { - let route_path = route_path.clone(); - async move { download_get(st, &route_path, params, &headers) } - }), - ); - } - - let mut gallery_paths: Vec = gallery_routes.keys().cloned().collect(); - gallery_paths.sort(); - for path in gallery_paths { - let cfg = gallery_routes.get(&path).cloned().unwrap_or_default(); - app = app.route( - &path, - get(move |State(st): State>| { - let cfg = cfg.clone(); - async move { gallery_page(&st, &cfg) } - }), - ); - } - - let mount = normalize_static_mount(static_mount); - if let Some(dir) = static_dir { - if !dir.is_dir() { - return Err(format!( - "static dir `{}` is not a directory", - dir.display() - )); - } - eprintln!( - "marqdo web static: {} → {}", - mount, - dir.display() - ); - let svc = ServeDir::new(dir); - app = app.nest_service(&mount, svc); - } - - // Root / custom icon file routes (favicon.ico, /icons/…). - for ir in icon_routes { - let url = ir.url.clone(); - if !url.starts_with('/') { - return Err(format!("icon url `{url}` must start with /")); - } - if !ir.path.is_file() { - return Err(format!( - "icon file `{}` not found for `{url}`", - ir.path.display() - )); - } - eprintln!( - "marqdo web icon: {} → {} ({})", - url, - ir.path.display(), - ir.content_type - ); - let path = ir.path.clone(); - let ct = ir.content_type.clone(); - app = app.route( - &url, - get(move || { - let path = path.clone(); - let ct = ct.clone(); - async move { serve_icon_file(path, ct) } - }), - ); - } - - let mut redir_paths: Vec = redirects.keys().cloned().collect(); - redir_paths.sort(); - for path in redir_paths { - let (to, permanent) = redirects.get(&path).cloned().unwrap_or_default(); - app = app.route( - &path, - get(move || { - let to = to.clone(); - let permanent = permanent; - async move { - // 301 for permanent (SEO), 307 for temporary — not axum's 308/307 defaults. - let status = if permanent { - StatusCode::MOVED_PERMANENTLY - } else { - StatusCode::TEMPORARY_REDIRECT - }; - match HeaderValue::from_str(&to) { - Ok(loc) => (status, [(header::LOCATION, loc)]).into_response(), - Err(_) => Redirect::to(&to).into_response(), - } - } - }), - ); - } - - let mut sm_paths: Vec = sitemap_routes.keys().cloned().collect(); - sm_paths.sort(); - for path in sm_paths { - let cfg = sitemap_routes.get(&path).cloned().unwrap_or_default(); - app = app.route( - &path, - get(move |State(st): State>| { - let cfg = cfg.clone(); - async move { sitemap_response(&st, &cfg) } - }), - ); - } - - if let Some(body) = robots_body { - app = app.route( - "/robots.txt", - get(move || { - let body = body.clone(); - async move { - ( - [( - header::CONTENT_TYPE, - HeaderValue::from_static("text/plain; charset=utf-8"), - )], - body, - ) - .into_response() - } - }), - ); - } - - // Streaming proxy + HTTP→## invoke (before fallback so paths are explicit). - app = crate::proxy::mount_all(app, &proxy_routes); - app = crate::invoke::mount_all(app, &invoke_routes); - - app = app.fallback(get(fallback_404)); - - let app = crate::middleware::apply(app, middleware); - let app = if !gates.is_empty() { - let gates_for_mw = gates.clone(); - let login_path_for_mw = state.login_path.clone(); - app.layer(axum::middleware::from_fn( - move |req: axum::http::Request, next: axum::middleware::Next| { - let gates = gates_for_mw.clone(); - let login_path = login_path_for_mw.clone(); - async move { rbac_middleware(gates, login_path, req, next).await } - }, - )) - } else { - app - }; - let app = app.with_state(state); - - let addr: SocketAddr = format!("{host}:{port}") - .parse() - .map_err(|e| format!("bad listen addr {host}:{port}: {e}"))?; - - let rt = Runtime::new().map_err(|e| e.to_string())?; - rt.block_on(async move { - let listener = tokio::net::TcpListener::bind(addr) - .await - .map_err(|e| format!("bind {addr}: {e}"))?; - eprintln!("marqdo web listening on http://{addr}"); - axum::serve(listener, app) - .await - .map_err(|e| format!("serve: {e}")) - })?; - Ok(json!({ "ok": true })) -} - -pub fn normalize_static_mount(raw: &str) -> String { - let s = raw.trim(); - if s.is_empty() { - return "/static".into(); - } - let mut m = if s.starts_with('/') { - s.to_string() - } else { - format!("/{s}") - }; - while m.len() > 1 && m.ends_with('/') { - m.pop(); - } - m -} - -fn rss_feed(st: &AppState, _path: &str, cfg: &Value) -> Response { - let Some(url) = st.db_url.as_deref() else { - return Html(String::from("

no database

")).into_response(); - }; - let table = cfg - .get("table") - .and_then(|v| v.as_str()) - .unwrap_or("posts"); - let limit = cfg - .get("limit") - .and_then(|v| v.as_i64()) - .unwrap_or(20); - let order = cfg.get("order").and_then(|v| v.as_str()); - let title = cfg - .get("title") - .and_then(|v| v.as_str()) - .unwrap_or("Feed"); - let link = cfg.get("link").and_then(|v| v.as_str()).unwrap_or("/"); - let description = cfg - .get("description") - .and_then(|v| v.as_str()) - .unwrap_or(""); - let rows = db::select_order(url, table, limit, None, order, None, None) - .ok() - .and_then(|v| v.get("rows").and_then(|r| r.as_array()).cloned()) - .unwrap_or_default(); - let xml = rss::build_rss(title, link, description, &rows); - ( - [(axum::http::header::CONTENT_TYPE, "application/rss+xml; charset=utf-8")], - xml, - ) - .into_response() -} - -async fn home(State(st): State>, headers: axum::http::HeaderMap) -> Response { - let (_, csrf, set_cookie) = resolve_session(&headers); - let page = with_site_head(&st.page, &st.site_head); - let page = with_nav_auth(&page, cookie_from_headers(&headers)); - let html = render::render_page(&page, st.db_url.as_deref(), Some(&csrf)); - let mut resp = Html(html).into_response(); - append_set_cookie(&mut resp, set_cookie); - resp -} - -/// Inject captured dynamic-route params into a page copy as `params` (a map), -/// so render can resolve `{param}` placeholders in `query`/`intro`. -fn inject_params(page: &mut Value, params: &HashMap) { - if let Some(obj) = page.as_object_mut() { - let mut map = Map::new(); - for (k, v) in params { - map.insert(k.clone(), json!(v)); - } - obj.insert("params".into(), Value::Object(map)); - // Propagate into every part (fragments render independently). - if let Some(parts) = obj.get_mut("parts").and_then(|p| p.as_object_mut()) { - for cfg in parts.values_mut() { - if let Some(m) = cfg.as_object_mut() { - let mut pmap = Map::new(); - for (k, v) in params { - pmap.insert(k.clone(), json!(v)); - } - m.insert("params".into(), Value::Object(pmap)); - } - } - } - } -} - -fn render_part_from_page(page: &Value, id: &str, db_url: Option<&str>) -> Response { - let Some(parts) = page.get("parts").and_then(|v| v.as_object()) else { - return Html(String::from("

no parts

")).into_response(); - }; - let Some(cfg) = parts.get(id) else { - return Html(format!("

unknown part {id}

")).into_response(); - }; - Html(render::render_fragment(cfg, db_url)).into_response() -} - -async fn home_part(State(st): State>, Path(id): Path) -> Response { - render_part_from_page(&st.page, &id, st.db_url.as_deref()) -} - -async fn form_get( - State(st): State>, - headers: axum::http::HeaderMap, - Path(id): Path, -) -> Response { - let Some(frm) = st.forms.get(&id) else { - return Html(format!("

unknown form {id}

")).into_response(); - }; - let (_, csrf, set_cookie) = resolve_session(&headers); - let mut resp = Html(form::render(frm, &id, None, None, Some(&csrf))).into_response(); - append_set_cookie(&mut resp, set_cookie); - resp -} - -async fn form_post( - State(st): State>, - headers: axum::http::HeaderMap, - Path(id): Path, - Form(posted): Form>, -) -> Response { - let Some(frm) = st.forms.get(&id) else { - return Html(format!("

unknown form {id}

")).into_response(); - }; - let Some(url) = st.db_url.as_deref() else { - return Html(String::from("

no database

")).into_response(); - }; - let (_, csrf, set_cookie, posted) = match validate_csrf_post(&headers, posted) { - Ok(v) => v, - Err(r) => return r, - }; - let mut resp = submit_and_respond(&st, frm, &id, url, posted, None, Some(&csrf)); - append_set_cookie(&mut resp, set_cookie); - resp -} - -fn posted_to_value(posted: HashMap) -> Value { - let mut data = Map::new(); - for (k, v) in posted { - data.insert(k, json!(v)); - } - Value::Object(data) -} - -fn with_flash(redirect: &str, flash: &str) -> String { - if redirect.contains('?') { - format!("{redirect}&flash={flash}") - } else { - format!("{redirect}?flash={flash}") - } -} - -fn submit_and_respond( - st: &AppState, - frm: &Value, - form_id: &str, - url: &str, - posted: HashMap, - admin_table: Option<&str>, - csrf: Option<&str>, -) -> Response { - let data_v = posted_to_value(posted); - match form::submit(frm, &data_v, url) { - Ok(res) if res.get("ok").and_then(|v| v.as_bool()).unwrap_or(false) => { - let mut redirect = res - .get("redirect") - .and_then(|v| v.as_str()) - .unwrap_or("/") - .to_string(); - if form_id.contains("-new") { - redirect = with_flash(&redirect, "created"); - } else if form_id.contains("-edit") { - redirect = with_flash(&redirect, "updated"); - } - Redirect::to(&redirect).into_response() - } - Ok(res) => { - let errors = res.get("errors"); - if let Some(table) = admin_table { - Html(admin_form_page( - st, - table, - if form_id.contains("-edit") { - "Edit" - } else { - "New" - }, - frm, - form_id, - Some(&data_v), - errors, - csrf, - )) - .into_response() - } else if let Some(page) = st.form_owners.get(form_id) { - Html(render::render_page_ex( - page, - st.db_url.as_deref(), - Some(&data_v), - errors, - csrf, - )) - .into_response() - } else { - Html(form::render(frm, form_id, Some(&data_v), errors, csrf)).into_response() - } - } - Err(e) => Html(format!("

submit error: {}

", esc(&e))).into_response(), - } -} - -fn cookie_from_headers(headers: &axum::http::HeaderMap) -> Option<&str> { - headers - .get(axum::http::header::COOKIE) - .and_then(|v| v.to_str().ok()) -} - -fn client_ip(headers: &axum::http::HeaderMap) -> String { - headers - .get("x-forwarded-for") - .and_then(|v| v.to_str().ok()) - .and_then(|s| s.split(',').next()) - .map(|s| s.trim().to_string()) - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| "127.0.0.1".into()) -} - -fn resolve_session(headers: &axum::http::HeaderMap) -> (String, String, Option) { - let cookie = cookie_from_headers(headers); - let (id, set_cookie) = session::ensure_from_cookie(cookie); - let csrf = session::csrf_for(&id).unwrap_or_default(); - (id, csrf, set_cookie) -} - -fn append_set_cookie(resp: &mut Response, set_cookie: Option) { - if let Some(c) = set_cookie { - let _ = resp.headers_mut().try_append( - axum::http::header::SET_COOKIE, - c.parse().unwrap(), - ); - } -} - -fn validate_csrf_post( - headers: &axum::http::HeaderMap, - posted: HashMap, -) -> Result<(String, String, Option, HashMap), Response> { - let (sid, csrf, set_cookie) = resolve_session(headers); - let token = posted.get("_csrf").map(|s| s.as_str()).unwrap_or(""); - if !session::validate_csrf(&sid, token) { - return Err(Html( - "

Invalid or missing CSRF token. Refresh and try again.

" - .to_string(), - ) - .into_response()); - } - let mut posted = posted; - posted.remove("_csrf"); - Ok((sid, csrf, set_cookie, posted)) -} - -fn json_err(status: StatusCode, msg: &str) -> Response { - let body = json!({ "ok": false, "error": msg }); - (status, axum::Json(body)).into_response() -} - -async fn upload_post( - st: Arc, - headers: axum::http::HeaderMap, - route_path: String, - mut multipart: Multipart, -) -> Response { - let cfg = match st.upload_routes.get(&route_path) { - Some(c) => c.clone(), - None => return json_err(StatusCode::NOT_FOUND, "upload route not found"), - }; - - let had_cookie = cookie_from_headers(&headers).is_some(); - let (sid, _csrf, set_cookie) = resolve_session(&headers); - - let mut csrf_token = String::new(); - let mut file_name = String::new(); - let mut file_ct = String::from("application/octet-stream"); - let mut file_bytes: Option> = None; - - loop { - let field = match multipart.next_field().await { - Ok(Some(f)) => f, - Ok(None) => break, - Err(e) => return json_err(StatusCode::BAD_REQUEST, &format!("multipart: {e}")), - }; - let name = field.name().unwrap_or("").to_string(); - if name == "_csrf" { - csrf_token = field.text().await.unwrap_or_default(); - continue; - } - if name != cfg.field { - // Drain unrelated fields. - let _ = field.bytes().await; - continue; - } - file_name = field - .file_name() - .map(|s| s.to_string()) - .unwrap_or_default(); - if let Some(ct) = field.content_type() { - file_ct = ct.to_string(); - } - match field.bytes().await { - Ok(b) => file_bytes = Some(b.to_vec()), - Err(e) => return json_err(StatusCode::BAD_REQUEST, &format!("read file: {e}")), - } - } - - // Existing session cookie → require CSRF; brand-new anonymous upload → open. - if had_cookie && !session::validate_csrf(&sid, &csrf_token) { - return json_err(StatusCode::FORBIDDEN, "Invalid or missing CSRF token"); - } - - let bytes = match file_bytes { - Some(b) if !b.is_empty() => b, - _ => return json_err(StatusCode::BAD_REQUEST, "missing file field"), - }; - let size = bytes.len() as u64; - let check = match upload::validate( - &file_name, - &file_ct, - size, - cfg.max_bytes, - cfg.types.as_ref(), - ) { - Ok(v) => v, - Err(e) => return json_err(StatusCode::BAD_REQUEST, &e), - }; - if check.get("ok").and_then(|v| v.as_bool()) != Some(true) { - let err = check - .get("error") - .and_then(|v| v.as_str()) - .unwrap_or("validation failed"); - return json_err(StatusCode::BAD_REQUEST, err); - } - let ct = check - .get("content_type") - .and_then(|v| v.as_str()) - .unwrap_or(&file_ct); - - let key = match upload::make_key(&cfg.prefix, &file_name) { - Ok(k) => k, - Err(e) => return json_err(StatusCode::BAD_REQUEST, &e), - }; - let saved = match storage::put_bytes(&cfg.storage_url, &key, &bytes, ct) { - Ok(v) => v, - Err(e) => return json_err(StatusCode::INTERNAL_SERVER_ERROR, &e), - }; - let mut body = json!({ - "ok": true, - "key": key, - "size": size, - "content_type": ct, - }); - if let Some(obj) = body.as_object_mut() { - if let Some(sz) = saved.get("size") { - obj.insert("size".into(), sz.clone()); - } - } - let mut resp = (StatusCode::OK, axum::Json(body)).into_response(); - append_set_cookie(&mut resp, set_cookie); - resp -} - -fn download_get( - st: Arc, - route_path: &str, - params: HashMap, - headers: &axum::http::HeaderMap, -) -> Response { - let cfg = match st.download_routes.get(route_path) { - Some(c) => c.clone(), - None => return json_err(StatusCode::NOT_FOUND, "download route not found"), - }; - let key = params - .get("key") - .or_else(|| params.values().next()) - .map(|s| s.trim_start_matches('/').to_string()) - .unwrap_or_default(); - if key.is_empty() { - return json_err(StatusCode::BAD_REQUEST, "missing key"); - } - let got = match storage::read_bytes(&cfg.storage_url, &key) { - Ok(Some(v)) => v, - Ok(None) => return json_err(StatusCode::NOT_FOUND, "not found"), - Err(e) => return json_err(StatusCode::INTERNAL_SERVER_ERROR, &e), - }; - let (bytes, content_type, filename) = got; - let etag = weak_etag(&bytes); - if let Some(inm) = headers - .get(header::IF_NONE_MATCH) - .and_then(|v| v.to_str().ok()) - { - if inm - .split(',') - .any(|t| t.trim().eq_ignore_ascii_case(&etag)) - { - return StatusCode::NOT_MODIFIED.into_response(); - } - } - let disp = if cfg.disposition.eq_ignore_ascii_case("inline") { - "inline" - } else { - "attachment" - }; - let safe_name = filename.replace('"', "_"); - ( - StatusCode::OK, - [ - ( - header::CONTENT_TYPE, - HeaderValue::from_str(&content_type) - .unwrap_or_else(|_| HeaderValue::from_static("application/octet-stream")), - ), - ( - header::CONTENT_DISPOSITION, - HeaderValue::from_str(&format!("{disp}; filename=\"{safe_name}\"")) - .unwrap_or_else(|_| HeaderValue::from_static("attachment")), - ), - ( - header::ETAG, - HeaderValue::from_str(&etag).unwrap_or_else(|_| HeaderValue::from_static("W/\"0\"")), - ), - ], - bytes, - ) - .into_response() -} - -fn weak_etag(bytes: &[u8]) -> String { - let mut h: u64 = 0xcbf2_9ce4_8422_2325; - for b in bytes { - h ^= u64::from(*b); - h = h.wrapping_mul(0x0100_0000_01b3); - } - format!("W/\"{h:x}-{}\"", bytes.len()) -} - -fn gate_matches(path: &str, gate: &Gate) -> bool { - let pat = gate.path.trim_end_matches('*').trim_end_matches('/'); - let pat = if pat.is_empty() { "/" } else { pat }; - match gate.match_mode { - GateMatch::Exact => path == pat || path == gate.path, - GateMatch::Prefix => path == pat || path.starts_with(&format!("{pat}/")), - } -} - -fn path_excluded(path: &str, exclude: &[String], login_path: &str) -> bool { - if path == login_path || path.starts_with(&format!("{login_path}?")) { - return true; - } - for ex in exclude { - let ex = ex.trim_end_matches('*').trim_end_matches('/'); - if ex.is_empty() { - continue; - } - if path == ex || path.starts_with(&format!("{ex}/")) { - return true; - } - } - false -} - -async fn rbac_middleware( - gates: Vec, - login_path: String, - req: axum::http::Request, - next: axum::middleware::Next, -) -> Response { - let path = req.uri().path().to_string(); - let cookie = req - .headers() - .get(header::COOKIE) - .and_then(|v| v.to_str().ok()) - .map(|s| s.to_string()); - for gate in &gates { - if !gate_matches(&path, gate) { - continue; - } - if path_excluded(&path, &gate.exclude, &login_path) { - break; - } - let role = session::session_role(cookie.as_deref()); - if !session::role_allowed(&role, &gate.roles) { - if role == "visitor" && gate.on_deny == OnDeny::Redirect { - let next_q = urlencoding_path(&path); - let dest = if next_q.is_empty() || path == login_path { - login_path.clone() - } else { - format!("{login_path}?next={next_q}") - }; - return Redirect::to(&dest).into_response(); - } - return ( - StatusCode::FORBIDDEN, - Html(format!( - "

403 Forbidden

Role `{role}` cannot access `{path}`.

" - )), - ) - .into_response(); - } - break; - } - next.run(req).await -} - -fn urlencoding_path(path: &str) -> String { - let mut out = String::new(); - for b in path.bytes() { - match b { - b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' | b'/' => { - out.push(b as char) - } - _ => out.push_str(&format!("%{b:02X}")), - } - } - out -} - -fn gallery_page(_st: &AppState, cfg: &Value) -> Response { - let storage_url = cfg - .get("storage") - .and_then(|v| v.as_str()) - .unwrap_or(""); - let prefix = cfg - .get("prefix") - .and_then(|v| v.as_str()) - .unwrap_or(""); - let title = cfg - .get("title") - .and_then(|v| v.as_str()) - .unwrap_or("Gallery"); - let download_base = cfg - .get("download_base") - .and_then(|v| v.as_str()) - .unwrap_or("/_media"); - let listed = storage::list(storage_url, Some(prefix)).unwrap_or_else(|_| json!({ "keys": [] })); - let keys = listed - .get("keys") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let mut items = String::new(); - for k in &keys { - let key = k.as_str().unwrap_or(""); - if key.is_empty() { - continue; - } - let href = format!( - "{}/{}", - download_base.trim_end_matches('/'), - key.trim_start_matches('/') - ); - let name = key.rsplit('/').next().unwrap_or(key); - let lower = name.to_ascii_lowercase(); - let is_img = lower.ends_with(".png") - || lower.ends_with(".jpg") - || lower.ends_with(".jpeg") - || lower.ends_with(".gif") - || lower.ends_with(".webp") - || lower.ends_with(".svg"); - if is_img { - items.push_str(&format!( - "
\"{n}\"/
{n}
", - h = esc(&href), - n = esc(name) - )); - } else { - items.push_str(&format!( - "
{n}
", - h = esc(&href), - n = esc(name) - )); - } - } - if items.is_empty() { - items = "

No media yet.

".into(); - } - let html = format!( - r#" - - -{title} - -

{title}

{items}
"#, - title = esc(title), - items = items - ); - let etag = weak_etag(html.as_bytes()); - ( - StatusCode::OK, - [ - ( - header::CONTENT_TYPE, - HeaderValue::from_static("text/html; charset=utf-8"), - ), - ( - header::ETAG, - HeaderValue::from_str(&etag).unwrap_or_else(|_| HeaderValue::from_static("W/\"0\"")), - ), - ], - html, - ) - .into_response() -} - -fn admin_gate(st: &AppState, cookie_header: Option<&str>) -> Option { - // When admin=false the built-in routes are not mounted; defense-in-depth only. - if !st.admin { - return Some((StatusCode::NOT_FOUND, "Not Found").into_response()); - } - if st.db_url.is_none() { - return Some(Html(admin_shell(st, "Admin", None, "

No database bound to this app.

")).into_response()); - } - if st.auth_users.is_some() && !admin_authed(st, cookie_header) { - return Some(Redirect::to(&st.login_path).into_response()); - } - None -} - -/// True when a session with role `admin` is present (legacy users without role → admin). -fn admin_authed(_st: &AppState, cookie_header: Option<&str>) -> bool { - let Some(sid) = session::session_id_from_cookie(cookie_header) else { - return false; - }; - if session::session_get(&sid, "username").is_none() { - return false; - } - let role = session::session_role(cookie_header); - session::role_allowed(&role, &["admin".into()]) -} - -async fn admin_login_get(State(st): State>, headers: axum::http::HeaderMap) -> Response { - if st.auth_users.is_none() { - return Redirect::to(&st.login_redirect).into_response(); - } - if admin_authed(&st, cookie_from_headers(&headers)) { - return Redirect::to(&st.login_redirect).into_response(); - } - let (_, csrf, set_cookie) = resolve_session(&headers); - let mut resp = Html(login_page(&st, None, Some(&csrf))).into_response(); - append_set_cookie(&mut resp, set_cookie); - resp -} - -async fn admin_login_post( - State(st): State>, - headers: axum::http::HeaderMap, - Form(posted): Form>, -) -> Response { - let Some(users) = &st.auth_users else { - return Redirect::to(&st.login_redirect).into_response(); - }; - let (_, csrf, set_cookie, posted) = match validate_csrf_post(&headers, posted) { - Ok(v) => v, - Err(r) => return r, - }; - let username = posted.get("username").cloned().unwrap_or_default(); - let password = posted.get("password").cloned().unwrap_or_default(); - let ip = client_ip(&headers); - if let Err(msg) = rate_limit::check(&ip, &username) { - let mut resp = Html(login_page(&st, Some(&msg), Some(&csrf))).into_response(); - append_set_cookie(&mut resp, set_cookie); - return resp; - } - let Some((user, role)) = session::check_credentials(users, &username, &password) else { - rate_limit::record_failure(&ip, &username); - let mut resp = - Html(login_page(&st, Some("Invalid username or password."), Some(&csrf))) - .into_response(); - append_set_cookie(&mut resp, set_cookie); - return resp; - }; - rate_limit::clear_success(&ip, &username); - let sid = session::session_new(Some(st.session_ttl)); - session::session_set(&sid, "username", json!(user)); - session::session_set(&sid, "role", json!(role)); - let mut resp = Redirect::to(&st.login_redirect).into_response(); - let _ = resp.headers_mut().try_append( - axum::http::header::SET_COOKIE, - session::session_cookie(&sid, st.session_ttl, st.cookie_secure) - .parse() - .unwrap(), - ); - append_set_cookie(&mut resp, set_cookie); - resp -} - -fn login_page(st: &AppState, error: Option<&str>, csrf: Option<&str>) -> String { - let err = match error { - Some(e) => format!("

{}

", esc(e)), - None => String::new(), - }; - let csrf_field = csrf - .filter(|s| !s.is_empty()) - .map(|t| format!("", esc(t))) - .unwrap_or_default(); - format!( - r#" - - - -Admin Login - - - - -"#, - err = err, - csrf_field = csrf_field, - login_action = esc(&st.login_path), - ) -} - -async fn admin_logout( - State(st): State>, - headers: axum::http::HeaderMap, -) -> Response { - if let Some(sid) = session::session_id_from_cookie( - headers - .get(axum::http::header::COOKIE) - .and_then(|v| v.to_str().ok()), - ) { - session::session_destroy(&sid); - } - let mut resp = Redirect::to(&st.logout_redirect).into_response(); - if let Ok(h) = resp.headers_mut().try_append( - axum::http::header::SET_COOKIE, - "marqdo_sid=; HttpOnly; Path=/; Max-Age=0; SameSite=Lax" - .parse() - .unwrap(), - ) { - let _ = h; - } - resp -} - -fn flash_html(flash: Option<&str>) -> String { - match flash { - Some("created") => "
Row created.
".into(), - Some("updated") => "
Row updated.
".into(), - Some("deleted") => "
Row deleted.
".into(), - Some(other) if !other.is_empty() => { - format!("
{}
", esc(other)) - } - _ => String::new(), - } -} - -fn admin_shell(st: &AppState, title: &str, active: Option<&str>, inner: &str) -> String { - let tables = st - .db_url - .as_deref() - .and_then(|u| db::list_tables(u).ok()) - .unwrap_or_default(); - let mut side = format!(""); - - format!( - r#" - - - -{title} · Admin - - - -{side} -
{inner}
-"#, - title = esc(title), - side = side, - inner = inner - ) -} - -fn admin_form_page( - st: &AppState, - table: &str, - kind: &str, - frm: &Value, - form_id: &str, - data: Option<&Value>, - errors: Option<&Value>, - csrf: Option<&str>, -) -> String { - let mut body = format!( - "

Admin / {t} / {kind}

{kind} {t}

", - home = esc(st.ap()), - table_href = esc(&st.admin_href(table)), - t = esc(table), - kind = esc(kind), - ); - body.push_str(&form::render_body(frm, form_id, data, errors, csrf)); - admin_shell(st, &format!("{kind} {table}"), Some(table), &body) -} - -#[derive(Deserialize)] -struct FlashQuery { - flash: Option, -} - -async fn admin_home( - State(st): State>, - headers: axum::http::HeaderMap, - Query(q): Query, -) -> Response { - if let Some(r) = admin_gate(&st, cookie_from_headers(&headers)) { - return r; - } - let url = st.db_url.as_deref().unwrap(); - let tables = db::list_tables(url).unwrap_or_default(); - let mut inner = String::from("

Admin

SQLite tables for this site.

"); - inner.push_str(&flash_html(q.flash.as_deref())); - if tables.is_empty() { - inner.push_str( - "
No tablesInitialize a table via db.init / 数据库.初始化.
", - ); - } else { - inner.push_str("
"); - for t in &tables { - inner.push_str(&format!( - "", - href = esc(&st.admin_href(t)), - new_href = esc(&st.admin_href(&format!("{t}/new"))), - t = esc(t) - )); - } - inner.push_str("
Table
{t}New
"); - } - Html(admin_shell(&st, "Admin", None, &inner)).into_response() -} - -async fn admin_table( - State(st): State>, - headers: axum::http::HeaderMap, - Path(table): Path, - Query(q): Query, -) -> Response { - if let Some(r) = admin_gate(&st, cookie_from_headers(&headers)) { - return r; - } - let url = st.db_url.as_deref().unwrap(); - let Ok(data) = db::select(url, &table, 200, None) else { - return Html(admin_shell( - &st, - &table, - Some(&table), - &format!("

Cannot read table {}.

", esc(&table)), - )) - .into_response(); - }; - let rows = data - .get("rows") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let mut cols: Vec = rows - .first() - .and_then(|r| r.as_object()) - .map(|m| m.keys().cloned().collect()) - .unwrap_or_default(); - if cols.is_empty() { - if let Ok(info) = db::table_info(url, &table) { - cols = info.into_iter().map(|c| c.name).collect(); - } - } - if let Some(i) = cols.iter().position(|c| c == "id") { - let idc = cols.remove(i); - cols.insert(0, idc); - } - - let mut inner = format!( - "

Admin / {t}

{t}

", - home = esc(st.ap()), - t = esc(&table) - ); - inner.push_str(&flash_html(q.flash.as_deref())); - inner.push_str(&format!( - "
New row{} row{}
", - rows.len(), - if rows.len() == 1 { "" } else { "s" }, - new_href = esc(&st.admin_href(&format!("{table}/new"))), - )); - - if rows.is_empty() { - inner.push_str(&format!( - "", - esc(&table), - new_href = esc(&st.admin_href(&format!("{table}/new"))), - )); - } else { - inner.push_str("
"); - for c in &cols { - inner.push_str(&format!("", esc(c))); - } - inner.push_str(""); - for row in &rows { - let m = row.as_object().cloned().unwrap_or_else(Map::new); - inner.push_str(""); - for c in &cols { - let cell = m - .get(c) - .map(|v| match v { - Value::String(s) => s.clone(), - Value::Null => String::new(), - other => other.to_string(), - }) - .unwrap_or_default(); - // Show full cell text; CSS wraps / table-wrap scrolls when needed. - inner.push_str(&format!("", esc(&cell))); - } - let id = m - .get("id") - .map(|v| match v { - Value::String(s) => s.clone(), - other => other.to_string(), - }) - .unwrap_or_default(); - if !id.is_empty() { - inner.push_str(&format!( - "", - edit = esc(&st.admin_href(&format!("{table}/{id}/edit"))), - del = esc(&st.admin_href(&format!("{table}/{id}/delete"))), - id = esc(&id), - )); - } else { - inner.push_str(""); - } - inner.push_str(""); - } - inner.push_str("
{}
{}Edit · Delete
"); - } - Html(admin_shell(&st, &table, Some(&table), &inner)).into_response() -} - -async fn admin_new_get( - State(st): State>, - headers: axum::http::HeaderMap, - Path(table): Path, -) -> Response { - if let Some(r) = admin_gate(&st, cookie_from_headers(&headers)) { - return r; - } - let url = st.db_url.as_deref().unwrap(); - let (_, csrf, set_cookie) = resolve_session(&headers); - match form::from_schema(url, &table, "insert", None, st.ap()) { - Ok(frm) => { - let mut resp = Html(admin_form_page( - &st, - &table, - "New", - &frm, - &format!("admin-{table}-new"), - None, - None, - Some(&csrf), - )) - .into_response(); - append_set_cookie(&mut resp, set_cookie); - resp - } - Err(e) => Html(admin_shell( - &st, - &table, - Some(&table), - &format!("

{}

", esc(&e)), - )) - .into_response(), - } -} - -async fn admin_new_post( - State(st): State>, - headers: axum::http::HeaderMap, - Path(table): Path, - Form(posted): Form>, -) -> Response { - if let Some(r) = admin_gate(&st, cookie_from_headers(&headers)) { - return r; - } - let url = st.db_url.as_deref().unwrap(); - let (_, csrf, set_cookie, posted) = match validate_csrf_post(&headers, posted) { - Ok(v) => v, - Err(r) => return r, - }; - match form::from_schema(url, &table, "insert", None, st.ap()) { - Ok(frm) => { - let mut resp = submit_and_respond( - &st, - &frm, - &format!("admin-{table}-new"), - url, - posted, - Some(&table), - Some(&csrf), - ); - append_set_cookie(&mut resp, set_cookie); - resp - } - Err(e) => Html(admin_shell( - &st, - &table, - Some(&table), - &format!("

{}

", esc(&e)), - )) - .into_response(), - } -} - -async fn admin_edit_get( - State(st): State>, - headers: axum::http::HeaderMap, - Path((table, id)): Path<(String, String)>, -) -> Response { - if let Some(r) = admin_gate(&st, cookie_from_headers(&headers)) { - return r; - } - let url = st.db_url.as_deref().unwrap(); - let row = match db::get(url, &table, &id, None) { - Ok(Value::Null) => { - return Html(admin_shell( - &st, - &table, - Some(&table), - &format!("

Row {id} not found.

"), - )) - .into_response(); - } - Ok(v) => v, - Err(e) => { - return Html(admin_shell( - &st, - &table, - Some(&table), - &format!("

{}

", esc(&e)), - )) - .into_response(); - } - }; - let (_, csrf, set_cookie) = resolve_session(&headers); - match form::from_schema(url, &table, "update", Some(&id), st.ap()) { - Ok(frm) => { - let mut resp = Html(admin_form_page( - &st, - &table, - "Edit", - &frm, - &format!("admin-{table}-edit"), - Some(&row), - None, - Some(&csrf), - )) - .into_response(); - append_set_cookie(&mut resp, set_cookie); - resp - } - Err(e) => Html(admin_shell( - &st, - &table, - Some(&table), - &format!("

{}

", esc(&e)), - )) - .into_response(), - } -} - -async fn admin_edit_post( - State(st): State>, - headers: axum::http::HeaderMap, - Path((table, id)): Path<(String, String)>, - Form(posted): Form>, -) -> Response { - if let Some(r) = admin_gate(&st, cookie_from_headers(&headers)) { - return r; - } - let url = st.db_url.as_deref().unwrap(); - let (_, csrf, set_cookie, posted) = match validate_csrf_post(&headers, posted) { - Ok(v) => v, - Err(r) => return r, - }; - match form::from_schema(url, &table, "update", Some(&id), st.ap()) { - Ok(frm) => { - let mut resp = submit_and_respond( - &st, - &frm, - &format!("admin-{table}-edit"), - url, - posted, - Some(&table), - Some(&csrf), - ); - append_set_cookie(&mut resp, set_cookie); - resp - } - Err(e) => Html(admin_shell( - &st, - &table, - Some(&table), - &format!("

{}

", esc(&e)), - )) - .into_response(), - } -} - -async fn admin_delete( - State(st): State>, - headers: axum::http::HeaderMap, - Path((table, id)): Path<(String, String)>, -) -> Response { - if let Some(r) = admin_gate(&st, cookie_from_headers(&headers)) { - return r; - } - let url = st.db_url.as_deref().unwrap(); - if let Err(e) = db::delete(url, &table, &id, None) { - return Html(admin_shell( - &st, - &table, - Some(&table), - &format!("

Delete failed: {}

", esc(&e)), - )) - .into_response(); - } - Redirect::to(&with_flash(&st.admin_href(&table), "deleted")).into_response() -} - -fn esc(s: &str) -> String { - s.replace('&', "&") - .replace('<', "<") - .replace('>', ">") -} - -fn sitemap_response(st: &AppState, cfg: &Value) -> Response { - let base = cfg - .get("base") - .and_then(|v| v.as_str()) - .unwrap_or(""); - let table = cfg.get("table").and_then(|v| v.as_str()); - let loc_col = cfg - .get("loc") - .and_then(|v| v.as_str()) - .unwrap_or("path"); - let limit = cfg - .get("limit") - .and_then(|v| v.as_i64()) - .unwrap_or(1000); - let mut items = cfg.get("items").cloned().unwrap_or(json!([])); - if let (Some(url), Some(table)) = (st.db_url.as_deref(), table) { - if let Ok(rows) = db::select_order(url, table, limit, None, None, None, None) { - if let Some(arr) = rows.get("rows").cloned() { - // Normalize loc column → loc - if let Some(list) = arr.as_array() { - let mut out = Vec::new(); - for row in list { - let mut m = row.as_object().cloned().unwrap_or_default(); - if !m.contains_key("loc") { - if let Some(v) = m.get(loc_col).cloned() { - m.insert("loc".into(), v); - } - } - out.push(Value::Object(m)); - } - items = Value::Array(out); - } - } - } - } - let xml = sitemap::build_sitemap(base, &items); - ( - [( - header::CONTENT_TYPE, - HeaderValue::from_static("application/xml; charset=utf-8"), - )], - xml, - ) - .into_response() -} - -async fn fallback_404(State(st): State>, headers: axum::http::HeaderMap) -> Response { - let (_, csrf, set_cookie) = resolve_session(&headers); - let html = if let Some(ref page) = st.page_404 { - let page = with_site_head(page, &st.site_head); - render::render_page(&page, st.db_url.as_deref(), Some(&csrf)) - } else { - "404

404 Not Found

" - .to_string() - }; - let mut resp = (StatusCode::NOT_FOUND, Html(html)).into_response(); - append_set_cookie(&mut resp, set_cookie); - resp -} - -/// Render a custom 500 page when configured. -#[allow(dead_code)] -fn error_500(st: &AppState, csrf: Option<&str>, msg: &str) -> Response { - let html = if let Some(ref page) = st.page_500 { - let page = with_site_head(page, &st.site_head); - render::render_page(&page, st.db_url.as_deref(), csrf) - } else { - format!( - "500

500

{}

", - esc(msg) - ) - }; - (StatusCode::INTERNAL_SERVER_ERROR, Html(html)).into_response() -} - -/// WebSocket server endpoint. -/// - `echo`: reply each text frame to the same socket -/// - `broadcast`: fan-out text frames to all sockets on this path -/// - `drain`: read and discard frames -async fn ws_upgrade( - ws: axum::extract::WebSocketUpgrade, - mode: crate::ws_hub::WsMode, - path: String, -) -> Response { - ws.on_upgrade(move |socket| ws_socket_loop(socket, mode, path)) -} - -async fn ws_socket_loop( - mut socket: axum::extract::ws::WebSocket, - mode: crate::ws_hub::WsMode, - path: String, -) { - use axum::extract::ws::Message; - use futures_util::{SinkExt, StreamExt}; - - match mode { - crate::ws_hub::WsMode::Echo => { - while let Some(Ok(msg)) = socket.recv().await { - match msg { - Message::Text(text) => { - if socket.send(Message::Text(text)).await.is_err() { - break; - } - } - Message::Close(_) => break, - _ => {} - } - } - } - crate::ws_hub::WsMode::Drain => { - while let Some(Ok(msg)) = socket.recv().await { - if matches!(msg, Message::Close(_)) { - break; - } - } - } - crate::ws_hub::WsMode::Broadcast => { - let mut rx = crate::ws_hub::subscribe(&path); - let (mut sink, mut stream) = socket.split(); - loop { - tokio::select! { - incoming = stream.next() => { - match incoming { - Some(Ok(Message::Text(text))) => { - crate::ws_hub::publish(&path, text.to_string()); - } - Some(Ok(Message::Close(_))) | None => break, - Some(Ok(_)) => {} - Some(Err(_)) => break, - } - } - out = rx.recv() => { - match out { - Ok(text) => { - if sink.send(Message::Text(text.into())).await.is_err() { - break; - } - } - Err(tokio::sync::broadcast::error::RecvError::Lagged(_)) => continue, - Err(_) => break, - } - } - } - } - } - } -} - -#[cfg(test)] -mod gate_tests { - use super::*; - - fn g(path: &str, mode: GateMatch) -> Gate { - Gate { - path: path.into(), - roles: vec!["admin".into()], - match_mode: mode, - on_deny: OnDeny::Forbid, - exclude: vec![], - } - } - - #[test] - fn prefix_segment_boundary() { - let gate = g("/admin", GateMatch::Prefix); - assert!(gate_matches("/admin", &gate)); - assert!(gate_matches("/admin/news", &gate)); - assert!(!gate_matches("/admin-publish", &gate)); - assert!(!gate_matches("/administrator", &gate)); - } - - #[test] - fn starred_json_becomes_prefix() { - let gate = Gate::from_json(&json!({"path": "/admin*", "roles": ["admin"]})).unwrap(); - assert_eq!(gate.match_mode, GateMatch::Prefix); - assert!(gate_matches("/admin/x", &gate)); - assert!(!gate_matches("/admin-publish", &gate)); - } - - #[test] - fn exclude_login() { - assert!(path_excluded( - "/desk/login", - &["/desk/login".into()], - "/desk/login" - )); - assert!(!path_excluded("/desk", &["/desk/login".into()], "/desk/login")); - } -} diff --git a/plugins/web-rust-archive/src/invoke.rs b/plugins/web-rust-archive/src/invoke.rs deleted file mode 100644 index 02408da..0000000 --- a/plugins/web-rust-archive/src/invoke.rs +++ /dev/null @@ -1,373 +0,0 @@ -//! HTTP → user `##` invoke routes for `app.invoke` / `configure invoke=`. - -use std::sync::Arc; - -use axum::extract::{Request, State}; -use axum::http::{header, HeaderValue, StatusCode}; -use axum::response::{IntoResponse, Response}; -use axum::routing::{get, post}; -use axum::Router; -use serde_json::{json, Map, Value}; - -use crate::middleware::{cell_text, JsonBody}; -use crate::table; -use crate::call_lib_with_args; - -/// One declared invoke mount. -#[derive(Clone, Debug)] -pub struct InvokeRoute { - pub method: String, - pub fn_path: String, - pub body_mode: String, - pub return_mode: String, -} - -impl InvokeRoute { - pub fn from_json(v: &Value) -> Option { - let obj = v.as_object()?; - let fn_path = obj - .get("fn") - .or_else(|| obj.get("function")) - .and_then(|x| x.as_str())? - .trim() - .to_string(); - if fn_path.is_empty() { - return None; - } - let method = obj - .get("method") - .and_then(|x| x.as_str()) - .unwrap_or("POST") - .to_uppercase(); - let body_mode = obj - .get("body") - .and_then(|x| x.as_str()) - .unwrap_or("json") - .to_ascii_lowercase(); - let return_mode = obj - .get("return") - .and_then(|x| x.as_str()) - .unwrap_or("json") - .to_ascii_lowercase(); - Some(Self { - method, - fn_path, - body_mode, - return_mode, - }) - } -} - -/// Normalize invoke-routes GFM table into `app.invoke_routes` map. -pub fn invoke_routes_from_table(table_v: &Value) -> Value { - let rows = table::as_rows(table_v); - let mut routes = Map::new(); - if let Some(arr) = rows.as_array() { - for row in arr { - let col = |keys: &[&str]| -> String { - keys.iter() - .find_map(|k| row.get(*k).map(cell_text)) - .unwrap_or_default() - }; - let path = col(&["路径", "path", "Path"]) - .trim() - .trim_start_matches('/') - .to_string(); - if path.is_empty() { - continue; - } - let fn_path = col(&["函数", "fn", "function", "Function"]); - if fn_path.is_empty() { - continue; - } - let method = { - let m = col(&["方法", "method", "Method"]).to_uppercase(); - if m.is_empty() { - "POST".into() - } else { - m - } - }; - let body = { - let b = col(&["正文", "body", "Body"]).to_ascii_lowercase(); - if b.is_empty() { - "json".into() - } else { - b - } - }; - let ret = { - let r = col(&["返回", "return", "Return"]).to_ascii_lowercase(); - if r.is_empty() { - "json".into() - } else { - r - } - }; - routes.insert( - path, - json!({ - "method": method, - "fn": fn_path, - "body": body, - "return": ret, - }), - ); - } - } - Value::Object(routes) -} - -pub fn mount_all( - mut app: Router>, - routes: &[(String, InvokeRoute)], -) -> Router> { - for (path, route) in routes { - app = mount_one(app, path, route.clone()); - } - app -} - -fn mount_one( - app: Router>, - path: &str, - route: InvokeRoute, -) -> Router> { - let r = route.clone(); - match route.method.as_str() { - "GET" => app.route( - path, - get(move |State(st): State>, req: Request| { - let r = r.clone(); - async move { invoke_handler(st, r, req).await } - }), - ), - _ => app.route( - path, - post(move |State(st): State>, req: Request| { - let r = r.clone(); - async move { invoke_handler(st, r, req).await } - }), - ), - } -} - -async fn invoke_handler( - _st: Arc, - route: InvokeRoute, - req: Request, -) -> Response { - let (parts, body) = req.into_parts(); - let query_map = query_to_map(parts.uri.query()); - - let payload = match route.body_mode.as_str() { - "query" => Value::Object(query_map.clone()), - "raw" => { - let bytes = match axum::body::to_bytes(body, 8 * 1024 * 1024).await { - Ok(b) => b, - Err(e) => { - return err_json(StatusCode::BAD_REQUEST, &format!("body: {e}")); - } - }; - json!({ "payload": String::from_utf8_lossy(&bytes).to_string() }) - } - "form" => { - let bytes = match axum::body::to_bytes(body, 8 * 1024 * 1024).await { - Ok(b) => b, - Err(e) => { - return err_json(StatusCode::BAD_REQUEST, &format!("body: {e}")); - } - }; - form_to_map(&bytes) - } - _ => { - // json (default) - let bytes = match axum::body::to_bytes(body, 8 * 1024 * 1024).await { - Ok(b) => b, - Err(e) => { - return err_json(StatusCode::BAD_REQUEST, &format!("body: {e}")); - } - }; - if bytes.is_empty() { - Value::Object(query_map.clone()) - } else { - match serde_json::from_slice::(&bytes) { - Ok(Value::Object(mut m)) => { - for (k, v) in query_map { - m.entry(k).or_insert(v); - } - Value::Object(m) - } - Ok(other) => json!({ "payload": other }), - Err(e) => { - return err_json(StatusCode::BAD_REQUEST, &format!("json: {e}")); - } - } - } - } - }; - - // Bind JSON object keys as named args; always offer `payload` too. - let mut args = Map::new(); - if let Value::Object(ref m) = payload { - for (k, v) in m { - args.insert(k.clone(), v.clone()); - } - } - if !args.contains_key("payload") { - args.insert("payload".to_string(), payload.clone()); - } - - let fn_path = route.fn_path.clone(); - let result = tokio::task::spawn_blocking(move || call_lib_with_args(&fn_path, &Value::Object(args))) - .await; - - let value = match result { - Ok(Ok(v)) => v, - Ok(Err(e)) => { - let status = if e.contains("unknown library") - || e.contains("call_lib_path: need") - || e.contains("not allowed") - || e.contains("no site") - { - StatusCode::BAD_REQUEST - } else { - StatusCode::INTERNAL_SERVER_ERROR - }; - return err_json(status, &e); - } - Err(e) => { - return err_json(StatusCode::INTERNAL_SERVER_ERROR, &format!("join: {e}")); - } - }; - - match route.return_mode.as_str() { - "text" => { - if matches!(value, Value::Null) { - return err_json(StatusCode::INTERNAL_SERVER_ERROR, "null result"); - } - let text = match &value { - Value::String(s) => s.clone(), - other => other.to_string(), - }; - ( - StatusCode::OK, - [( - header::CONTENT_TYPE, - HeaderValue::from_static("text/plain; charset=utf-8"), - )], - text, - ) - .into_response() - } - "status" => { - if matches!(value, Value::Null) { - return err_json(StatusCode::INTERNAL_SERVER_ERROR, "null result"); - } - StatusCode::NO_CONTENT.into_response() - } - _ => { - let body = match json_wrap_invoke_value(value) { - Ok((status, body)) => { - let mut resp = JsonBody(body).into_response(); - *resp.status_mut() = status; - resp - } - Err(resp) => resp, - }; - body - } - } -} - -/// Map host return value to invoke JSON. `Null` must not look like success (GAP-08). -pub(crate) fn json_wrap_invoke_value( - value: Value, -) -> Result<(StatusCode, Value), Response> { - match value { - Value::Null => Err(err_json( - StatusCode::INTERNAL_SERVER_ERROR, - "null result", - )), - Value::Object(_) => Ok((StatusCode::OK, value)), - other => Ok((StatusCode::OK, json!({ "ok": true, "result": other }))), - } -} - -fn query_to_map(q: Option<&str>) -> Map { - let mut m = Map::new(); - let Some(q) = q else { - return m; - }; - for pair in q.split('&') { - if pair.is_empty() { - continue; - } - let (k, v) = pair.split_once('=').unwrap_or((pair, "")); - let k = urlencoding_decode(k); - let v = urlencoding_decode(v); - if !k.is_empty() { - m.insert(k, json!(v)); - } - } - m -} - -fn form_to_map(bytes: &[u8]) -> Value { - let s = String::from_utf8_lossy(bytes); - Value::Object(query_to_map(Some(&s))) -} - -fn urlencoding_decode(s: &str) -> String { - let mut out = String::with_capacity(s.len()); - let b = s.as_bytes(); - let mut i = 0; - while i < b.len() { - match b[i] { - b'+' => { - out.push(' '); - i += 1; - } - b'%' if i + 2 < b.len() => { - let h = u8::from_str_radix(std::str::from_utf8(&b[i + 1..i + 3]).unwrap_or(""), 16); - if let Ok(c) = h { - out.push(c as char); - i += 3; - } else { - out.push('%'); - i += 1; - } - } - c => { - out.push(c as char); - i += 1; - } - } - } - out -} - -fn err_json(status: StatusCode, msg: &str) -> Response { - ( - status, - JsonBody(json!({ "ok": false, "error": msg })), - ) - .into_response() -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn null_result_is_not_fake_ok() { - let err = json_wrap_invoke_value(Value::Null).expect_err("null must fail"); - assert_eq!(err.status(), StatusCode::INTERNAL_SERVER_ERROR); - let ok = json_wrap_invoke_value(json!({ "hits": [] })).expect("object ok"); - assert_eq!(ok.0, StatusCode::OK); - let wrap = json_wrap_invoke_value(json!(1)).expect("scalar wrap"); - assert_eq!(wrap.0, StatusCode::OK); - assert_eq!(wrap.1["ok"], true); - assert_eq!(wrap.1["result"], 1); - } -} diff --git a/plugins/web-rust-archive/src/lib.rs b/plugins/web-rust-archive/src/lib.rs deleted file mode 100644 index 5d9d3b4..0000000 --- a/plugins/web-rust-archive/src/lib.rs +++ /dev/null @@ -1,2664 +0,0 @@ -//! Marqdo web plugin (C ABI v2): SQLite, page assemble, HTTP listen. - -mod assets; -mod compose; -mod db; -mod db_pg; -mod driver; -mod form; -mod http; -mod cache; -mod invoke; -mod markdown; -mod middleware; -mod password; -mod proxy; -mod rate_limit; -mod render; -mod rss; -mod session; -mod sitemap; -mod storage; -mod table; -mod upload; -mod ws; -mod ws_hub; - -use crate::table::as_css_named_checked; - -use std::ffi::{CStr, CString}; -use std::os::raw::{c_char, c_int, c_void}; -use std::path::PathBuf; -use std::ptr; - -use serde_json::{json, Value}; - -const ABI_VERSION: u32 = 2; - -type PluginFn = unsafe extern "C" fn( - args_json: *const c_char, - out_json: *mut *mut c_char, - err_msg: *mut *mut c_char, -) -> c_int; - -type HostQueryFn = unsafe extern "C" fn( - userdata: *mut c_void, - name: *const c_char, - args_json: *const c_char, - out_json: *mut *mut c_char, - err_msg: *mut *mut c_char, -) -> c_int; - -#[repr(C)] -pub struct MarqdoHostApi { - pub userdata: *mut c_void, - pub register_fn: Option< - unsafe extern "C" fn( - userdata: *mut c_void, - name: *const c_char, - params: *const c_char, - fn_ptr: PluginFn, - ) -> c_int, - >, - pub alloc: Option *mut c_void>, - pub free: Option, - pub host_query: Option, -} - -static mut HOST_FREE: Option = None; -static mut HOST_ALLOC: Option *mut c_void> = None; -static mut HOST_QUERY: Option = None; -static mut HOST_USERDATA: *mut c_void = ptr::null_mut(); - -unsafe fn host_strdup(s: &str) -> *mut c_char { - let alloc = HOST_ALLOC.expect("host alloc"); - let bytes = s.as_bytes(); - let p = alloc(bytes.len() + 1) as *mut u8; - if p.is_null() { - return ptr::null_mut(); - } - std::ptr::copy_nonoverlapping(bytes.as_ptr(), p, bytes.len()); - *p.add(bytes.len()) = 0; - p as *mut c_char -} - -fn set_out(out: *mut *mut c_char, s: &str) { - if out.is_null() { - return; - } - unsafe { - *out = host_strdup(s); - } -} - -fn set_err(err: *mut *mut c_char, s: &str) { - if err.is_null() { - return; - } - unsafe { - *err = host_strdup(s); - } -} - -fn parse_args(args_json: *const c_char) -> Result { - if args_json.is_null() { - return Ok(json!({})); - } - let s = unsafe { CStr::from_ptr(args_json) } - .to_str() - .map_err(|_| "args not utf-8".to_string())?; - if s.trim().is_empty() { - return Ok(json!({})); - } - serde_json::from_str(s).map_err(|e| e.to_string()) -} - -fn take_host_string(p: *mut c_char) -> Option { - if p.is_null() { - return None; - } - let s = unsafe { CStr::from_ptr(p) } - .to_str() - .ok() - .map(|s| s.to_string()); - unsafe { - if let Some(free) = HOST_FREE { - free(p as *mut c_void); - } - } - s -} - -fn host_query_json(name: &str, args: &Value) -> Result { - let query = unsafe { HOST_QUERY }.ok_or_else(|| "host_query not available".to_string())?; - let userdata = unsafe { HOST_USERDATA }; - let c_name = CString::new(name).map_err(|e| e.to_string())?; - let c_args = CString::new(args.to_string()).map_err(|e| e.to_string())?; - let mut out_ptr: *mut c_char = ptr::null_mut(); - let mut err_ptr: *mut c_char = ptr::null_mut(); - let rc = unsafe { - query( - userdata, - c_name.as_ptr(), - c_args.as_ptr(), - &mut out_ptr, - &mut err_ptr, - ) - }; - let err = take_host_string(err_ptr); - let out = take_host_string(out_ptr); - if rc != 0 { - return Err(err.unwrap_or_else(|| format!("host_query `{name}` failed"))); - } - let out = out.unwrap_or_else(|| "null".into()); - serde_json::from_str(&out).map_err(|e| format!("host_query `{name}` bad JSON: {e}")) -} - -fn call_lib(path: &str) -> Result { - host_query_json("call_lib_path", &json!({ "path": path })) -} - -/// Call `lib.member` with a JSON object of named arguments (for HTTP invoke). -pub(crate) fn call_lib_with_args(path: &str, args: &Value) -> Result { - host_query_json( - "call_lib_path", - &json!({ - "path": path, - "args": args, - }), - ) -} - -/// Absolute directory of the entry `.mq.md` (falls back to process cwd). -fn entry_dir() -> PathBuf { - host_query_json("entry_dir", &json!({})) - .ok() - .and_then(|v| v.as_str().map(|s| PathBuf::from(s))) - .unwrap_or_else(|| { - std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")) - }) -} - -/// Resolve a DB URL for the plugin. -/// -/// - `postgres://` / `postgresql://` — passed through unchanged. -/// - `sqlite:` / bare relative path — made absolute against `entry_dir()`. -fn resolve_db_url(url: &str) -> String { - let lower = url.to_ascii_lowercase(); - if lower.starts_with("postgres://") || lower.starts_with("postgresql://") { - return url.to_string(); - } - let stripped = url - .strip_prefix("sqlite:") - .or_else(|| url.strip_prefix("SQLITE:")) - .unwrap_or(url); - let abs = PathBuf::from(stripped); - let abs = if abs.is_absolute() { - abs - } else { - entry_dir().join(abs) - }; - if stripped.len() == url.len() { - abs.to_string_lossy().into_owned() - } else if url.starts_with("sqlite:") { - format!("sqlite:{}", abs.to_string_lossy()) - } else { - format!("SQLITE:{}", abs.to_string_lossy()) - } -} - -fn arg_text(v: &Value, key: &str) -> Result { - match v.get(key) { - None | Some(Value::Null) => Err(format!("missing `{key}`")), - Some(Value::String(s)) => Ok(s.clone()), - Some(Value::Number(n)) => Ok(n.to_string()), - Some(Value::Bool(b)) => Ok(b.to_string()), - Some(other) => Ok(other.to_string()), - } -} - -fn arg_str<'a>(v: &'a Value, key: &str) -> Result<&'a str, String> { - v.get(key) - .and_then(|x| x.as_str()) - .ok_or_else(|| format!("missing `{key}`")) -} - -fn arg_str_opt<'a>(v: &'a Value, key: &str) -> Option<&'a str> { - v.get(key).and_then(|x| x.as_str()).filter(|s| !s.is_empty()) -} - -fn db_url_of(args: &Value) -> Result { - let raw = if let Some(s) = arg_str_opt(args, "url").or_else(|| arg_str_opt(args, "db_url")) - { - Some(s.to_string()) - } else if let Some(db) = args.get("db") { - if let Some(s) = db.get("url").and_then(|v| v.as_str()) { - Some(s.to_string()) - } else { - None - } - } else { - None - }; - match raw { - Some(s) => Ok(resolve_db_url(&s)), - None => Err("missing db url".into()), - } -} - -fn reply(out_json: *mut *mut c_char, err_msg: *mut *mut c_char, r: Result) -> c_int { - match r { - Ok(v) => { - set_out(out_json, &v.to_string()); - 0 - } - Err(e) => { - set_err(err_msg, &e); - 1 - } - } -} - -macro_rules! web_ffi { - ($name:ident, $body:expr) => { - unsafe extern "C" fn $name( - args_json: *const c_char, - out_json: *mut *mut c_char, - err_msg: *mut *mut c_char, - ) -> c_int { - let args = match parse_args(args_json) { - Ok(v) => v, - Err(e) => { - set_err(err_msg, &format!("{}: {e}", stringify!($name))); - return 1; - } - }; - let r: Result = (|| $body(&args))(); - reply( - out_json, - err_msg, - r.map_err(|e| format!("{}: {e}", stringify!($name))), - ) - } - }; -} - -web_ffi!(web_page_new, |args: &Value| { - let title = arg_str_opt(args, "title").unwrap_or("Marqdo Web"); - let intro = arg_str_opt(args, "intro").unwrap_or(""); - let mut out = json!({ - "title": title, - "intro": intro, - }); - if let Some(s) = arg_str_opt(args, "shell_css").or_else(|| arg_str_opt(args, "壳样式")) { - out.as_object_mut().unwrap().insert("shell_css".into(), json!(s)); - } - if let Some(s) = arg_str_opt(args, "layout").or_else(|| arg_str_opt(args, "布局")) { - out.as_object_mut().unwrap().insert("layout".into(), json!(s)); - } - if let Some(s) = arg_str_opt(args, "asset_version") - .or_else(|| arg_str_opt(args, "资源版本")) - { - out.as_object_mut() - .unwrap() - .insert("asset_version".into(), json!(s)); - } - Ok(out) -}); - -web_ffi!(web_compose_components, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let components = args - .get("components") - .cloned() - .ok_or_else(|| "missing `components`".to_string())?; - compose::compose_components(&page, &components, |path| call_lib(path)) -}); - -web_ffi!(web_compose_main, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let main = args - .get("main") - .cloned() - .ok_or_else(|| "missing `main`".to_string())?; - compose::compose_main(&page, &main, |path| call_lib(path)) -}); - -web_ffi!(web_page_query, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let query = args.get("query").cloned().unwrap_or(json!({})); - let mut obj = page.as_object().cloned().unwrap_or_default(); - obj.insert("query".into(), query); - Ok(Value::Object(obj)) -}); - -web_ffi!(web_page_order, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let order = arg_str(args, "order")?.to_string(); - let mut obj = page.as_object().cloned().unwrap_or_default(); - obj.insert("order".into(), json!(order)); - Ok(Value::Object(obj)) -}); - -web_ffi!(web_page_link_prefix, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let prefix = arg_str(args, "prefix")?.to_string(); - let mut obj = page.as_object().cloned().unwrap_or_default(); - obj.insert("link_prefix".into(), json!(prefix)); - Ok(Value::Object(obj)) -}); - -web_ffi!(web_page_css, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let css = arg_str_opt(args, "css").unwrap_or("").to_string(); - let mut obj = page.as_object().cloned().unwrap_or_default(); - if !css.trim().is_empty() { - let prev = obj - .get("styles_css") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - obj.insert("styles_css".into(), json!(format!("{prev}\n{css}"))); - } - Ok(Value::Object(obj)) -}); - -// Assemble a GFM style table into CSS text. -// -// Two shapes are accepted: -// 1. Rule rows `|选择器|属性|值|` → `selector { prop: value; }` -// 2. Property rows `|属性|值|` → `.name { prop: value; }` -// -// The `name` argument names the CSS class for shape 2, and is ignored for -// shape 1. This is how Marqdo-side theme modules turn style tables into a -// stylesheet with 文档即代码 — styles are data, assembly is a function. -web_ffi!(web_style, |args: &Value| { - let name = arg_str_opt(args, "name").unwrap_or("").to_string(); - let table = args.get("table").cloned().unwrap_or(json!([])); - let strict = args - .get("strict") - .or_else(|| args.get("strict_css_cells")) - .or_else(|| args.get("严格")) - .map(|v| match v { - Value::Bool(b) => *b, - Value::Number(n) => n.as_i64().unwrap_or(0) != 0, - Value::String(s) => matches!( - s.trim(), - "1" | "true" | "True" | "yes" | "on" | "真" | "是" - ), - _ => false, - }) - .unwrap_or(false); - as_css_named_checked(&name, &table, strict).map(Value::String) -}); - -web_ffi!(web_page_detail, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let on = args - .get("detail") - .and_then(|v| v.as_bool()) - .unwrap_or(true); - let mut obj = page.as_object().cloned().unwrap_or_default(); - obj.insert("detail".into(), json!(on)); - Ok(Value::Object(obj)) -}); - -web_ffi!(web_page_meta, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let meta = args - .get("meta") - .or_else(|| args.get("table")) - .cloned() - .unwrap_or(json!({})); - let mut obj = page.as_object().cloned().unwrap_or_default(); - obj.insert("meta".into(), Value::Object(crate::table::as_meta_map(&meta))); - Ok(Value::Object(obj)) -}); - -web_ffi!(web_page_head, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let table = args - .get("table") - .or_else(|| args.get("head")) - .cloned() - .unwrap_or(json!([])); - let links = crate::assets::as_head_links(&table); - let mut obj = page.as_object().cloned().unwrap_or_default(); - let mut existing = obj - .get("head") - .map(crate::assets::head_links_from_json) - .unwrap_or_default(); - for link in links { - let dup = existing - .iter() - .any(|e| e.href == link.href && e.rel.eq_ignore_ascii_case(&link.rel)); - if !dup { - existing.push(link); - } - } - obj.insert("head".into(), crate::assets::head_links_to_json(&existing)); - Ok(Value::Object(obj)) -}); - -web_ffi!(web_head, |args: &Value| { - let table = args - .get("table") - .or_else(|| args.get("head")) - .cloned() - .unwrap_or(json!([])); - Ok(Value::String(crate::assets::make_head_html(&table))) -}); - -web_ffi!(web_images, |args: &Value| { - let table = args - .get("table") - .or_else(|| args.get("images")) - .cloned() - .unwrap_or(json!([])); - Ok(Value::String(crate::assets::make_images_html(&table))) -}); - -web_ffi!(web_page_images, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let table = args - .get("table") - .or_else(|| args.get("images")) - .cloned() - .unwrap_or(json!([])); - let html = crate::assets::make_images_html(&table); - let mut obj = page.as_object().cloned().unwrap_or_default(); - let prev = obj - .get("images_html") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - let combined = if prev.is_empty() { - html - } else if html.is_empty() { - prev - } else { - format!("{prev}{html}") - }; - obj.insert("images_html".into(), json!(combined)); - Ok(Value::Object(obj)) -}); - -web_ffi!(web_app_icons, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let table = args - .get("table") - .or_else(|| args.get("icons")) - .cloned() - .unwrap_or(json!([])); - let (icons, site_head, _routes) = crate::assets::normalize_icons(&table); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - obj.insert("icons".into(), icons); - obj.insert( - "site_head".into(), - crate::assets::head_links_to_json(&site_head), - ); - Ok(app) -}); - -web_ffi!(web_page_paginate, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let offset = args - .get("offset") - .and_then(|v| v.as_i64().or_else(|| v.as_u64().map(|u| u as i64))) - .unwrap_or(0); - let limit = args - .get("limit") - .and_then(|v| v.as_i64().or_else(|| v.as_u64().map(|u| u as i64))) - .unwrap_or(10); - let path = arg_str_opt(args, "path").unwrap_or("/").to_string(); - let mut obj = page.as_object().cloned().unwrap_or_default(); - obj.insert( - "paginate".into(), - json!({ "offset": offset, "limit": limit, "path": path }), - ); - Ok(Value::Object(obj)) -}); - -web_ffi!(web_rss_build, |args: &Value| { - let title = arg_str_opt(args, "title").unwrap_or("Feed"); - let link = arg_str_opt(args, "link").unwrap_or("/"); - let description = arg_str_opt(args, "description").unwrap_or(""); - let items = args - .get("items") - .or_else(|| args.get("rows")) - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - Ok(Value::String(rss::build_rss( - title, - link, - description, - &items, - ))) -}); - -web_ffi!(web_app_route_rss, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = normalize_route_path_in_app(arg_str(args, "path")?, &app)?; - let table = arg_str(args, "table")?.to_string(); - let limit = args - .get("limit") - .and_then(|v| v.as_i64().or_else(|| v.as_u64().map(|u| u as i64))) - .unwrap_or(20); - let order = arg_str_opt(args, "order").unwrap_or("-created_at").to_string(); - let title = arg_str_opt(args, "title").unwrap_or("Feed").to_string(); - let link = arg_str_opt(args, "link").unwrap_or("/").to_string(); - let description = arg_str_opt(args, "description") - .unwrap_or("") - .to_string(); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut rss_routes = obj - .get("rss_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - rss_routes.insert( - path, - json!({ - "table": table, - "limit": limit, - "order": order, - "title": title, - "link": link, - "description": description, - }), - ); - obj.insert("rss_routes".into(), Value::Object(rss_routes)); - Ok(app) -}); - -web_ffi!(web_app_redirect, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let from = normalize_route_path_in_app(arg_str(args, "from").or_else(|_| arg_str(args, "path"))?, &app)?; - let to = arg_str(args, "to")?.to_string(); - let permanent = match args - .get("permanent") - .or_else(|| args.get("永久")) - .cloned() - .unwrap_or(json!(false)) - { - Value::Bool(b) => b, - Value::String(s) => matches!(s.as_str(), "true" | "True" | "1" | "yes" | "真"), - Value::Number(n) => n.as_i64().unwrap_or(0) != 0, - _ => false, - }; - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut redirects = obj - .get("redirects") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - redirects.insert(from, json!({ "to": to, "permanent": permanent })); - obj.insert("redirects".into(), Value::Object(redirects)); - Ok(app) -}); - -web_ffi!(web_app_error_page, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let status = args - .get("status") - .or_else(|| args.get("状态")) - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(404) as u16; - let page = args - .get("page") - .or_else(|| args.get("页面")) - .cloned() - .ok_or_else(|| "missing `page`".to_string())?; - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let key = match status { - 500 => "page_500", - _ => "page_404", - }; - obj.insert(key.into(), page); - Ok(app) -}); - -web_ffi!(web_app_sitemap, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = normalize_route_path_in_app(arg_str(args, "path").unwrap_or("/sitemap.xml"), &app)?; - let base = arg_str_opt(args, "base").unwrap_or("").to_string(); - let table = arg_str_opt(args, "table").map(|s| s.to_string()); - let loc = arg_str_opt(args, "loc").unwrap_or("path").to_string(); - let limit = args - .get("limit") - .and_then(|v| v.as_i64()) - .unwrap_or(1000); - let items = args.get("items").cloned().unwrap_or(json!([])); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut routes = obj - .get("sitemap_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - routes.insert( - path, - json!({ - "base": base, - "table": table, - "loc": loc, - "limit": limit, - "items": items, - }), - ); - obj.insert("sitemap_routes".into(), Value::Object(routes)); - Ok(app) -}); - -web_ffi!(web_app_robots, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let body = arg_str_opt(args, "body").map(|s| s.to_string()); - let sitemap_url = arg_str_opt(args, "sitemap").map(|s| s.to_string()); - let text = match body.filter(|s| !s.is_empty()) { - Some(b) => b, - None => crate::sitemap::build_robots(sitemap_url.as_deref()), - }; - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - obj.insert("robots_body".into(), json!(text)); - Ok(app) -}); - -web_ffi!(web_sitemap_build, |args: &Value| { - let base = arg_str_opt(args, "base").unwrap_or(""); - let items = args.get("items").cloned().unwrap_or(json!([])); - Ok(crate::sitemap::sitemap_json(base, &items)) -}); - -fn storage_url_arg(args: &Value, key: &str) -> Result { - if let Some(s) = arg_str_opt(args, key) { - return Ok(s.to_string()); - } - let v = args - .get(key) - .ok_or_else(|| format!("missing `{key}`"))?; - if let Some(u) = v.get("url").and_then(|x| x.as_str()) { - return Ok(u.to_string()); - } - Err(format!("`{key}` must be a storage url string or storage handle")) -} - -web_ffi!(web_app_upload, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = normalize_route_path_in_app(arg_str(args, "path").unwrap_or("/_upload"), &app)?; - let field = arg_str_opt(args, "field").unwrap_or("file").to_string(); - let storage_url = storage_url_arg(args, "storage")?; - let prefix = arg_str_opt(args, "prefix").unwrap_or("uploads/").to_string(); - let max_bytes = args - .get("max_bytes") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(5_242_880); - let types = args.get("types").cloned().filter(|v| !matches!(v, Value::Null)); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut upload_routes = obj - .get("upload_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - upload_routes.insert( - path, - json!({ - "field": field, - "storage_url": storage_url, - "prefix": prefix, - "max_bytes": max_bytes, - "types": types, - }), - ); - obj.insert("upload_routes".into(), Value::Object(upload_routes)); - Ok(app) -}); - -web_ffi!(web_app_download, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = arg_str(args, "path").unwrap_or("/_media/{*key}"); - let path = { - let s = path.trim(); - if s.is_empty() { - return Err("download path is empty".into()); - } - let mut p = if s.starts_with('/') { - s.to_string() - } else { - format!("/{s}") - }; - while p.len() > 1 && p.ends_with('/') { - p.pop(); - } - p - }; - if !path.contains('{') { - return Err("download path must include a `{key}` or `{*key}` capture".into()); - } - let storage_url = storage_url_arg(args, "storage")?; - let disposition = arg_str_opt(args, "disposition") - .unwrap_or("attachment") - .to_string(); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut download_routes = obj - .get("download_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - download_routes.insert( - path, - json!({ - "storage_url": storage_url, - "disposition": disposition, - }), - ); - obj.insert("download_routes".into(), Value::Object(download_routes)); - Ok(app) -}); - -web_ffi!(web_upload_validate, |args: &Value| { - let filename = arg_str(args, "filename")?; - let content_type = arg_str_opt(args, "content_type").unwrap_or("application/octet-stream"); - let size = args - .get("size") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .ok_or_else(|| "missing `size`".to_string())?; - let max_bytes = args - .get("max_bytes") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(5_242_880); - let types = args.get("types"); - upload::validate(filename, content_type, size, max_bytes, types) -}); - -web_ffi!(web_upload_save, |args: &Value| { - let storage_url = if let Ok(u) = storage_url_arg(args, "storage") { - u - } else if let Ok(u) = storage_url_arg(args, "url") { - u - } else { - arg_str(args, "storage_url")?.to_string() - }; - let path = arg_str(args, "path")?; - let key = arg_str_opt(args, "key"); - let content_type = arg_str_opt(args, "content_type"); - let prefix = arg_str_opt(args, "prefix"); - upload::save(&storage_url, key, path, content_type, prefix) -}); - -web_ffi!(web_media_new, |args: &Value| { - let storage = args.get("storage").cloned().unwrap_or(Value::Null); - Ok(json!({ "_type": "media", "storage": storage })) -}); - -web_ffi!(web_compose_form, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let form = args - .get("form") - .cloned() - .ok_or_else(|| "missing `form`".to_string())?; - let id = arg_str(args, "id")?.to_string(); - let target = arg_str_opt(args, "target") - .or_else(|| arg_str_opt(args, "form_target")) - .or_else(|| arg_str_opt(args, "form_slot")) - .or_else(|| arg_str_opt(args, "表单插槽")); - compose::compose_form(&page, &form, &id, target) -}); - -web_ffi!(web_render, |args: &Value| { - let page = args.get("page").cloned().unwrap_or_else(|| args.clone()); - let db_url = db_url_of(args).ok(); - let html = render::render_page(&page, db_url.as_deref(), None); - Ok(Value::String(html)) -}); - -web_ffi!(web_db_new, |args: &Value| { - let url = arg_str_opt(args, "url").unwrap_or("sqlite:site.db"); - Ok(json!({ "url": resolve_db_url(url), "_type": "db" })) -}); - -web_ffi!(web_cache_new, |args: &Value| { - let url = arg_str_opt(args, "url").unwrap_or("memory:"); - cache::open(url) -}); - -web_ffi!(web_cache_get, |args: &Value| { - let url = arg_str(args, "url")?; - let key = arg_str(args, "key")?; - cache::get(url, key) -}); - -web_ffi!(web_cache_set, |args: &Value| { - let url = arg_str(args, "url")?; - let key = arg_str(args, "key")?; - let value = arg_text(args, "value")?; - let ttl = args - .get("ttl") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))); - cache::set(url, key, &value, ttl) -}); - -web_ffi!(web_cache_del, |args: &Value| { - let url = arg_str(args, "url")?; - let key = arg_str(args, "key")?; - cache::del(url, key) -}); - -web_ffi!(web_cache_exists, |args: &Value| { - let url = arg_str(args, "url")?; - let key = arg_str(args, "key")?; - cache::exists(url, key) -}); - -web_ffi!(web_cache_ttl, |args: &Value| { - let url = arg_str(args, "url")?; - let key = arg_str(args, "key")?; - cache::ttl(url, key) -}); - -web_ffi!(web_storage_new, |args: &Value| { - let url = arg_str(args, "url").unwrap_or("file:data/blobs"); - storage::open(url) -}); - -web_ffi!(web_storage_put, |args: &Value| { - let url = arg_str(args, "url")?; - let key = arg_str(args, "key")?; - let body = arg_str_opt(args, "body"); - let path = arg_str_opt(args, "path"); - let content_type = arg_str_opt(args, "content_type"); - storage::put(url, key, body, path, content_type) -}); - -web_ffi!(web_storage_get, |args: &Value| { - let url = arg_str(args, "url")?; - let key = arg_str(args, "key")?; - storage::get(url, key) -}); - -web_ffi!(web_storage_delete, |args: &Value| { - let url = arg_str(args, "url")?; - let key = arg_str(args, "key")?; - storage::delete(url, key) -}); - -web_ffi!(web_storage_list, |args: &Value| { - let url = arg_str(args, "url")?; - let prefix = arg_str_opt(args, "prefix"); - storage::list(url, prefix) -}); - -web_ffi!(web_db_init, |args: &Value| { - let url = db_url_of(args)?; - let name = arg_str(args, "name") - .or_else(|_| arg_str(args, "table"))? - .to_string(); - let fields = args.get("fields").cloned().unwrap_or(json!([])); - db::init(&url, &name, &fields) -}); - -web_ffi!(web_db_insert, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let rows = args - .get("rows") - .or_else(|| args.get("row")) - .cloned() - .unwrap_or(json!([])); - let txn = args.get("txn").and_then(|v| v.as_str()); - db::insert(&url, &table, &rows, txn) -}); - -web_ffi!(web_db_select, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let limit = args - .get("limit") - .and_then(|v| v.as_i64()) - .unwrap_or(200); - let where_v = match args.get("where") { - None | Some(Value::Null) => None, - Some(Value::String(s)) - if s.is_empty() - || s.eq_ignore_ascii_case("none") - || s.eq_ignore_ascii_case("null") => - { - None - } - Some(v) => Some(v), - }; - let order = args.get("order").and_then(|v| v.as_str()); - let offset = args - .get("offset") - .or_else(|| args.get("跳过")) - .and_then(|v| v.as_i64()); - let txn = args.get("txn").and_then(|v| v.as_str()); - db::select_order(&url, &table, limit, where_v, order, offset, txn) -}); - -web_ffi!(web_db_query, |args: &Value| { - let url = db_url_of(args)?; - let sql = arg_str(args, "sql")?.to_string(); - let args_v = args.get("args"); - let txn = args.get("txn").and_then(|v| v.as_str()); - db::query(&url, &sql, args_v, txn) -}); - -web_ffi!(web_db_count, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let where_v = args.get("where").filter(|v| !v.is_null()); - let txn = args.get("txn").and_then(|v| v.as_str()); - db::count(&url, &table, where_v, txn) -}); - -web_ffi!(web_db_migrate, |args: &Value| { - let url = db_url_of(args)?; - let steps = args - .get("steps") - .ok_or_else(|| "missing `steps`".to_string())?; - db::migrate(&url, steps) -}); - -web_ffi!(web_db_fts_create, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let columns = args - .get("columns") - .ok_or_else(|| "missing `columns`".to_string())?; - let name = arg_str_opt(args, "name"); - db::fts_create(&url, &table, columns, name) -}); - -web_ffi!(web_db_search, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let q = arg_str(args, "q") - .or_else(|_| arg_str(args, "query")) - .or_else(|_| arg_str(args, "关键词"))? - .to_string(); - let limit = args - .get("limit") - .and_then(|v| v.as_i64().or_else(|| v.as_u64().map(|u| u as i64))) - .unwrap_or(20); - let name = arg_str_opt(args, "name"); - db::search(&url, &table, &q, limit, name) -}); - -web_ffi!(web_db_begin, |args: &Value| { - let url = db_url_of(args)?; - db::begin(&url) -}); - -web_ffi!(web_db_commit, |args: &Value| { - let txn = arg_str(args, "txn")?.to_string(); - db::commit(&txn) -}); - -web_ffi!(web_db_rollback, |args: &Value| { - let txn = arg_str(args, "txn")?.to_string(); - db::rollback(&txn) -}); - -web_ffi!(web_db_get, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let id = arg_text(args, "id")?; - let txn = args.get("txn").and_then(|v| v.as_str()); - db::get(&url, &table, &id, txn) -}); - -web_ffi!(web_db_update, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let id = arg_text(args, "id")?; - let row = args.get("row").cloned().unwrap_or(json!({})); - let txn = args.get("txn").and_then(|v| v.as_str()); - db::update(&url, &table, &id, &row, txn) -}); - -web_ffi!(web_db_delete, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let id = arg_text(args, "id")?; - let txn = args.get("txn").and_then(|v| v.as_str()); - db::delete(&url, &table, &id, txn) -}); - -web_ffi!(web_db_exec, |args: &Value| { - let url = db_url_of(args)?; - let sql = arg_str(args, "sql")?.to_string(); - let args_v = args.get("args"); - let txn = args.get("txn").and_then(|v| v.as_str()); - db::exec(&url, &sql, args_v, txn) -}); - -web_ffi!(web_db_list_tables, |args: &Value| { - let url = db_url_of(args)?; - let tables = db::list_tables(&url)?; - Ok(json!({ "tables": tables })) -}); - -web_ffi!(web_app_new, |args: &Value| { - let page = args.get("page").cloned().unwrap_or(json!({})); - let db = args.get("db").cloned().unwrap_or(Value::Null); - let host = arg_str_opt(args, "host").unwrap_or("127.0.0.1"); - let port = args - .get("port") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(18081); - let admin = match args.get("admin") { - Some(Value::Bool(b)) => *b, - Some(Value::String(s)) => matches!(s.as_str(), "true" | "True" | "1" | "yes"), - Some(Value::Number(n)) => n.as_i64().unwrap_or(0) != 0, - _ => false, - }; - let admin_prefix = arg_str_opt(args, "admin_prefix") - .or_else(|| arg_str_opt(args, "后台前缀")) - .map(normalize_admin_prefix) - .transpose()? - .unwrap_or_else(|| "/admin".into()); - let login_redirect = arg_str_opt(args, "login_redirect") - .or_else(|| arg_str_opt(args, "登录回跳")) - .map(|s| s.to_string()); - let logout_redirect = arg_str_opt(args, "logout_redirect") - .or_else(|| arg_str_opt(args, "登出回跳")) - .map(|s| s.to_string()); - let mut out = json!({ - "page": page, - "db": db, - "host": host, - "port": port, - "admin": admin, - "admin_prefix": admin_prefix, - "forms": {}, - "routes": {}, - "ws_routes": {}, - "static_dir": null, - "static_mount": "/static", - }); - if let Some(v) = login_redirect { - out.as_object_mut().unwrap().insert("login_redirect".into(), json!(v)); - } - if let Some(v) = logout_redirect { - out.as_object_mut().unwrap().insert("logout_redirect".into(), json!(v)); - } - if let Some(s) = arg_str_opt(args, "shell_css").or_else(|| arg_str_opt(args, "壳样式")) { - out.as_object_mut().unwrap().insert("shell_css".into(), json!(s)); - } - if let Some(s) = arg_str_opt(args, "layout").or_else(|| arg_str_opt(args, "布局")) { - out.as_object_mut().unwrap().insert("layout".into(), json!(s)); - } - if let Some(s) = arg_str_opt(args, "asset_version") - .or_else(|| arg_str_opt(args, "资源版本")) - { - out.as_object_mut() - .unwrap() - .insert("asset_version".into(), json!(s)); - } - Ok(out) -}); - -/// Normalize a URL path: leading slash, no trailing slash (except never `/` here). -fn clean_mount_path(raw: &str) -> Result { - let s = raw.trim(); - if s.is_empty() { - return Err("path is empty".into()); - } - let mut path = if s.starts_with('/') { - s.to_string() - } else { - format!("/{s}") - }; - while path.len() > 1 && path.ends_with('/') { - path.pop(); - } - Ok(path) -} - -fn normalize_admin_prefix(raw: &str) -> Result { - let path = clean_mount_path(raw)?; - if path == "/" { - return Err("admin_prefix cannot be `/`".into()); - } - if path == "/_form" - || path.starts_with("/_form/") - || path == "/_part" - || path.starts_with("/_part/") - { - return Err(format!("admin_prefix `{path}` collides with framework paths")); - } - Ok(path) -} - -fn path_under_prefix(path: &str, prefix: &str) -> bool { - path == prefix || path.starts_with(&format!("{prefix}/")) -} - -fn is_framework_reserved(path: &str, static_mount: &str) -> bool { - path == "/_form" - || path.starts_with("/_form/") - || path == "/_part" - || path.starts_with("/_part/") - || path_under_prefix(path, static_mount) -} - -/// Reserved only while built-in admin is enabled, for the active prefix. -fn normalize_route_path_for( - raw: &str, - admin: bool, - admin_prefix: &str, - static_mount: &str, -) -> Result { - let path = clean_mount_path(raw)?; - if path == "/" { - return Err("route path `/` is reserved for the home page".into()); - } - if is_framework_reserved(&path, static_mount) { - return Err(format!("route path `{path}` is reserved")); - } - if admin && path_under_prefix(&path, admin_prefix) { - return Err(format!("route path `{path}` is reserved")); - } - Ok(path) -} - -fn app_admin_flag(app: &Value) -> bool { - app.get("admin") - .and_then(|v| v.as_bool()) - .unwrap_or(false) -} - -fn app_admin_prefix(app: &Value) -> String { - app.get("admin_prefix") - .and_then(|v| v.as_str()) - .and_then(|s| normalize_admin_prefix(s).ok()) - .unwrap_or_else(|| "/admin".into()) -} - -fn app_static_mount(app: &Value) -> String { - app.get("static_mount") - .and_then(|v| v.as_str()) - .map(http::normalize_static_mount) - .unwrap_or_else(|| "/static".into()) -} - -fn normalize_route_path_in_app(raw: &str, app: &Value) -> Result { - normalize_route_path_for( - raw, - app_admin_flag(app), - &app_admin_prefix(app), - &app_static_mount(app), - ) -} - -web_ffi!(web_app_route, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = normalize_route_path_in_app(arg_str(args, "path")?, &app)?; - let mut page = args - .get("page") - .cloned() - .ok_or_else(|| "missing `page` for route".to_string())?; - // Stamp mount path so render can emit `{path}/_part/{id}` slot sources. - if let Some(obj) = page.as_object_mut() { - obj.insert("_route".into(), json!(&path)); - } - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let routes = obj - .entry("routes".to_string()) - .or_insert_with(|| json!({})); - let rmap = routes - .as_object_mut() - .ok_or_else(|| "app.routes must be a map".to_string())?; - rmap.insert(path, page); - Ok(app) -}); - -web_ffi!(web_app_route_ws, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = normalize_route_path_in_app(arg_str(args, "path")?, &app)?; - let mode = if let Some(m) = args.get("mode").or_else(|| args.get("模式")) { - crate::ws_hub::WsMode::parse(m) - } else { - crate::ws_hub::WsMode::parse(&args.get("echo").cloned().unwrap_or(json!(true))) - }; - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let ws_routes = obj - .entry("ws_routes".to_string()) - .or_insert_with(|| json!({})); - let wmap = ws_routes - .as_object_mut() - .ok_or_else(|| "app.ws_routes must be a map".to_string())?; - wmap.insert(path, json!({ "mode": mode.as_str() })); - Ok(app) -}); - -web_ffi!(web_ws_connect, |args: &Value| { - let url = arg_str(args, "url")?.to_string(); - let message = arg_str_opt(args, "message").unwrap_or(""); - let headers = args.get("headers"); - let timeout_sec = args - .get("timeout_sec") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(30); - match crate::ws::connect(&url, message, headers, timeout_sec) { - Ok(v) => Ok(v), - Err(e) => Ok(json!({ "ok": false, "error": e })), - } -}); - -web_ffi!(web_session_new, |args: &Value| { - session::abi_session_new(args) -}); - -web_ffi!(web_session_set, |args: &Value| { - session::abi_session_set(args) -}); - -web_ffi!(web_session_get, |args: &Value| { - session::abi_session_get(args) -}); - -web_ffi!(web_session_del, |args: &Value| { - session::abi_session_del(args) -}); - -web_ffi!(web_session_destroy, |args: &Value| { - session::abi_session_destroy(args) -}); - -web_ffi!(web_auth_login, |args: &Value| { - session::abi_auth_login(args) -}); - -web_ffi!(web_auth_check, |args: &Value| { - session::abi_auth_check(args) -}); - -web_ffi!(web_auth_logout, |args: &Value| { - session::abi_auth_logout(args) -}); - -web_ffi!(web_password_hash, |args: &Value| { - session::abi_password_hash(args) -}); - -web_ffi!(web_auth_new, |args: &Value| { - let users = args.get("users").cloned().unwrap_or(Value::Null); - let session_ttl = args - .get("session_ttl") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(3600); - Ok(json!({ "users": users, "session_ttl": session_ttl })) -}); - -web_ffi!(web_app_auth, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let users = args.get("users").cloned().unwrap_or(Value::Null); - let session_ttl = args - .get("session_ttl") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(3600); - if let Some(p) = arg_str_opt(args, "admin_prefix").or_else(|| arg_str_opt(args, "后台前缀")) { - let p = normalize_admin_prefix(p)?; - app.as_object_mut() - .ok_or_else(|| "app must be a map".to_string())? - .insert("admin_prefix".into(), json!(p)); - } - if let Some(v) = arg_str_opt(args, "login_redirect").or_else(|| arg_str_opt(args, "登录回跳")) { - app.as_object_mut() - .ok_or_else(|| "app must be a map".to_string())? - .insert("login_redirect".into(), json!(v)); - } - if let Some(v) = arg_str_opt(args, "logout_redirect").or_else(|| arg_str_opt(args, "登出回跳")) { - app.as_object_mut() - .ok_or_else(|| "app must be a map".to_string())? - .insert("logout_redirect".into(), json!(v)); - } - if let Some(v) = arg_str_opt(args, "login_path").or_else(|| arg_str_opt(args, "登录路径")) { - app.as_object_mut() - .ok_or_else(|| "app must be a map".to_string())? - .insert("login_path".into(), json!(v)); - } - let prefix = app_admin_prefix(&app); - let login_path = app - .get("login_path") - .and_then(|v| v.as_str()) - .filter(|s| !s.is_empty()) - .map(|s| s.to_string()) - .unwrap_or_else(|| format!("{prefix}/login")); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - obj.insert("login_path".into(), json!(&login_path)); - obj.insert( - "auth".to_string(), - json!({ "users": users, "session_ttl": session_ttl }), - ); - // Default RBAC: segment-boundary prefix on admin_prefix; redirect visitors to login. - let mut gates = obj - .get("gates") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let has_admin_gate = gates.iter().any(|g| { - g.get("path").and_then(|v| v.as_str()).is_some_and(|p| { - let cleaned = p.trim_end_matches('*').trim_end_matches('/'); - cleaned == prefix.trim_end_matches('/') - }) - }); - if !has_admin_gate { - gates.push(json!({ - "path": prefix, - "roles": ["admin"], - "match": "prefix", - "on_deny": "redirect", - "exclude": [login_path], - })); - obj.insert("gates".into(), Value::Array(gates)); - } - Ok(app) -}); - -web_ffi!(web_app_gate, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = arg_str(args, "path")?.to_string(); - let roles_raw = arg_str_opt(args, "roles") - .or_else(|| arg_str_opt(args, "角色")) - .unwrap_or("admin"); - let roles: Vec = session::parse_roles_csv(roles_raw); - let match_mode = arg_str_opt(args, "match") - .or_else(|| arg_str_opt(args, "匹配")) - .unwrap_or("prefix"); - let on_deny = arg_str_opt(args, "on_deny") - .or_else(|| arg_str_opt(args, "拒绝")) - .unwrap_or("forbid"); - let exclude = args - .get("exclude") - .or_else(|| args.get("排除")) - .cloned() - .unwrap_or(Value::Null); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut gates = obj - .get("gates") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let mut entry = json!({ - "path": path, - "roles": roles, - "match": match_mode, - "on_deny": on_deny, - }); - if !matches!(exclude, Value::Null) { - entry - .as_object_mut() - .unwrap() - .insert("exclude".into(), exclude); - } - gates.push(entry); - obj.insert("gates".into(), Value::Array(gates)); - Ok(app) -}); - -web_ffi!(web_app_gallery, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = normalize_route_path_in_app( - arg_str(args, "path") - .or_else(|_| arg_str(args, "路径")) - .unwrap_or("/gallery"), - &app, - )?; - let storage_url = storage_url_arg(args, "storage") - .or_else(|_| storage_url_arg(args, "存储"))?; - let prefix = arg_str_opt(args, "prefix") - .or_else(|| arg_str_opt(args, "前缀")) - .unwrap_or("uploads/") - .to_string(); - let title = arg_str_opt(args, "title") - .or_else(|| arg_str_opt(args, "标题")) - .unwrap_or("Gallery") - .to_string(); - let download_base = arg_str_opt(args, "download_base") - .or_else(|| arg_str_opt(args, "media")) - .or_else(|| arg_str_opt(args, "下载基址")) - .unwrap_or("/_media") - .to_string(); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut routes = obj - .get("gallery_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - routes.insert( - path, - json!({ - "storage": storage_url, - "prefix": prefix, - "title": title, - "download_base": download_base, - }), - ); - obj.insert("gallery_routes".into(), Value::Object(routes)); - Ok(app) -}); - -web_ffi!(web_app_mount_form, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let id = arg_str(args, "id")?.to_string(); - let form_v = args - .get("form") - .cloned() - .ok_or_else(|| "missing `form`".to_string())?; - let obj = app.as_object_mut().ok_or_else(|| "app must be a map".to_string())?; - let forms = obj - .entry("forms".to_string()) - .or_insert_with(|| json!({})); - let fmap = forms - .as_object_mut() - .ok_or_else(|| "app.forms must be a map".to_string())?; - fmap.insert(id, form_v); - Ok(app) -}); - -web_ffi!(web_app_static, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let dir = arg_str(args, "dir")?.to_string(); - if dir.trim().is_empty() { - return Err("static `dir` is empty".into()); - } - let mount = arg_str_opt(args, "mount").unwrap_or("/static"); - let mount = http::normalize_static_mount(mount); - if mount == "/_form" - || mount.starts_with("/_form/") - || mount == "/_part" - || mount.starts_with("/_part/") - { - return Err(format!("static mount `{mount}` is reserved")); - } - if app_admin_flag(&app) && path_under_prefix(&mount, &app_admin_prefix(&app)) { - return Err(format!("static mount `{mount}` is reserved")); - } - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - obj.insert("static_dir".into(), json!(dir)); - obj.insert("static_mount".into(), json!(mount)); - Ok(app) -}); - -// Configure cross-cutting HTTP middleware on an app: CORS, security response -// headers, gzip compression, request-body limits, and JSON API routes. -// -// Every capability is passed in as *data* (GFM tables from the Marqdo side, -// normalized here into the `middleware` map): 配置即数据、装配即函数. -// -// - `cors` : `|允许来源|方法|头|暴露头|凭证|` table (one row per origin). -// - `security` : `|头|值|` table of response headers (e.g. `X-Frame-Options`). -// - `compress` : bool — enable gzip response compression. -// - `body_limit` : number — max request body bytes (e.g. `1048576`). -// - `json_routes`: `|路径|方法|表|条件|排序|上限|` table of JSON API endpoints -// backed by db queries (method GET/POST, `表`=table name). -web_ffi!(web_app_middleware, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - { - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mw = obj - .entry("middleware".to_string()) - .or_insert_with(|| json!({})); - let m = mw - .as_object_mut() - .ok_or_else(|| "app.middleware must be a map".to_string())?; - - if let Some(cors) = args.get("cors") { - m.insert("cors".into(), middleware::cors_from_table(cors)); - } - if let Some(security) = args.get("security") { - m.insert( - "security".into(), - middleware::security_from_table(security), - ); - } - if let Some(compress) = args.get("compress") { - let on = match compress { - Value::Bool(b) => *b, - Value::String(s) => matches!(s.as_str(), "true" | "True" | "1" | "yes" | "on"), - Value::Number(n) => n.as_i64().unwrap_or(0) != 0, - _ => false, - }; - m.insert("compress".into(), json!(on)); - } - if let Some(al) = args.get("access_log").or_else(|| args.get("访问日志")) { - let on = match al { - Value::Bool(b) => *b, - Value::String(s) => { - matches!(s.as_str(), "true" | "True" | "1" | "yes" | "on" | "真") - } - Value::Number(n) => n.as_i64().unwrap_or(0) != 0, - _ => false, - }; - m.insert("access_log".into(), json!(on)); - } - if let Some(cc) = args - .get("cache_control") - .or_else(|| args.get("缓存控制")) - .and_then(|v| v.as_str()) - { - let s = cc.trim(); - if !s.is_empty() { - m.insert("cache_control".into(), json!(s)); - } - } - if let Some(bl) = args.get("body_limit") { - let n = bl - .as_u64() - .or_else(|| bl.as_i64().map(|i| i as u64)) - .unwrap_or(0); - if n > 0 { - m.insert("body_limit".into(), json!(n)); - } - } - if let Some(routes) = args.get("json_routes") { - m.insert( - "json_routes".into(), - middleware::json_routes_from_table(routes), - ); - } - } - - if let Some(proxy) = args - .get("proxy") - .or_else(|| args.get("proxy_routes")) - .or_else(|| args.get("代理")) - .filter(|v| !v.is_null()) - { - let incoming = proxy::proxy_routes_from_table(proxy); - let obj_app = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut existing = obj_app - .get("proxy_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - if let Some(map) = incoming.as_object() { - for (k, v) in map { - existing.insert(k.clone(), v.clone()); - } - } - obj_app.insert("proxy_routes".into(), Value::Object(existing)); - } - if let Some(inv) = args - .get("invoke") - .or_else(|| args.get("invoke_routes")) - .or_else(|| args.get("调用")) - .filter(|v| !v.is_null()) - { - let incoming = invoke::invoke_routes_from_table(inv); - let obj_app = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut existing = obj_app - .get("invoke_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - if let Some(map) = incoming.as_object() { - for (k, v) in map { - existing.insert(k.clone(), v.clone()); - } - } - obj_app.insert("invoke_routes".into(), Value::Object(existing)); - } - Ok(app) -}); - -web_ffi!(web_app_proxy, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = normalize_route_path_in_app( - arg_str(args, "path").or_else(|_| arg_str(args, "路径"))?, - &app, - )?; - let upstream = arg_str(args, "upstream") - .or_else(|_| arg_str(args, "上游"))? - .to_string(); - if upstream.trim().is_empty() { - return Err("proxy requires `upstream`".into()); - } - let stream = match args - .get("stream") - .or_else(|| args.get("流式")) - .cloned() - .unwrap_or(json!(true)) - { - Value::Bool(b) => b, - Value::String(s) => matches!( - s.as_str(), - "true" | "True" | "1" | "yes" | "on" | "真" - ), - Value::Number(n) => n.as_i64().unwrap_or(0) != 0, - _ => true, - }; - let strip_prefix = arg_str_opt(args, "strip_prefix") - .or_else(|| arg_str_opt(args, "去前缀")) - .unwrap_or("") - .to_string(); - let methods = match args.get("methods").or_else(|| args.get("方法")) { - Some(Value::Array(arr)) => arr - .iter() - .filter_map(|v| v.as_str().map(|s| s.to_uppercase())) - .collect::>(), - Some(Value::String(s)) => s - .split(',') - .map(|m| m.trim().to_uppercase()) - .filter(|m| !m.is_empty()) - .collect(), - _ => vec!["POST".into()], - }; - let headers_from_env = arg_str_opt(args, "headers_from_env") - .or_else(|| arg_str_opt(args, "环境头")) - .unwrap_or("") - .to_string(); - let timeout_ms = args - .get("timeout_ms") - .or_else(|| args.get("超时")) - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(120_000); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut routes = obj - .get("proxy_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - let key = path.trim_start_matches('/').to_string(); - routes.insert( - key, - json!({ - "upstream": upstream, - "stream": stream, - "strip_prefix": strip_prefix, - "methods": methods, - "headers_from_env": headers_from_env, - "timeout_ms": timeout_ms, - }), - ); - obj.insert("proxy_routes".into(), Value::Object(routes)); - Ok(app) -}); - -web_ffi!(web_app_invoke, |args: &Value| { - let mut app = args.get("app").cloned().unwrap_or(json!({})); - let path = normalize_route_path_in_app( - arg_str(args, "path").or_else(|_| arg_str(args, "路径"))?, - &app, - )?; - let fn_path = arg_str(args, "fn") - .or_else(|_| arg_str(args, "function")) - .or_else(|_| arg_str(args, "函数"))? - .to_string(); - if fn_path.trim().is_empty() { - return Err("invoke requires `fn`".into()); - } - // Optional allowlist: only `lib.member` form for now (no arbitrary file paths). - if !fn_path.contains('.') || fn_path.contains('/') || fn_path.contains('#') { - return Err( - "invoke `fn` must be `lib.member` (imported on the entry module)".into(), - ); - } - let method = arg_str_opt(args, "method") - .or_else(|| arg_str_opt(args, "方法")) - .unwrap_or("POST") - .to_uppercase(); - let body = arg_str_opt(args, "body") - .or_else(|| arg_str_opt(args, "正文")) - .unwrap_or("json") - .to_ascii_lowercase(); - let ret = arg_str_opt(args, "return") - .or_else(|| arg_str_opt(args, "返回")) - .unwrap_or("json") - .to_ascii_lowercase(); - let obj = app - .as_object_mut() - .ok_or_else(|| "app must be a map".to_string())?; - let mut routes = obj - .get("invoke_routes") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - let key = path.trim_start_matches('/').to_string(); - routes.insert( - key, - json!({ - "method": method, - "fn": fn_path, - "body": body, - "return": ret, - }), - ); - obj.insert("invoke_routes".into(), Value::Object(routes)); - Ok(app) -}); - -web_ffi!(web_form_new, |args: &Value| { - let table = arg_str_opt(args, "table"); - let action = arg_str_opt(args, "action").unwrap_or("insert"); - let id = arg_str_opt(args, "id"); - Ok(form::form_new(table, action, id)) -}); - -web_ffi!(web_form_fields, |args: &Value| { - let form_v = args.get("form").cloned().unwrap_or(json!({})); - let fields = args - .get("fields") - .cloned() - .ok_or_else(|| "missing `fields`".to_string())?; - Ok(form::set_fields(&form_v, &fields)) -}); - -web_ffi!(web_form_rules, |args: &Value| { - let form_v = args.get("form").cloned().unwrap_or(json!({})); - let rules = args - .get("rules") - .cloned() - .ok_or_else(|| "missing `rules`".to_string())?; - Ok(form::set_rules(&form_v, &rules)) -}); - -web_ffi!(web_form_validate, |args: &Value| { - let form_v = args.get("form").cloned().unwrap_or(json!({})); - let data = args - .get("data") - .cloned() - .ok_or_else(|| "missing `data`".to_string())?; - let rules = args.get("rules"); - Ok(form::validate(&form_v, rules, &data)) -}); - -web_ffi!(web_form_render, |args: &Value| { - let form_v = args.get("form").cloned().unwrap_or(json!({})); - let id = arg_str_opt(args, "id").unwrap_or("form"); - let data = args.get("data"); - let errors = args.get("errors"); - Ok(Value::String(form::render( - &form_v, - id, - data, - errors, - arg_str_opt(args, "csrf"), - ))) -}); - -web_ffi!(web_form_submit, |args: &Value| { - let form_v = args.get("form").cloned().unwrap_or(json!({})); - let data = args - .get("data") - .cloned() - .ok_or_else(|| "missing `data`".to_string())?; - let url = db_url_of(args)?; - form::submit(&form_v, &data, &url) -}); - -web_ffi!(web_form_from_schema, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let action = arg_str_opt(args, "action").unwrap_or("insert"); - let id = match args.get("id") { - None | Some(Value::Null) => None, - Some(_) => Some(arg_text(args, "id")?), - }; - let admin_prefix = arg_str_opt(args, "admin_prefix") - .or_else(|| arg_str_opt(args, "后台前缀")) - .unwrap_or("/admin"); - form::from_schema(&url, &table, action, id.as_deref(), admin_prefix) -}); - -web_ffi!(web_db_table_info, |args: &Value| { - let url = db_url_of(args)?; - let table = arg_str(args, "table")?.to_string(); - let cols = db::table_info(&url, &table)?; - let arr: Vec = cols - .into_iter() - .map(|c| { - json!({ - "name": c.name, - "type": c.sql_type, - "notnull": c.notnull, - "pk": c.pk, - }) - }) - .collect(); - Ok(json!({ "columns": arr })) -}); - - -fn stamp_page_shell( - page: &mut Value, - shell_css: Option<&str>, - layout: Option<&str>, - asset_version: Option<&str>, -) { - let Some(obj) = page.as_object_mut() else { - return; - }; - if let Some(s) = shell_css { - let empty = obj - .get("shell_css") - .and_then(|v| v.as_str()) - .unwrap_or("") - .is_empty(); - if empty { - obj.insert("shell_css".into(), json!(s)); - } - } - if let Some(s) = layout { - let empty = obj - .get("layout") - .and_then(|v| v.as_str()) - .unwrap_or("") - .is_empty(); - if empty { - obj.insert("layout".into(), json!(s)); - } - } - if let Some(s) = asset_version { - let empty = obj - .get("asset_version") - .and_then(|v| v.as_str()) - .unwrap_or("") - .is_empty(); - if empty { - obj.insert("asset_version".into(), json!(s)); - } - } -} - -web_ffi!(web_listen, |args: &Value| { - use std::collections::HashMap; - use std::path::PathBuf; - let ( - page, - db_url, - host, - port, - admin, - forms, - routes, - static_dir, - static_mount, - auth_users, - session_ttl, - ws_routes, - rss_routes, - upload_routes, - download_routes, - redirects, - sitemap_routes, - robots_body, - page_404, - page_500, - gates, - gallery_routes, - proxy_routes, - invoke_routes, - middleware, - cookie_secure, - site_head, - icon_routes, - ) = if args.get("page").is_some() || args.get("host").is_some() { - let page = args.get("page").cloned().unwrap_or(json!({})); - let db_url = db_url_of(args).ok(); - let host = arg_str_opt(args, "host").unwrap_or("127.0.0.1"); - let port = args - .get("port") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(18081) as u16; - let admin = match args.get("admin") { - Some(Value::Bool(b)) => *b, - _ => false, - }; - let static_dir = arg_str_opt(args, "static_dir").map(PathBuf::from); - let static_mount = arg_str_opt(args, "static_mount") - .unwrap_or("/static") - .to_string(); - let auth_users = args - .get("auth") - .or_else(|| args.get("users")) - .cloned() - .filter(|v| !matches!(v, Value::Null)); - let session_ttl = args - .get("session_ttl") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(3600); - let cookie_secure = args - .get("cookie_secure") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - ( - page, - db_url, - host.to_string(), - port, - admin, - HashMap::new(), - HashMap::new(), - static_dir, - static_mount, - auth_users, - session_ttl, - HashMap::::new(), - HashMap::new(), - HashMap::new(), - HashMap::new(), - HashMap::new(), - HashMap::new(), - None, - None, - None, - Vec::::new(), - HashMap::new(), - Vec::<(String, crate::proxy::ProxyRoute)>::new(), - Vec::<(String, crate::invoke::InvokeRoute)>::new(), - middleware::Middleware::default(), - cookie_secure, - Vec::::new(), - Vec::::new(), - ) - } else { - let app = args.get("app").cloned().unwrap_or_else(|| args.clone()); - let page = app.get("page").cloned().unwrap_or(json!({})); - let db_url = app - .get("db") - .and_then(|d| d.get("url")) - .and_then(|v| v.as_str()) - .map(|s| s.to_string()) - .or_else(|| arg_str_opt(&app, "db_url").map(|s| s.to_string())) - .map(|s| resolve_db_url(&s)); - let host = app - .get("host") - .and_then(|v| v.as_str()) - .unwrap_or("127.0.0.1") - .to_string(); - let port = app - .get("port") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(18081) as u16; - let admin = app - .get("admin") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - let mut forms = HashMap::new(); - if let Some(obj) = app.get("forms").and_then(|v| v.as_object()) { - for (k, v) in obj { - forms.insert(k.clone(), v.clone()); - } - } - let mut routes = HashMap::new(); - if let Some(obj) = app.get("routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - routes.insert(k.clone(), v.clone()); - } - } - let mut ws_routes = HashMap::new(); - if let Some(obj) = app.get("ws_routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - ws_routes.insert(k.clone(), crate::ws_hub::WsMode::parse(v)); - } - } - let mut rss_routes = HashMap::new(); - if let Some(obj) = app.get("rss_routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - rss_routes.insert(k.clone(), v.clone()); - } - } - let mut upload_routes = HashMap::new(); - if let Some(obj) = app.get("upload_routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - let field = v - .get("field") - .and_then(|x| x.as_str()) - .unwrap_or("file") - .to_string(); - let storage_url = v - .get("storage_url") - .and_then(|x| x.as_str()) - .unwrap_or("") - .to_string(); - let prefix = v - .get("prefix") - .and_then(|x| x.as_str()) - .unwrap_or("uploads/") - .to_string(); - let max_bytes = v - .get("max_bytes") - .and_then(|x| x.as_u64().or_else(|| x.as_i64().map(|i| i as u64))) - .unwrap_or(5_242_880); - let types = v.get("types").cloned().filter(|t| !matches!(t, Value::Null)); - upload_routes.insert( - k.clone(), - http::UploadRoute { - field, - storage_url, - prefix, - max_bytes, - types, - }, - ); - } - } - let mut download_routes = HashMap::new(); - if let Some(obj) = app.get("download_routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - let storage_url = v - .get("storage_url") - .and_then(|x| x.as_str()) - .unwrap_or("") - .to_string(); - let disposition = v - .get("disposition") - .and_then(|x| x.as_str()) - .unwrap_or("attachment") - .to_string(); - download_routes.insert( - k.clone(), - http::DownloadRoute { - storage_url, - disposition, - }, - ); - } - } - let mut redirects = HashMap::new(); - if let Some(obj) = app.get("redirects").and_then(|v| v.as_object()) { - for (k, v) in obj { - let to = v - .get("to") - .and_then(|x| x.as_str()) - .unwrap_or("/") - .to_string(); - let permanent = v - .get("permanent") - .and_then(|x| x.as_bool()) - .unwrap_or(false); - redirects.insert(k.clone(), (to, permanent)); - } - } - let mut sitemap_routes = HashMap::new(); - if let Some(obj) = app.get("sitemap_routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - sitemap_routes.insert(k.clone(), v.clone()); - } - } - let robots_body = app - .get("robots_body") - .and_then(|v| v.as_str()) - .map(|s| s.to_string()); - let page_404 = app.get("page_404").cloned().filter(|v| !v.is_null()); - let page_500 = app.get("page_500").cloned().filter(|v| !v.is_null()); - let mut gates: Vec = Vec::new(); - if let Some(arr) = app.get("gates").and_then(|v| v.as_array()) { - for g in arr { - if let Some(gate) = http::Gate::from_json(g) { - gates.push(gate); - } - } - } - let mut gallery_routes = HashMap::new(); - if let Some(obj) = app.get("gallery_routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - gallery_routes.insert(k.clone(), v.clone()); - } - } - let mut proxy_routes: Vec<(String, proxy::ProxyRoute)> = Vec::new(); - if let Some(obj) = app.get("proxy_routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - if let Some(r) = proxy::ProxyRoute::from_json(v) { - let path = if k.starts_with('/') { - k.clone() - } else { - format!("/{k}") - }; - proxy_routes.push((path, r)); - } - } - proxy_routes.sort_by(|a, b| a.0.cmp(&b.0)); - } - let mut invoke_routes: Vec<(String, invoke::InvokeRoute)> = Vec::new(); - if let Some(obj) = app.get("invoke_routes").and_then(|v| v.as_object()) { - for (k, v) in obj { - if let Some(r) = invoke::InvokeRoute::from_json(v) { - let path = if k.starts_with('/') { - k.clone() - } else { - format!("/{k}") - }; - invoke_routes.push((path, r)); - } - } - invoke_routes.sort_by(|a, b| a.0.cmp(&b.0)); - } - if app.get("tls_cert").is_some() || app.get("tls_key").is_some() { - eprintln!( - "marqdo web: in-process TLS is not enabled; terminate HTTPS at a reverse proxy (nginx/caddy) and set cookie_secure=True" - ); - } - let static_dir = app - .get("static_dir") - .and_then(|v| v.as_str()) - .filter(|s| !s.is_empty()) - .map(PathBuf::from); - let static_mount = app - .get("static_mount") - .and_then(|v| v.as_str()) - .unwrap_or("/static") - .to_string(); - // `auth` may hold the users table directly or `{users:…, ttl:…}`. - let (auth_users, session_ttl) = match app.get("auth") { - Some(Value::Object(m)) if m.contains_key("users") => ( - m.get("users").cloned(), - m.get("ttl") - .or_else(|| m.get("session_ttl")) - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(3600), - ), - Some(other) if !matches!(other, Value::Null) => ( - Some(other.clone()), - app.get("session_ttl") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(3600), - ), - _ => ( - None, - app.get("session_ttl") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .unwrap_or(3600), - ), - }; - let middleware = middleware::parse(&app); - let mw_summary = middleware::summary(&app); - if !mw_summary.is_empty() { - eprintln!("marqdo web middleware: {mw_summary}"); - } - let cookie_secure = app - .get("cookie_secure") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - let (site_head, icon_routes) = if let Some(icons) = app.get("icons") { - let (_icons_json, head, routes) = crate::assets::normalize_icons(icons); - // Prefer precomputed site_head if present (same content). - let head = app - .get("site_head") - .map(crate::assets::head_links_from_json) - .filter(|h| !h.is_empty()) - .unwrap_or(head); - (head, routes) - } else if let Some(sh) = app.get("site_head") { - (crate::assets::head_links_from_json(sh), Vec::new()) - } else { - (Vec::new(), Vec::new()) - }; - ( - page, - db_url, - host, - port, - admin, - forms, - routes, - static_dir, - static_mount, - auth_users, - session_ttl, - ws_routes, - rss_routes, - upload_routes, - download_routes, - redirects, - sitemap_routes, - robots_body, - page_404, - page_500, - gates, - gallery_routes, - proxy_routes, - invoke_routes, - middleware, - cookie_secure, - site_head, - icon_routes, - ) - }; - let static_dir = static_dir.map(|p| { - if p.is_absolute() { - p - } else { - entry_dir().join(p) - } - }); - let icon_routes: Vec = icon_routes - .into_iter() - .map(|mut r| { - if !r.path.is_absolute() { - let joined = entry_dir().join(&r.path); - if joined.is_file() { - r.path = joined; - } else if let Some(ref sd) = static_dir { - let name = r - .path - .file_name() - .map(PathBuf::from) - .unwrap_or_else(|| r.path.clone()); - let in_static = sd.join(&name); - if in_static.is_file() { - r.path = in_static; - } else { - r.path = joined; - } - } else { - r.path = joined; - } - } - r - }) - .collect(); - let admin_cfg_app = args.get("app").cloned().unwrap_or_else(|| { - json!({ - "admin": admin, - "admin_prefix": arg_str_opt(args, "admin_prefix").unwrap_or("/admin"), - "login_redirect": args.get("login_redirect").cloned().unwrap_or(Value::Null), - "logout_redirect": args.get("logout_redirect").cloned().unwrap_or(Value::Null), - }) - }); - let admin_prefix = app_admin_prefix(&admin_cfg_app); - let login_path = admin_cfg_app - .get("login_path") - .and_then(|v| v.as_str()) - .filter(|s| !s.is_empty()) - .map(|s| s.to_string()) - .unwrap_or_else(|| format!("{admin_prefix}/login")); - let login_redirect = admin_cfg_app - .get("login_redirect") - .and_then(|v| v.as_str()) - .filter(|s| !s.is_empty()) - .map(|s| s.to_string()) - .unwrap_or_else(|| admin_prefix.clone()); - let logout_redirect = admin_cfg_app - .get("logout_redirect") - .and_then(|v| v.as_str()) - .filter(|s| !s.is_empty()) - .map(|s| s.to_string()) - .unwrap_or_else(|| login_path.clone()); - let app_shell = admin_cfg_app - .get("shell_css") - .or_else(|| admin_cfg_app.get("壳样式")) - .and_then(|v| v.as_str()); - let app_layout = admin_cfg_app - .get("layout") - .or_else(|| admin_cfg_app.get("布局")) - .and_then(|v| v.as_str()); - let app_asset_version = admin_cfg_app - .get("asset_version") - .or_else(|| admin_cfg_app.get("资源版本")) - .and_then(|v| v.as_str()); - let mut page = page; - let mut routes = routes; - stamp_page_shell(&mut page, app_shell, app_layout, app_asset_version); - for (_k, p) in routes.iter_mut() { - stamp_page_shell(p, app_shell, app_layout, app_asset_version); - } - http::listen( - &page, - db_url.as_deref(), - &host, - port, - admin, - &admin_prefix, - &login_path, - &login_redirect, - &logout_redirect, - forms, - routes, - static_dir, - &static_mount, - auth_users, - session_ttl, - cookie_secure, - ws_routes, - rss_routes, - upload_routes, - download_routes, - redirects, - sitemap_routes, - robots_body, - page_404, - page_500, - gates, - gallery_routes, - &middleware, - site_head, - icon_routes, - proxy_routes, - invoke_routes, - ) -}); - -fn register(host: &MarqdoHostApi, name: &str, params: &str, fn_ptr: PluginFn) -> c_int { - let register = match host.register_fn { - Some(f) => f, - None => return 1, - }; - let n = CString::new(name).unwrap(); - let p = CString::new(params).unwrap(); - unsafe { register(host.userdata, n.as_ptr(), p.as_ptr(), fn_ptr) } -} - -#[no_mangle] -pub unsafe extern "C" fn marqdo_plugin_abi_version() -> u32 { - ABI_VERSION -} - -#[no_mangle] -pub unsafe extern "C" fn marqdo_plugin_shutdown() {} - -#[no_mangle] -pub unsafe extern "C" fn marqdo_plugin_init(host: *const MarqdoHostApi) -> c_int { - if host.is_null() { - return 1; - } - let host = &*host; - HOST_ALLOC = host.alloc; - HOST_FREE = host.free; - HOST_QUERY = host.host_query; - HOST_USERDATA = host.userdata; - if host.host_query.is_none() { - return 1; - } - - let regs = [ - ( - "web_page_new", - "title,intro,shell_css,layout,asset_version", - web_page_new as PluginFn, - ), - ( - "web_compose_components", - "page,components", - web_compose_components as PluginFn, - ), - ("web_compose_main", "page,main", web_compose_main as PluginFn), - ( - "web_page_query", - "page,query", - web_page_query as PluginFn, - ), - ( - "web_page_order", - "page,order", - web_page_order as PluginFn, - ), - ( - "web_page_link_prefix", - "page,prefix", - web_page_link_prefix as PluginFn, - ), - ( - "web_page_css", - "page,css", - web_page_css as PluginFn, - ), - ( - "web_page_detail", - "page,detail", - web_page_detail as PluginFn, - ), - ( - "web_page_meta", - "page,meta", - web_page_meta as PluginFn, - ), - ( - "web_page_head", - "page,table", - web_page_head as PluginFn, - ), - ( - "web_page_images", - "page,table", - web_page_images as PluginFn, - ), - ("web_head", "table", web_head as PluginFn), - ("web_images", "table", web_images as PluginFn), - ( - "web_app_icons", - "app,table", - web_app_icons as PluginFn, - ), - ( - "web_page_paginate", - "page,offset,limit,path", - web_page_paginate as PluginFn, - ), - ( - "web_rss_build", - "title,link,description,items", - web_rss_build as PluginFn, - ), - ( - "web_app_route_rss", - "app,path,table,limit,order,title,link,description", - web_app_route_rss as PluginFn, - ), - ( - "web_app_redirect", - "app,from,to,permanent", - web_app_redirect as PluginFn, - ), - ( - "web_app_error_page", - "app,status,page", - web_app_error_page as PluginFn, - ), - ( - "web_app_sitemap", - "app,path,base,table,loc,limit,items", - web_app_sitemap as PluginFn, - ), - ("web_app_robots", "app,body,sitemap", web_app_robots as PluginFn), - ("web_sitemap_build", "base,items", web_sitemap_build as PluginFn), - ( - "web_app_upload", - "app,path,field,storage,prefix,max_bytes,types", - web_app_upload as PluginFn, - ), - ( - "web_app_download", - "app,path,storage,disposition", - web_app_download as PluginFn, - ), - ( - "web_upload_validate", - "filename,content_type,size,max_bytes,types", - web_upload_validate as PluginFn, - ), - ( - "web_upload_save", - "storage,path,key,content_type,prefix", - web_upload_save as PluginFn, - ), - ("web_media_new", "storage", web_media_new as PluginFn), - ( - "web_style", - "name,table,strict", - web_style as PluginFn, - ), - ( - "web_compose_form", - "page,form,id,target", - web_compose_form as PluginFn, - ), - ("web_render", "page", web_render as PluginFn), - ("web_db_new", "url", web_db_new as PluginFn), - ("web_cache_new", "url", web_cache_new as PluginFn), - ("web_cache_get", "url,key", web_cache_get as PluginFn), - ("web_cache_set", "url,key,value,ttl", web_cache_set as PluginFn), - ("web_cache_del", "url,key", web_cache_del as PluginFn), - ("web_cache_exists", "url,key", web_cache_exists as PluginFn), - ("web_cache_ttl", "url,key", web_cache_ttl as PluginFn), - ("web_storage_new", "url", web_storage_new as PluginFn), - ( - "web_storage_put", - "url,key,body,path,content_type", - web_storage_put as PluginFn, - ), - ("web_storage_get", "url,key", web_storage_get as PluginFn), - ("web_storage_delete", "url,key", web_storage_delete as PluginFn), - ("web_storage_list", "url,prefix", web_storage_list as PluginFn), - ("web_db_init", "url,name,fields", web_db_init as PluginFn), - ("web_db_insert", "url,table,rows,txn", web_db_insert as PluginFn), - ( - "web_db_select", - "url,table,where,limit,order,offset,txn", - web_db_select as PluginFn, - ), - ( - "web_db_query", - "url,sql,args,txn", - web_db_query as PluginFn, - ), - ( - "web_db_count", - "url,table,where,txn", - web_db_count as PluginFn, - ), - ("web_db_migrate", "url,steps", web_db_migrate as PluginFn), - ( - "web_db_fts_create", - "url,table,columns,name", - web_db_fts_create as PluginFn, - ), - ( - "web_db_search", - "url,table,q,limit,name", - web_db_search as PluginFn, - ), - ("web_db_begin", "url", web_db_begin as PluginFn), - ("web_db_commit", "txn", web_db_commit as PluginFn), - ("web_db_rollback", "txn", web_db_rollback as PluginFn), - ("web_db_get", "url,table,id,txn", web_db_get as PluginFn), - ("web_db_update", "url,table,id,row,txn", web_db_update as PluginFn), - ("web_db_delete", "url,table,id,txn", web_db_delete as PluginFn), - ("web_db_exec", "url,sql,args,txn", web_db_exec as PluginFn), - ("web_db_list_tables", "url", web_db_list_tables as PluginFn), - ( - "web_app_new", - "page,db,admin,host,port,admin_prefix,login_redirect,logout_redirect,shell_css,layout,asset_version", - web_app_new as PluginFn, - ), - ("web_app_route", "app,path,page", web_app_route as PluginFn), - ( - "web_app_mount_form", - "app,id,form", - web_app_mount_form as PluginFn, - ), - ( - "web_app_static", - "app,dir,mount", - web_app_static as PluginFn, - ), - ( - "web_app_middleware", - "app,cors,security,compress,body_limit,json_routes,access_log,cache_control,proxy,invoke", - web_app_middleware as PluginFn, - ), - ( - "web_app_proxy", - "app,path,upstream,stream,strip_prefix,methods,headers_from_env,timeout_ms", - web_app_proxy as PluginFn, - ), - ( - "web_app_invoke", - "app,path,method,fn,body,return", - web_app_invoke as PluginFn, - ), - ("web_form_new", "table,action,id", web_form_new as PluginFn), - ("web_form_fields", "form,fields", web_form_fields as PluginFn), - ("web_form_rules", "form,rules", web_form_rules as PluginFn), - ( - "web_form_validate", - "form,rules,data", - web_form_validate as PluginFn, - ), - ("web_form_render", "form,id", web_form_render as PluginFn), - ("web_form_submit", "form,data,url", web_form_submit as PluginFn), - ( - "web_form_from_schema", - "url,table,action", - web_form_from_schema as PluginFn, - ), - ("web_db_table_info", "url,table", web_db_table_info as PluginFn), - ("web_session_new", "ttl_sec", web_session_new as PluginFn), - ("web_session_set", "id,key,value", web_session_set as PluginFn), - ("web_session_get", "id,key", web_session_get as PluginFn), - ("web_session_del", "id,key", web_session_del as PluginFn), - ("web_session_destroy", "id", web_session_destroy as PluginFn), - ( - "web_auth_login", - "username,password,users,session_ttl", - web_auth_login as PluginFn, - ), - ("web_auth_check", "session_id", web_auth_check as PluginFn), - ("web_auth_logout", "session_id", web_auth_logout as PluginFn), - ("web_password_hash", "password", web_password_hash as PluginFn), - ("web_auth_new", "users,session_ttl", web_auth_new as PluginFn), - ("web_app_auth", "app,users,session_ttl,admin_prefix,login_redirect,logout_redirect,login_path", web_app_auth as PluginFn), - ("web_app_gate", "app,path,roles,match,on_deny,exclude", web_app_gate as PluginFn), - ( - "web_app_gallery", - "app,path,storage,prefix,title,download_base", - web_app_gallery as PluginFn, - ), - ( - "web_app_route_ws", - "app,path,echo,mode", - web_app_route_ws as PluginFn, - ), - ( - "web_ws_connect", - "url,message,headers,timeout_sec", - web_ws_connect as PluginFn, - ), - ("web_listen", "app", web_listen as PluginFn), - ]; - for (name, params, f) in regs { - if register(host, name, params, f) != 0 { - return 1; - } - } - 0 -} diff --git a/plugins/web-rust-archive/src/markdown.rs b/plugins/web-rust-archive/src/markdown.rs deleted file mode 100644 index 5ac7042..0000000 --- a/plugins/web-rust-archive/src/markdown.rs +++ /dev/null @@ -1,16 +0,0 @@ -//! Markdown → HTML for article bodies (GFM subset via pulldown-cmark). - -use pulldown_cmark::{html, Options, Parser}; - -pub fn to_html(md: &str) -> String { - let mut opts = Options::empty(); - opts.insert( - Options::ENABLE_STRIKETHROUGH - | Options::ENABLE_TABLES - | Options::ENABLE_TASKLISTS, - ); - let parser = Parser::new_ext(md, opts); - let mut html_out = String::new(); - html::push_html(&mut html_out, parser); - format!("
{html_out}
") -} diff --git a/plugins/web-rust-archive/src/middleware.rs b/plugins/web-rust-archive/src/middleware.rs deleted file mode 100644 index d519cfc..0000000 --- a/plugins/web-rust-archive/src/middleware.rs +++ /dev/null @@ -1,487 +0,0 @@ -//! Declarative middleware for the web app. -//! -//! All cross-cutting HTTP capabilities (CORS, security headers, compression, -//! body limits, JSON API routes) are configured as *data* on the `app` object -//! and applied to the axum router here. This keeps the authoring surface -//! declarative: a GFM table in Marqdo becomes a `middleware` map, and this -//! module turns it into axum layers — 配置即数据、装配即函数. - -use std::sync::Arc; - -use axum::body::Body; -use axum::extract::State; -use axum::http::{header, HeaderValue, Method, Request, StatusCode}; -use axum::middleware::{self as axum_mw, Next}; -use axum::response::{IntoResponse, Response}; -use axum::routing::{get, post}; -use axum::Router; -use serde_json::{json, Map, Value}; -use tower_http::compression::CompressionLayer; -use tower_http::cors::{Any, CorsLayer}; -use tower_http::limit::RequestBodyLimitLayer; -use tower_http::set_header::SetResponseHeaderLayer; - -use crate::db; - -/// Render a cell value as text (strings stay, numbers/bools stringify). -pub fn cell_text(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -/// Parsed middleware configuration (from `app["middleware"]`). -#[derive(Clone, Default)] -pub struct Middleware { - pub cors: Option, - pub security: Vec<(String, String)>, - pub compress: bool, - pub body_limit: Option, - /// Log `METHOD path status duration_ms` to stderr for each request. - pub access_log: bool, - /// Global `Cache-Control` response header (e.g. `public, max-age=3600`). - pub cache_control: Option, - /// JSON API routes: `path -> { method, table, where?, order?, limit? }`. - pub json_routes: Vec<(String, JsonRoute)>, -} - -#[derive(Clone)] -pub struct CorsConfig { - pub allow_origins: Vec, - pub methods: Vec, - pub headers: Vec, - pub expose_headers: Vec, - pub credentials: bool, -} - -#[derive(Clone)] -pub struct JsonRoute { - pub method: String, - pub table: String, - pub where_v: Option, - pub order: Option, - pub limit: i64, -} - -/// Parse `app["middleware"]` (a map) into a `Middleware`. -pub fn parse(app: &Value) -> Middleware { - let mut mw = Middleware::default(); - let Some(obj) = app.get("middleware").and_then(|v| v.as_object()) else { - return mw; - }; - if let Some(c) = obj.get("cors") { - mw.cors = parse_cors(c); - } - if let Some(sec) = obj.get("security").and_then(|v| v.as_object()) { - mw.security = sec - .iter() - .map(|(k, v)| (k.clone(), v.as_str().unwrap_or("").to_string())) - .filter(|(_, v)| !v.is_empty()) - .collect(); - } - mw.compress = obj - .get("compress") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - mw.access_log = obj - .get("access_log") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - mw.cache_control = obj - .get("cache_control") - .and_then(|v| v.as_str()) - .map(|s| s.trim().to_string()) - .filter(|s| !s.is_empty()); - mw.body_limit = obj - .get("body_limit") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))) - .filter(|n| *n > 0); - if let Some(routes) = obj.get("json_routes").and_then(|v| v.as_object()) { - for (path, spec) in routes { - if let Some(route) = parse_json_route(path, spec) { - mw.json_routes.push(route); - } - } - mw.json_routes.sort_by(|a, b| a.0.cmp(&b.0)); - } - mw -} - -fn parse_cors(v: &Value) -> Option { - let obj = v.as_object()?; - let str_list = |key: &str| -> Vec { - obj.get(key) - .and_then(|v| v.as_array()) - .map(|arr| { - arr.iter() - .filter_map(|x| x.as_str().map(|s| s.to_string())) - .collect() - }) - .unwrap_or_default() - }; - Some(CorsConfig { - allow_origins: str_list("allow_origins"), - methods: str_list("methods"), - headers: str_list("headers"), - expose_headers: str_list("expose_headers"), - credentials: obj - .get("credentials") - .and_then(|v| v.as_bool()) - .unwrap_or(false), - }) -} - -fn parse_json_route(path: &str, spec: &Value) -> Option<(String, JsonRoute)> { - let spec = spec.as_object()?; - let method = spec - .get("method") - .and_then(|v| v.as_str()) - .unwrap_or("GET") - .to_uppercase(); - let table = spec.get("table")?.as_str()?.to_string(); - let order = spec.get("order").and_then(|v| v.as_str()).map(|s| s.to_string()); - let limit = spec - .get("limit") - .and_then(|v| v.as_i64()) - .unwrap_or(200); - Some(( - format!("/{}", path.trim_start_matches('/')), - JsonRoute { - method, - table, - where_v: spec.get("where").cloned(), - order, - limit, - }, - )) -} - -/// Apply the middleware configuration to a router (state already provided). -pub fn apply( - router: Router>, - mw: &Middleware, -) -> Router> { - let mut app = router; - - // JSON API routes first: axum layers only wrap routes registered before - // the `.layer()` call, so these must be mounted ahead of the pipeline. - for (path, route) in &mw.json_routes { - app = mount_json(app, path, route.clone()); - } - - // CORS - if let Some(c) = &mw.cors { - let mut layer = CorsLayer::new(); - if c.allow_origins.is_empty() { - layer = layer.allow_origin(Any); - } else { - layer = layer.allow_origin( - c.allow_origins - .iter() - .filter_map(|o| o.parse::().ok()) - .collect::>(), - ); - } - if c.methods.is_empty() { - layer = layer.allow_methods(Any); - } else { - layer = layer.allow_methods( - c.methods - .iter() - .filter_map(|m| m.parse::().ok()) - .collect::>(), - ); - } - if c.headers.is_empty() { - layer = layer.allow_headers(Any); - } else { - layer = layer.allow_headers( - c.headers - .iter() - .filter_map(|h| h.parse::().ok()) - .collect::>(), - ); - } - if !c.expose_headers.is_empty() { - layer = layer.expose_headers( - c.expose_headers - .iter() - .filter_map(|h| h.parse::().ok()) - .collect::>(), - ); - } - layer = layer.allow_credentials(c.credentials); - app = app.layer(layer); - } - - // Security response headers - for (name, value) in &mw.security { - let Some(header_name) = header_name_from(&name.to_ascii_lowercase()) else { - continue; - }; - if let Ok(v) = HeaderValue::from_str(value) { - app = app.layer(SetResponseHeaderLayer::overriding(header_name, v)); - } - } - - // Compression - if mw.compress { - app = app.layer(CompressionLayer::new()); - } - - if let Some(ref cc) = mw.cache_control { - if let Ok(v) = HeaderValue::from_str(cc) { - app = app.layer(SetResponseHeaderLayer::overriding( - header::CACHE_CONTROL, - v, - )); - } - } - - // Request body limit - if let Some(bytes) = mw.body_limit { - app = app.layer(RequestBodyLimitLayer::new(bytes as usize)); - } - - // Access log (outermost so status/duration include other layers). - if mw.access_log { - app = app.layer(axum_mw::from_fn(access_log_mw)); - } - - app -} - -async fn access_log_mw(req: Request, next: Next) -> Response { - let method = req.method().clone(); - let path = req.uri().path().to_string(); - let start = std::time::Instant::now(); - let resp = next.run(req).await; - eprintln!( - "marqdo web {} {} {} {}ms", - method, - path, - resp.status().as_u16(), - start.elapsed().as_millis() - ); - resp -} - -fn header_name_from(name: &str) -> Option { - let h = match name { - "x_frame_options" | "x-frame-options" => header::X_FRAME_OPTIONS, - "content_security_policy" | "content-security-policy" => header::CONTENT_SECURITY_POLICY, - "x_content_type_options" | "x-content-type-options" => header::X_CONTENT_TYPE_OPTIONS, - "referrer_policy" | "referrer-policy" => header::REFERRER_POLICY, - "strict_transport_security" | "strict-transport-security" | "hsts" => { - header::STRICT_TRANSPORT_SECURITY - } - "x_xss_protection" | "x-xss-protection" => header::X_XSS_PROTECTION, - _ => return None, - }; - Some(h) -} - -/// Mount a JSON API route backed by a db query. -fn mount_json( - app: Router>, - path: &str, - route: JsonRoute, -) -> Router> { - let handler = match route.method.as_str() { - "POST" => post(move |State(st): State>| { - json_handler(st, route.clone()) - }), - _ => get(move |State(st): State>| { - json_handler(st, route.clone()) - }), - }; - app.route(path, handler) -} - -async fn json_handler(st: Arc, route: JsonRoute) -> Response { - let Some(url) = st.db_url.as_deref() else { - return ( - StatusCode::INTERNAL_SERVER_ERROR, - JsonBody(json!({ "error": "no database" })), - ) - .into_response(); - }; - let res = match &route.order { - Some(o) if !o.trim().is_empty() => { - db::select_order(url, &route.table, route.limit, route.where_v.as_ref(), Some(o), None, None) - } - _ => db::select(url, &route.table, route.limit, route.where_v.as_ref()), - }; - match res { - Ok(data) => JsonBody(data).into_response(), - Err(e) => ( - StatusCode::INTERNAL_SERVER_ERROR, - JsonBody(json!({ "error": e })), - ) - .into_response(), - } -} - -/// A JSON body response wrapper (sets `Content-Type: application/json`). -pub struct JsonBody(pub Value); - -impl IntoResponse for JsonBody { - fn into_response(self) -> Response { - Response::builder() - .status(StatusCode::OK) - .header(header::CONTENT_TYPE, "application/json; charset=utf-8") - .body(Body::from(self.0.to_string())) - .unwrap() - } -} - -/// Normalize a `security` table into the `middleware.security` map shape. -/// Accepts a GFM table `|头|值|` (list of rows) or an already-shaped map. -pub fn security_from_table(table: &Value) -> Value { - let rows = crate::table::as_rows(table); - let mut m = Map::new(); - if let Some(arr) = rows.as_array() { - for row in arr { - let col = |keys: &[&str]| -> String { - keys.iter() - .find_map(|k| row.get(*k).map(cell_text)) - .unwrap_or_default() - }; - let k = col(&["头", "header", "Header", "name"]); - let v = col(&["值", "value", "Value"]); - if !k.is_empty() { - m.insert(k, json!(v)); - } - } - } - Value::Object(m) -} - -/// Normalize a CORS table `|允许来源|方法|头|暴露头|凭证|` (one row per origin) -/// into the `middleware.cors` map shape. -pub fn cors_from_table(table: &Value) -> Value { - let rows = crate::table::as_rows(table); - let mut allow_origins = Vec::new(); - let mut methods = Vec::new(); - let mut headers = Vec::new(); - let mut expose_headers = Vec::new(); - let mut credentials = false; - if let Some(arr) = rows.as_array() { - for row in arr { - let col = |keys: &[&str]| -> String { - keys.iter() - .find_map(|k| row.get(*k).map(cell_text)) - .unwrap_or_default() - }; - let origin = col(&["允许来源", "origin", "Origin"]); - if !origin.is_empty() && origin != "*" { - allow_origins.push(origin); - } - for m in col(&["方法", "methods", "Methods"]).split(',') { - let m = m.trim(); - if !m.is_empty() { - methods.push(m.to_string()); - } - } - for h in col(&["头", "headers", "Headers"]).split(',') { - let h = h.trim(); - if !h.is_empty() { - headers.push(h.to_string()); - } - } - for h in col(&["暴露头", "expose_headers", "Expose-Headers"]).split(',') { - let h = h.trim(); - if !h.is_empty() { - expose_headers.push(h.to_string()); - } - } - let cred = col(&["凭证", "credentials", "Credentials"]); - if cred.eq_ignore_ascii_case("true") - || cred == "1" - || cred.eq_ignore_ascii_case("yes") - { - credentials = true; - } - } - } - json!({ - "allow_origins": allow_origins, - "methods": methods, - "headers": headers, - "expose_headers": expose_headers, - "credentials": credentials, - }) -} - -/// Normalize a JSON-routes table into `middleware.json_routes` map shape. -/// Accepts a GFM table `|路径|方法|表|条件|排序|上限|` (rows). -pub fn json_routes_from_table(table: &Value) -> Value { - let rows = crate::table::as_rows(table); - let mut routes = Map::new(); - if let Some(arr) = rows.as_array() { - for row in arr { - let col = |keys: &[&str]| -> String { - keys.iter() - .find_map(|k| row.get(*k).map(cell_text)) - .unwrap_or_default() - }; - let path = col(&["路径", "path", "Path"]).trim_start_matches('/').to_string(); - if path.is_empty() { - continue; - } - let method = col(&["方法", "method", "Method"]).to_uppercase(); - let method = if method.is_empty() { "GET".into() } else { method }; - let table = col(&["表", "table", "Table"]); - if table.is_empty() { - continue; - } - let order = col(&["排序", "order", "Order"]); - let limit = col(&["上限", "limit", "Limit"]).parse::().unwrap_or(200); - let mut spec = Map::new(); - spec.insert("method".into(), json!(method)); - spec.insert("table".into(), json!(table)); - if !order.is_empty() { - spec.insert("order".into(), json!(order)); - } - spec.insert("limit".into(), json!(limit)); - routes.insert(path, Value::Object(spec)); - } - } - Value::Object(routes) -} - -/// Read the `middleware` map out of an app object (for logging/debug). -pub fn summary(app: &Value) -> String { - let mw = parse(app); - let mut parts = Vec::new(); - if mw.cors.is_some() { - parts.push("cors".to_string()); - } - if !mw.security.is_empty() { - parts.push("security".to_string()); - } - if mw.compress { - parts.push("compress".to_string()); - } - if mw.body_limit.is_some() { - parts.push("body_limit".to_string()); - } - if mw.access_log { - parts.push("access_log".to_string()); - } - if mw.cache_control.is_some() { - parts.push("cache_control".to_string()); - } - if !mw.json_routes.is_empty() { - parts.push(format!("json:{}", mw.json_routes.len())); - } - if parts.is_empty() { - String::new() - } else { - parts.join(" + ") - } -} diff --git a/plugins/web-rust-archive/src/password.rs b/plugins/web-rust-archive/src/password.rs deleted file mode 100644 index 5c80668..0000000 --- a/plugins/web-rust-archive/src/password.rs +++ /dev/null @@ -1,64 +0,0 @@ -//! Password hashing (argon2id) for admin users and auth tables. - -use argon2::{ - password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString}, - Argon2, -}; -use getrandom::getrandom; - -/// True when `stored` looks like an argon2 PHC string. -pub fn is_hashed(stored: &str) -> bool { - stored.starts_with("$argon2") -} - -/// Hash a plaintext password (argon2id, random salt). -pub fn hash_password(plain: &str) -> Result { - if plain.is_empty() { - return Err("password must not be empty".into()); - } - let mut salt_bytes = [0u8; 16]; - getrandom(&mut salt_bytes).map_err(|e| format!("getrandom: {e}"))?; - let salt = SaltString::encode_b64(&salt_bytes).map_err(|e| e.to_string())?; - let argon2 = Argon2::default(); - argon2 - .hash_password(plain.as_bytes(), &salt) - .map(|h| h.to_string()) - .map_err(|e| e.to_string()) -} - -/// Verify plaintext against stored hash or legacy plaintext (dev / gold tests). -pub fn verify_password(plain: &str, stored: &str) -> bool { - if stored.is_empty() || plain.is_empty() { - return false; - } - if is_hashed(stored) { - let parsed = match PasswordHash::new(stored) { - Ok(h) => h, - Err(_) => return false, - }; - Argon2::default() - .verify_password(plain.as_bytes(), &parsed) - .is_ok() - } else { - plain == stored - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn hash_and_verify_roundtrip() { - let hash = hash_password("secret").unwrap(); - assert!(is_hashed(&hash)); - assert!(verify_password("secret", &hash)); - assert!(!verify_password("wrong", &hash)); - } - - #[test] - fn legacy_plaintext_still_works() { - assert!(verify_password("secret", "secret")); - assert!(!verify_password("other", "secret")); - } -} diff --git a/plugins/web-rust-archive/src/proxy.rs b/plugins/web-rust-archive/src/proxy.rs deleted file mode 100644 index 1f43014..0000000 --- a/plugins/web-rust-archive/src/proxy.rs +++ /dev/null @@ -1,471 +0,0 @@ -//! Streaming reverse proxy routes for `app.proxy` / `configure proxy=`. -//! -//! Browser → Marqdo (same origin) → upstream, piping response bodies -//! (including `text/event-stream`) without buffering the full stream. - -use std::sync::Arc; -use std::time::Duration; - -use axum::body::Body; -use axum::extract::{Request, State}; -use axum::http::{header, HeaderMap, HeaderName, HeaderValue, StatusCode}; -use axum::response::{IntoResponse, Response}; -use axum::routing::{MethodFilter, MethodRouter}; -use axum::Router; -use futures_util::TryStreamExt; -use serde_json::{json, Map, Value}; - -use crate::middleware::cell_text; -use crate::table; - -/// One declared proxy mount. -#[derive(Clone, Debug)] -pub struct ProxyRoute { - pub upstream: String, - pub stream: bool, - pub strip_prefix: String, - pub methods: Vec, - /// `ENV_NAME=Header-Name` pairs injected on the upstream request. - pub headers_from_env: Vec<(String, String)>, - pub timeout_ms: u64, -} - -impl ProxyRoute { - pub fn from_json(v: &Value) -> Option { - let obj = v.as_object()?; - let upstream = obj.get("upstream")?.as_str()?.trim().to_string(); - if upstream.is_empty() { - return None; - } - let stream = obj - .get("stream") - .and_then(|x| x.as_bool()) - .unwrap_or(true); - let strip_prefix = obj - .get("strip_prefix") - .and_then(|x| x.as_str()) - .unwrap_or("") - .to_string(); - let methods = obj - .get("methods") - .and_then(|x| x.as_array()) - .map(|arr| { - arr.iter() - .filter_map(|m| m.as_str().map(|s| s.to_uppercase())) - .filter(|s| !s.is_empty()) - .collect::>() - }) - .filter(|v| !v.is_empty()) - .unwrap_or_else(|| vec!["POST".into()]); - let headers_from_env = parse_headers_from_env_value(obj.get("headers_from_env")); - let timeout_ms = obj - .get("timeout_ms") - .and_then(|x| x.as_u64().or_else(|| x.as_i64().map(|i| i as u64))) - .unwrap_or(120_000) - .max(1); - Some(Self { - upstream, - stream, - strip_prefix, - methods, - headers_from_env, - timeout_ms, - }) - } -} - -fn parse_headers_from_env_value(v: Option<&Value>) -> Vec<(String, String)> { - let Some(v) = v else { - return Vec::new(); - }; - match v { - Value::String(s) => parse_headers_from_env_str(s), - Value::Array(arr) => arr - .iter() - .filter_map(|x| x.as_str()) - .flat_map(parse_headers_from_env_str) - .collect(), - _ => Vec::new(), - } -} - -fn parse_headers_from_env_str(s: &str) -> Vec<(String, String)> { - s.split(|c| c == ',' || c == ';') - .filter_map(|part| { - let part = part.trim(); - if part.is_empty() { - return None; - } - let (env, hdr) = part.split_once('=')?; - let env = env.trim(); - let hdr = hdr.trim(); - if env.is_empty() || hdr.is_empty() { - return None; - } - Some((env.to_string(), hdr.to_string())) - }) - .collect() -} - -/// Expand `$VAR` / `${VAR}` in upstream URL strings. -pub fn expand_env(s: &str) -> String { - let mut out = String::with_capacity(s.len()); - let bytes = s.as_bytes(); - let mut i = 0; - while i < bytes.len() { - if bytes[i] == b'$' { - if i + 1 < bytes.len() && bytes[i + 1] == b'{' { - if let Some(end) = s[i + 2..].find('}') { - let name = &s[i + 2..i + 2 + end]; - out.push_str(&std::env::var(name).unwrap_or_default()); - i += 3 + end; - continue; - } - } else { - let start = i + 1; - let mut end = start; - while end < bytes.len() - && (bytes[end].is_ascii_alphanumeric() || bytes[end] == b'_') - { - end += 1; - } - if end > start { - let name = &s[start..end]; - out.push_str(&std::env::var(name).unwrap_or_default()); - i = end; - continue; - } - } - } - out.push(bytes[i] as char); - i += 1; - } - out -} - -/// Normalize a proxy-routes GFM table into `app.proxy_routes` map shape. -pub fn proxy_routes_from_table(table_v: &Value) -> Value { - let rows = table::as_rows(table_v); - let mut routes = Map::new(); - if let Some(arr) = rows.as_array() { - for row in arr { - let col = |keys: &[&str]| -> String { - keys.iter() - .find_map(|k| row.get(*k).map(cell_text)) - .unwrap_or_default() - }; - let path = normalize_path(&col(&["路径", "path", "Path"])); - if path.is_empty() || path == "/" { - continue; - } - let upstream = col(&["上游", "upstream", "Upstream"]); - if upstream.is_empty() { - continue; - } - let stream = { - let s = col(&["流式", "stream", "Stream"]); - if s.is_empty() { - true - } else { - matches!( - s.to_ascii_lowercase().as_str(), - "true" | "1" | "yes" | "on" | "真" - ) - } - }; - let strip_prefix = col(&["去前缀", "strip_prefix", "Strip-Prefix"]); - let methods_raw = col(&["方法", "methods", "Methods"]); - let methods: Vec = if methods_raw.is_empty() { - vec!["POST".into()] - } else { - methods_raw - .split(',') - .map(|m| m.trim().to_uppercase()) - .filter(|m| !m.is_empty()) - .collect() - }; - let headers_from_env = col(&[ - "环境头", - "headers_from_env", - "Headers-From-Env", - ]); - let timeout_ms = col(&["超时", "timeout_ms", "Timeout"]) - .parse::() - .unwrap_or(120_000); - routes.insert( - path.trim_start_matches('/').to_string(), - json!({ - "upstream": upstream, - "stream": stream, - "strip_prefix": strip_prefix, - "methods": methods, - "headers_from_env": headers_from_env, - "timeout_ms": timeout_ms, - }), - ); - } - } - Value::Object(routes) -} - -fn normalize_path(raw: &str) -> String { - let s = raw.trim(); - if s.is_empty() { - return String::new(); - } - if s.starts_with('/') { - s.to_string() - } else { - format!("/{s}") - } -} - -/// Mount all proxy routes onto the router. -pub fn mount_all( - mut app: Router>, - routes: &[(String, ProxyRoute)], -) -> Router> { - for (path, route) in routes { - app = mount_one(app, path, route.clone()); - } - app -} - -fn mount_one( - app: Router>, - path: &str, - route: ProxyRoute, -) -> Router> { - let mut filter: Option = None; - for m in &route.methods { - let f = match m.as_str() { - "GET" => MethodFilter::GET, - "POST" => MethodFilter::POST, - "PUT" => MethodFilter::PUT, - "PATCH" => MethodFilter::PATCH, - "DELETE" => MethodFilter::DELETE, - "HEAD" => MethodFilter::HEAD, - "OPTIONS" => MethodFilter::OPTIONS, - _ => continue, - }; - filter = Some(match filter { - None => f, - Some(acc) => acc.or(f), - }); - } - let filter = filter.unwrap_or(MethodFilter::POST); - let r = route.clone(); - let handler = MethodRouter::new().on(filter, move |State(_st): State>, req: Request| { - let r = r.clone(); - async move { proxy_handler(r, req).await } - }); - app.route(path, handler) -} - -async fn proxy_handler(route: ProxyRoute, req: Request) -> Response { - let method = req.method().clone(); - let uri = req.uri().clone(); - let in_headers = req.headers().clone(); - let body_bytes = match axum::body::to_bytes(req.into_body(), 64 * 1024 * 1024).await { - Ok(b) => b, - Err(e) => { - return ( - StatusCode::BAD_REQUEST, - format!("read body: {e}"), - ) - .into_response(); - } - }; - - let target = match build_upstream_url(&route, uri.path(), uri.query()) { - Ok(u) => u, - Err(e) => return (StatusCode::BAD_GATEWAY, e).into_response(), - }; - - let client = match reqwest::Client::builder() - .timeout(Duration::from_millis(route.timeout_ms)) - .build() - { - Ok(c) => c, - Err(e) => { - return ( - StatusCode::INTERNAL_SERVER_ERROR, - format!("client: {e}"), - ) - .into_response(); - } - }; - - let mut builder = client.request( - reqwest::Method::from_bytes(method.as_str().as_bytes()).unwrap_or(reqwest::Method::POST), - &target, - ); - - // Forward selected inbound headers (skip hop-by-hop). - for (name, value) in in_headers.iter() { - let lname = name.as_str().to_ascii_lowercase(); - if is_hop_by_hop(&lname) || lname == "host" { - continue; - } - if let Ok(v) = value.to_str() { - builder = builder.header(name.as_str(), v); - } - } - - // Inject secrets from env (never from the browser). - for (env_name, header_name) in &route.headers_from_env { - if let Ok(val) = std::env::var(env_name) { - if !val.is_empty() { - // Common pattern: Authorization Bearer - let hdr_val = if header_name.eq_ignore_ascii_case("authorization") - && !val.to_ascii_lowercase().starts_with("bearer ") - { - format!("Bearer {val}") - } else { - val - }; - builder = builder.header(header_name.as_str(), hdr_val); - } - } - } - - if !body_bytes.is_empty() { - builder = builder.body(body_bytes); - } - - let upstream = match builder.send().await { - Ok(r) => r, - Err(e) => { - return (StatusCode::BAD_GATEWAY, format!("upstream: {e}")).into_response(); - } - }; - - let status = StatusCode::from_u16(upstream.status().as_u16()).unwrap_or(StatusCode::BAD_GATEWAY); - let mut out_headers = HeaderMap::new(); - for (name, value) in upstream.headers().iter() { - let lname = name.as_str().to_ascii_lowercase(); - if is_hop_by_hop(&lname) { - continue; - } - if let (Ok(n), Ok(v)) = ( - HeaderName::from_bytes(name.as_str().as_bytes()), - HeaderValue::from_bytes(value.as_bytes()), - ) { - out_headers.append(n, v); - } - } - // Ensure SSE content-type is preserved if present. - if !out_headers.contains_key(header::CONTENT_TYPE) { - if let Some(ct) = upstream.headers().get(reqwest::header::CONTENT_TYPE) { - if let Ok(v) = HeaderValue::from_bytes(ct.as_bytes()) { - out_headers.insert(header::CONTENT_TYPE, v); - } - } - } - - if route.stream { - // Industry SSE / reverse-proxy practice: disable buffering at CDN/Nginx. - out_headers.insert( - header::CACHE_CONTROL, - HeaderValue::from_static("no-cache, no-transform"), - ); - out_headers.insert( - HeaderName::from_static("x-accel-buffering"), - HeaderValue::from_static("no"), - ); - let stream = upstream.bytes_stream().map_err(|e| { - std::io::Error::new(std::io::ErrorKind::Other, e) - }); - let body = Body::from_stream(stream); - let mut resp = Response::new(body); - *resp.status_mut() = status; - *resp.headers_mut() = out_headers; - resp - } else { - let bytes = match upstream.bytes().await { - Ok(b) => b, - Err(e) => { - return (StatusCode::BAD_GATEWAY, format!("upstream body: {e}")).into_response(); - } - }; - let mut resp = Response::new(Body::from(bytes)); - *resp.status_mut() = status; - *resp.headers_mut() = out_headers; - resp - } -} - -fn build_upstream_url( - route: &ProxyRoute, - req_path: &str, - query: Option<&str>, -) -> Result { - let base = expand_env(&route.upstream); - if base.is_empty() { - return Err("proxy upstream empty after env expand".into()); - } - // If upstream already looks like a full URL with path (contains scheme and - // more than origin), and strip_prefix empties the remainder, use base as-is. - let mut path = req_path.to_string(); - let strip = route.strip_prefix.trim(); - if !strip.is_empty() { - let strip_n = normalize_path(strip); - if path.starts_with(&strip_n) { - path = path[strip_n.len()..].to_string(); - if path.is_empty() { - path = "/".into(); - } else if !path.starts_with('/') { - path = format!("/{path}"); - } - } - } - - let url = if base.contains("://") { - let trimmed = base.trim_end_matches('/'); - // If base has no path beyond origin, append path; if base includes a - // path suffix, append remaining path. - if let Some(idx) = trimmed.find("://") { - let after = &trimmed[idx + 3..]; - if after.contains('/') { - // base includes path — append only if remaining path is not "/" - if path == "/" { - trimmed.to_string() - } else { - format!("{trimmed}{path}") - } - } else { - format!("{trimmed}{path}") - } - } else { - format!("{trimmed}{path}") - } - } else { - return Err(format!("proxy upstream must be absolute URL, got `{base}`")); - }; - - Ok(match query { - Some(q) if !q.is_empty() => { - if url.contains('?') { - format!("{url}&{q}") - } else { - format!("{url}?{q}") - } - } - _ => url, - }) -} - -fn is_hop_by_hop(name: &str) -> bool { - matches!( - name, - "connection" - | "keep-alive" - | "proxy-authenticate" - | "proxy-authorization" - | "te" - | "trailers" - | "transfer-encoding" - | "upgrade" - | "content-length" - ) -} diff --git a/plugins/web-rust-archive/src/rate_limit.rs b/plugins/web-rust-archive/src/rate_limit.rs deleted file mode 100644 index e879f9a..0000000 --- a/plugins/web-rust-archive/src/rate_limit.rs +++ /dev/null @@ -1,95 +0,0 @@ -//! Login rate limiting — max failures per IP+username within a window. - -use std::collections::HashMap; -use std::sync::Mutex; -use std::time::{SystemTime, UNIX_EPOCH}; - -const MAX_FAILS: u32 = 5; -const WINDOW_SEC: u64 = 900; // 15 minutes - -struct Window { - count: u32, - start: u64, -} - -static ATTEMPTS: Mutex>> = Mutex::new(None); - -fn now_secs() -> u64 { - SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|d| d.as_secs()) - .unwrap_or(0) -} - -fn key(ip: &str, username: &str) -> String { - format!("{ip}|{username}") -} - -fn with_map(f: impl FnOnce(&mut HashMap) -> T) -> T { - let mut guard = ATTEMPTS.lock().unwrap_or_else(|e| e.into_inner()); - let map = guard.get_or_insert_with(HashMap::new); - f(map) -} - -/// Reset attempt counters (between listens / tests). -pub fn reset() { - let mut guard = ATTEMPTS.lock().unwrap_or_else(|e| e.into_inner()); - *guard = Some(HashMap::new()); -} - -/// Returns `Err(message)` when the client is temporarily locked out. -pub fn check(ip: &str, username: &str) -> Result<(), String> { - let k = key(ip, username); - let now = now_secs(); - with_map(|map| { - if let Some(w) = map.get(&k) { - if now.saturating_sub(w.start) < WINDOW_SEC && w.count >= MAX_FAILS { - return Err( - "Too many failed login attempts. Try again in about 15 minutes.".into(), - ); - } - if now.saturating_sub(w.start) >= WINDOW_SEC { - map.remove(&k); - } - } - Ok(()) - }) -} - -pub fn record_failure(ip: &str, username: &str) { - let k = key(ip, username); - let now = now_secs(); - with_map(|map| { - let entry = map.entry(k).or_insert(Window { count: 0, start: now }); - if now.saturating_sub(entry.start) >= WINDOW_SEC { - entry.count = 0; - entry.start = now; - } - entry.count = entry.count.saturating_add(1); - }); -} - -pub fn clear_success(ip: &str, username: &str) { - let k = key(ip, username); - with_map(|map| { - map.remove(&k); - }); -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn locks_after_max_fails() { - reset(); - let ip = "127.0.0.1"; - let user = "admin"; - for _ in 0..MAX_FAILS { - record_failure(ip, user); - } - assert!(check(ip, user).is_err()); - clear_success(ip, user); - assert!(check(ip, user).is_ok()); - } -} diff --git a/plugins/web-rust-archive/src/render.rs b/plugins/web-rust-archive/src/render.rs deleted file mode 100644 index fb8f159..0000000 --- a/plugins/web-rust-archive/src/render.rs +++ /dev/null @@ -1,1262 +0,0 @@ -//! Minimal HTML shell for assembled pages / parts. - -use serde_json::{json, Map, Value}; - -use crate::db; -use crate::markdown; -use crate::table::{ - as_bind, as_nav_rows, nav_label_href, nav_media_when_class, normalize_ref, normalize_slot, - parse_site_path, project_rows, SitePath, -}; - -fn esc(s: &str) -> String { - s.replace('&', "&") - .replace('<', "<") - .replace('>', ">") - .replace('"', """) -} - -fn text(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -fn class_attr(css: &str) -> String { - if css.is_empty() { - String::new() - } else { - format!(" class=\"{}\"", esc(css)) - } -} - -fn is_simple_ident(s: &str) -> bool { - !s.is_empty() - && s.chars() - .all(|c| c.is_ascii_alphanumeric() || c == '_' || !c.is_ascii()) -} - -/// Normalize a form mount selector to a bare HTML id (`#foo` → `foo`). -fn form_mount_id(target: &str) -> Option<&str> { - let t = target.trim().trim_start_matches('#'); - if t.is_empty() { - return None; - } - // Keep injection conservative: id must be a simple token (no spaces / quotes). - if t.chars().any(|c| c.is_whitespace() || c == '"' || c == '\'' || c == '<' || c == '>') { - return None; - } - Some(t) -} - -/// Inject `payload` as the inner HTML of the first element with `id="…"` / `id='…'`. -/// Returns `None` if no matching open+close pair is found (caller falls back to sibling form). -pub(crate) fn inject_html_into_id(haystack: &str, id: &str, payload: &str) -> Option { - let id = form_mount_id(id)?; - let patterns = [format!("id=\"{id}\""), format!("id='{id}'")]; - for pat in &patterns { - let Some(idx) = haystack.find(pat.as_str()) else { - continue; - }; - let tag_start = haystack[..idx].rfind('<')?; - // Reject closing tags / comments accidentally matching. - let after_lt = haystack.as_bytes().get(tag_start + 1).copied()?; - if after_lt == b'/' || after_lt == b'!' { - continue; - } - let name_end = haystack[tag_start + 1..] - .find(|c: char| c.is_whitespace() || c == '>' || c == '/') - .map(|i| tag_start + 1 + i) - .unwrap_or(idx); - let tag_name = haystack[tag_start + 1..name_end].trim(); - if tag_name.is_empty() { - continue; - } - let after_id = idx + pat.len(); - let open_gt = haystack[after_id..].find('>')? + after_id; - // Skip self-closing `
`. - if haystack.as_bytes().get(open_gt.saturating_sub(1)) == Some(&b'/') { - continue; - } - let close = format!(""); - // Case-insensitive close search for HTML friendliness. - let rest = &haystack[open_gt + 1..]; - let close_rel = rest - .to_ascii_lowercase() - .find(&close.to_ascii_lowercase())?; - let close_idx = open_gt + 1 + close_rel; - let mut out = String::with_capacity(haystack.len() + payload.len()); - out.push_str(&haystack[..open_gt + 1]); - out.push_str(payload); - out.push_str(&haystack[close_idx..]); - return Some(out); - } - None -} - -/// Append intro + optional form: either inject into `form_target` mount inside intro, or sibling. -fn push_intro_and_form( - buf: &mut String, - intro: &str, - args: &Value, - form_data: Option<&Value>, - form_errors: Option<&Value>, - csrf: Option<&str>, -) { - let form = args.get("form"); - let form_id = args - .get("form_id") - .and_then(|v| v.as_str()) - .unwrap_or("form"); - let target = args - .get("form_target") - .or_else(|| args.get("target")) - .or_else(|| args.get("form_slot")) - .or_else(|| args.get("表单插槽")) - .and_then(|v| v.as_str()) - .unwrap_or(""); - let form_html = form.map(|f| { - crate::form::render_body(f, form_id, form_data, form_errors, csrf) - }); - - if let Some(ref html) = form_html { - if !target.is_empty() && !intro.is_empty() { - if let Some(injected) = inject_html_into_id(intro, target, html) { - buf.push_str(&format!("
{injected}
")); - return; - } - } - } - - if !intro.is_empty() { - buf.push_str(&format!("
{intro}
")); - } - if let Some(html) = form_html { - buf.push_str(&html); - } -} - -/// True when `back` is a DB field path (`table.col` / `mod.table.col`), not a URL or site path. -fn is_db_bind_back(back: &str) -> bool { - let s = normalize_ref(back); - if s.is_empty() - || s.contains("://") - || s.starts_with('/') - || s.starts_with('#') - || s.starts_with('?') - { - return false; - } - match parse_site_path(&s) { - SitePath::DbField { .. } => true, - SitePath::LibMember { lib, member } => is_simple_ident(&lib) && is_simple_ident(&member), - SitePath::Plain(p) => { - let parts: Vec<&str> = p.split('.').filter(|x| !x.is_empty()).collect(); - parts.len() == 2 && parts.iter().all(|x| is_simple_ident(x)) - } - } -} - -#[derive(Clone, Debug)] -struct NavLink { - label: String, - href: String, - class: String, - media: String, -} - -#[derive(Clone, Copy, Debug, PartialEq, Eq)] -enum NavWhen { - Always, - Hide, - Auth, - Guest, -} - -fn parse_nav_when(raw: &str) -> NavWhen { - let t = raw.trim(); - if t.is_empty() - || matches!( - t, - "*" | "always" | "Always" | "真" | "yes" | "on" | "show" | "all" - ) - { - return NavWhen::Always; - } - if matches!( - t, - "hide" | "never" | "off" | "no" | "假" | "否" | "0" | "false" | "False" - ) { - return NavWhen::Hide; - } - if matches!( - t, - "auth" | "user" | "登录" | "已登录" | "logged_in" | "logged-in" - ) { - return NavWhen::Auth; - } - if matches!( - t, - "guest" | "anon" | "anonymous" | "访客" | "匿名" | "未登录" - ) { - return NavWhen::Guest; - } - // Unknown token: keep visible (forward-compatible). - NavWhen::Always -} - -/// `Some(true)` logged in, `Some(false)` guest, `None` unknown (do not filter auth/guest). -fn page_auth_state(page: Option<&Value>) -> Option { - let page = page?; - if let Some(v) = page - .get("_nav_user") - .or_else(|| page.get("user")) - .or_else(|| page.get("username")) - .or_else(|| page.get("_user")) - { - match v { - Value::Null => Some(false), - Value::Bool(b) => Some(*b), - Value::String(s) => Some(!s.trim().is_empty()), - Value::Number(n) => Some(n.as_i64().unwrap_or(0) != 0), - _ => Some(true), - } - } else if let Some(v) = page.get("_logged_in").or_else(|| page.get("logged_in")) { - match v { - Value::Bool(b) => Some(*b), - Value::String(s) => Some(matches!( - s.trim(), - "1" | "true" | "True" | "yes" | "on" | "真" | "是" - )), - Value::Number(n) => Some(n.as_i64().unwrap_or(0) != 0), - _ => None, - } - } else { - None - } -} - -fn nav_when_visible(when: NavWhen, auth: Option) -> bool { - match when { - NavWhen::Always => true, - NavWhen::Hide => false, - NavWhen::Auth => auth.unwrap_or(true), // unknown → keep (compat) - NavWhen::Guest => match auth { - Some(logged_in) => !logged_in, - None => true, - }, - } -} - -fn resolve_links(raw: Option<&Value>, db_url: Option<&str>, page: Option<&Value>) -> Vec { - let Some(raw) = raw else { - return Vec::new(); - }; - let auth = page_auth_state(page); - let binds = as_bind(raw); - let arr = binds.as_array().cloned().unwrap_or_default(); - let rows: Vec> = if !arr.is_empty() { - let has_db = arr - .iter() - .any(|b| b.get("back").and_then(|v| v.as_str()).is_some_and(is_db_bind_back)); - if has_db { - let Some(url) = db_url else { - return Vec::new(); - }; - let table = crate::table::bind_table_name(&arr); - let Some(table) = table else { - return Vec::new(); - }; - let data = select_page_data(url, &table, raw, 200, 0); - let projected = project_rows( - &arr, - &data - .get("rows") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(), - ); - projected - .as_array() - .cloned() - .unwrap_or_default() - .into_iter() - .filter_map(|it| it.as_object().cloned()) - .collect() - } else { - arr.into_iter() - .filter_map(|b| b.as_object().cloned()) - .collect() - } - } else { - as_nav_rows(raw) - }; - - let mut out = Vec::new(); - for m in rows { - let (label, href) = nav_label_href(&m); - if label.is_empty() { - continue; - } - let (media, when_raw, class) = nav_media_when_class(&m); - // DB-projected rows may use title/href without media keys on bind. - let when_raw = if when_raw.is_empty() { - m.get("when") - .or_else(|| m.get("当")) - .map(text) - .unwrap_or_default() - } else { - when_raw - }; - let media = if media.is_empty() { - m.get("media") - .or_else(|| m.get("媒体")) - .map(text) - .unwrap_or_default() - } else { - media - }; - let when = parse_nav_when(&when_raw); - if !nav_when_visible(when, auth) { - continue; - } - out.push(NavLink { - label, - href, - class, - media, - }); - } - out -} - -fn nav_media_class_map(links: &[NavLink]) -> (String, Vec<(String, String)>) { - nav_media_class_map_many(&[links]) -} - -fn nav_media_class_map_many(groups: &[&[NavLink]]) -> (String, Vec<(String, String)>) { - let mut pairs: Vec<(String, String)> = Vec::new(); - let mut css = String::new(); - for links in groups { - for link in *links { - let media = link.media.trim(); - if media.is_empty() || pairs.iter().any(|(m, _)| m == media) { - continue; - } - let class = format!("nav-mq-{}", pairs.len()); - css.push_str(&format!( - "@media not {media} {{ li.{class} {{ display:none !important; }} }}\n" - )); - pairs.push((media.to_string(), class)); - } - } - (css, pairs) -} - -fn render_ul(links: &[NavLink], class: &str) -> String { - let (_css, mq_pairs) = nav_media_class_map(links); - render_ul_with_mq(links, class, &mq_pairs) -} - -fn render_ul_with_mq(links: &[NavLink], class: &str, mq_pairs: &[(String, String)]) -> String { - let mut s = format!("
    ", esc(class)); - for link in links { - let mq = link.media.trim(); - let mq_class = if mq.is_empty() { - "" - } else { - mq_pairs - .iter() - .find(|(m, _)| m == mq) - .map(|(_, c)| c.as_str()) - .unwrap_or("") - }; - let mut li_class = String::new(); - if !link.class.is_empty() { - li_class.push_str(&link.class); - } - if !mq_class.is_empty() { - if !li_class.is_empty() { - li_class.push(' '); - } - li_class.push_str(mq_class); - } - if li_class.is_empty() { - s.push_str(&format!( - "
  • {}
  • ", - esc(&link.href), - esc(&link.label) - )); - } else { - s.push_str(&format!( - "
  • {}
  • ", - esc(&li_class), - esc(&link.href), - esc(&link.label) - )); - } - } - s.push_str("
"); - s -} - -fn resolve_main(args: &Value, db_url: Option<&str>) -> (String, Vec>, Option) { - let intro = args - .get("intro") - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string(); - let Some(main) = args.get("main") else { - return (intro, Vec::new(), None); - }; - let binds = as_bind(main); - let arr = binds.as_array().cloned().unwrap_or_default(); - if arr.is_empty() { - return (intro, Vec::new(), None); - } - let Some(url) = db_url else { - return (intro, Vec::new(), None); - }; - let Some(table) = crate::table::bind_table_name(&arr) else { - return (intro, Vec::new(), None); - }; - let limit = args - .get("paginate") - .and_then(|p| p.get("limit")) - .and_then(|v| v.as_i64()) - .unwrap_or(200); - let offset = args - .get("paginate") - .and_then(|p| p.get("offset")) - .and_then(|v| v.as_i64()) - .unwrap_or(0); - let data = select_page_data(url, &table, args, limit, offset); - let total = data.get("total").and_then(|v| v.as_i64()); - let rows = data - .get("rows") - .and_then(|v| v.as_array()) - .cloned() - .unwrap_or_default(); - let projected = project_rows(&arr, &rows); - let items = projected - .as_array() - .cloned() - .unwrap_or_default() - .into_iter() - .filter_map(|v| v.as_object().cloned()) - .collect(); - (intro, items, total) -} - -/// Run the page's DB query: `where` (with `{param}` placeholders resolved from -/// `params`) and optional `order`, then project through the bind table. -fn select_page_data( - url: &str, - table: &str, - args: &Value, - limit: i64, - offset: i64, -) -> Value { - let mut where_v = args.get("query").cloned(); - if let Some(v) = where_v.take() { - where_v = Some(resolve_placeholders(v, args)); - } - let order = args.get("order").and_then(|v| v.as_str()); - let paginate = args.get("paginate").is_some(); - db::select_order( - url, - table, - limit, - where_v.as_ref(), - order.filter(|s| !s.trim().is_empty()), - if paginate || offset > 0 { - Some(offset) - } else { - None - }, - None, - ) - .unwrap_or(json!({ "rows": [] })) -} - -/// Recursively replace `{param}` in all string leaves (columnar / row tables). -fn resolve_placeholders(v: Value, args: &Value) -> Value { - match v { - Value::String(s) => Value::String(resolve_params(&s, args)), - Value::Array(arr) => Value::Array( - arr.into_iter() - .map(|x| resolve_placeholders(x, args)) - .collect(), - ), - Value::Object(map) => { - let mut out = Map::new(); - for (k, val) in map { - out.insert(k, resolve_placeholders(val, args)); - } - Value::Object(out) - } - other => other, - } -} - -/// Replace `{param}` placeholders with values from `args["params"]` (a map). -fn resolve_params(s: &str, args: &Value) -> String { - let params = args - .get("params") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - let mut out = String::new(); - let mut rest = s; - while let Some(start) = rest.find('{') { - out.push_str(&rest[..start]); - rest = &rest[start + 1..]; - if let Some(end) = rest.find('}') { - let key = &rest[..end]; - let val = params - .get(key) - .map(text) - .unwrap_or_else(|| format!("{{{key}}}")); - out.push_str(&val); - rest = &rest[end + 1..]; - } else { - out.push('{'); - break; - } - } - out.push_str(rest); - out -} - -fn field_css(obj: &Map, field: &str) -> String { - obj.get("_css") - .and_then(|v| v.as_object()) - .and_then(|m| m.get(field)) - .and_then(|v| v.as_str()) - .unwrap_or("") - .to_string() -} - -fn part_src_prefix(args: &Value) -> String { - let raw = args.get("_route").and_then(|v| v.as_str()).unwrap_or(""); - let resolved = resolve_params(raw, args); - match resolved.as_str() { - "" | "/" => String::new(), - r => { - let mut p = r.to_string(); - while p.len() > 1 && p.ends_with('/') { - p.pop(); - } - if p.starts_with('/') { - p - } else { - format!("/{p}") - } - } - } -} - -fn slot_attrs(slot: &str, parts: &Map, page: &Value) -> String { - let prefix = part_src_prefix(page); - let mut a = format!(" data-slot=\"{}\"", esc(slot)); - for (id, cfg) in parts { - let s = cfg - .get("slot") - .or_else(|| cfg.get("fragment")) - .and_then(|v| v.as_str()) - .unwrap_or(""); - if s == slot || (slot == "sidebar" && id == "side") || (slot == "main" && id == "index") { - a.push_str(&format!( - " data-slot-src=\"{}/_part/{}\"", - esc(&prefix), - esc(id) - )); - break; - } - } - a -} - -fn slot_class(args: &Value, slot: &str, base: &str) -> String { - let extra = args - .get("slot_class") - .and_then(|v| v.as_object()) - .and_then(|m| m.get(slot)) - .and_then(|v| v.as_str()) - .unwrap_or(""); - if extra.is_empty() { - base.to_string() - } else { - format!("{base} {extra}") - } -} - -const SHELL_VARS: &str = r#" -:root { --ink:#1c1917; --muted:#57534e; --paper:#fafaf9; --line:#e7e5e4; --accent:#0f766e; } -body { margin:0; font-family: "IBM Plex Sans", "Noto Sans SC", sans-serif; background:var(--paper); color:var(--ink); } -a { color:var(--ink); text-decoration:none; } -a:hover { color:var(--accent); } -"#; - -const SHELL_LAYOUT: &str = r#" -body { display:grid; min-height:100vh; grid-template-rows:auto 1fr auto; } -body.has-sidebar { grid-template-columns:14rem 1fr; grid-template-areas:"top top" "side main" "foot foot"; } -body.no-sidebar { grid-template-areas:"top" "main" "foot"; } -@media (max-width:720px) { - body.has-sidebar { grid-template-columns:1fr; grid-template-areas:"top" "main" "foot" "side"; } - body.has-sidebar aside.side { border-right:0; border-top:1px solid var(--line); } -} -body.layout-stacked { display:flex; flex-direction:column; min-height:100vh; } -body.layout-stacked header.topnav, body.layout-stacked aside.side, body.layout-stacked main.main, body.layout-stacked footer.foot { width:100%; } -body.layout-stacked aside.side { border-right:0; border-bottom:1px solid var(--line); } -body.layout-bare { display:block; min-height:100vh; } -body.layout-bare main.main { padding:1.5rem 1.25rem 2rem; } -header.topnav { grid-area:top; border-bottom:1px solid var(--line); padding:.85rem 1.25rem; background:#fff; } -aside.side { grid-area:side; border-right:1px solid var(--line); padding:1.25rem 1rem; background:#f5f5f4; } -main.main { grid-area:main; padding:1.5rem 1.25rem 2rem; } -footer.foot { grid-area:foot; border-top:1px solid var(--line); padding:.85rem 1.25rem; color:var(--muted); background:#fff; } -ul.nav, ul.side-nav, ul.foot-nav { list-style:none; margin:0; padding:0; display:flex; flex-wrap:wrap; gap:.35rem 1rem; } -ul.side-nav { flex-direction:column; } -"#; - -const SHELL_WIDGETS: &str = r#" -.content.cards { display:grid; gap:1rem; margin-top:1.25rem; grid-template-columns:repeat(auto-fill,minmax(16rem,1fr)); } -.content.cards article { background:#fff; border:1px solid var(--line); border-radius:6px; padding:1rem; } -.main-intro h1 { margin:0 0 .75rem; font-size:2rem; } -.main-intro p { color:var(--muted); } -.site-form { margin-top:1.25rem; max-width:28rem; } -.site-form form { display:grid; gap:.85rem; } -.site-form label { display:grid; gap:.25rem; font-size:.9rem; } -.site-form input, .site-form textarea { padding:.5rem .6rem; border:1px solid var(--line); border-radius:4px; font:inherit; background:#fff; } -.site-form input[readonly] { background:#f5f5f4; color:var(--muted); } -.site-form .err { color:#b91c1c; font-size:.85rem; } -.site-form .actions { display:flex; gap:.75rem; align-items:center; flex-wrap:wrap; } -.site-form button { background:var(--accent); color:#fff; border:0; padding:.55rem 1rem; border-radius:4px; cursor:pointer; } -.site-form .meta { color:var(--muted); font-size:.9rem; } -.article { background:#fff; border:1px solid var(--line); border-radius:8px; padding:2rem; margin-top:1.5rem; } -.article-meta { color:var(--muted); font-size:.85rem; } -.article-title { margin:0 0 .75rem; font-size:2rem; } -.article-tags { margin-bottom:1rem; } -.article-body { line-height:1.75; color:var(--ink); } -.article-p { margin:0 0 1rem; white-space:pre-line; } -.article-h2 { margin:1.5rem 0 .75rem; } -.article-body.md { line-height: 1.75; } -.article-body.md pre { background:#f5f5f4; border:1px solid var(--line); border-radius:6px; padding:1rem; overflow-x:auto; } -.article-body.md code { font-size:.9em; } -.pagination { display:flex; gap:1rem; align-items:center; margin:1.5rem 0; font-size:.95rem; } -.pagination a { color:var(--accent); text-decoration:none; } -.pagination a:hover { text-decoration:underline; } -.pagination .page-status { color:var(--muted); } -"#; - -fn normalize_shell_css(raw: &str) -> &'static str { - match raw.trim().to_ascii_lowercase().as_str() { - "" | "full" | "default" => "full", - "minimal" | "min" | "vars" => "minimal", - "off" | "none" | "false" | "0" => "off", - _ => "full", - } -} - -fn shell_css_for(mode: &str) -> String { - match normalize_shell_css(mode) { - "off" => String::new(), - "minimal" => SHELL_VARS.to_string(), - _ => format!("{SHELL_VARS}{SHELL_LAYOUT}{SHELL_WIDGETS}"), - } -} - -fn normalize_layout(raw: &str) -> String { - match raw.trim().to_ascii_lowercase().as_str() { - "" | "auto" | "default" => String::new(), - "sidebar" | "side" => "sidebar".into(), - "stacked" | "stack" | "column" => "stacked".into(), - "bare" | "main" | "none" => "bare".into(), - "rail" => "rail".into(), - other => other.to_string(), - } -} - -fn resolve_shell_css(args: &Value) -> String { - let raw = args - .get("shell_css") - .or_else(|| args.get("壳样式")) - .and_then(|v| v.as_str()) - .unwrap_or("full"); - shell_css_for(raw) -} - -fn resolve_layout(args: &Value) -> String { - let raw = args - .get("layout") - .or_else(|| args.get("布局")) - .and_then(|v| v.as_str()) - .unwrap_or(""); - normalize_layout(raw) -} - -fn head_html(args: &Value, default_title: &str) -> String { - let meta = args.get("meta").and_then(|v| v.as_object()); - let page_title = meta - .and_then(|m| m.get("title")) - .map(text) - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| default_title.to_string()); - let mut s = format!("{}", esc(&page_title)); - if let Some(m) = meta { - for (k, v) in m { - if k == "title" { - continue; - } - let val = text(v); - if val.is_empty() { - continue; - } - match k.as_str() { - "description" => { - s.push_str(&format!( - "", - esc(&val) - )); - } - "canonical" => { - s.push_str(&format!("", esc(&val))); - } - "icon" | "favicon" => { - s.push_str(&format!( - "", - esc(&val) - )); - } - "apple-touch-icon" | "apple_touch_icon" => { - s.push_str(&format!( - "", - esc(&val) - )); - } - k if k.starts_with("og:") => { - s.push_str(&format!( - "", - esc(k), - esc(&val) - )); - } - other => { - s.push_str(&format!( - "", - esc(other), - esc(&val) - )); - } - } - } - } - if let Some(head) = args.get("head") { - let links = crate::assets::head_links_from_json(head); - let asset_version = args - .get("asset_version") - .or_else(|| args.get("资源版本")) - .and_then(|v| v.as_str()) - .unwrap_or(""); - s.push_str(&crate::assets::render_head_links_with_version( - &links, - asset_version, - )); - } - s -} - -fn render_pagination(args: &Value, total: i64, item_count: usize) -> String { - let Some(p) = args.get("paginate") else { - return String::new(); - }; - let offset = p.get("offset").and_then(|v| v.as_i64()).unwrap_or(0); - let limit = p.get("limit").and_then(|v| v.as_i64()).unwrap_or(10); - if limit <= 0 { - return String::new(); - } - let path = p - .get("path") - .and_then(|v| v.as_str()) - .unwrap_or("/") - .to_string(); - let mut s = String::from(""); - s -} - -pub fn render_page(args: &Value, db_url: Option<&str>, csrf: Option<&str>) -> String { - render_page_ex(args, db_url, None, None, csrf) -} - -/// Like `render_page`, optionally replaying form POST data/errors into the embedded form. -pub fn render_page_ex( - args: &Value, - db_url: Option<&str>, - form_data: Option<&Value>, - form_errors: Option<&Value>, - csrf: Option<&str>, -) -> String { - let title = args - .get("title") - .and_then(|v| v.as_str()) - .unwrap_or("Marqdo Web"); - let shell = resolve_shell_css(args); - let layout = resolve_layout(args); - let parts = args - .get("parts") - .and_then(|v| v.as_object()) - .cloned() - .unwrap_or_default(); - let nav = resolve_links(args.get("nav"), db_url, Some(args)); - let side = resolve_links(args.get("sidebar"), db_url, Some(args)); - let foot = resolve_links(args.get("footer"), db_url, Some(args)); - let (intro, items, total) = resolve_main(args, db_url); - let (nav_css, mq_pairs) = nav_media_class_map_many(&[&nav, &side, &foot]); - let extra_owned = { - let base = args - .get("styles_css") - .and_then(|v| v.as_str()) - .unwrap_or(""); - if nav_css.is_empty() { - base.to_string() - } else { - format!("{base}\n{nav_css}") - } - }; - let extra = extra_owned.as_str(); - - let has_side = args.get("sidebar").is_some() || !side.is_empty(); - let bare = layout == "bare"; - let body_class = match layout.as_str() { - "bare" => "layout-bare".to_string(), - "stacked" => "layout-stacked".to_string(), - "rail" => { - if has_side { - "has-rail has-sidebar".into() - } else { - "has-rail no-sidebar".into() - } - } - "sidebar" => { - if has_side { - "has-sidebar".into() - } else { - "no-sidebar".into() - } - } - "" => { - if has_side { - "has-sidebar".into() - } else { - "no-sidebar".into() - } - } - other => other.to_string(), - }; - - let mut main_html = String::new(); - if let Some(images) = args.get("images_html").and_then(|v| v.as_str()) { - if !images.is_empty() { - main_html.push_str(images); - } - } - push_intro_and_form( - &mut main_html, - &intro, - args, - form_data, - form_errors, - csrf, - ); - if !items.is_empty() { - let is_detail = args - .get("detail") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - if is_detail { - main_html.push_str(&render_article(&items[0])); - } else { - main_html.push_str("
"); - for it in &items { - main_html.push_str(&render_card(args, it)); - } - main_html.push_str("
"); - } - if let Some(t) = total { - main_html.push_str(&render_pagination(args, t, items.len())); - } - } - - let style_block = if shell.is_empty() && extra.is_empty() { - String::new() - } else { - format!("") - }; - - let show_chrome = !bare; - let side_html = if show_chrome && has_side { - format!( - "", - slot_class(args, "sidebar", "side"), - slot_attrs("sidebar", &parts, args), - render_ul_with_mq(&side, "side-nav", &mq_pairs) - ) - } else { - String::new() - }; - let header_html = if show_chrome { - format!( - "
{}
", - slot_class(args, "nav", "topnav"), - slot_attrs("nav", &parts, args), - render_ul_with_mq(&nav, "nav", &mq_pairs) - ) - } else { - String::new() - }; - let footer_html = if show_chrome { - format!( - "
{}
", - slot_class(args, "footer", "foot"), - slot_attrs("footer", &parts, args), - render_ul_with_mq(&foot, "foot-nav", &mq_pairs) - ) - } else { - String::new() - }; - - format!( - r#" - - - -{head} -{style_block} - - -{header_html} -{side_html} -
{main_html}
-{footer_html} -"#, - head = head_html(args, title), - main_class = slot_class(args, "main", "main"), - main_attrs = slot_attrs("main", &parts, args), - ) -} - -pub fn render_fragment(args: &Value, db_url: Option<&str>) -> String { - let slot = args - .get("fragment") - .or_else(|| args.get("slot")) - .and_then(|v| v.as_str()) - .map(normalize_slot) - .unwrap_or_else(|| "main".into()); - match slot.as_str() { - "nav" => { - let links = resolve_links(args.get("nav"), db_url, Some(args)); - format!( - "
{}
", - render_ul(&links, "nav") - ) - } - "sidebar" => { - let links = resolve_links(args.get("sidebar"), db_url, Some(args)); - format!( - "", - render_ul(&links, "side-nav") - ) - } - "footer" => { - let links = resolve_links(args.get("footer"), db_url, Some(args)); - format!( - "
{}
", - render_ul(&links, "foot-nav") - ) - } - _ => { - let (intro, items, _total) = resolve_main(args, db_url); - let mut body = String::new(); - if let Some(images) = args.get("images_html").and_then(|v| v.as_str()) { - if !images.is_empty() { - body.push_str(images); - } - } - push_intro_and_form(&mut body, &intro, args, None, None, None); - if !items.is_empty() { - let is_detail = args - .get("detail") - .and_then(|v| v.as_bool()) - .unwrap_or(false); - if is_detail { - body.push_str(&render_article(&items[0])); - } else { - body.push_str("
"); - for it in &items { - body.push_str(&render_card(args, it)); - } - body.push_str("
"); - } - } - format!("
{body}
") - } - } -} - -/// Render a single list card from a projected DB row. -fn render_card(args: &Value, it: &Map) -> String { - let title = it.get("title").map(text).unwrap_or_default(); - let body = it.get("body").map(text).unwrap_or_default(); - let href = it.get("href").map(text).unwrap_or_default(); - let meta = it.get("meta").map(text).unwrap_or_default(); - let tag = it.get("tag").map(text).unwrap_or_default(); - let tc = class_attr(&field_css(it, "title")); - let bc = class_attr(&field_css(it, "body")); - let mut card = String::from("
"); - if !href.is_empty() { - let prefix = args - .get("link_prefix") - .and_then(|v| v.as_str()) - .unwrap_or("/post/"); - card.push_str(&format!( - "", - esc(&format!("{prefix}{href}")) - )); - } - if !meta.is_empty() { - card.push_str(&format!( - "
{}
", - esc(&meta) - )); - } - card.push_str(&format!("{}", esc(&title))); - if !tag.is_empty() { - card.push_str(&format!( - "
{}
", - esc(&tag) - )); - } - if !body.is_empty() { - card.push_str(&format!("{}

", esc(&body))); - } - if !href.is_empty() { - card.push_str("
"); - } - card.push_str("
"); - card -} - -/// Render a single article (detail page) from a projected DB row. -fn render_article(it: &Map) -> String { - let title = it.get("title").map(text).unwrap_or_default(); - let body = it.get("body").map(text).unwrap_or_default(); - let meta = it.get("meta").map(text).unwrap_or_default(); - let tag = it.get("tag").map(text).unwrap_or_default(); - let mut s = String::from("
"); - if !meta.is_empty() { - s.push_str(&format!( - "
{}
", - esc(&meta) - )); - } - s.push_str(&format!("

{}

", esc(&title))); - if !tag.is_empty() { - s.push_str(&format!( - "
{}
", - esc(&tag) - )); - } - if !body.is_empty() { - s.push_str(&markdown::to_html(&body)); - } - s.push_str("
"); - s -} - -#[cfg(test)] -mod shell_tests { - use super::*; - use serde_json::json; - - #[test] - fn shell_off_omits_sidebar_grid() { - let page = json!({ - "title": "t", - "shell_css": "off", - "layout": "stacked", - "sidebar": [{"label": "A", "href": "/a"}], - }); - let html = render_page(&page, None, None); - assert!(html.contains("layout-stacked")); - assert!(!html.contains("has-sidebar")); - assert!(!html.contains("grid-template-columns:14rem")); - } - - #[test] - fn shell_minimal_keeps_vars_not_cards() { - let page = json!({ "title": "t", "shell_css": "minimal" }); - let html = render_page(&page, None, None); - assert!(html.contains("--ink:")); - assert!(!html.contains(".content.cards article")); - assert!(!html.contains("grid-template-columns:14rem")); - } - - #[test] - fn layout_bare_skips_aside() { - let page = json!({ - "title": "t", - "layout": "bare", - "sidebar": [{"label": "A", "href": "/a"}], - "nav": [{"label": "Home", "href": "/"}], - }); - let html = render_page(&page, None, None); - assert!(html.contains("layout-bare")); - assert!(!html.contains("Home<"), "{html}"); - assert!(!html.contains("/x"), "{html}"); - } - - #[test] - fn when_auth_guest_respects_logged_in() { - let nav = json!([ - {"front": "Public", "back": "/"}, - {"front": "Admin", "back": "/admin", "when": "auth"}, - {"front": "Login", "back": "/login", "when": "guest"}, - ]); - let guest = json!({ - "title": "t", - "shell_css": "off", - "_logged_in": false, - "nav": nav, - }); - let g = render_page(&guest, None, None); - assert!(g.contains("/login"), "{g}"); - assert!(!g.contains("/admin"), "{g}"); - - let user = json!({ - "title": "t", - "shell_css": "off", - "_logged_in": true, - "_nav_user": "alice", - "nav": nav, - }); - let u = render_page(&user, None, None); - assert!(u.contains("/admin"), "{u}"); - assert!(!u.contains("/login"), "{u}"); - } - - #[test] - fn media_emits_class_and_css() { - let page = json!({ - "title": "t", - "shell_css": "off", - "nav": [ - {"label": "Wide", "href": "/w", "media": "(min-width: 900px)"}, - {"label": "Home", "href": "/"}, - ], - }); - let html = render_page(&page, None, None); - assert!(html.contains("nav-mq-0"), "{html}"); - assert!(html.contains("@media not (min-width: 900px)"), "{html}"); - assert!(html.contains(">Home<"), "{html}"); - } - - #[test] - fn inject_html_into_id_replaces_inner() { - let intro = r#"
L
"#; - let out = inject_html_into_id(intro, "#form-mount", "
x
") - .expect("inject"); - assert!(out.contains(r#"
x
"#), "{out}"); - assert!(out.contains(r#"
L
"#), "{out}"); - } - - #[test] - fn form_target_mounts_inside_intro() { - let page = json!({ - "title": "Compose", - "shell_css": "off", - "intro": "
A
", - "form_id": "note", - "form_target": "#qd-note-form-mount", - "form": { - "title": "note", - "show_meta": false, - "fields": [{"name": "title", "label": "Title", "type": "text"}] - } - }); - let html = render_page(&page, None, None); - assert_eq!(html.matches("class=\"site-form\"").count(), 1, "{html}"); - let mount_at = html.find("id=\"qd-note-form-mount\"").expect("mount"); - let form_at = html.find("class=\"site-form\"").expect("form"); - assert!(form_at > mount_at, "{html}"); - assert!( - html.contains("qd-note-form-mount\">
of main-intro. - let intro_end = html.find("class=\"main-intro\"").expect("intro") - + html[html.find("class=\"main-intro\"").unwrap()..] - .find("
") - .expect("intro close"); - // With injection, site-form is before the outer main-intro close — already asserted by adjacency. - let _ = intro_end; - } -} diff --git a/plugins/web-rust-archive/src/rss.rs b/plugins/web-rust-archive/src/rss.rs deleted file mode 100644 index c0a2c5f..0000000 --- a/plugins/web-rust-archive/src/rss.rs +++ /dev/null @@ -1,101 +0,0 @@ -//! RSS 2.0 feed assembly (content-site W4). - -use serde_json::Value; - -fn esc(s: &str) -> String { - s.replace('&', "&") - .replace('<', "<") - .replace('>', ">") - .replace('"', """) -} - -fn cell_str(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -fn pick<'a>(m: &'a serde_json::Map, keys: &[&str]) -> Option<&'a Value> { - keys.iter().find_map(|k| m.get(*k)) -} - -/// Build RSS 2.0 XML from channel metadata and row maps. -pub fn build_rss( - title: &str, - link: &str, - description: &str, - items: &[Value], -) -> String { - let mut body = format!( - r#" - -{t} -{l} -{d} -"#, - t = esc(title), - l = esc(link), - d = esc(description), - ); - for row in items { - let Some(m) = row.as_object() else { - continue; - }; - let item_title = pick(m, &["title", "标题"]) - .map(cell_str) - .unwrap_or_default(); - let item_link = pick(m, &["link", "href", "链接", "slug"]) - .map(cell_str) - .unwrap_or_default(); - let item_desc = pick(m, &["description", "summary", "摘要", "body", "正文"]) - .map(cell_str) - .unwrap_or_default(); - let pub_date = pick(m, &["pubDate", "published", "created_at", "发布"]) - .map(cell_str) - .unwrap_or_default(); - let full_link = if item_link.starts_with("http") { - item_link.clone() - } else if item_link.starts_with('/') { - format!("{link}{item_link}") - } else if !item_link.is_empty() { - format!("{link}/{item_link}") - } else { - link.to_string() - }; - body.push_str(""); - body.push_str(&format!("{}", esc(&item_title))); - body.push_str(&format!("{}", esc(&full_link))); - body.push_str(&format!( - "{}", - esc(&item_desc) - )); - if !pub_date.is_empty() { - body.push_str(&format!("{}", esc(&pub_date))); - } - body.push_str(""); - } - body.push_str(""); - body -} - -#[cfg(test)] -mod tests { - use super::*; - use serde_json::json; - - #[test] - fn rss_contains_item() { - let xml = build_rss( - "Blog", - "http://example.com", - "Feed", - &[json!({"title": "Hi", "slug": "/post/a", "summary": "text"})], - ); - assert!(xml.contains("Hi")); - } -} diff --git a/plugins/web-rust-archive/src/session.rs b/plugins/web-rust-archive/src/session.rs deleted file mode 100644 index fba198f..0000000 --- a/plugins/web-rust-archive/src/session.rs +++ /dev/null @@ -1,643 +0,0 @@ -//! Session store + cookie helpers + CSRF tokens (ext-web-net W3). -//! -//! - **CSPRNG** session ids (`getrandom`). -//! - **SQLite persistence** when `configure` receives a `db_url`; otherwise in-memory (offline gold). -//! - **Sliding expiry** on read/write. -//! - **CSRF** token per session (`_csrf` key). - -use std::collections::HashMap; -use std::sync::Mutex; -use std::time::{SystemTime, UNIX_EPOCH}; - -use getrandom::getrandom; -use serde_json::{json, Map, Value}; - -use crate::db; -use crate::password; - -type SessionMap = HashMap; - -#[derive(Clone, Default)] -pub struct Config { - pub db_url: Option, - pub ttl_sec: u64, - pub cookie_secure: bool, -} - -static CONFIG: Mutex> = Mutex::new(None); - -struct MemStore { - ttl_sec: u64, - data: HashMap, -} - -static MEM: Mutex> = Mutex::new(None); - -const SESSION_TABLE: &str = "_marqdo_sessions"; -const CSRF_KEY: &str = "_csrf"; - -fn now_secs() -> u64 { - SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|d| d.as_secs()) - .unwrap_or(0) -} - -fn cfg() -> Config { - CONFIG - .lock() - .unwrap_or_else(|e| e.into_inner()) - .clone() - .unwrap_or(Config { - db_url: None, - ttl_sec: 3600, - cookie_secure: false, - }) -} - -/// Configure session backend before `listen` or offline ABI calls. -pub fn configure(config: Config) { - let ttl = if config.ttl_sec > 0 { - config.ttl_sec - } else { - 3600 - }; - let mut c = config; - c.ttl_sec = ttl; - if let Some(ref url) = c.db_url { - let _ = ensure_session_table(url); - } - let mut guard = CONFIG.lock().unwrap_or_else(|e| e.into_inner()); - *guard = Some(c); -} - -/// Reset in-memory sessions (tests / each listen). -pub fn reset(ttl_sec: u64) { - let ttl = if ttl_sec > 0 { ttl_sec } else { 3600 }; - { - let mut guard = CONFIG.lock().unwrap_or_else(|e| e.into_inner()); - if let Some(ref mut c) = *guard { - c.ttl_sec = ttl; - } else { - *guard = Some(Config { - db_url: None, - ttl_sec: ttl, - cookie_secure: false, - }); - } - } - let mut mem = MEM.lock().unwrap_or_else(|e| e.into_inner()); - *mem = Some(MemStore { - ttl_sec: ttl, - data: HashMap::new(), - }); -} - -fn ensure_session_table(url: &str) -> Result<(), String> { - db::exec( - url, - &format!( - "CREATE TABLE IF NOT EXISTS \"{SESSION_TABLE}\" ( - id TEXT PRIMARY KEY, - expires_at INTEGER NOT NULL, - data TEXT NOT NULL - ); - CREATE INDEX IF NOT EXISTS idx_marqdo_sessions_exp ON \"{SESSION_TABLE}\"(expires_at);" - ), - None, - None, - )?; - Ok(()) -} - -fn prune_mem(store: &mut MemStore) { - let now = now_secs(); - store.data.retain(|_, (exp, _)| *exp > now); -} - -fn prune_sql(url: &str) { - let now = now_secs() as i64; - let _ = db::exec( - url, - &format!("DELETE FROM \"{SESSION_TABLE}\" WHERE expires_at <= ?1"), - Some(&json!([now])), - None, - ); -} - -fn secure_random_id() -> Result { - let mut bytes = [0u8; 32]; - getrandom(&mut bytes).map_err(|e| format!("getrandom: {e}"))?; - Ok(bytes.iter().map(|b| format!("{b:02x}")).collect()) -} - -fn random_csrf() -> Result { - let mut bytes = [0u8; 24]; - getrandom(&mut bytes).map_err(|e| format!("getrandom: {e}"))?; - Ok(bytes.iter().map(|b| format!("{b:02x}")).collect()) -} - -fn map_to_json(m: &SessionMap) -> Result { - let obj: Map = m.iter().map(|(k, v)| (k.clone(), v.clone())).collect(); - serde_json::to_string(&Value::Object(obj)).map_err(|e| e.to_string()) -} - -fn json_to_map(s: &str) -> SessionMap { - match serde_json::from_str::(s) { - Ok(Value::Object(m)) => m.into_iter().collect(), - _ => HashMap::new(), - } -} - -fn load_sql(url: &str, id: &str) -> Option<(u64, SessionMap)> { - let q = db::query( - url, - &format!("SELECT expires_at, data FROM \"{SESSION_TABLE}\" WHERE id = ?1"), - Some(&json!([id])), - None, - ) - .ok()?; - let rows = q.get("rows")?.as_array()?; - let row = rows.first()?; - let exp = row.get("expires_at")?.as_i64()? as u64; - let data_s = row.get("data")?.as_str()?; - Some((exp, json_to_map(data_s))) -} - -fn save_sql(url: &str, id: &str, exp: u64, data: &SessionMap) -> Result<(), String> { - let data_s = map_to_json(data)?; - db::exec( - url, - &format!( - "INSERT INTO \"{SESSION_TABLE}\" (id, expires_at, data) VALUES (?1, ?2, ?3) - ON CONFLICT(id) DO UPDATE SET expires_at = excluded.expires_at, data = excluded.data" - ), - Some(&json!([id, exp as i64, data_s])), - None, - )?; - Ok(()) -} - -fn delete_sql(url: &str, id: &str) { - let _ = db::exec( - url, - &format!("DELETE FROM \"{SESSION_TABLE}\" WHERE id = ?1"), - Some(&json!([id])), - None, - ); -} - -fn touch_expiry(ttl: u64) -> u64 { - now_secs() + ttl -} - -fn ensure_csrf(data: &mut SessionMap) -> Result { - if let Some(Value::String(t)) = data.get(CSRF_KEY) { - if !t.is_empty() { - return Ok(t.clone()); - } - } - let t = random_csrf()?; - data.insert(CSRF_KEY.to_string(), json!(t)); - Ok(t) -} - -pub fn session_new(ttl_sec: Option) -> String { - let cfg = cfg(); - let ttl = ttl_sec.unwrap_or(cfg.ttl_sec); - if ttl > 0 { - if let Ok(mut guard) = CONFIG.lock() { - if let Some(ref mut c) = *guard { - c.ttl_sec = ttl; - } - } - } - let id = secure_random_id().unwrap_or_else(|_| format!("fallback-{}", now_secs())); - let exp = touch_expiry(ttl); - let mut data = SessionMap::new(); - let _ = ensure_csrf(&mut data); - if let Some(ref url) = cfg.db_url { - prune_sql(url); - let _ = save_sql(url, &id, exp, &data); - } else { - with_mem(|store| { - store.ttl_sec = ttl; - prune_mem(store); - store.data.insert(id.clone(), (exp, data)); - }); - } - id -} - -fn with_mem(f: impl FnOnce(&mut MemStore) -> T) -> T { - let mut guard = MEM.lock().unwrap_or_else(|e| e.into_inner()); - let store = guard.get_or_insert_with(|| MemStore { - ttl_sec: cfg().ttl_sec, - data: HashMap::new(), - }); - f(store) -} - -fn get_record(id: &str) -> Option<(u64, SessionMap)> { - let cfg = cfg(); - let now = now_secs(); - if let Some(ref url) = cfg.db_url { - prune_sql(url); - let (exp, data) = load_sql(url, id)?; - if exp <= now { - delete_sql(url, id); - return None; - } - Some((exp, data)) - } else { - with_mem(|store| { - prune_mem(store); - let (exp, data) = store.data.get(id)?.clone(); - if exp <= now { - store.data.remove(id); - return None; - } - Some((exp, data)) - }) - } -} - -fn put_record(id: &str, exp: u64, data: SessionMap) -> bool { - let cfg = cfg(); - if let Some(ref url) = cfg.db_url { - save_sql(url, id, exp, &data).is_ok() - } else { - with_mem(|store| { - store.data.insert(id.to_string(), (exp, data)); - true - }) - } -} - -pub fn session_set(id: &str, key: &str, value: Value) -> bool { - let cfg = cfg(); - let Some((_, mut data)) = get_record(id) else { - return false; - }; - data.insert(key.to_string(), value); - put_record(id, touch_expiry(cfg.ttl_sec), data) -} - -pub fn session_get(id: &str, key: &str) -> Option { - let cfg = cfg(); - let (_, data) = get_record(id)?; - let v = data.get(key).cloned()?; - put_record(id, touch_expiry(cfg.ttl_sec), data); - Some(v) -} - -pub fn session_del(id: &str, key: &str) -> bool { - let cfg = cfg(); - let Some((_, mut data)) = get_record(id) else { - return false; - }; - let ok = data.remove(key).is_some(); - if ok { - put_record(id, touch_expiry(cfg.ttl_sec), data); - } - ok -} - -pub fn session_destroy(id: &str) -> bool { - let cfg = cfg(); - if let Some(ref url) = cfg.db_url { - delete_sql(url, id); - true - } else { - with_mem(|store| store.data.remove(id).is_some()) - } -} - -/// CSRF token for an existing session (creates one if missing). -pub fn csrf_for(id: &str) -> Option { - let cfg = cfg(); - let (_, mut data) = get_record(id)?; - let token = ensure_csrf(&mut data).ok()?; - put_record(id, touch_expiry(cfg.ttl_sec), data); - Some(token) -} - -pub fn validate_csrf(id: &str, token: &str) -> bool { - if token.is_empty() { - return false; - } - match session_get(id, CSRF_KEY) { - Some(Value::String(stored)) => stored == token, - _ => false, - } -} - -/// Resolve session from cookie: reuse valid id or create a new one. -/// Returns `(session_id, set_cookie_header)`. -pub fn ensure_from_cookie(cookie_header: Option<&str>) -> (String, Option) { - if let Some(id) = session_id_from_cookie(cookie_header) { - if get_record(&id).is_some() { - let _ = csrf_for(&id); - return (id, None); - } - } - let id = session_new(None); - let cfg = cfg(); - ( - id.clone(), - Some(session_cookie(&id, cfg.ttl_sec, cfg.cookie_secure)), - ) -} - -/// Parse the session id from a `Cookie` request header (looks for `marqdo_sid=…`). -pub fn session_id_from_cookie(cookie_header: Option<&str>) -> Option { - let header = cookie_header?; - for part in header.split(';') { - let part = part.trim(); - if let Some(v) = part.strip_prefix("marqdo_sid=") { - let v = v.trim_matches('"'); - if !v.is_empty() { - return Some(v.to_string()); - } - } - } - None -} - -/// `Set-Cookie: marqdo_sid=; HttpOnly; Path=/; SameSite=Lax; Max-Age=[; Secure]` -pub fn session_cookie(id: &str, ttl_sec: u64, secure: bool) -> String { - let mut s = format!( - "marqdo_sid={id}; HttpOnly; Path=/; SameSite=Lax; Max-Age={ttl_sec}" - ); - if secure { - s.push_str("; Secure"); - } - s -} - -/// Validate credentials; supports argon2 hashes or legacy plaintext in the password column. -/// Returns `(username, role)`. Missing role column defaults to `admin` (legacy admin tables). -pub fn check_credentials(users: &Value, username: &str, password: &str) -> Option<(String, String)> { - let rows = crate::table::as_rows(users); - let rows = match rows { - Value::Array(a) => a, - _ => return None, - }; - for row in &rows { - let m = match row { - Value::Object(m) => m, - _ => continue, - }; - let u = pick_cell(m, &["用户名", "用户", "username", "user", "账号"]) - .map(cell_str) - .unwrap_or_default(); - let p = pick_cell(m, &["密码", "password", "pass", "口令"]) - .map(cell_str) - .unwrap_or_default(); - if u == username && password::verify_password(password, &p) { - let role = pick_cell(m, &["角色", "role", "roles"]) - .map(cell_str) - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| "admin".into()); - return Some((u, role.to_ascii_lowercase())); - } - } - None -} - -/// Session role (defaults to `visitor` when anonymous / missing). -pub fn session_role(cookie_header: Option<&str>) -> String { - let Some(sid) = session_id_from_cookie(cookie_header) else { - return "visitor".into(); - }; - match session_get(&sid, "role") { - Some(Value::String(r)) if !r.is_empty() => r.to_ascii_lowercase(), - _ => { - if session_get(&sid, "username").is_some() { - "admin".into() - } else { - "visitor".into() - } - } - } -} - -pub fn role_allowed(role: &str, allowed: &[String]) -> bool { - if allowed.is_empty() { - return true; - } - let role = role.to_ascii_lowercase(); - allowed.iter().any(|a| a.eq_ignore_ascii_case(&role)) -} - -pub fn parse_roles_csv(raw: &str) -> Vec { - raw.split(',') - .map(|s| s.trim().to_ascii_lowercase()) - .filter(|s| !s.is_empty()) - .collect() -} - -fn pick_cell<'a>(m: &'a Map, keys: &[&str]) -> Option<&'a Value> { - keys.iter().find_map(|k| m.get(*k)) -} - -fn cell_str(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -pub fn abi_session_new(args: &Value) -> Result { - let ttl = args - .get("ttl_sec") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))); - let id = session_new(ttl); - Ok(json!({ "id": id })) -} - -pub fn abi_session_set(args: &Value) -> Result { - let id = arg_str(args, "id")?; - let key = arg_str(args, "key")?; - let value = args.get("value").cloned().unwrap_or(Value::Null); - Ok(json!({ "ok": session_set(id, key, value) })) -} - -pub fn abi_session_get(args: &Value) -> Result { - let id = arg_str(args, "id")?; - let key = arg_str(args, "key")?; - match session_get(id, key) { - Some(v) => Ok(json!({ "ok": true, "value": v })), - None => Ok(json!({ "ok": false })), - } -} - -pub fn abi_session_del(args: &Value) -> Result { - let id = arg_str(args, "id")?; - let key = arg_str(args, "key")?; - Ok(json!({ "ok": session_del(id, key) })) -} - -pub fn abi_session_destroy(args: &Value) -> Result { - let id = arg_str(args, "id")?; - Ok(json!({ "ok": session_destroy(id) })) -} - -pub fn abi_auth_login(args: &Value) -> Result { - let username = arg_str(args, "username")?; - let password = arg_str(args, "password")?; - let users = args.get("users").cloned().unwrap_or(Value::Null); - let ttl = args - .get("session_ttl") - .and_then(|v| v.as_u64().or_else(|| v.as_i64().map(|i| i as u64))); - match check_credentials(&users, username, password) { - Some((u, role)) => { - let id = session_new(ttl); - session_set(&id, "username", json!(u)); - session_set(&id, "role", json!(role)); - Ok(json!({ "ok": true, "session_id": id, "username": u, "role": role })) - } - None => Ok(json!({ "ok": false })), - } -} - -pub fn abi_auth_check(args: &Value) -> Result { - let id = arg_str(args, "session_id")?; - match session_get(id, "username") { - Some(Value::String(u)) => { - let role = match session_get(id, "role") { - Some(Value::String(r)) => r, - _ => "admin".into(), - }; - Ok(json!({ "ok": true, "username": u, "role": role })) - } - _ => Ok(json!({ "ok": false })), - } -} - -pub fn abi_auth_logout(args: &Value) -> Result { - let id = arg_str(args, "session_id")?; - Ok(json!({ "ok": session_destroy(id) })) -} - -pub fn abi_password_hash(args: &Value) -> Result { - let plain = arg_str(args, "password")?; - let hash = password::hash_password(plain)?; - Ok(json!({ "hash": hash })) -} - -fn arg_str<'a>(v: &'a Value, key: &str) -> Result<&'a str, String> { - v.get(key) - .and_then(|x| x.as_str()) - .ok_or_else(|| format!("missing `{key}`")) -} - -#[cfg(test)] -mod tests { - use super::*; - - fn users() -> Value { - json!([ - { "username": "admin", "password": "secret" }, - { "用户": "站长", "密码": "pw123" } - ]) - } - - #[test] - fn session_set_get_del() { - reset(3600); - let id = session_new(None); - assert!(!id.is_empty()); - assert!(session_set(&id, "username", json!("admin"))); - assert_eq!(session_get(&id, "username"), Some(json!("admin"))); - assert!(session_del(&id, "username")); - assert_eq!(session_get(&id, "username"), None); - assert!(session_destroy(&id)); - } - - #[test] - fn auth_login_check_logout() { - reset(3600); - let r = abi_auth_login(&json!({ - "username": "admin", - "password": "secret", - "users": users(), - })) - .unwrap(); - assert_eq!(r["ok"].as_bool(), Some(true)); - let sid = r["session_id"].as_str().unwrap().to_string(); - let check = abi_auth_check(&json!({ "session_id": sid })).unwrap(); - assert_eq!(check["ok"].as_bool(), Some(true)); - - let bad = abi_auth_login(&json!({ - "username": "admin", - "password": "wrong", - "users": users(), - })) - .unwrap(); - assert_eq!(bad["ok"].as_bool(), Some(false)); - - let out = abi_auth_logout(&json!({ "session_id": sid })).unwrap(); - assert_eq!(out["ok"].as_bool(), Some(true)); - } - - #[test] - fn csrf_roundtrip() { - reset(3600); - let id = session_new(None); - let t = csrf_for(&id).unwrap(); - assert!(validate_csrf(&id, &t)); - assert!(!validate_csrf(&id, "bad")); - } - - #[test] - fn cookie_roundtrip() { - reset(3600); - let id = session_new(None); - let cookie = session_cookie(&id, 3600, false); - assert!(cookie.starts_with("marqdo_sid=")); - let got = session_id_from_cookie(Some(&format!("theme=light; {cookie}"))); - assert_eq!(got.as_deref(), Some(id.as_str())); - } - - #[test] - fn hashed_password_login() { - reset(3600); - let hash = password::hash_password("secret").unwrap(); - let users = json!([{ "username": "admin", "password": hash }]); - let r = abi_auth_login(&json!({ - "username": "admin", - "password": "secret", - "users": users, - })) - .unwrap(); - assert_eq!(r["ok"].as_bool(), Some(true)); - } - - #[test] - fn session_persists_in_sqlite() { - let dir = std::env::temp_dir().join(format!("marqdo_web_sess_{}", std::process::id())); - let _ = std::fs::create_dir_all(&dir); - let path = dir.join("persist.db"); - let _ = std::fs::remove_file(&path); - let url = format!("sqlite:{}", path.display()); - configure(Config { - db_url: Some(url.clone()), - ttl_sec: 3600, - cookie_secure: false, - }); - let id = session_new(None); - assert!(session_set(&id, "theme", json!("dark"))); - // Re-configure (simulates listen restart with same db). - configure(Config { - db_url: Some(url), - ttl_sec: 3600, - cookie_secure: false, - }); - assert_eq!(session_get(&id, "theme"), Some(json!("dark"))); - let _ = std::fs::remove_dir_all(dir); - } -} diff --git a/plugins/web-rust-archive/src/sitemap.rs b/plugins/web-rust-archive/src/sitemap.rs deleted file mode 100644 index 40ca601..0000000 --- a/plugins/web-rust-archive/src/sitemap.rs +++ /dev/null @@ -1,152 +0,0 @@ -//! sitemap.xml / robots.txt helpers (W7). - -use serde_json::{json, Value}; - -fn cell_str(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -fn xml_escape(s: &str) -> String { - s.replace('&', "&") - .replace('<', "<") - .replace('>', ">") - .replace('"', """) - .replace('\'', "'") -} - -/// Build a sitemap.xml document from rows. -/// -/// Each row may use keys: `loc`/`url`/`路径`, optional `lastmod`/`更新`, -/// `changefreq`/`频率`, `priority`/`优先级`. -pub fn build_sitemap(base: &str, items: &Value) -> String { - let base = base.trim_end_matches('/'); - let rows: Vec = match items { - Value::Array(a) => a - .iter() - .map(|row| match row { - Value::String(s) => json!({ "loc": s }), - Value::Object(_) => row.clone(), - other => json!({ "loc": cell_str(other) }), - }) - .collect(), - Value::Object(m) => { - // Columnar GFM: { loc: [...], ... } - let locs = m - .get("loc") - .or_else(|| m.get("路径")) - .or_else(|| m.get("path")) - .or_else(|| m.get("url")); - match locs { - Some(Value::Array(a)) => a - .iter() - .enumerate() - .map(|(i, loc)| { - let mut obj = serde_json::Map::new(); - obj.insert("loc".into(), loc.clone()); - for (k, v) in m { - if k == "loc" || k == "路径" || k == "path" || k == "url" { - continue; - } - if let Some(Value::Array(col)) = Some(v) { - if let Some(cell) = col.get(i) { - obj.insert(k.clone(), cell.clone()); - } - } - } - Value::Object(obj) - }) - .collect(), - _ => Vec::new(), - } - } - _ => Vec::new(), - }; - let mut out = String::from( - "\n\ - \n", - ); - for row in &rows { - let Some(obj) = row.as_object() else { - continue; - }; - let loc_raw = obj - .get("loc") - .or_else(|| obj.get("url")) - .or_else(|| obj.get("路径")) - .or_else(|| obj.get("path")) - .map(cell_str) - .unwrap_or_default(); - if loc_raw.is_empty() { - continue; - } - let loc = if loc_raw.starts_with("http://") || loc_raw.starts_with("https://") { - loc_raw - } else if loc_raw.starts_with('/') { - format!("{base}{loc_raw}") - } else { - format!("{base}/{loc_raw}") - }; - out.push_str(" \n"); - out.push_str(&format!(" {}\n", xml_escape(&loc))); - if let Some(lm) = obj - .get("lastmod") - .or_else(|| obj.get("更新")) - .map(cell_str) - .filter(|s| !s.is_empty()) - { - out.push_str(&format!(" {}\n", xml_escape(&lm))); - } - if let Some(cf) = obj - .get("changefreq") - .or_else(|| obj.get("频率")) - .map(cell_str) - .filter(|s| !s.is_empty()) - { - out.push_str(&format!( - " {}\n", - xml_escape(&cf) - )); - } - if let Some(pr) = obj - .get("priority") - .or_else(|| obj.get("优先级")) - .map(cell_str) - .filter(|s| !s.is_empty()) - { - out.push_str(&format!(" {}\n", xml_escape(&pr))); - } - out.push_str(" \n"); - } - out.push_str("\n"); - out -} - -/// Default robots.txt body allowing all and pointing at a sitemap URL. -pub fn build_robots(sitemap_url: Option<&str>) -> String { - let mut out = String::from("User-agent: *\nAllow: /\n"); - if let Some(u) = sitemap_url.filter(|s| !s.is_empty()) { - out.push_str(&format!("Sitemap: {u}\n")); - } - out -} - -/// ABI helper returning `{ xml }`. -pub fn sitemap_json(base: &str, items: &Value) -> Value { - json!({ "xml": build_sitemap(base, items) }) -} - -/// ABI helper returning `{ body }`. -#[allow(dead_code)] -pub fn robots_json(sitemap_url: Option<&str>, body: Option<&str>) -> Value { - let text = match body.filter(|s| !s.is_empty()) { - Some(b) => b.to_string(), - None => build_robots(sitemap_url), - }; - json!({ "body": text }) -} diff --git a/plugins/web-rust-archive/src/storage.rs b/plugins/web-rust-archive/src/storage.rs deleted file mode 100644 index 319a478..0000000 --- a/plugins/web-rust-archive/src/storage.rs +++ /dev/null @@ -1,661 +0,0 @@ -//! `# storage` — local `file:` blobs; `s3://` reserved for live S3/MinIO (SigV4 later). - -use serde_json::{json, Value}; -use std::fs; -use std::path::{Path, PathBuf}; - -fn is_file(url: &str) -> bool { - let u = url.trim().to_ascii_lowercase(); - u.starts_with("file:") || u.starts_with("file://") -} - -fn is_s3(url: &str) -> bool { - url.trim().to_ascii_lowercase().starts_with("s3://") -} - -fn file_root(url: &str) -> Result { - let raw = url - .trim() - .strip_prefix("file://") - .or_else(|| url.trim().strip_prefix("file:")) - .unwrap_or(url.trim()); - let p = PathBuf::from(raw); - if !p.as_os_str().is_empty() { - fs::create_dir_all(&p).map_err(|e| format!("storage mkdir: {e}"))?; - } - Ok(p) -} - -fn safe_key(key: &str) -> Result { - let k = key.trim().trim_start_matches('/'); - if k.is_empty() { - return Err("storage key is empty".into()); - } - if k.contains("..") { - return Err("storage key must not contain `..`".into()); - } - Ok(k.replace('\\', "/")) -} - -fn path_for(root: &Path, key: &str) -> Result { - let k = safe_key(key)?; - Ok(root.join(k)) -} - -/// Open storage. For `file:` ensures the directory exists. -pub fn open(url: &str) -> Result { - let url = url.trim(); - if is_file(url) { - let _ = file_root(url)?; - Ok(json!({ "_type": "storage", "url": url, "backend": "file" })) - } else if is_s3(url) { - // Validate shape early so author typos fail at open, not at put. - let rest = url - .strip_prefix("s3://") - .ok_or_else(|| "bad s3 url".to_string())?; - let bucket = rest.split('?').next().unwrap_or(""); - if bucket.is_empty() { - return Err("s3 url missing bucket (s3://bucket?endpoint=…)".into()); - } - Ok(json!({ "_type": "storage", "url": url, "backend": "s3" })) - } else { - Err(format!( - "storage url must be `file:…` or `s3://bucket?…`, got `{url}`" - )) - } -} - -fn load_bytes(body: Option<&str>, path: Option<&str>) -> Result, String> { - if let Some(p) = path.filter(|s| !s.is_empty()) { - return fs::read(p).map_err(|e| format!("read path `{p}`: {e}")); - } - if let Some(b) = body { - return Ok(b.as_bytes().to_vec()); - } - Err("storage.put needs `body` or `path`".into()) -} - -pub fn put( - url: &str, - key: &str, - body: Option<&str>, - path: Option<&str>, - content_type: Option<&str>, -) -> Result { - let bytes = load_bytes(body, path)?; - let ct = content_type.unwrap_or("application/octet-stream"); - put_bytes(url, key, &bytes, ct) -} - -/// Persist raw bytes (multipart upload / binary save). -pub fn put_bytes( - url: &str, - key: &str, - bytes: &[u8], - content_type: &str, -) -> Result { - let ct = if content_type.trim().is_empty() { - "application/octet-stream" - } else { - content_type.trim() - }; - if is_file(url) { - let root = file_root(url)?; - let dest = path_for(&root, key)?; - if let Some(parent) = dest.parent() { - fs::create_dir_all(parent).map_err(|e| e.to_string())?; - } - fs::write(&dest, bytes).map_err(|e| e.to_string())?; - let _ = fs::write(ctype_path(&dest), ct); - Ok(json!({ "ok": true, "key": key, "size": bytes.len(), "content_type": ct })) - } else if is_s3(url) { - s3_put_http(url, key, bytes, ct) - } else { - Err("unknown storage backend".into()) - } -} - -/// Read object bytes for HTTP download. Returns `(bytes, content_type, filename)`. -pub fn read_bytes(url: &str, key: &str) -> Result, String, String)>, String> { - let filename = key - .rsplit('/') - .next() - .filter(|s| !s.is_empty()) - .unwrap_or("download") - .to_string(); - if is_file(url) { - let root = file_root(url)?; - let dest = path_for(&root, key)?; - if !dest.is_file() { - return Ok(None); - } - let bytes = fs::read(&dest).map_err(|e| e.to_string())?; - let ct = fs::read_to_string(ctype_path(&dest)) - .unwrap_or_else(|_| "application/octet-stream".into()); - Ok(Some((bytes, ct, filename))) - } else if is_s3(url) { - let cfg = S3Conf::parse(url)?; - let target = cfg.object_url(key)?; - let (status, ct, body) = cfg.request_bytes("GET", &target)?; - if status == 404 { - return Ok(None); - } - if !(200..300).contains(&status) { - return Err(format!("s3 get HTTP {status}")); - } - let content_type = if ct.trim().is_empty() { - "application/octet-stream".into() - } else { - ct - }; - Ok(Some((body, content_type, filename))) - } else { - Err("unknown storage backend".into()) - } -} - -fn ctype_path(dest: &Path) -> PathBuf { - PathBuf::from(format!("{}.ctype", dest.display())) -} - -pub fn get(url: &str, key: &str) -> Result { - if is_file(url) { - let root = file_root(url)?; - let dest = path_for(&root, key)?; - if !dest.is_file() { - return Ok(json!({ "ok": false })); - } - let bytes = fs::read(&dest).map_err(|e| e.to_string())?; - let ct = fs::read_to_string(ctype_path(&dest)) - .unwrap_or_else(|_| "application/octet-stream".into()); - match String::from_utf8(bytes.clone()) { - Ok(s) => Ok(json!({ - "ok": true, - "key": key, - "body": s, - "content_type": ct, - "size": s.len(), - })), - Err(_) => Ok(json!({ - "ok": true, - "key": key, - "path": dest.to_string_lossy(), - "content_type": ct, - "size": bytes.len(), - "binary": true, - })), - } - } else if is_s3(url) { - s3_get_http(url, key) - } else { - Err("unknown storage backend".into()) - } -} - -pub fn delete(url: &str, key: &str) -> Result { - if is_file(url) { - let root = file_root(url)?; - let dest = path_for(&root, key)?; - let ok = if dest.is_file() { - fs::remove_file(&dest).map_err(|e| e.to_string())?; - let _ = fs::remove_file(ctype_path(&dest)); - true - } else { - false - }; - Ok(json!({ "ok": ok })) - } else if is_s3(url) { - s3_delete_http(url, key) - } else { - Err("unknown storage backend".into()) - } -} - -pub fn list(url: &str, prefix: Option<&str>) -> Result { - let prefix = prefix.unwrap_or("").trim_start_matches('/'); - if is_file(url) { - let root = file_root(url)?; - let mut keys = Vec::new(); - walk_keys(&root, &root, prefix, &mut keys)?; - keys.sort(); - Ok(json!({ "ok": true, "keys": keys, "count": keys.len() })) - } else if is_s3(url) { - s3_list_http(url, prefix) - } else { - Err("unknown storage backend".into()) - } -} - -fn walk_keys(root: &Path, dir: &Path, prefix: &str, out: &mut Vec) -> Result<(), String> { - let entries = match fs::read_dir(dir) { - Ok(e) => e, - Err(_) => return Ok(()), - }; - for ent in entries { - let ent = ent.map_err(|e| e.to_string())?; - let path = ent.path(); - if path - .file_name() - .and_then(|n| n.to_str()) - .is_some_and(|n| n.ends_with(".ctype")) - { - continue; - } - if path.is_dir() { - walk_keys(root, &path, prefix, out)?; - } else if path.is_file() { - let rel = path - .strip_prefix(root) - .map_err(|e| e.to_string())? - .to_string_lossy() - .replace('\\', "/"); - if prefix.is_empty() || rel.starts_with(prefix) { - out.push(rel); - } - } - } - Ok(()) -} - -/// Live S3/MinIO via AWS SigV4. Requires `endpoint` query for path-style (MinIO). -fn s3_put_http(url: &str, key: &str, body: &[u8], content_type: &str) -> Result { - let cfg = S3Conf::parse(url)?; - let target = cfg.object_url(key)?; - let status = cfg.request("PUT", &target, body, content_type)?; - if (200..300).contains(&status) { - Ok(json!({ "ok": true, "key": key, "size": body.len() })) - } else { - Err(format!("s3 put HTTP {status}")) - } -} - -fn s3_get_http(url: &str, key: &str) -> Result { - let cfg = S3Conf::parse(url)?; - let target = cfg.object_url(key)?; - let (status, ct, bytes) = cfg.request_bytes("GET", &target)?; - if status == 404 { - return Ok(json!({ "ok": false })); - } - if !(200..300).contains(&status) { - return Err(format!("s3 get HTTP {status}")); - } - match String::from_utf8(bytes.clone()) { - Ok(s) => Ok(json!({ - "ok": true, "key": key, "body": s, "content_type": ct, "size": s.len() - })), - Err(_) => Ok(json!({ - "ok": true, "key": key, "content_type": ct, "size": bytes.len(), "binary": true - })), - } -} - -fn s3_delete_http(url: &str, key: &str) -> Result { - let cfg = S3Conf::parse(url)?; - let target = cfg.object_url(key)?; - let status = cfg.request("DELETE", &target, &[], "")?; - if (200..300).contains(&status) || status == 204 || status == 404 { - Ok(json!({ "ok": status != 404 })) - } else { - Err(format!("s3 delete HTTP {status}")) - } -} - -fn s3_list_http(url: &str, prefix: &str) -> Result { - let cfg = S3Conf::parse(url)?; - let list_url = cfg.list_url(prefix); - let (status, _ct, bytes) = cfg.request_bytes("GET", &list_url)?; - let text = String::from_utf8_lossy(&bytes).into_owned(); - if !(200..300).contains(&status) { - return Err(format!("s3 list HTTP {status}: {text}")); - } - let mut keys = Vec::new(); - for part in text.split("").skip(1) { - if let Some(end) = part.find("") { - keys.push(part[..end].to_string()); - } - } - Ok(json!({ "ok": true, "keys": keys, "count": keys.len() })) -} - -struct S3Conf { - bucket: String, - endpoint: String, - region: String, - access_key: String, - secret_key: String, - path_style: bool, -} - -impl S3Conf { - fn parse(url: &str) -> Result { - let rest = url - .trim() - .strip_prefix("s3://") - .ok_or_else(|| "not an s3 url".to_string())?; - let (bucket, query) = match rest.split_once('?') { - Some((b, q)) => (b.to_string(), q), - None => (rest.to_string(), ""), - }; - if bucket.is_empty() { - return Err("s3 url missing bucket".into()); - } - let mut endpoint = String::new(); - let mut region = "us-east-1".to_string(); - let mut access_key = std::env::var("AWS_ACCESS_KEY_ID") - .or_else(|_| std::env::var("S3_ACCESS_KEY")) - .unwrap_or_default(); - let mut secret_key = std::env::var("AWS_SECRET_ACCESS_KEY") - .or_else(|_| std::env::var("S3_SECRET_KEY")) - .unwrap_or_default(); - let mut path_style = true; - for pair in query.split('&').filter(|p| !p.is_empty()) { - let (k, v) = pair.split_once('=').unwrap_or((pair, "")); - let v = pct_decode(v); - match k { - "endpoint" => endpoint = v, - "region" => region = v, - "access_key" | "accessKey" => access_key = v, - "secret_key" | "secretKey" => secret_key = v, - "path_style" => { - path_style = matches!(v.as_str(), "1" | "true" | "True" | "yes") - } - _ => {} - } - } - if endpoint.is_empty() { - return Err( - "s3 url needs `endpoint=` for MinIO/path-style (e.g. s3://bucket?endpoint=http://127.0.0.1:9000)" - .into(), - ); - } - if access_key.is_empty() || secret_key.is_empty() { - return Err( - "s3 credentials missing (access_key/secret_key query or AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY)" - .into(), - ); - } - Ok(Self { - bucket, - endpoint: endpoint.trim_end_matches('/').to_string(), - region, - access_key, - secret_key, - path_style, - }) - } - - fn object_url(&self, key: &str) -> Result { - let k = safe_key(key)?; - if self.path_style { - Ok(format!("{}/{}/{}", self.endpoint, self.bucket, k)) - } else { - Err("virtual-hosted s3 not implemented in this wave — set path_style=true".into()) - } - } - - fn list_url(&self, prefix: &str) -> String { - format!( - "{}/{}?list-type=2&prefix={}", - self.endpoint, - self.bucket, - uri_encode(prefix) - ) - } - - fn request( - &self, - method: &str, - url: &str, - body: &[u8], - content_type: &str, - ) -> Result { - let (status, _, _) = self.request_inner(method, url, body, content_type)?; - Ok(status) - } - - fn request_bytes(&self, method: &str, url: &str) -> Result<(u16, String, Vec), String> { - self.request_inner(method, url, &[], "") - } - - fn request_inner( - &self, - method: &str, - url: &str, - body: &[u8], - content_type: &str, - ) -> Result<(u16, String, Vec), String> { - use hmac::{Hmac, Mac}; - use sha2::{Digest, Sha256}; - type HmacSha256 = Hmac; - - let (scheme_host, path_query) = split_url(url)?; - let (path, query) = match path_query.split_once('?') { - Some((p, q)) => (p, q), - None => (path_query.as_str(), ""), - }; - let host = scheme_host - .split("://") - .nth(1) - .ok_or_else(|| "bad url host".to_string())?; - - let amz_date = amz_timestamp(); - let date_stamp = &amz_date[..8]; - let payload_hash = hex::encode(Sha256::digest(body)); - - let mut hdrs: Vec<(String, String)> = vec![ - ("host".into(), host.into()), - ("x-amz-content-sha256".into(), payload_hash.clone()), - ("x-amz-date".into(), amz_date.clone()), - ]; - if method == "PUT" && !content_type.is_empty() { - hdrs.push(("content-type".into(), content_type.into())); - } - hdrs.sort_by(|a, b| a.0.cmp(&b.0)); - let signed_headers = hdrs.iter().map(|(k, _)| k.as_str()).collect::>().join(";"); - let canonical_headers = hdrs - .iter() - .map(|(k, v)| format!("{k}:{}\n", v.trim())) - .collect::(); - let canonical_query = canonical_query_string(query); - let canonical_request = format!( - "{method}\n{path}\n{canonical_query}\n{canonical_headers}\n{signed_headers}\n{payload_hash}" - ); - let scope = format!("{date_stamp}/{}/s3/aws4_request", self.region); - let string_to_sign = format!( - "AWS4-HMAC-SHA256\n{amz_date}\n{scope}\n{}", - hex::encode(Sha256::digest(canonical_request.as_bytes())) - ); - - let mut mac = - HmacSha256::new_from_slice(format!("AWS4{}", self.secret_key).as_bytes()).unwrap(); - mac.update(date_stamp.as_bytes()); - let k_date = mac.finalize().into_bytes(); - let mut mac = HmacSha256::new_from_slice(&k_date).unwrap(); - mac.update(self.region.as_bytes()); - let k_region = mac.finalize().into_bytes(); - let mut mac = HmacSha256::new_from_slice(&k_region).unwrap(); - mac.update(b"s3"); - let k_service = mac.finalize().into_bytes(); - let mut mac = HmacSha256::new_from_slice(&k_service).unwrap(); - mac.update(b"aws4_request"); - let k_signing = mac.finalize().into_bytes(); - let mut mac = HmacSha256::new_from_slice(&k_signing).unwrap(); - mac.update(string_to_sign.as_bytes()); - let signature = hex::encode(mac.finalize().into_bytes()); - let auth = format!( - "AWS4-HMAC-SHA256 Credential={}/{scope}, SignedHeaders={signed_headers}, Signature={signature}", - self.access_key - ); - - let agent = ureq::AgentBuilder::new() - .timeout(std::time::Duration::from_secs(30)) - .build(); - let mut req = agent.request(method, url); - req = req - .set("Authorization", &auth) - .set("x-amz-content-sha256", &payload_hash) - .set("x-amz-date", &amz_date); - if method == "PUT" && !content_type.is_empty() { - req = req.set("Content-Type", content_type); - } - let result = if method == "PUT" { - req.send_bytes(body) - } else { - req.call() - }; - match result { - Ok(r) => { - let status = r.status(); - let ct = r - .header("content-type") - .unwrap_or("application/octet-stream") - .to_string(); - let mut buf = Vec::new(); - let _ = std::io::Read::read_to_end(&mut r.into_reader(), &mut buf); - Ok((status, ct, buf)) - } - Err(ureq::Error::Status(code, r)) => { - let ct = r - .header("content-type") - .unwrap_or("application/octet-stream") - .to_string(); - let mut buf = Vec::new(); - let _ = std::io::Read::read_to_end(&mut r.into_reader(), &mut buf); - Ok((code, ct, buf)) - } - Err(e) => Err(e.to_string()), - } - } -} - -fn split_url(url: &str) -> Result<(String, String), String> { - let without = url - .strip_prefix("https://") - .or_else(|| url.strip_prefix("http://")) - .ok_or_else(|| "url must be http(s)".to_string())?; - let scheme = if url.starts_with("https://") { - "https" - } else { - "http" - }; - let (hostport, rest) = match without.find('/') { - Some(i) => (&without[..i], &without[i..]), - None => (without, "/"), - }; - Ok((format!("{scheme}://{hostport}"), rest.to_string())) -} - -fn amz_timestamp() -> String { - let secs = std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .map(|d| d.as_secs()) - .unwrap_or(0); - // UTC YYYYMMDDTHHMMSSZ via a tiny formatter (no chrono dep). - let days = secs / 86400; - let tod = secs % 86400; - let hour = tod / 3600; - let min = (tod % 3600) / 60; - let sec = tod % 60; - let (y, m, d) = civil_from_days(days as i64); - format!("{y:04}{m:02}{d:02}T{hour:02}{min:02}{sec:02}Z") -} - -/// Algorithm from Howard Hinnant's date algorithms (days since 1970-01-01 → Y-M-D). -fn civil_from_days(z: i64) -> (i32, u32, u32) { - let z = z + 719468; - let era = if z >= 0 { z } else { z - 146096 } / 146097; - let doe = (z - era * 146097) as u64; - let yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365; - let y = (yoe as i64) + era * 400; - let doy = doe - (365 * yoe + yoe / 4 - yoe / 100); - let mp = (5 * doy + 2) / 153; - let d = doy - (153 * mp + 2) / 5 + 1; - let m = if mp < 10 { mp + 3 } else { mp - 9 }; - let y = if m <= 2 { y + 1 } else { y }; - (y as i32, m as u32, d as u32) -} - -fn uri_encode(s: &str) -> String { - let mut out = String::new(); - for b in s.bytes() { - match b { - b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' => { - out.push(b as char) - } - _ => out.push_str(&format!("%{b:02X}")), - } - } - out -} - -fn canonical_query_string(query: &str) -> String { - if query.is_empty() { - return String::new(); - } - let mut pairs: Vec<(String, String)> = query - .split('&') - .filter(|p| !p.is_empty()) - .map(|p| { - let (k, v) = p.split_once('=').unwrap_or((p, "")); - (pct_decode(k), pct_decode(v)) - }) - .collect(); - pairs.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.cmp(&b.1))); - pairs - .iter() - .map(|(k, v)| format!("{}={}", uri_encode(k), uri_encode(v))) - .collect::>() - .join("&") -} - -fn pct_decode(s: &str) -> String { - let mut out = String::with_capacity(s.len()); - let b = s.as_bytes(); - let mut i = 0; - while i < b.len() { - if b[i] == b'%' && i + 2 < b.len() { - if let Ok(v) = u8::from_str_radix(std::str::from_utf8(&b[i + 1..i + 3]).unwrap_or(""), 16) - { - out.push(v as char); - i += 3; - continue; - } - } - out.push(b[i] as char); - i += 1; - } - out -} - -#[cfg(test)] -mod tests { - use super::*; - use std::time::{SystemTime, UNIX_EPOCH}; - - #[test] - fn file_put_get_list_delete() { - let nanos = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_nanos(); - let dir = std::env::temp_dir().join(format!("marqdo-storage-{nanos}")); - let url = format!("file:{}", dir.display()); - open(&url).unwrap(); - put(&url, "a/hello.txt", Some("hi"), None, Some("text/plain")).unwrap(); - let g = get(&url, "a/hello.txt").unwrap(); - assert_eq!(g["ok"], true); - assert_eq!(g["body"], "hi"); - let ls = list(&url, Some("a/")).unwrap(); - assert_eq!(ls["count"], 1); - delete(&url, "a/hello.txt").unwrap(); - assert_eq!(get(&url, "a/hello.txt").unwrap()["ok"], false); - let _ = fs::remove_dir_all(dir); - } - - #[test] - fn s3_open_validates_bucket() { - let r = open("s3://mybucket?endpoint=http://127.0.0.1:9000"); - assert!(r.is_ok()); - assert!(open("s3://").is_err()); - } -} diff --git a/plugins/web-rust-archive/src/table.rs b/plugins/web-rust-archive/src/table.rs deleted file mode 100644 index 75c412d..0000000 --- a/plugins/web-rust-archive/src/table.rs +++ /dev/null @@ -1,898 +0,0 @@ -//! GFM table helpers + site path parsing (cells stay string literals). - -use serde_json::{json, Map, Value}; - -const FIELD_KEYS: &[&str] = &["字段", "name", "列", "column"]; -const TYPE_KEYS: &[&str] = &["类型", "type"]; -const NULL_KEYS: &[&str] = &["可空", "null", "nullable"]; -const FRONT_KEYS: &[&str] = &["属性", "前端变量", "front", "field"]; -const BACK_KEYS: &[&str] = &["值", "后端数据库", "back", "db"]; -const CSS_KEYS: &[&str] = &["样式", "绑定css样式", "css", "class", "style"]; -const SRC_KEYS: &[&str] = &["组件", "导入的页面", "src", "page"]; -const STYLE_KEYS: &[&str] = &["样式", "style", "class"]; -const PROP_KEYS: &[&str] = &["属性", "property", "prop", "名", "name"]; -const VAL_KEYS: &[&str] = &["值", "value"]; -const SEL_KEYS: &[&str] = &["选择器", "selector", "sel"]; -const MEDIA_KEYS: &[&str] = &["媒体", "media", "mq", "@media"]; -const WHEN_KEYS: &[&str] = &["当", "when", "if", "条件", "visible"]; -const NAV_LABEL_KEYS: &[&str] = &["标签", "label", "title", "text", "名"]; -const NAV_HREF_KEYS: &[&str] = &["链接", "href", "url", "path", "地址"]; - - -pub fn normalize_ref(s: &str) -> String { - let s = s.trim(); - let mut out = String::with_capacity(s.len()); - let mut rest = s; - while let Some(start) = rest.find('`') { - out.push_str(&rest[..start]); - rest = &rest[start + 1..]; - if let Some(end) = rest.find('`') { - out.push_str(&rest[..end]); - rest = &rest[end + 1..]; - } else { - out.push('`'); - out.push_str(rest); - return out; - } - } - out.push_str(rest); - out -} - -fn pick<'a>(m: &'a Map, keys: &[&str]) -> Option<&'a Value> { - keys.iter().find_map(|k| m.get(*k)) -} - -fn cell_str(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -fn as_str_list(v: &Value) -> Vec { - match v { - Value::Array(a) => a.iter().map(cell_str).collect(), - Value::Null => Vec::new(), - other => vec![cell_str(other)], - } -} - -fn boolish(v: &Value) -> bool { - match v { - Value::Bool(b) => *b, - Value::String(s) => matches!(s.trim(), "1" | "true" | "True" | "yes" | "是" | "可"), - Value::Number(n) => n.as_i64().unwrap_or(0) != 0, - _ => false, - } -} - -const UNIQUE_KEYS: &[&str] = &["唯一", "unique", "uniq"]; -const INDEX_KEYS: &[&str] = &["索引", "index", "idx"]; -const FK_KEYS: &[&str] = &["外键", "fk", "references", "ref", "引用"]; - -/// Schema table → `[{name,type,nullable,unique,index,fk}, …]` -pub fn as_fields(table: &Value) -> Value { - match table { - Value::Array(rows) => { - let mut out = Vec::new(); - for row in rows { - if let Some(m) = row.as_object() { - let name = pick(m, FIELD_KEYS).map(cell_str).unwrap_or_default(); - if name.is_empty() { - continue; - } - let ty = pick(m, TYPE_KEYS) - .map(cell_str) - .unwrap_or_else(|| "text".into()); - let nullable = pick(m, NULL_KEYS).map(boolish).unwrap_or(true); - let unique = pick(m, UNIQUE_KEYS).map(boolish).unwrap_or(false); - let index = pick(m, INDEX_KEYS).map(boolish).unwrap_or(false); - let fk = pick(m, FK_KEYS) - .map(cell_str) - .filter(|s| !s.is_empty()) - .unwrap_or_default(); - out.push(json!({ - "name": name, - "type": ty, - "nullable": nullable, - "unique": unique, - "index": index, - "fk": fk, - })); - } - } - Value::Array(out) - } - Value::Object(m) => { - let names = pick(m, FIELD_KEYS).map(as_str_list).unwrap_or_default(); - let types = pick(m, TYPE_KEYS).map(as_str_list).unwrap_or_default(); - let nulls = pick(m, NULL_KEYS).map(as_str_list).unwrap_or_default(); - let uniques = pick(m, UNIQUE_KEYS).map(as_str_list).unwrap_or_default(); - let indexes = pick(m, INDEX_KEYS).map(as_str_list).unwrap_or_default(); - let fks = pick(m, FK_KEYS).map(as_str_list).unwrap_or_default(); - let mut out = Vec::new(); - for (i, name) in names.iter().enumerate() { - if name.is_empty() { - continue; - } - let ty = types.get(i).cloned().unwrap_or_else(|| "text".into()); - let nullable = nulls - .get(i) - .map(|s| boolish(&Value::String(s.clone()))) - .unwrap_or(true); - let unique = uniques - .get(i) - .map(|s| boolish(&Value::String(s.clone()))) - .unwrap_or(false); - let index = indexes - .get(i) - .map(|s| boolish(&Value::String(s.clone()))) - .unwrap_or(false); - let fk = fks.get(i).cloned().unwrap_or_default(); - out.push(json!({ - "name": name, - "type": ty, - "nullable": nullable, - "unique": unique, - "index": index, - "fk": fk, - })); - } - Value::Array(out) - } - _ => json!([]), - } -} - -/// Seed / row table → list of maps. -pub fn as_rows(table: &Value) -> Value { - match table { - Value::Array(a) => Value::Array(a.clone()), - Value::Object(m) => { - // @ / 行 / row column → list of maps - let keys: Vec = m.keys().cloned().collect(); - let row_key = ["@", "行", "row"] - .iter() - .find(|k| m.contains_key(**k)) - .map(|s| s.to_string()); - if let Some(rk) = row_key { - let n = as_str_list(m.get(&rk).unwrap()).len(); - let mut out = Vec::new(); - for i in 0..n { - let mut row = Map::new(); - for k in &keys { - if k == &rk { - continue; - } - let list = as_str_list(m.get(k).unwrap_or(&Value::Null)); - row.insert(k.clone(), json!(list.get(i).cloned().unwrap_or_default())); - } - if let Some(id) = as_str_list(m.get(&rk).unwrap()).get(i) { - if !id.is_empty() { - row.insert("id".into(), json!(id)); - } - } - out.push(Value::Object(row)); - } - return Value::Array(out); - } - // Columnar GFM table: each value is a same-length array → zip into rows. - let mut col_lens: Vec = Vec::new(); - let mut all_arrays = !m.is_empty(); - for v in m.values() { - match v { - Value::Array(a) => col_lens.push(a.len()), - _ => { - all_arrays = false; - break; - } - } - } - if all_arrays { - let n = col_lens.iter().copied().max().unwrap_or(0); - if n > 0 && col_lens.iter().all(|&l| l == n || l == 0) { - let mut out = Vec::new(); - for i in 0..n { - let mut row = Map::new(); - for (k, v) in m { - if let Value::Array(a) = v { - row.insert( - k.clone(), - a.get(i).cloned().unwrap_or(Value::Null), - ); - } - } - out.push(Value::Object(row)); - } - return Value::Array(out); - } - } - // single map - Value::Array(vec![Value::Object(m.clone())]) - } - _ => json!([]), - } -} - -/// Bind table → `[{front,back,css,media,when}, …]` -pub fn as_bind(table: &Value) -> Value { - match table { - Value::Array(rows) => { - let mut out = Vec::new(); - for row in rows { - if let Some(m) = row.as_object() { - let front = normalize_ref(&pick(m, FRONT_KEYS).map(cell_str).unwrap_or_default()); - let back = normalize_ref(&pick(m, BACK_KEYS).map(cell_str).unwrap_or_default()); - let css = normalize_ref(&pick(m, CSS_KEYS).map(cell_str).unwrap_or_default()); - let media = - normalize_ref(&pick(m, MEDIA_KEYS).map(cell_str).unwrap_or_default()); - let when = normalize_ref(&pick(m, WHEN_KEYS).map(cell_str).unwrap_or_default()); - if !front.is_empty() || !back.is_empty() { - out.push(json!({ - "front": front, - "back": back, - "css": css, - "media": media, - "when": when, - })); - } - } - } - Value::Array(out) - } - Value::Object(m) => { - let fronts = pick(m, FRONT_KEYS).map(as_str_list).unwrap_or_default(); - let backs = pick(m, BACK_KEYS).map(as_str_list).unwrap_or_default(); - let csses = pick(m, CSS_KEYS).map(as_str_list).unwrap_or_default(); - let medias = pick(m, MEDIA_KEYS).map(as_str_list).unwrap_or_default(); - let whens = pick(m, WHEN_KEYS).map(as_str_list).unwrap_or_default(); - let n = fronts.len().max(backs.len()); - let mut out = Vec::new(); - for i in 0..n { - let front = normalize_ref(&fronts.get(i).cloned().unwrap_or_default()); - let back = normalize_ref(&backs.get(i).cloned().unwrap_or_default()); - let css = normalize_ref(&csses.get(i).cloned().unwrap_or_default()); - let media = normalize_ref(&medias.get(i).cloned().unwrap_or_default()); - let when = normalize_ref(&whens.get(i).cloned().unwrap_or_default()); - if !front.is_empty() || !back.is_empty() { - out.push(json!({ - "front": front, - "back": back, - "css": css, - "media": media, - "when": when, - })); - } - } - Value::Array(out) - } - _ => json!([]), - } -} - -/// Nav / link table → row maps with label/href (and optional media/when/class). -/// Accepts bind rows (`front`/`back`) or author tables (`标签`/`链接`). -pub fn as_nav_rows(table: &Value) -> Vec> { - let binds = as_bind(table); - let bind_arr = binds.as_array().cloned().unwrap_or_default(); - if !bind_arr.is_empty() { - return bind_arr - .into_iter() - .filter_map(|v| v.as_object().cloned()) - .collect(); - } - as_rows(table) - .as_array() - .cloned() - .unwrap_or_default() - .into_iter() - .filter_map(|v| v.as_object().cloned()) - .collect() -} - -/// Pick label/href from a nav row (bind or 标签/链接 shape). -pub fn nav_label_href(m: &Map) -> (String, String) { - let label = pick(m, NAV_LABEL_KEYS) - .or_else(|| m.get("front")) - .map(cell_str) - .map(|s| normalize_ref(&s)) - .unwrap_or_default(); - let href = pick(m, NAV_HREF_KEYS) - .or_else(|| m.get("back")) - .map(cell_str) - .map(|s| normalize_ref(&s)) - .filter(|s| !s.is_empty()) - .unwrap_or_else(|| "#".into()); - (label, href) -} - -pub fn nav_media_when_class(m: &Map) -> (String, String, String) { - let media = pick(m, MEDIA_KEYS) - .or_else(|| m.get("media")) - .map(cell_str) - .map(|s| normalize_ref(&s)) - .unwrap_or_default(); - let when = pick(m, WHEN_KEYS) - .or_else(|| m.get("when")) - .map(cell_str) - .map(|s| normalize_ref(&s)) - .unwrap_or_default(); - let class = pick(m, CSS_KEYS) - .or_else(|| m.get("css")) - .map(cell_str) - .map(|s| normalize_ref(&s)) - .unwrap_or_default(); - (media, when, class) -} - -/// Page table → `[{src,style,slot}, …]` -pub fn as_compose(table: &Value) -> Value { - match table { - Value::Object(m) => { - let srcs = pick(m, SRC_KEYS).map(as_str_list).unwrap_or_default(); - let styles = pick(m, STYLE_KEYS).map(as_str_list).unwrap_or_default(); - let mut out = Vec::new(); - for (i, src_raw) in srcs.iter().enumerate() { - let src = normalize_ref(src_raw); - if src.is_empty() { - continue; - } - let style = normalize_ref(&styles.get(i).cloned().unwrap_or_default()); - let slot = infer_slot(&src); - out.push(json!({ "src": src, "style": style, "slot": slot })); - } - Value::Array(out) - } - Value::Array(rows) => { - let mut out = Vec::new(); - for row in rows { - if let Some(m) = row.as_object() { - let src = normalize_ref(&pick(m, SRC_KEYS).map(cell_str).unwrap_or_default()); - if src.is_empty() { - continue; - } - let style = normalize_ref(&pick(m, STYLE_KEYS).map(cell_str).unwrap_or_default()); - let slot = infer_slot(&src); - out.push(json!({ "src": src, "style": style, "slot": slot })); - } - } - Value::Array(out) - } - _ => json!([]), - } -} - -fn infer_slot(src: &str) -> String { - let base = src.rsplit('.').next().unwrap_or(src); - match base { - "nav" | "links" | "导航" => "nav".into(), - "side" | "sidebar" | "侧栏" => "sidebar".into(), - "foot" | "footer" | "页脚" => "footer".into(), - other => other.to_string(), - } -} - -pub fn normalize_slot(name: &str) -> String { - match name { - "nav" | "links" | "导航" => "nav".into(), - "side" | "sidebar" | "侧栏" => "sidebar".into(), - "foot" | "footer" | "页脚" => "footer".into(), - "main" | "index" | "" | "主体" => "main".into(), - other => other.to_string(), - } -} - -/// Style table → CSS text. -/// -/// Table shapes: -/// 1. Rule rows `|媒体|选择器|属性|值|` — rows grouped by `媒体` emit -/// `@media { … }` blocks; rows sharing a selector are merged into one rule. -/// 2. Rule rows `|选择器|属性|值|` — each row emits `selector { prop: value; }`, -/// rows sharing a selector are merged into one rule. `selector` may be any -/// CSS selector (`aside.side`, `ul.side-nav a:hover`). -/// 3. Plain property rows `|属性|值|` — emitted as `.name { prop: value; }`. -/// 4. **`@keyframes`** — selector `@keyframes name` (optional stop in the -/// selector: `@keyframes name from`) or stop in the `属性` column: -/// `|@keyframes fade|from|opacity: 0|` → nested keyframe rules. -/// -/// Examples (rule shape): -/// ```text -/// | 媒体 | 选择器 | 属性 | 值 | -/// |------|--------|------|-----| -/// | (max-width: 860px) | aside.side | padding | 1rem 2rem | -/// -/// | 选择器 | 属性 | 值 | -/// |--------|------|-----| -/// | aside.side | padding | 2rem 1.25rem | -/// | @keyframes pulse | 0% | opacity: 0 | -/// | @keyframes pulse | 100% | opacity: 1 | -/// | @keyframes pulse from | opacity | 0 | -/// ``` -pub fn as_css_named(name: &str, table: &Value) -> String { - as_css_named_checked(name, table, false).unwrap_or_default() -} - -/// Like [`as_css_named`], but when `strict` is true, reject cells that look like -/// T5 evaluated a bare `/` (numeric/bool CSS values). Default mode warns on stderr. -pub fn as_css_named_checked(name: &str, table: &Value, strict: bool) -> Result { - let name = normalize_ref(name); - if name.is_empty() { - return Ok(String::new()); - } - let mut out = String::new(); - match table { - Value::Object(m) => { - let sels = pick(m, SEL_KEYS).map(as_str_list).unwrap_or_default(); - let props = pick(m, PROP_KEYS).map(as_str_list).unwrap_or_default(); - let vals_raw = pick(m, VAL_KEYS); - let vals = vals_raw.map(as_str_list).unwrap_or_default(); - let medias = pick(m, MEDIA_KEYS).map(as_str_list).unwrap_or_default(); - let n = props.len().max(sels.len()).max(vals.len()); - if n == 0 { - return Ok(String::new()); - } - if let Some(raw) = vals_raw { - check_css_value_cells(raw, &props, strict)?; - } - let rows: Vec<(String, String, String, String)> = (0..n) - .map(|i| { - ( - medias.get(i).cloned().unwrap_or_default(), - sels.get(i).cloned().unwrap_or_default(), - props.get(i).cloned().unwrap_or_default(), - vals.get(i).cloned().unwrap_or_default(), - ) - }) - .collect(); - emit_css_rows(&rows, &name, &mut out); - } - Value::Array(rows) => { - let mut collected = Vec::new(); - for row in rows { - let Some(m) = row.as_object() else { - continue; - }; - let prop = pick(m, PROP_KEYS).map(cell_str).unwrap_or_default(); - if let Some(v) = pick(m, VAL_KEYS) { - note_css_value_cell(&prop, v, strict)?; - } - collected.push(( - pick(m, MEDIA_KEYS).map(cell_str).unwrap_or_default(), - pick(m, SEL_KEYS).map(cell_str).unwrap_or_default(), - prop, - pick(m, VAL_KEYS).map(cell_str).unwrap_or_default(), - )); - } - emit_css_rows(&collected, &name, &mut out); - } - _ => {} - } - Ok(out) -} - -fn css_value_suspicious(v: &Value) -> Option<&'static str> { - // Numbers are normal CSS (z-index, opacity, …). Do not treat Markup-evaluated - // ints/floats as bare `/` division false positives. - match v { - Value::Bool(_) => Some("boolean CSS value (quote the cell if intentional)"), - _ => None, - } -} - -fn note_css_value_cell(prop: &str, val: &Value, strict: bool) -> Result<(), String> { - let Some(why) = css_value_suspicious(val) else { - return Ok(()); - }; - let prop = if prop.trim().is_empty() { - "(value)" - } else { - prop.trim() - }; - let msg = format!("ext/web style: suspicious cell for `{prop}`: {why}"); - if strict { - Err(msg) - } else { - eprintln!("warning: {msg}"); - Ok(()) - } -} - -fn check_css_value_cells(vals: &Value, props: &[String], strict: bool) -> Result<(), String> { - match vals { - Value::Array(a) => { - for (i, v) in a.iter().enumerate() { - let prop = props.get(i).map(|s| s.as_str()).unwrap_or(""); - note_css_value_cell(prop, v, strict)?; - } - } - other => note_css_value_cell(props.first().map(|s| s.as_str()).unwrap_or(""), other, strict)?, - } - Ok(()) -} - -/// Parse `@keyframes name` or `@keyframes name stop` from a selector cell. -fn parse_keyframes_sel(sel: &str) -> Option<(String, Option)> { - let t = sel.trim(); - if t.len() < 10 || !t[..10].eq_ignore_ascii_case("@keyframes") { - return None; - } - let rest = t[10..].trim(); - if rest.is_empty() { - return None; - } - // First token = animation name; optional second = keyframe stop. - let mut parts = rest.split_whitespace(); - let anim = parts.next()?.to_string(); - let stop = parts.next().map(|s| s.to_string()); - Some((anim, stop)) -} - -fn is_keyframe_stop(s: &str) -> bool { - let t = s.trim(); - if t.is_empty() { - return false; - } - if t.eq_ignore_ascii_case("from") || t.eq_ignore_ascii_case("to") { - return true; - } - // 0%, 50%, 100.5%, etc. - let stripped = t.trim_end_matches('%'); - !stripped.is_empty() - && stripped - .chars() - .all(|c| c.is_ascii_digit() || c == '.') - && t.ends_with('%') -} - -fn keyframe_decl_lines(css_prop: &str, value: &str) -> Vec { - // Value may be a full declaration (`opacity: 0`) or bare value when the - // CSS property lived in the selector form `@keyframes name from` + 属性. - let v = value.trim().trim_end_matches(';').trim(); - if v.is_empty() { - return Vec::new(); - } - if v.contains(':') { - v.split(';') - .map(|p| p.trim()) - .filter(|p| !p.is_empty()) - .map(|p| format!(" {p};")) - .collect() - } else if !css_prop.is_empty() && !is_keyframe_stop(css_prop) { - // `@keyframes name from` + 属性=opacity + 值=0 - vec![format!(" {css_prop}: {v};")] - } else { - // Bare value — prefer `opacity: 0` in the 值 column. - vec![format!(" {v};")] - } -} - -fn push_keyframe( - groups: &mut Vec<(String, Vec<(String, Vec)>)>, - anim: &str, - stop: &str, - decls: Vec, -) { - if anim.is_empty() || stop.is_empty() || decls.is_empty() { - return; - } - let anim_group = match groups.iter_mut().find(|(n, _)| n == anim) { - Some((_, g)) => g, - None => { - groups.push((anim.to_string(), Vec::new())); - &mut groups.last_mut().unwrap().1 - } - }; - match anim_group.iter_mut().find(|(s, _)| s == stop) { - Some((_, d)) => d.extend(decls), - None => anim_group.push((stop.to_string(), decls)), - } -} - -fn emit_css_rows(rows: &[(String, String, String, String)], class_name: &str, out: &mut String) { - let mut by_media: Vec<(String, Vec<(String, Vec)>)> = Vec::new(); - let mut by_keyframes: Vec<(String, Vec<(String, Vec)>)> = Vec::new(); - let mut plain: Vec = Vec::new(); - - for (media, sel, p, v) in rows { - let media = media.trim(); - let sel = sel.trim(); - let p = p.trim(); - let v = v.trim(); - - if let Some((anim, stop_in_sel)) = parse_keyframes_sel(sel) { - let stop_from_sel = stop_in_sel.is_some(); - let (stop, prop_for_decl) = match stop_in_sel { - Some(s) => (s, p.to_string()), - None => { - // 属性 = keyframe stop (from / to / N%); 值 = declaration(s) - if !is_keyframe_stop(p) { - continue; - } - (p.to_string(), String::new()) - } - }; - let decls = if stop_from_sel { - keyframe_decl_lines(&prop_for_decl, v) - } else { - keyframe_decl_lines("", v) - }; - let decls = if decls.is_empty() && !v.is_empty() && !prop_for_decl.is_empty() { - keyframe_decl_lines(&prop_for_decl, v) - } else { - decls - }; - push_keyframe(&mut by_keyframes, &anim, &stop, decls); - continue; - } - - if p.is_empty() { - continue; - } - let decl = format!(" {p}: {v};"); - if !media.is_empty() { - let group = match by_media.iter_mut().find(|(mq, _)| *mq == media) { - Some((_, g)) => g, - None => { - by_media.push((media.to_string(), Vec::new())); - let (_, g) = by_media.last_mut().unwrap(); - g - } - }; - push_rule(group, sel, decl); - } else if !sel.is_empty() { - let group = match by_media.iter_mut().find(|(mq, _)| mq.is_empty()) { - Some((_, g)) => g, - None => { - by_media.push((String::new(), Vec::new())); - let (_, g) = by_media.last_mut().unwrap(); - g - } - }; - push_rule(group, sel, decl); - } else { - plain.push(decl); - } - } - - for (media, rules) in by_media { - if media.is_empty() { - for (sel, decls) in rules { - out.push_str(&format!("{} {{\n{}\n}}\n", sel, decls.join("\n"))); - } - } else { - let inner = rules - .iter() - .map(|(sel, decls)| format!("{} {{\n{}\n}}", sel, decls.join("\n"))) - .collect::>() - .join("\n"); - out.push_str(&format!("@media {} {{\n{}\n}}\n", media, inner)); - } - } - for (anim, stops) in by_keyframes { - out.push_str(&format!("@keyframes {} {{\n", anim)); - for (stop, decls) in stops { - out.push_str(&format!(" {} {{\n", stop)); - out.push_str(&decls.join("\n")); - out.push('\n'); - out.push_str(" }\n"); - } - out.push_str("}\n"); - } - if !plain.is_empty() { - out.push_str(&format!(".{} {{\n{}\n}}\n", class_name, plain.join("\n"))); - } -} - -/// Push `decl` under `sel` into a `(selector, declarations)` group list, -/// merging declarations when the selector already exists. -fn push_rule(groups: &mut Vec<(String, Vec)>, sel: &str, decl: String) { - if sel.is_empty() { - return; - } - match groups.iter_mut().find(|(s, _)| s == sel) { - Some((_, decls)) => decls.push(decl), - None => groups.push((sel.to_string(), vec![decl])), - } -} - -#[derive(Debug, Clone, PartialEq, Eq)] -pub enum SitePath { - LibMember { lib: String, member: String }, - DbField { table: String, field: String }, - Plain(String), -} - -pub fn parse_site_path(raw: &str) -> SitePath { - let s = normalize_ref(raw); - if s.is_empty() { - return SitePath::Plain(String::new()); - } - let parts: Vec<&str> = s.split('.').filter(|p| !p.is_empty()).collect(); - match parts.as_slice() { - [lib, member] => SitePath::LibMember { - lib: (*lib).into(), - member: (*member).into(), - }, - [_, table, field] => SitePath::DbField { - table: (*table).into(), - field: (*field).into(), - }, - _ => SitePath::Plain(s), - } -} - -pub fn bind_table_name(binds: &[Value]) -> Option { - let mut found: Option = None; - for b in binds { - let back = b.get("back").and_then(|v| v.as_str()).unwrap_or(""); - if let SitePath::DbField { table, .. } = parse_site_path(back) { - match &found { - None => found = Some(table), - Some(prev) if prev != &table => return None, - _ => {} - } - } else if back.contains('.') { - let mut p = back.splitn(2, '.'); - if let (Some(t), Some(_)) = (p.next(), p.next()) { - match &found { - None => found = Some(t.into()), - Some(prev) if prev != t => return None, - _ => {} - } - } - } - } - found -} - -pub fn project_rows(binds: &[Value], rows: &[Value]) -> Value { - let mut out = Vec::new(); - for row in rows { - let obj = row.as_object().cloned().unwrap_or_default(); - let mut m = Map::new(); - let mut css = Map::new(); - for b in binds { - let front = b.get("front").and_then(|v| v.as_str()).unwrap_or(""); - let back = b.get("back").and_then(|v| v.as_str()).unwrap_or(""); - let class = b.get("css").and_then(|v| v.as_str()).unwrap_or(""); - let col = match parse_site_path(back) { - SitePath::DbField { field, .. } => field, - SitePath::LibMember { member, .. } => member, - SitePath::Plain(s) if s.contains('.') => { - s.split('.').next_back().unwrap_or(&s).to_string() - } - SitePath::Plain(s) => s, - }; - if let Some(v) = obj.get(&col).or_else(|| obj.get(front)) { - m.insert(front.to_string(), v.clone()); - } - if !class.is_empty() { - css.insert(front.to_string(), json!(class)); - } - } - if let Some(id) = obj.get("id") { - m.insert("id".into(), id.clone()); - } - if !css.is_empty() { - m.insert("_css".into(), Value::Object(css)); - } - out.push(Value::Object(m)); - } - Value::Array(out) -} - -const META_KEY_KEYS: &[&str] = &["键", "key", "name"]; -const META_VAL_KEYS: &[&str] = &["值", "value"]; - -/// SEO / OpenGraph meta table → `{title, description, og:…, canonical, …}`. -pub fn as_meta_map(table: &Value) -> Map { - let mut out = Map::new(); - match table { - Value::Array(rows) => { - for row in rows { - let Some(obj) = row.as_object() else { - continue; - }; - let key = META_KEY_KEYS - .iter() - .find_map(|k| obj.get(*k)) - .map(|v| normalize_ref(&meta_text(v))) - .unwrap_or_default(); - let val = META_VAL_KEYS - .iter() - .find_map(|k| obj.get(*k)) - .map(|v| meta_text(v)) - .unwrap_or_default(); - if !key.is_empty() { - out.insert(key, json!(val)); - } - } - } - Value::Object(m) => { - for (k, v) in m { - out.insert(k.clone(), json!(meta_text(v))); - } - } - _ => {} - } - out -} - -fn meta_text(v: &Value) -> String { - match v { - Value::Null => String::new(), - Value::String(s) => s.clone(), - Value::Bool(b) => b.to_string(), - Value::Number(n) => n.to_string(), - other => other.to_string(), - } -} - -#[cfg(test)] -mod css_tests { - use super::*; - use serde_json::json; - - #[test] - fn keyframes_stop_in_prop() { - let t = json!([ - {"选择器": "@keyframes pulse", "属性": "0%", "值": "opacity: 0"}, - {"选择器": "@keyframes pulse", "属性": "100%", "值": "opacity: 1"}, - ]); - let css = as_css_named("anim", &t); - assert!(css.contains("@keyframes pulse {"), "{css}"); - assert!(css.contains("0% {"), "{css}"); - assert!(css.contains("opacity: 0;"), "{css}"); - assert!(css.contains("100% {"), "{css}"); - assert!(!css.contains("0%: opacity"), "{css}"); - } - - #[test] - fn keyframes_stop_in_selector() { - let t = json!([ - {"选择器": "@keyframes fade from", "属性": "opacity", "值": "0"}, - {"选择器": "@keyframes fade to", "属性": "opacity", "值": "1"}, - ]); - let css = as_css_named("anim", &t); - assert!(css.contains("@keyframes fade {"), "{css}"); - assert!(css.contains("from {"), "{css}"); - assert!(css.contains("opacity: 0;"), "{css}"); - assert!(css.contains("to {"), "{css}"); - } - - #[test] - fn media_still_works() { - let t = json!([ - {"媒体": "(max-width: 800px)", "选择器": ".x", "属性": "color", "值": "red"}, - ]); - let css = as_css_named("x", &t); - assert!(css.contains("@media (max-width: 800px)"), "{css}"); - assert!(css.contains(".x {"), "{css}"); - assert!(css.contains("color: red;"), "{css}"); - } - - #[test] - fn strict_rejects_numeric_css_value() { - let t = json!([ - {"选择器": ".x", "属性": "grid-column", "值": 0}, - ]); - let err = as_css_named_checked("x", &t, true).unwrap_err(); - assert!(err.contains("suspicious"), "{err}"); - // Non-strict still emits (with warning on stderr). - let css = as_css_named_checked("x", &t, false).unwrap(); - assert!(css.contains("grid-column: 0;"), "{css}"); - } - - #[test] - fn quoted_string_ok_in_strict() { - let t = json!([ - {"选择器": ".x", "属性": "grid-column", "值": "1 / 5"}, - ]); - let css = as_css_named_checked("x", &t, true).unwrap(); - assert!(css.contains("grid-column: 1 / 5;"), "{css}"); - } -} diff --git a/plugins/web-rust-archive/src/upload.rs b/plugins/web-rust-archive/src/upload.rs deleted file mode 100644 index 6d4097d..0000000 --- a/plugins/web-rust-archive/src/upload.rs +++ /dev/null @@ -1,264 +0,0 @@ -//! HTTP upload validation and safe object keys (W5). - -use serde_json::{json, Value}; -use std::fs; -use std::time::{SystemTime, UNIX_EPOCH}; - -/// Validate size / MIME / extension against an optional allowlist table. -/// -/// `types` may be: -/// - `null` / missing → allow any -/// - string CSV of MIME types (`image/png,image/jpeg`) -/// - GFM-style rows: `|类型|扩展名|` / `|type|ext|` (ext may be comma-separated) -pub fn validate( - filename: &str, - content_type: &str, - size: u64, - max_bytes: u64, - types: Option<&Value>, -) -> Result { - if size > max_bytes { - return Ok(json!({ - "ok": false, - "error": format!("file too large: {size} > {max_bytes}"), - })); - } - let name = filename.trim(); - if name.is_empty() { - return Ok(json!({ "ok": false, "error": "empty filename" })); - } - if name.contains("..") || name.contains('/') || name.contains('\\') { - // Basename only is expected from clients; reject path fragments. - return Ok(json!({ "ok": false, "error": "unsafe filename" })); - } - - let ct = content_type.trim().to_ascii_lowercase(); - let ct = ct.split(';').next().unwrap_or(&ct).trim(); - let ext = name - .rsplit('.') - .next() - .filter(|e| !e.is_empty() && *e != name) - .unwrap_or("") - .to_ascii_lowercase(); - - if let Some(t) = types { - if !types_allow(t, ct, &ext) { - return Ok(json!({ - "ok": false, - "error": format!("type not allowed: content_type={ct} ext={ext}"), - })); - } - } - - Ok(json!({ - "ok": true, - "filename": name, - "content_type": if ct.is_empty() { "application/octet-stream" } else { ct }, - "size": size, - "ext": ext, - })) -} - -fn types_allow(types: &Value, content_type: &str, ext: &str) -> bool { - match types { - Value::Null => true, - Value::String(s) => { - let s = s.trim(); - if s.is_empty() { - return true; - } - s.split(',') - .map(|p| p.trim().to_ascii_lowercase()) - .filter(|p| !p.is_empty()) - .any(|p| p == content_type) - } - Value::Array(rows) => { - if rows.is_empty() { - return true; - } - for row in rows { - if row_allows(row, content_type, ext) { - return true; - } - } - false - } - Value::Object(obj) => { - // Shapes: - // 1) Columnar GFM: `{类型: [mime…], 扩展名: [ext…]}` (Marqdo default) - // 2) Single allowlist row: `{类型|type, 扩展名|ext}` with string values - // 3) MIME→ext map: `{ "image/png": "png", … }` - let col_mime = obj - .get("类型") - .or_else(|| obj.get("type")) - .or_else(|| obj.get("mime")); - let col_ext = obj - .get("扩展名") - .or_else(|| obj.get("ext")) - .or_else(|| obj.get("extension")); - if let (Some(Value::Array(mimes)), Some(exts_v)) = (col_mime, col_ext) { - let exts: Vec = match exts_v { - Value::Array(a) => a - .iter() - .map(|x| x.as_str().unwrap_or("").to_ascii_lowercase()) - .collect(), - Value::String(s) => vec![s.to_ascii_lowercase()], - _ => Vec::new(), - }; - if mimes.is_empty() { - return true; - } - for (i, mime_v) in mimes.iter().enumerate() { - let mime = mime_v - .as_str() - .unwrap_or("") - .trim() - .to_ascii_lowercase(); - let row_ext = exts.get(i).map(|s| s.as_str()).unwrap_or(""); - let mime_ok = mime.is_empty() || mime == content_type; - let ext_ok = if row_ext.is_empty() { - true - } else { - row_ext - .split(',') - .map(|e| e.trim().trim_start_matches('.')) - .any(|e| e == ext) - }; - if mime_ok && ext_ok { - return true; - } - } - return false; - } - if col_mime.is_some() || col_ext.is_some() { - return row_allows(&Value::Object(obj.clone()), content_type, ext); - } - if obj.is_empty() { - return true; - } - for (mime, exts_v) in obj { - let mime = mime.trim().to_ascii_lowercase(); - let exts = match exts_v { - Value::String(s) => s.clone(), - Value::Array(a) => a - .iter() - .filter_map(|x| x.as_str()) - .collect::>() - .join(","), - _ => String::new(), - }; - let exts = exts.trim().to_ascii_lowercase(); - let mime_ok = mime.is_empty() || mime == content_type; - let ext_ok = if exts.is_empty() { - true - } else { - exts.split(',') - .map(|e| e.trim().trim_start_matches('.')) - .any(|e| e == ext) - }; - if mime_ok && ext_ok { - return true; - } - } - false - } - _ => true, - } -} - -fn row_allows(row: &Value, content_type: &str, ext: &str) -> bool { - let Some(obj) = row.as_object() else { - if let Some(s) = row.as_str() { - return s.trim().eq_ignore_ascii_case(content_type); - } - return false; - }; - let mime = obj - .get("类型") - .or_else(|| obj.get("type")) - .or_else(|| obj.get("mime")) - .and_then(|v| v.as_str()) - .unwrap_or("") - .trim() - .to_ascii_lowercase(); - let exts = obj - .get("扩展名") - .or_else(|| obj.get("ext")) - .or_else(|| obj.get("extension")) - .and_then(|v| v.as_str()) - .unwrap_or("") - .trim() - .to_ascii_lowercase(); - let mime_ok = mime.is_empty() || mime == content_type; - let ext_ok = if exts.is_empty() { - true - } else { - exts.split(',') - .map(|e| e.trim().trim_start_matches('.')) - .any(|e| e == ext) - }; - mime_ok && ext_ok -} - -/// Build `prefix` + timestamp-random + sanitized basename. -pub fn make_key(prefix: &str, filename: &str) -> Result { - let base = filename - .rsplit(['/', '\\']) - .next() - .unwrap_or(filename) - .trim(); - if base.is_empty() { - return Err("empty filename".into()); - } - let safe: String = base - .chars() - .map(|c| { - if c.is_ascii_alphanumeric() || c == '.' || c == '-' || c == '_' { - c - } else { - '_' - } - }) - .collect(); - if safe.contains("..") { - return Err("unsafe filename".into()); - } - let mut pref = prefix.trim().trim_start_matches('/').replace('\\', "/"); - if !pref.is_empty() && !pref.ends_with('/') { - pref.push('/'); - } - if pref.contains("..") { - return Err("prefix must not contain `..`".into()); - } - let secs = SystemTime::now() - .duration_since(UNIX_EPOCH) - .map(|d| d.as_secs()) - .unwrap_or(0); - let mut rnd = [0u8; 4]; - getrandom::getrandom(&mut rnd).map_err(|e| e.to_string())?; - let hex = hex::encode(rnd); - Ok(format!("{pref}{secs}-{hex}-{safe}")) -} - -/// Offline save: read local `path` bytes into storage under `key` (or auto key). -pub fn save( - storage_url: &str, - key: Option<&str>, - path: &str, - content_type: Option<&str>, - prefix: Option<&str>, -) -> Result { - let bytes = fs::read(path).map_err(|e| format!("read `{path}`: {e}"))?; - let filename = path - .rsplit(['/', '\\']) - .next() - .unwrap_or("upload.bin"); - let ct = content_type - .filter(|s| !s.is_empty()) - .unwrap_or("application/octet-stream"); - let object_key = match key.filter(|k| !k.is_empty()) { - Some(k) => k.to_string(), - None => make_key(prefix.unwrap_or("uploads/"), filename)?, - }; - crate::storage::put_bytes(storage_url, &object_key, &bytes, ct) -} diff --git a/plugins/web-rust-archive/src/ws.rs b/plugins/web-rust-archive/src/ws.rs deleted file mode 100644 index 630eedc..0000000 --- a/plugins/web-rust-archive/src/ws.rs +++ /dev/null @@ -1,132 +0,0 @@ -//! WebSocket client primitive (design ext-web-net §3.4). -//! -//! Single request–response style: connect, send one text `message`, collect all -//! server text replies until close, then return `{ok, messages}`. - -use futures_util::{SinkExt, StreamExt}; -use serde_json::{json, Value}; -use tokio_tungstenite::tungstenite::http::header::HeaderName; - -/// Convert `headers` (a JSON map) into tungstenite header pairs. -fn headers_from_value(headers: Option<&Value>) -> Vec<(HeaderName, String)> { - let Some(h) = headers else { - return Vec::new(); - }; - match h { - Value::Object(m) => m - .iter() - .filter_map(|(k, v)| { - HeaderName::from_bytes(k.as_bytes()) - .ok() - .map(|hn| (hn, v.as_str().unwrap_or("").to_string())) - }) - .collect(), - _ => Vec::new(), - } -} - -/// Connect to a WebSocket URL, send `message`, drain text replies until close. -pub fn connect( - url: &str, - message: &str, - headers: Option<&Value>, - timeout_sec: u64, -) -> Result { - if !(url.starts_with("ws://") || url.starts_with("wss://")) { - return Err("ws url must start with ws:// or wss://".into()); - } - - let hdrs = headers_from_value(headers); - let mut builder = tokio_tungstenite::tungstenite::client::IntoClientRequest::into_client_request( - url.to_string(), - ) - .map_err(|e| format!("bad ws url: {e}"))?; - for (hn, v) in &hdrs { - builder - .headers_mut() - .insert(hn.clone(), v.parse().map_err(|e| format!("bad header value: {e}"))?); - } - - let rt = tokio::runtime::Runtime::new().map_err(|e| e.to_string())?; - rt.block_on(async move { - let timeout = tokio::time::Duration::from_secs(timeout_sec.max(1)); - let fut = tokio_tungstenite::connect_async(builder); - let (mut socket, _resp) = tokio::time::timeout(timeout, fut) - .await - .map_err(|_| "ws connect timeout".to_string())? - .map_err(|e| format!("ws connect: {e}"))?; - - let send = tokio_tungstenite::tungstenite::Message::Text(message.to_string()); - socket - .send(send) - .await - .map_err(|e| format!("ws send: {e}"))?; - - let mut messages = Vec::new(); - loop { - match tokio::time::timeout(timeout, socket.next()).await { - Ok(Some(Ok(tokio_tungstenite::tungstenite::Message::Text(t)))) => { - messages.push(t.to_string()); - } - Ok(Some(Ok(tokio_tungstenite::tungstenite::Message::Close(_)))) - | Ok(Some(Err(_))) => break, - Ok(None) => break, - Ok(Some(Ok(_))) => {} - Err(_) => break, - } - } - Ok(json!({ "ok": true, "messages": messages })) - }) -} - -#[cfg(test)] -mod tests { - use super::*; - use tokio::net::TcpListener; - use tokio_tungstenite::tungstenite::Message; - - #[test] - fn echo_roundtrip() { - let rt = tokio::runtime::Runtime::new().expect("rt"); - let listener = rt.block_on(async { TcpListener::bind("127.0.0.1:0").await.expect("bind") }); - let addr = listener.local_addr().expect("addr"); - let server = std::thread::spawn(move || { - let rt = tokio::runtime::Runtime::new().expect("server rt"); - rt.block_on(async move { - let (stream, _) = listener.accept().await.expect("accept"); - let ws = tokio_tungstenite::accept_async(stream).await.expect("ws"); - let (mut sink, mut source) = ws.split(); - if let Some(Ok(Message::Text(t))) = source.next().await { - let _ = sink.send(Message::Text(t)).await; - } - }); - }); - - let url = format!("ws://{addr}/"); - let got = connect(&url, "ping", None, 5).expect("connect"); - assert_eq!(got["ok"], true); - assert_eq!(got["messages"], json!(["ping"])); - server.join().expect("server join"); - } - - #[test] - fn refuses_bad_url() { - let err = connect("http://127.0.0.1:1", "hi", None, 1).unwrap_err(); - assert!(err.contains("ws://") || err.contains("ws url")); - } - - #[test] - fn refused_connection() { - // Connect to a port that is closed; connect_async fails fast. - let rt = tokio::runtime::Runtime::new().expect("rt"); - let listener = rt.block_on(async { TcpListener::bind("127.0.0.1:0").await.expect("bind") }); - let addr = listener.local_addr().expect("addr"); - drop(listener); // port now closed - let url = format!("ws://{addr}/"); - let err = connect(&url, "hi", None, 2).unwrap_err(); - assert!( - err.starts_with("ws connect") || err.contains("timeout"), - "unexpected error: {err}" - ); - } -} diff --git a/plugins/web-rust-archive/src/ws_hub.rs b/plugins/web-rust-archive/src/ws_hub.rs deleted file mode 100644 index 00b6602..0000000 --- a/plugins/web-rust-archive/src/ws_hub.rs +++ /dev/null @@ -1,92 +0,0 @@ -//! Per-path WebSocket broadcast hubs (W6 remainder). - -use std::collections::HashMap; -use std::sync::Mutex; - -use tokio::sync::broadcast; - -const CAP: usize = 256; - -static HUBS: Mutex>>> = Mutex::new(None); - -fn with_hubs(f: impl FnOnce(&mut HashMap>) -> T) -> T { - let mut g = HUBS.lock().unwrap_or_else(|e| e.into_inner()); - let m = g.get_or_insert_with(HashMap::new); - f(m) -} - -/// Subscribe to (or create) the broadcast channel for `path`. -pub fn subscribe(path: &str) -> broadcast::Receiver { - with_hubs(|m| { - if let Some(tx) = m.get(path) { - return tx.subscribe(); - } - let (tx, rx) = broadcast::channel(CAP); - m.insert(path.to_string(), tx); - rx - }) -} - -/// Publish a text frame to all subscribers on `path`. -pub fn publish(path: &str, text: String) { - with_hubs(|m| { - let tx = m.entry(path.to_string()).or_insert_with(|| { - let (tx, _) = broadcast::channel(CAP); - tx - }); - let _ = tx.send(text); - }); -} - -#[derive(Clone, Copy, Debug, PartialEq, Eq)] -pub enum WsMode { - Echo, - Broadcast, - Drain, -} - -impl WsMode { - pub fn parse(v: &serde_json::Value) -> Self { - match v { - serde_json::Value::Bool(true) => WsMode::Echo, - serde_json::Value::Bool(false) => WsMode::Drain, - serde_json::Value::String(s) => match s.trim().to_ascii_lowercase().as_str() { - "broadcast" | "广播" => WsMode::Broadcast, - "drain" | "false" | "0" | "no" | "drain_only" => WsMode::Drain, - _ => WsMode::Echo, - }, - serde_json::Value::Object(m) => { - if let Some(mode) = m.get("mode").or_else(|| m.get("模式")) { - return Self::parse(mode); - } - if let Some(echo) = m.get("echo").or_else(|| m.get("回显")) { - return Self::parse(echo); - } - WsMode::Echo - } - _ => WsMode::Echo, - } - } - - pub fn as_str(self) -> &'static str { - match self { - WsMode::Echo => "echo", - WsMode::Broadcast => "broadcast", - WsMode::Drain => "drain", - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn broadcast_fanout() { - let mut a = subscribe("/t-fanout"); - let mut b = subscribe("/t-fanout"); - publish("/t-fanout", "hi".into()); - assert_eq!(a.try_recv().unwrap(), "hi"); - assert_eq!(b.try_recv().unwrap(), "hi"); - } -} diff --git a/plugins/web/README.md b/plugins/web/README.md index b2fb0bd..329c26a 100644 --- a/plugins/web/README.md +++ b/plugins/web/README.md @@ -24,4 +24,6 @@ Override path: `export MARQDO_WEB_PLUGIN=$PWD/plugins/web/build/libweb.so` | `abi/marqdo_abi_cgo.h` | C contract for cgo | | `internal/*` | page / db / http / ws / … | -Rust reference (not built by default): `plugins/web-rust-archive/`. +The legacy Rust implementation was archived during v1.6 and then removed from the +working tree (it remains in git history before commit ``); see +`CHANGELOG.md` “默认 libweb 为 Go”。