Compare commits
4 Commits
feature-v0
...
428da76a81
| Author | SHA1 | Date | |
|---|---|---|---|
| 428da76a81 | |||
| f59040c11e | |||
| e3cb065b35 | |||
| 5e69a6a980 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,4 +1,5 @@
|
|||||||
/target
|
/target
|
||||||
/.vscode
|
/.vscode
|
||||||
|
/.idea
|
||||||
*.exe
|
*.exe
|
||||||
./Cargo.lock
|
./Cargo.lock
|
||||||
|
|||||||
331
Cargo.lock
generated
331
Cargo.lock
generated
@@ -1,331 +0,0 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
|
||||||
# It is not intended for manual editing.
|
|
||||||
version = 4
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "autocfg"
|
|
||||||
version = "1.5.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bitflags"
|
|
||||||
version = "2.13.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bstr"
|
|
||||||
version = "1.13.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
"serde_core",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cc"
|
|
||||||
version = "1.4.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5d262e149917187838d5b42777c8253bcb64500067342904e7d429499a6f277e"
|
|
||||||
dependencies = [
|
|
||||||
"find-msvc-tools",
|
|
||||||
"shlex",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cfg-if"
|
|
||||||
version = "1.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "either"
|
|
||||||
version = "1.17.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "find-msvc-tools"
|
|
||||||
version = "0.1.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "26b73573e6edcd2af0cdf47bd6cb58f0b3839491263c314eaad1ccf24430e1de"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fs-err"
|
|
||||||
version = "3.3.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b91aa448ca50d7e79433bdf3ee8d99215430d2ec02ade5aefab2a073a1822e8a"
|
|
||||||
dependencies = [
|
|
||||||
"autocfg",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libc"
|
|
||||||
version = "0.2.189"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lock_api"
|
|
||||||
version = "0.4.14"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
|
|
||||||
dependencies = [
|
|
||||||
"scopeguard",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lua-src"
|
|
||||||
version = "550.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "75c110c2fa33f34e0de05448e1f3eb2e0631e7a69e2d8ae1586cffc9fc9f9949"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "luajit-src"
|
|
||||||
version = "210.7.2+b925b3e"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "920cf654b23d217c550ceea57c32cd2a413ea27b6d47ed77b5ee0cf655adefa6"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"which",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "memchr"
|
|
||||||
version = "2.8.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mlua"
|
|
||||||
version = "0.12.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ad72ffa037cf5970c9860674f32f703fda25d86cf217475fe7a79c5f9961bcaa"
|
|
||||||
dependencies = [
|
|
||||||
"bstr",
|
|
||||||
"either",
|
|
||||||
"libc",
|
|
||||||
"mlua-sys",
|
|
||||||
"num-traits",
|
|
||||||
"parking_lot",
|
|
||||||
"rustc-hash",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mlua-sys"
|
|
||||||
version = "0.11.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "92136787b906d4e55cfe96cd6c62e010bb1a56889d0d6cf83eb016dbad07576b"
|
|
||||||
dependencies = [
|
|
||||||
"cc",
|
|
||||||
"cfg-if",
|
|
||||||
"libc",
|
|
||||||
"lua-src",
|
|
||||||
"luajit-src",
|
|
||||||
"pkg-config",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num-traits"
|
|
||||||
version = "0.2.19"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
|
||||||
dependencies = [
|
|
||||||
"autocfg",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking_lot"
|
|
||||||
version = "0.12.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
|
|
||||||
dependencies = [
|
|
||||||
"lock_api",
|
|
||||||
"parking_lot_core",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking_lot_core"
|
|
||||||
version = "0.9.12"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"libc",
|
|
||||||
"redox_syscall",
|
|
||||||
"smallvec",
|
|
||||||
"windows-link",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pkg-config"
|
|
||||||
version = "0.3.33"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro2"
|
|
||||||
version = "1.0.107"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
|
|
||||||
dependencies = [
|
|
||||||
"unicode-ident",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "quote"
|
|
||||||
version = "1.0.47"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "redox_syscall"
|
|
||||||
version = "0.5.18"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rshim"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"fs-err",
|
|
||||||
"mlua",
|
|
||||||
"thiserror",
|
|
||||||
"unicode-bom",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rustc-hash"
|
|
||||||
version = "2.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "scopeguard"
|
|
||||||
version = "1.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_core"
|
|
||||||
version = "1.0.229"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
|
|
||||||
dependencies = [
|
|
||||||
"serde_derive",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_derive"
|
|
||||||
version = "1.0.229"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "shlex"
|
|
||||||
version = "2.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "smallvec"
|
|
||||||
version = "1.15.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "syn"
|
|
||||||
version = "3.0.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"unicode-ident",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "thiserror"
|
|
||||||
version = "2.0.20"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f"
|
|
||||||
dependencies = [
|
|
||||||
"thiserror-impl",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "thiserror-impl"
|
|
||||||
version = "2.0.20"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-bom"
|
|
||||||
version = "2.0.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-ident"
|
|
||||||
version = "1.0.24"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "which"
|
|
||||||
version = "8.0.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8f3ef584124b911bcc3875c2f1472e80f24361ceb789bd1c62b3e9a3df9ff43c"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi"
|
|
||||||
version = "0.3.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
|
||||||
dependencies = [
|
|
||||||
"winapi-i686-pc-windows-gnu",
|
|
||||||
"winapi-x86_64-pc-windows-gnu",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-i686-pc-windows-gnu"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-x86_64-pc-windows-gnu"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows-link"
|
|
||||||
version = "0.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
|
||||||
42
Cargo.toml
42
Cargo.toml
@@ -1,32 +1,32 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "rshim"
|
name = "rshim"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
authors = ["anonymous <anonymous@example.com>"]
|
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
rust-version = "1.94"
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
license = "MIT OR Unlicense"
|
||||||
|
description = "A fast, safe Rust shim launcher for Scoop"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
opt-level = "z"
|
opt-level = "z"
|
||||||
panic = "abort"
|
panic = "abort"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
fs-err = "3.3.1"
|
anyhow = "1.0.104"
|
||||||
unicode-bom = "2.0.3"
|
|
||||||
thiserror={version = "2.0.20"}
|
mlua = { version = "0.12.0", features = ["lua54", "vendored","send"] }
|
||||||
mlua = { version = "0.12.0", features = ["lua54", "vendored"] }
|
windows-sys = { version = "0.61.2", features = [
|
||||||
winapi = { version = "0.3", features = [
|
"Win32_Foundation",
|
||||||
"wincon",
|
"Win32_System_Com",
|
||||||
"consoleapi",
|
"Win32_System_Console",
|
||||||
"minwindef",
|
"Win32_System_Registry",
|
||||||
"shellapi",
|
"Win32_System_Threading",
|
||||||
"winuser",
|
"Win32_UI_Shell",
|
||||||
"synchapi",
|
"Win32_UI_WindowsAndMessaging",
|
||||||
"combaseapi",
|
|
||||||
"winbase",
|
|
||||||
"processthreadsapi",
|
|
||||||
"objbase",
|
|
||||||
"impl-default"
|
|
||||||
] }
|
] }
|
||||||
|
dunce = "1.0.5"
|
||||||
|
|
||||||
|
# 日志
|
||||||
|
tracing = "0.1.44"
|
||||||
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||||
|
tracing-appender = "0.2"
|
||||||
|
encoding_rs = "0.8.35"
|
||||||
|
|||||||
21
build.rs
21
build.rs
@@ -18,30 +18,29 @@ fn main() {
|
|||||||
// 在 target/debug/ 或 target/release/ 下创建 bin2 目录
|
// 在 target/debug/ 或 target/release/ 下创建 bin2 目录
|
||||||
let output_dir = target_dir.join(&profile).join("bin2");
|
let output_dir = target_dir.join(&profile).join("bin2");
|
||||||
|
|
||||||
|
|
||||||
// cargo:rerun-if-changed -> 当指定文件变化时，重新运行 xxx
|
// cargo:rerun-if-changed -> 当指定文件变化时，重新运行 xxx
|
||||||
println!("cargo:rerun-if-changed=build.rs");
|
println!("cargo:rerun-if-changed=build.rs");
|
||||||
println!("cargo:rerun-if-changed=shims.lua");
|
println!("cargo:rerun-if-changed=rshim.lua");
|
||||||
println!("cargo:rustc-env=OUTPUT_DIR={}", output_dir.display());
|
println!("cargo:rustc-env=OUTPUT_DIR={}", output_dir.display());
|
||||||
|
|
||||||
// 创建目录
|
// 创建目录
|
||||||
let dirs = ["bin", "tools"];
|
let subdirs = ["bin", "tools"];
|
||||||
for dir in &dirs {
|
for subdir in &subdirs {
|
||||||
let path = output_dir.join(dir);
|
let path = output_dir.join(subdir);
|
||||||
if !path.exists() {
|
if !path.exists() {
|
||||||
fs::create_dir_all(&path).expect(&format!("Failed to create {} directory", dir));
|
fs::create_dir_all(&path).expect(&format!("Failed to create {} directory", subdir));
|
||||||
println!("Created: {:?}", path);
|
println!("Created: {:?}", path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 复制文件
|
// 复制文件
|
||||||
let source = PathBuf::from(&manifest_dir).join("shims.lua");
|
let source = PathBuf::from(&manifest_dir).join("mimic.lua");
|
||||||
let destination = output_dir.join("shims.lua");
|
let destination = output_dir.join("rshim.lua");
|
||||||
|
|
||||||
if source.exists() {
|
if source.exists() {
|
||||||
fs::copy(&source, &destination).expect("Failed to copy shims.lua");
|
fs::copy(&source, &destination).expect("Failed to copy mimic.lua");
|
||||||
println!("Copied shims.lua to: {:?}", destination);
|
println!("Copied mimic.lua to: {:?}", destination);
|
||||||
} else {
|
} else {
|
||||||
panic!("shims.lua not found at: {:?}", source);
|
panic!("mimic.lua not found at: {:?}", source);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
-- shims.lua (总控制台)
|
-- mimic.lua (总控制台)
|
||||||
-- __SHIM_DIR__ 已经在 Rust 中注入完毕，并且是正斜杠格式 (例如 C:/Tools)
|
-- __SHIM_DIR__ 已经在 Rust 中注入完毕，并且是正斜杠格式 (例如 C:/Tools)
|
||||||
local base_dir = __SHIM_DIR__
|
local base_dir = __SHIM_DIR__
|
||||||
|
|
||||||
@@ -9,8 +9,18 @@ return {
|
|||||||
---------------------------------------------------
|
---------------------------------------------------
|
||||||
-- 1. 标准相对路径 + 正斜杠拼接 (最推荐，绿色便携)
|
-- 1. 标准相对路径 + 正斜杠拼接 (最推荐，绿色便携)
|
||||||
---------------------------------------------------
|
---------------------------------------------------
|
||||||
|
["numa"] = {
|
||||||
|
target = base_dir .. "/tools/numa/numa.exe",
|
||||||
|
-- 追加参数
|
||||||
|
args = { "--help" },
|
||||||
|
-- 注入环境变量，使用 get_env 获取宿主机当前值
|
||||||
|
env = {
|
||||||
|
PATH = { base_dir .. "/tools/numa", get_env("PATH") }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
["git"] = {
|
["git"] = {
|
||||||
path = base_dir .. "/git/bin/git.exe",
|
target = base_dir .. "/git/bin/git.exe",
|
||||||
-- 追加参数
|
-- 追加参数
|
||||||
args = { "--no-pager" },
|
args = { "--no-pager" },
|
||||||
-- 注入环境变量，使用 get_env 获取宿主机当前值
|
-- 注入环境变量，使用 get_env 获取宿主机当前值
|
||||||
@@ -24,7 +34,7 @@ return {
|
|||||||
---------------------------------------------------
|
---------------------------------------------------
|
||||||
["python"] = {
|
["python"] = {
|
||||||
-- 在 [[]] 内部，\ 不需要写成 \\，直接粘贴即可
|
-- 在 [[]] 内部，\ 不需要写成 \\，直接粘贴即可
|
||||||
path = [[C:\Python310\python.exe]],
|
target = [[C:\Python310\python.exe]],
|
||||||
args = { "-B" },
|
args = { "-B" },
|
||||||
-- 空字典也是合法的，等同于不设置
|
-- 空字典也是合法的，等同于不设置
|
||||||
env = {
|
env = {
|
||||||
@@ -46,14 +56,15 @@ return {
|
|||||||
-- 3. 极简参数覆盖 (没有 args 和 env)
|
-- 3. 极简参数覆盖 (没有 args 和 env)
|
||||||
---------------------------------------------------
|
---------------------------------------------------
|
||||||
["curl"] = {
|
["curl"] = {
|
||||||
path = base_dir .. "/curl/curl.exe"
|
target = base_dir .. "/curl/curl.exe"
|
||||||
},
|
},
|
||||||
|
|
||||||
---------------------------------------------------
|
---------------------------------------------------
|
||||||
-- 4. 模块化路由 (得益于 Rust 注入的 package.path)
|
-- 4. 模块化路由 (得益于 Rust 注入的 package.path)
|
||||||
-- require 能够直接在当前目录 或 conf.d/ 目录下寻找 node.lua
|
-- require 能够直接在当前目录 或 tools/ 目录下寻找 node.lua
|
||||||
|
-- 模块缺失时由 Rust 侧记录日志并跳过该条目（见 runtime.rs）
|
||||||
---------------------------------------------------
|
---------------------------------------------------
|
||||||
["node"] = require("node"),
|
["node"] = require("node"),
|
||||||
|
|
||||||
["npm"] = require("npm")
|
["npm"] = require("npm")
|
||||||
}
|
}
|
||||||
527
src/config.rs
527
src/config.rs
@@ -1,29 +1,221 @@
|
|||||||
|
use mlua::{FromLua, Lua, LuaString, ObjectLike, Table, Value};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
use std::ffi::OsString;
|
||||||
|
use std::fmt;
|
||||||
|
use std::fmt::Display;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use mlua::{FromLua, Lua, Table, Value};
|
/// 构造一个带上下文的 FromLua 转换错误，便于定位配置问题
|
||||||
|
fn conversion_error(message: impl Into<String>) -> mlua::Error {
|
||||||
|
mlua::Error::FromLuaConversionError {
|
||||||
|
from: "Lua value",
|
||||||
|
to: "ShimConfig".into(),
|
||||||
|
message: Some(message.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
/// 将 Lua 字符串转为 Rust 字符串；非 UTF-8 按系统默认的 ANSI/OEM (如 GBK) 进行安全解码
|
||||||
|
fn lua_string_2_os_string(s: LuaString) -> mlua::Result<OsString> {
|
||||||
|
let raw_bytes = &s.as_bytes().to_vec();
|
||||||
|
// 1. Unix 平台：直接零拷贝透传原始字节（无损支持任意编码）
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::ffi::OsStrExt;
|
||||||
|
Ok(OsStr::from_bytes(raw_bytes).to_os_string())
|
||||||
|
}
|
||||||
|
// 2. Windows 平台：优先按 UTF-8 解码，失败则按当前系统本地代码页 (ANSI/GBK) 转换
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
// 先尝试标准的 UTF-8
|
||||||
|
if let Ok(utf8_str) = std::str::from_utf8(raw_bytes) {
|
||||||
|
return Ok(OsString::from(utf8_str));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 非 UTF-8 时，按系统默认的 ANSI/OEM (如 GBK) 进行安全解码
|
||||||
|
let (cow, _, had_errors) = encoding_rs::GBK.decode(raw_bytes);
|
||||||
|
if had_errors {
|
||||||
|
return Err(mlua::Error::RuntimeError(
|
||||||
|
"路径包含无效/不支持的字节编码".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Ok(OsString::from(cow.as_ref()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按连续整数下标遍历表的序列部分；存在空洞或非序列键时返回错误，避免静默截断
|
||||||
|
|
||||||
|
/// 值分流与上下文分发枚举
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum ValueShunt<'a> {
|
||||||
|
/// 命令行参数元素：仅支持一维基础标量，禁止嵌套 Table
|
||||||
|
Args,
|
||||||
|
/// 环境变量值：支持基础标量及多维嵌套 Table（递归展平）
|
||||||
|
Env(&'a str),
|
||||||
|
}
|
||||||
|
impl<'a> Display for ValueShunt<'a> {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
Self::Args => write!(f, "命令行参数 (args)"),
|
||||||
|
Self::Env(name) => write!(f, "环境变量 ({name})"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> ValueShunt<'a> {
|
||||||
|
fn parse_sequence(&self, tbl: &Table, out: &mut Vec<OsString>) -> mlua::Result<()> {
|
||||||
|
self.validate_each_sequence_item(tbl, |item| self.collect_into(item, out))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validate_each_sequence_item(
|
||||||
|
&self,
|
||||||
|
tbl: &Table,
|
||||||
|
mut f: impl FnMut(Value) -> mlua::Result<()>,
|
||||||
|
) -> mlua::Result<()> {
|
||||||
|
let mut index = 1i64;
|
||||||
|
loop {
|
||||||
|
let item: Value = tbl.raw_get(index)?;
|
||||||
|
if matches!(item, Value::Nil) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
f(item)?;
|
||||||
|
index += 1;
|
||||||
|
}
|
||||||
|
// 校验剩余键：只允许已经被遍历的连续整数键
|
||||||
|
for pair in tbl.pairs::<Value, Value>() {
|
||||||
|
let (key, _) = pair?;
|
||||||
|
match key {
|
||||||
|
Value::Integer(i) if i >= 1 && i < index => {}
|
||||||
|
Value::Integer(_) => {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"{} 第 {} 个元素为 nil 或不存在（请检查是否漏写引号或变量未定义）",
|
||||||
|
self, index
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
// let label = match self {
|
||||||
|
// ValueShunt::Args => "命令行参数 (args)".to_string(),
|
||||||
|
// ValueShunt::Env(n) => format!("环境变量 [{n}]"),
|
||||||
|
// };
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"{} 必须是纯列表，不能包含键值对/字典结构",
|
||||||
|
self
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> ValueShunt<'a> {
|
||||||
|
/// 递归/标量收集实现
|
||||||
|
pub fn collect_into(&self, value: Value, out: &mut Vec<OsString>) -> mlua::Result<()> {
|
||||||
|
match value {
|
||||||
|
Value::Nil => {}
|
||||||
|
Value::String(s) => out.push(lua_string_2_os_string(s)?),
|
||||||
|
Value::Integer(i) => out.push(OsString::from(i.to_string())),
|
||||||
|
Value::Number(n) => {
|
||||||
|
tracing::warn!(context = %self, value = %n, "浮点数将按十进制格式转换为字符串");
|
||||||
|
out.push(OsString::from(n.to_string()));
|
||||||
|
}
|
||||||
|
Value::Boolean(b) => {
|
||||||
|
tracing::warn!(context = %self, value = %b, "布尔值将转换为字符串");
|
||||||
|
out.push(OsString::from(b.to_string()));
|
||||||
|
}
|
||||||
|
// 嵌套 Table 仅在 EnvValue 下允许递归展开（支持 get_env("PATH") 等返回的子表）
|
||||||
|
// Value::Table(tbl) if *self == Self::Env(_) => {
|
||||||
|
// self.validate_each_sequence_item(&tbl, |item| self.collect_into(item, out))?;
|
||||||
|
// }
|
||||||
|
Value::Table(tbl) => {
|
||||||
|
match self {
|
||||||
|
Self::Args => {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"{} 不支持 {} 类型, 仅支持 string/number/boolean",
|
||||||
|
self,
|
||||||
|
tbl.to_string()?
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
Self::Env(_) => {
|
||||||
|
self.validate_each_sequence_item(&tbl, |item| {
|
||||||
|
self.collect_into(item, out)
|
||||||
|
})?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// self.validate_each_sequence_item(&tbl, |item| self.collect_into(item, out))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
other => {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"{} 不支持 {} 类型, 仅支持 string/number/boolean 或包含这些类型的数组/嵌套数组",
|
||||||
|
self,
|
||||||
|
other.type_name(),
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 校验环境变量名的合法性（Windows 约束：非空、不含 '='、不含 NUL）
|
||||||
|
fn validate_env_var_name(key_val: &Value, val: &Value) -> mlua::Result<String> {
|
||||||
|
let key = match key_val {
|
||||||
|
Value::String(s) => s.to_str()?.to_string(),
|
||||||
|
|
||||||
|
_ => {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
r#"env 配置解析失败：值: {} (类型: {}) 无效的键值！
|
||||||
|
示例 HOME="/home" 或 PATH = {{ "C:/tools/", "D:/Windows"}}）"#,
|
||||||
|
val.to_string()?,
|
||||||
|
val.type_name()
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if key.is_empty() {
|
||||||
|
return Err(conversion_error("环境变量名不能为空"));
|
||||||
|
}
|
||||||
|
if key.contains('=') {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"环境变量名 [{}] 不能包含 '='",
|
||||||
|
key
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
if key.contains('\0') {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"环境变量名 [{}] 不能包含 NUL 字符",
|
||||||
|
key
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
Ok(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 递归将任意 Lua Value 展开为扁平的字符串片段列表
|
||||||
|
// fn collect_env_segments(value: Value, out: &mut Vec<OsString>) -> mlua::Result<()>{OK(())}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default)]
|
||||||
pub struct ShimConfig {
|
pub struct ShimConfig {
|
||||||
pub target_path: PathBuf,
|
pub target: PathBuf,
|
||||||
pub args: Option<Vec<String>>,
|
pub args: Vec<OsString>,
|
||||||
pub envs: Option<HashMap<String, String>>,
|
pub env: HashMap<String, OsString>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ShimConfig {
|
impl ShimConfig {
|
||||||
/// 根据配置快速构建准备执行的 Command 对象
|
/// 根据配置快速构建准备执行的 Command 对象
|
||||||
pub fn to_command(&self) -> Command {
|
pub fn to_command<I, S>(&self, runtime_args: I) -> Command
|
||||||
let mut cmd = Command::new(&self.target_path);
|
where
|
||||||
|
I: IntoIterator<Item = S>,
|
||||||
|
S: AsRef<std::ffi::OsStr>,
|
||||||
|
{
|
||||||
|
let mut cmd = Command::new(&self.target);
|
||||||
|
|
||||||
if let Some(args) = &self.args {
|
// 1. 先追加配置里固定的默认参数 (例如: node, --max-old-space-size=4096)
|
||||||
cmd.args(args);
|
cmd.args(&self.args);
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(envs) = &self.envs {
|
// 2. 透传外部动态运行时参数
|
||||||
for (key, val) in envs {
|
cmd.args(runtime_args);
|
||||||
// 直接应用环境变量（Lua 端已经处理好字符串拼接或列表合并）
|
|
||||||
cmd.env(key, val);
|
for (key, val) in &self.env {
|
||||||
}
|
// 直接应用环境变量（Lua 端已经处理好字符串拼接或列表合并）
|
||||||
|
cmd.env(key, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd
|
cmd
|
||||||
@@ -33,60 +225,267 @@ impl ShimConfig {
|
|||||||
/// 实现 FromLua Trait，由 mlua 自动处理 Table 转换
|
/// 实现 FromLua Trait，由 mlua 自动处理 Table 转换
|
||||||
impl FromLua for ShimConfig {
|
impl FromLua for ShimConfig {
|
||||||
fn from_lua(value: Value, _lua: &Lua) -> mlua::Result<Self> {
|
fn from_lua(value: Value, _lua: &Lua) -> mlua::Result<Self> {
|
||||||
match value {
|
// 脚本返回必须是一个 Table 变体
|
||||||
Value::Table(table) => {
|
let table = match value {
|
||||||
let path_str: String = table.get("path")?;
|
Value::Table(t) => t,
|
||||||
let args: Option<Vec<String>> = table.get("args")?;
|
_ => {
|
||||||
// 解析 env Table
|
return Err(conversion_error(format!(
|
||||||
let mut envs_map = HashMap::new();
|
"期望得到一个 Lua Table 配置对象，实际是 {}",
|
||||||
if let Ok(env_table) = table.get::<Table>("env") {
|
value.type_name()
|
||||||
// 获取当前系统的路径分隔符（Windows 为 ";"，Unix 为 ":"）
|
)));
|
||||||
#[cfg(windows)]
|
}
|
||||||
let sep = ";";
|
};
|
||||||
#[cfg(not(windows))]
|
|
||||||
let sep = ":";
|
|
||||||
|
|
||||||
for pair in env_table.pairs::<String, Value>() {
|
// 必填字段: target（严格限定为字符串，避免数字被 mlua 宽松转为字符串后掩盖错误）
|
||||||
let (k, v) = pair?;
|
let target = match table.get::<Value>("target")? {
|
||||||
match v {
|
Value::String(s) => lua_string_2_os_string(s)?,
|
||||||
// 情况 1: 普通字符串，如 HOME = "C:/path" -> 直接覆盖
|
Value::Nil => {
|
||||||
Value::String(s) => {
|
return Err(conversion_error("缺少必填字段 target（应为字符串路径）"));
|
||||||
envs_map.insert(k, s.to_str()?.to_string());
|
}
|
||||||
}
|
other => {
|
||||||
// 情况 2: 数组 Table，如 PATH = { bin_dir, get_env("PATH") }
|
return Err(conversion_error(format!(
|
||||||
Value::Table(arr) => {
|
"target 需为有效的路径且类型必须是字符串，实际类型是 {}",
|
||||||
let paths: Vec<String> = arr
|
other.type_name()
|
||||||
// 将 arr 作为序列（数组）处理，每个元素转为 String
|
)));
|
||||||
.sequence_values::<String>()
|
}
|
||||||
.filter_map(|r| r.ok())
|
};
|
||||||
.filter(|s| !s.is_empty()) // 过滤空串，防止生成不必要的连续 ;;
|
let mut args = Vec::new();
|
||||||
.collect();
|
|
||||||
|
|
||||||
let combined = paths.join(sep);
|
// 可选字段: args（缺失或 nil 时默认空列表；保留空字符串参数，与提权路径的 "" 语义一致）
|
||||||
envs_map.insert(k, combined);
|
match table.get::<Option<Value>>("args")? {
|
||||||
}
|
None | Some(Value::Nil) => {}
|
||||||
_ => {}
|
Some(Value::Table(tbl)) => ValueShunt::Args.parse_sequence(&tbl, &mut args)?,
|
||||||
|
Some(other) => {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"args 必须是数组列表，实际类型是 {}",
|
||||||
|
other.type_name()
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
// 可选字段: env（只允许缺失/nil，其他类型由 Option<Table> 转换报错，不再静默忽略）
|
||||||
|
let env_table = table.get::<Option<Value>>("env")?;
|
||||||
|
println!("env_table:{:?}", env_table);
|
||||||
|
let mut env = HashMap::new();
|
||||||
|
match env_table {
|
||||||
|
None | Some(Value::Nil) => {}
|
||||||
|
Some(Value::Table(tbl)) => {
|
||||||
|
for pair in tbl.pairs::<Value, Value>() {
|
||||||
|
let (name, value) = pair?;
|
||||||
|
|
||||||
|
let name = validate_env_var_name(&name, &value)?;
|
||||||
|
println!("==========={name}:{:?}", value);
|
||||||
|
let mut parts = Vec::new();
|
||||||
|
ValueShunt::Env(&name).collect_into(value, &mut parts)?;
|
||||||
|
|
||||||
|
// 空数组/空串也显式设置（空值表示清空该变量），
|
||||||
|
// 与“未配置该变量（继承宿主环境）”相区分
|
||||||
|
let joined_os_str = std::env::join_paths(parts).map_err(|e| {
|
||||||
|
conversion_error(format!(
|
||||||
|
"环境变量 [{}] 的值无法用系统路径分隔符拼接: {}",
|
||||||
|
name, e
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
// println!("环境变量拼接结果：{:?}", joined_os_str);
|
||||||
|
// 检查是否包含非法 NUL 字符
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::ffi::OsStrExt;
|
||||||
|
if joined_os_str.as_bytes().contains(&0) {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"环境变量 [{}] 的值不能包含 NUL 字符",
|
||||||
|
key
|
||||||
|
)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use std::os::windows::ffi::OsStrExt;
|
||||||
|
if joined_os_str.encode_wide().any(|c| c == 0) {
|
||||||
|
return Err(conversion_error(format!(
|
||||||
|
"环境变量 [{}] 的值不能包含 NUL 字符",
|
||||||
|
name
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
env.insert(name, joined_os_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
let envs = if envs_map.is_empty() {
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
Some(envs_map)
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(ShimConfig {
|
|
||||||
target_path: PathBuf::from(path_str),
|
|
||||||
args,
|
|
||||||
envs,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
_ => Err(mlua::Error::FromLuaConversionError {
|
Some(other) => {
|
||||||
from: value.type_name(),
|
return Err(conversion_error(format!(
|
||||||
to: "ShimConfig".into(),
|
"env 必须是键值表 (table)，实际类型是 {}",
|
||||||
message: Some("Expected a Lua table".to_string()),
|
other.type_name()
|
||||||
}),
|
)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
println!("环境变量结果：{:?}", env);
|
||||||
|
Ok(ShimConfig {
|
||||||
|
target: PathBuf::from(target),
|
||||||
|
args,
|
||||||
|
env,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn parse(src: &str) -> mlua::Result<ShimConfig> {
|
||||||
|
let lua = Lua::new();
|
||||||
|
// 模拟 runtime 注入的 get_env：返回按平台分隔符拆分的段数组（空变量返回空表）
|
||||||
|
let get_env = lua
|
||||||
|
.create_function(|lua, key: String| -> mlua::Result<Table> {
|
||||||
|
let value = std::env::var(key).unwrap_or_default();
|
||||||
|
let segments: Vec<String> = if value.is_empty() {
|
||||||
|
Vec::new()
|
||||||
|
} else {
|
||||||
|
std::env::split_paths(std::ffi::OsStr::new(&value))
|
||||||
|
.map(|p| p.to_string_lossy().into_owned())
|
||||||
|
.collect()
|
||||||
|
};
|
||||||
|
lua.create_sequence_from(segments)
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
lua.globals().set("get_env", get_env).unwrap();
|
||||||
|
|
||||||
|
let value = lua.load(src).eval::<Value>()?;
|
||||||
|
let t = ShimConfig::from_lua(value, &lua);
|
||||||
|
println!("读取出的数据：{:?}", t.clone()?);
|
||||||
|
t
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_basic_config() {
|
||||||
|
let cfg = parse(
|
||||||
|
r#"
|
||||||
|
return {
|
||||||
|
target = "C:/tools/git.exe",
|
||||||
|
args = { "--no-pager" },
|
||||||
|
env = {
|
||||||
|
PATH = { "C:/tools/git/bin", "C:/Windows", get_env("PATH") },
|
||||||
|
HOME = "C:/tools/home",
|
||||||
|
CONST = 3,
|
||||||
|
BOOL = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(cfg.target, PathBuf::from("C:/tools/git.exe"));
|
||||||
|
assert_eq!(cfg.args, vec!["--no-pager"]);
|
||||||
|
assert_eq!(cfg.env.get("HOME").unwrap().to_str(), Some("C:/tools/home"));
|
||||||
|
// PATH 前缀来自配置，随后附加 get_env("PATH") 拆出的宿主 PATH 段
|
||||||
|
let path = cfg.env.get("PATH").unwrap().to_str().unwrap();
|
||||||
|
assert!(
|
||||||
|
path == "C:/tools/git/bin;C:/Windows"
|
||||||
|
|| path.starts_with("C:/tools/git/bin;C:/Windows;"),
|
||||||
|
"unexpected PATH: {path}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn missing_args_and_env_are_empty() {
|
||||||
|
let cfg = parse(r#"return { target = "t.exe" }"#).unwrap();
|
||||||
|
assert!(cfg.args.is_empty());
|
||||||
|
assert!(cfg.env.is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn keeps_empty_args() {
|
||||||
|
let cfg = parse(r#"return { target = "t.exe", args = { "" } }"#).unwrap();
|
||||||
|
assert_eq!(cfg.args, vec![""]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn keeps_empty_env_value() {
|
||||||
|
let cfg = parse(r#"return { target = "t.exe", env = { FOO = "" } }"#).unwrap();
|
||||||
|
assert_eq!(cfg.env.get("FOO").unwrap().to_str(), Some(""));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn empty_array_clears_env_var() {
|
||||||
|
let cfg = parse(r#"return { target = "t.exe", env = { PATH = {} } }"#).unwrap();
|
||||||
|
assert_eq!(cfg.env.get("PATH").unwrap().to_str(), Some(""));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn expands_nested_env_array() {
|
||||||
|
// get_env("PATH") 现在返回拆分后的段数组，嵌套表应被递归展开
|
||||||
|
let cfg = parse(
|
||||||
|
r#"return { target = "t.exe", env = { PATH = { "C:/a", { "C:/b", "C:/c" } } } }"#,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
cfg.env.get("PATH").unwrap().to_str(),
|
||||||
|
Some("C:/a;C:/b;C:/c")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_wrong_env_type() {
|
||||||
|
assert!(parse(r#"return { target = "t.exe", env = "PATH=C:/x" }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_sparse_env_array() {
|
||||||
|
assert!(parse(r#"return { target = "t.exe", env = { P = { "a", nil, "b" } } }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_mixed_key_env_array() {
|
||||||
|
assert!(parse(r#"return { target = "t.exe", env = { P = { a = "b" } } }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_invalid_env_key() {
|
||||||
|
assert!(parse(r#"return { target = "t.exe", env = { ["FOO=1"] = "x" } }"#).is_err());
|
||||||
|
assert!(parse(r#"return { target = "t.exe", env = { [""] = "x" } }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_nul_in_env_value() {
|
||||||
|
assert!(parse(r#"return { target = "t.exe", env = { P = { string.char(0) } } }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_quote_in_env_value() {
|
||||||
|
// Windows 的 join_paths 对含双引号的路径元素返回错误
|
||||||
|
assert!(
|
||||||
|
parse(r#"return { target = "t.exe", env = { P = { string.char(34) } } }"#).is_err()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_unsupported_env_value_type() {
|
||||||
|
assert!(parse(r#"return { target = "t.exe", env = { F = function() end } }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn missing_target_is_error() {
|
||||||
|
assert!(parse(r#"return { args = { "x" } }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_non_string_target() {
|
||||||
|
assert!(parse(r#"return { target = 123 }"#).is_err());
|
||||||
|
assert!(parse(r#"return { target = false }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_non_string_args_element() {
|
||||||
|
// ValueShunt::Args 允许基础标量（数字/布尔）转字符串，仅禁止嵌套表
|
||||||
|
let cfg = parse(r#"return { target = "t.exe", args = { 1, true } }"#).unwrap();
|
||||||
|
assert_eq!(cfg.args, vec!["1", "true"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_sparse_args() {
|
||||||
|
assert!(parse(r#"return { target = "t.exe", args = { "a", nil, "b" } }"#).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_non_table_args() {
|
||||||
|
assert!(parse(r#"return { target = "t.exe", args = "-B" }"#).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
57
src/env.rs
57
src/env.rs
@@ -1,57 +0,0 @@
|
|||||||
use crate::error::ShimError;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
pub struct ShimEnv {
|
|
||||||
pub bin_dir: PathBuf,
|
|
||||||
pub root_dir: PathBuf,
|
|
||||||
pub tools_dir: PathBuf,
|
|
||||||
pub target_name: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ShimEnv {
|
|
||||||
/// 提取当前代理程序的运行环境信息
|
|
||||||
pub fn new(current_exe: PathBuf) -> Result<Self, ShimError> {
|
|
||||||
let bin_dir = current_exe
|
|
||||||
.parent()
|
|
||||||
.ok_or_else(|| {
|
|
||||||
ShimError::PathResolutionError(format!(
|
|
||||||
"无法获取程序 [{}] 的父级 bin 目录",
|
|
||||||
current_exe.display()
|
|
||||||
))
|
|
||||||
})?
|
|
||||||
.to_path_buf();
|
|
||||||
println!("bin_dir目录 {}", bin_dir.display());
|
|
||||||
|
|
||||||
let root_dir = bin_dir
|
|
||||||
.parent()
|
|
||||||
.ok_or_else(|| {
|
|
||||||
ShimError::PathResolutionError(format!(
|
|
||||||
"无法获取 bin 目录 [{}] 的父级 root 目录",
|
|
||||||
bin_dir.display()
|
|
||||||
))
|
|
||||||
})?
|
|
||||||
.to_path_buf();
|
|
||||||
println!("root_dir 目录 {}", root_dir.display());
|
|
||||||
|
|
||||||
let tools_dir = root_dir.join("tools");
|
|
||||||
println!("tools_dir 目录 {}", tools_dir.display());
|
|
||||||
|
|
||||||
let target_name = current_exe
|
|
||||||
.file_stem()
|
|
||||||
.and_then(|s| s.to_str())
|
|
||||||
.ok_or_else(|| {
|
|
||||||
ShimError::PathResolutionError(format!(
|
|
||||||
"无法从路径 [{}] 提取有效的程序名称",
|
|
||||||
current_exe.display()
|
|
||||||
))
|
|
||||||
})?
|
|
||||||
.to_lowercase();
|
|
||||||
println!("程序名称 {}", target_name);
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
bin_dir,
|
|
||||||
root_dir,
|
|
||||||
tools_dir,
|
|
||||||
target_name,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
26
src/error.rs
26
src/error.rs
@@ -1,26 +0,0 @@
|
|||||||
use thiserror::Error; // 推荐引入 thiserror 库，若不使用可手动实现 std::fmt::Display
|
|
||||||
|
|
||||||
#[derive(Debug, Error)]
|
|
||||||
pub enum ShimError {
|
|
||||||
#[error("路径解析失败: {0}")]
|
|
||||||
PathResolutionError(String),
|
|
||||||
|
|
||||||
#[error("获取环境信息失败: {0}")]
|
|
||||||
EnvError(String),
|
|
||||||
|
|
||||||
#[error("配置文件未找到: {0}")]
|
|
||||||
ConfigNotFound(String),
|
|
||||||
|
|
||||||
#[error("Lua 运行时/语法错误 [{file}]: {source}")]
|
|
||||||
LuaExecutionError {
|
|
||||||
file: String,
|
|
||||||
#[source]
|
|
||||||
source: mlua::Error,
|
|
||||||
},
|
|
||||||
|
|
||||||
#[error("配置格式非法: {0}")]
|
|
||||||
InvalidConfig(String),
|
|
||||||
|
|
||||||
#[error("IO 错误: {0}")]
|
|
||||||
Io(#[from] std::io::Error),
|
|
||||||
}
|
|
||||||
67
src/layout.rs
Normal file
67
src/layout.rs
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
use anyhow::{Context, Result, bail};
|
||||||
|
use std::env;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use tracing::debug;
|
||||||
|
pub struct Layout {
|
||||||
|
pub base_dir: PathBuf,
|
||||||
|
pub bin_dir: PathBuf,
|
||||||
|
pub tools_dir: PathBuf,
|
||||||
|
pub lua_file: PathBuf,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Layout {
|
||||||
|
/// 自动解析目录布局：
|
||||||
|
/// 1. 优先使用环境变量 RSHIM_HOME
|
||||||
|
/// 2. 兜底回退到当前垫片可执行文件所在目录推断 (exe -> bin -> root)
|
||||||
|
pub fn discover(current_exe: &Path) -> Result<Self> {
|
||||||
|
// 策略 1: 环境变量优先
|
||||||
|
if let Ok(home_val) = env::var("MIMIC_HOME") {
|
||||||
|
let trimmed = home_val.trim();
|
||||||
|
if !trimmed.is_empty() {
|
||||||
|
debug!(home = %trimmed, "检测到 MIMIC_HOME，采用环境变量配置");
|
||||||
|
return Self::from_base_dir(PathBuf::from(trimmed));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 策略 2: 相对路径自动推断兜底
|
||||||
|
debug!("未配置 MIMIC_HOME，尝试从当前可执行文件路径推断根目录");
|
||||||
|
Self::from_executable(current_exe)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 基于确定的根目录构建完整布局
|
||||||
|
fn from_base_dir(base_dir: PathBuf) -> Result<Self> {
|
||||||
|
if !base_dir.is_dir() {
|
||||||
|
bail!("指定的根目录不存在或不是有效目录: [{}]", base_dir.display());
|
||||||
|
}
|
||||||
|
|
||||||
|
let bin_dir = base_dir.join("bin");
|
||||||
|
let tools_dir = base_dir.join("tools");
|
||||||
|
let lua_file = base_dir.join("mimic.lua");
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
base_dir,
|
||||||
|
bin_dir,
|
||||||
|
tools_dir,
|
||||||
|
lua_file,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从当前可执行文件解析 shim 安装目录布局
|
||||||
|
fn from_executable(exe_path: &Path) -> Result<Self> {
|
||||||
|
// let exe_path = exe_path.as_ref();
|
||||||
|
let bin_dir = exe_path
|
||||||
|
.parent()
|
||||||
|
.with_context(|| format!("无法获取程序 [{}] 的父级 bin 目录", exe_path.display()))?
|
||||||
|
.to_path_buf();
|
||||||
|
|
||||||
|
debug!("bin_dir目录 {}", bin_dir.display());
|
||||||
|
|
||||||
|
let base_dir = bin_dir
|
||||||
|
.parent()
|
||||||
|
.with_context(|| format!("无法获取 bin 目录 [{}] 的父级 root 目录", bin_dir.display()))?
|
||||||
|
.to_path_buf();
|
||||||
|
debug!("base_dir 目录 {}", base_dir.display());
|
||||||
|
|
||||||
|
Self::from_base_dir(base_dir)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
mod config;
|
mod config;
|
||||||
mod env;
|
mod layout;
|
||||||
mod error;
|
mod logger;
|
||||||
mod runtime;
|
mod runtime;
|
||||||
mod shim;
|
mod shim;
|
||||||
|
mod loader;
|
||||||
|
|
||||||
pub use config::ShimConfig;
|
pub use config::ShimConfig;
|
||||||
pub use env::ShimEnv;
|
pub use layout::Layout;
|
||||||
pub use error::ShimError;
|
|
||||||
pub use runtime::LuaRuntime;
|
pub use runtime::LuaRuntime;
|
||||||
pub use shim::Shim;
|
pub use shim::Shim;
|
||||||
|
|||||||
39
src/logger.rs
Normal file
39
src/logger.rs
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
use std::path::Path;
|
||||||
|
use tracing_appender::non_blocking::WorkerGuard;
|
||||||
|
use tracing_subscriber::{EnvFilter, fmt};
|
||||||
|
|
||||||
|
/// 初始化日志系统，返回的 `_guard` 必须在 main 作用域内保持存活直到程序退出
|
||||||
|
pub fn init_file_logger(log_dir: impl AsRef<Path>) -> Option<WorkerGuard> {
|
||||||
|
// 允许通过环境变量动态控制日志级别，如 SHIM_LOG=debug，默认 debug 或 info
|
||||||
|
let filter = EnvFilter::try_from_env("SHIM_LOG").unwrap_or_else(|_| EnvFilter::new("debug"));
|
||||||
|
|
||||||
|
// 1. 创建按天滚动的日志追加器 (每天生成类似 shim.2026-08-14.log)
|
||||||
|
let file_appender = tracing_appender::rolling::daily(log_dir, "shim.log");
|
||||||
|
|
||||||
|
// 2. 包装为非阻塞后台写入（不会拖慢主程序的启动与执行速度）
|
||||||
|
let (non_blocking, guard) = tracing_appender::non_blocking(file_appender);
|
||||||
|
|
||||||
|
// 3. 构建 Subscriber，只输出到文件，不输出到控制台
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_env_filter(filter)
|
||||||
|
.with_writer(non_blocking) // 写入文件
|
||||||
|
.with_ansi(false) // 关闭终端彩色转义字符
|
||||||
|
.with_target(false) // 隐藏模块前缀（可选）
|
||||||
|
.init();
|
||||||
|
|
||||||
|
Some(guard)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 调用
|
||||||
|
// fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
// // 假设日志存放在安装根目录下的 logs 文件夹
|
||||||
|
// // 也可以先快速推导 layout 拿到 log_dir
|
||||||
|
// let log_dir = "path/to/root_dir/logs";
|
||||||
|
// let _guard = init_file_logger(log_dir);
|
||||||
|
//
|
||||||
|
// // 此处写你的 Shim 业务逻辑
|
||||||
|
// // 业务代码中所有的 debug!/info!/warn! 都会静默写入文件，控制台干干净净
|
||||||
|
// let config = Shim::load()?;
|
||||||
|
//
|
||||||
|
// Ok(())
|
||||||
|
// }
|
||||||
235
src/main.rs
235
src/main.rs
@@ -1,36 +1,41 @@
|
|||||||
use std::{
|
|
||||||
env,
|
|
||||||
ffi::CString,
|
|
||||||
mem::size_of,
|
|
||||||
path::Path,
|
|
||||||
process::{Command, exit},
|
|
||||||
ptr::null_mut,
|
|
||||||
};
|
|
||||||
|
|
||||||
use rshim::Shim;
|
use rshim::Shim;
|
||||||
|
use std::os::windows::ffi::OsStrExt;
|
||||||
|
use std::{env, ffi::CString, mem::size_of, path::Path, process::exit, ptr::null_mut};
|
||||||
|
use tracing_subscriber::{EnvFilter, fmt};
|
||||||
|
|
||||||
use winapi::{
|
use std::ffi::{OsStr, OsString};
|
||||||
shared::minwindef::{BOOL, DWORD, FALSE, TRUE},
|
|
||||||
um::{
|
use windows_sys::Win32::UI::Shell::{SHELLEXECUTEINFOW, ShellExecuteExW};
|
||||||
combaseapi::CoInitializeEx,
|
|
||||||
consoleapi,
|
use windows_sys::Win32::Foundation::CloseHandle;
|
||||||
objbase::{COINIT_APARTMENTTHREADED, COINIT_DISABLE_OLE1DDE},
|
use windows_sys::{
|
||||||
processthreadsapi::GetExitCodeProcess,
|
Win32::{
|
||||||
shellapi::{SEE_MASK_NOASYNC, SEE_MASK_NOCLOSEPROCESS, SHELLEXECUTEINFOA, ShellExecuteExA},
|
Foundation::{FALSE, TRUE},
|
||||||
synchapi::WaitForSingleObject,
|
System::{
|
||||||
winbase::INFINITE,
|
Com::{COINIT_APARTMENTTHREADED, COINIT_DISABLE_OLE1DDE, CoInitializeEx},
|
||||||
wincon,
|
Console::{
|
||||||
winuser::SW_NORMAL,
|
CTRL_BREAK_EVENT, CTRL_C_EVENT, CTRL_CLOSE_EVENT, CTRL_LOGOFF_EVENT,
|
||||||
|
CTRL_SHUTDOWN_EVENT, SetConsoleCtrlHandler,
|
||||||
|
},
|
||||||
|
Threading::{GetExitCodeProcess, INFINITE, WaitForSingleObject},
|
||||||
|
},
|
||||||
|
UI::{
|
||||||
|
Shell::{
|
||||||
|
SEE_MASK_NOASYNC, SEE_MASK_NOCLOSEPROCESS, SHELLEXECUTEINFOA, ShellExecuteExA,
|
||||||
|
},
|
||||||
|
WindowsAndMessaging::SW_NORMAL,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
core::BOOL,
|
||||||
};
|
};
|
||||||
|
|
||||||
unsafe extern "system" fn routine_handler(evt: DWORD) -> BOOL {
|
unsafe extern "system" fn console_ctrl_handler(evt: u32) -> BOOL {
|
||||||
match evt {
|
match evt {
|
||||||
wincon::CTRL_C_EVENT => TRUE, //eprintln!("ctrl_c handled!"),
|
CTRL_C_EVENT => TRUE, //eprintln!("ctrl_c handled!"),
|
||||||
wincon::CTRL_BREAK_EVENT => TRUE, //eprintln!("ctrl_break handled!"),
|
CTRL_BREAK_EVENT => TRUE, //eprintln!("ctrl_break handled!"),
|
||||||
wincon::CTRL_CLOSE_EVENT => TRUE, //eprintln!("ctrl_close handled!"),
|
CTRL_CLOSE_EVENT => TRUE, //eprintln!("ctrl_close handled!"),
|
||||||
wincon::CTRL_LOGOFF_EVENT => TRUE, //eprintln!("ctrl_logoff handled!"),
|
CTRL_LOGOFF_EVENT => TRUE, //eprintln!("ctrl_logoff handled!"),
|
||||||
wincon::CTRL_SHUTDOWN_EVENT => TRUE, //eprintln!("ctrl_shutdown handled!"),
|
CTRL_SHUTDOWN_EVENT => TRUE, //eprintln!("ctrl_shutdown handled!"),
|
||||||
other => {
|
other => {
|
||||||
eprintln!("未知的系统事件编号: {}，未处理！", other);
|
eprintln!("未知的系统事件编号: {}，未处理！", other);
|
||||||
FALSE
|
FALSE
|
||||||
@@ -45,13 +50,21 @@ const EXIT_PROG_TERMINATED: i32 = 4;
|
|||||||
|
|
||||||
const ERROR_ELEVATION_REQUIRED: i32 = 740;
|
const ERROR_ELEVATION_REQUIRED: i32 = 740;
|
||||||
fn main() {
|
fn main() {
|
||||||
let res: BOOL = unsafe { consoleapi::SetConsoleCtrlHandler(Some(routine_handler), TRUE) };
|
// 初始化日志：输出到 stderr，避免污染 shim 子进程的 stdout
|
||||||
|
fmt()
|
||||||
|
.with_writer(std::io::stderr)
|
||||||
|
.with_env_filter(
|
||||||
|
EnvFilter::try_from_env("SHIM_LOG").unwrap_or_else(|_| EnvFilter::new("warn")),
|
||||||
|
)
|
||||||
|
.init();
|
||||||
|
|
||||||
|
let res: BOOL = unsafe { SetConsoleCtrlHandler(Some(console_ctrl_handler), TRUE) };
|
||||||
if res == FALSE {
|
if res == FALSE {
|
||||||
eprintln!("警告: 注册控制台中断事件处理器失败。");
|
eprintln!("警告: 注册控制台中断事件处理器失败。");
|
||||||
}
|
}
|
||||||
|
|
||||||
let calling_args: Vec<_> = env::args().skip(1).collect();
|
let calling_args: Vec<_> = env::args_os().skip(1).collect();
|
||||||
let shim = match Shim::init() {
|
let shim = match Shim::load() {
|
||||||
Ok(v) => v,
|
Ok(v) => v,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("加载代理(shim)配置时发生错误: {}", e);
|
eprintln!("加载代理(shim)配置时发生错误: {}", e);
|
||||||
@@ -59,42 +72,33 @@ fn main() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let args = if let Some(mut shim_args) = shim.args {
|
// 构建 Command：复用 ShimConfig::to_command（含 args/env 注入），避免重复逻辑
|
||||||
shim_args.extend_from_slice(calling_args.as_slice());
|
let mut cmd = shim.to_command(&calling_args);
|
||||||
shim_args
|
|
||||||
} else {
|
|
||||||
calling_args
|
|
||||||
};
|
|
||||||
// ======= 【修改位置 1：构建 Command 并注入环境变量】 =======
|
|
||||||
let mut cmd_builder = Command::new(&shim.target_path);
|
|
||||||
cmd_builder.args(&args);
|
|
||||||
|
|
||||||
// 仅作用于目标子进程，完全 Safe 且隔离
|
// 提权回退时需要完整参数：配置默认参数 + 调用方透传参数
|
||||||
if let Some(ref envs) = shim.envs {
|
let mut args = shim.args.clone();
|
||||||
cmd_builder.envs(envs);
|
args.extend_from_slice(&calling_args);
|
||||||
}
|
|
||||||
let mut cmd = match cmd_builder.spawn() {
|
let mut child = match cmd.spawn() {
|
||||||
Ok(v) => v,
|
Ok(v) => v,
|
||||||
Err(e) if e.raw_os_error() == Some(ERROR_ELEVATION_REQUIRED) => exit(execute_elevated(
|
Err(e) if e.raw_os_error() == Some(ERROR_ELEVATION_REQUIRED) => {
|
||||||
&shim.target_path,
|
exit(execute_elevated(&shim.target, &args, Some(&shim.env)))
|
||||||
&args,
|
}
|
||||||
shim.envs.as_ref(),
|
|
||||||
)),
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"启动目标程序 [{}] 时发生错误: {}",
|
"启动目标程序 [{}] 时发生错误: {}",
|
||||||
shim.target_path.to_string_lossy(),
|
shim.target.to_string_lossy(),
|
||||||
e
|
e
|
||||||
);
|
);
|
||||||
exit(EXIT_FAILED_SPAWN_PROG);
|
exit(EXIT_FAILED_SPAWN_PROG);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let status = match cmd.wait() {
|
let status = match child.wait() {
|
||||||
Ok(v) => v,
|
Ok(v) => v,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"等待目标程序 [{}] 执行完毕时发生错误: {}",
|
"等待目标程序 [{}] 执行完毕时发生错误: {}",
|
||||||
shim.target_path.to_string_lossy(),
|
shim.target.to_string_lossy(),
|
||||||
e
|
e
|
||||||
);
|
);
|
||||||
exit(EXIT_FAILED_WAIT_PROG);
|
exit(EXIT_FAILED_WAIT_PROG);
|
||||||
@@ -102,67 +106,130 @@ fn main() {
|
|||||||
};
|
};
|
||||||
exit(status.code().unwrap_or(EXIT_PROG_TERMINATED))
|
exit(status.code().unwrap_or(EXIT_PROG_TERMINATED))
|
||||||
}
|
}
|
||||||
|
// 辅助函数：将任意 OsStr 转换为以 \0 结尾的 UTF-16 宽字符向量 (Vec<u16>)
|
||||||
|
fn to_wide_null(s: impl AsRef<OsStr>) -> Vec<u16> {
|
||||||
|
s.as_ref().encode_wide().chain(std::iter::once(0)).collect()
|
||||||
|
}
|
||||||
|
|
||||||
fn execute_elevated(
|
fn execute_elevated(
|
||||||
program: &Path,
|
program: &Path,
|
||||||
args: &[String],
|
args: &[OsString],
|
||||||
envs: Option<&std::collections::HashMap<String, String>>,
|
env_vars: Option<&std::collections::HashMap<String, OsString>>,
|
||||||
) -> i32 {
|
) -> i32 {
|
||||||
// 若提权启动，在此处将环境变量设置给当前进程（即将弹窗 UAC 的进程，随后会被子进程继承）
|
// 若提权启动，在此处将环境变量设置给当前进程（即将弹窗 UAC 的进程，随后会被子进程继承）
|
||||||
if let Some(env_map) = envs {
|
if let Some(env_map) = env_vars {
|
||||||
for (k, v) in env_map {
|
for (k, v) in env_map {
|
||||||
unsafe {
|
unsafe {
|
||||||
env::set_var(k, v);
|
env::set_var(k, v);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 2. 将参数列表按 Windows 命令行规则拼装为单个命令行字符串
|
||||||
let runas = CString::new("runas").unwrap();
|
let mut arguments_os = OsString::new();
|
||||||
let program = CString::new(program.to_str().unwrap()).unwrap();
|
for (i, arg) in args.iter().enumerate() {
|
||||||
let mut params = String::new();
|
if i > 0 {
|
||||||
for arg in args.iter() {
|
arguments_os.push(" ");
|
||||||
params.push(' ');
|
}
|
||||||
if arg.len() == 0 {
|
let arg_str = arg.to_string_lossy();
|
||||||
params.push_str("\"\"");
|
if arg_str.is_empty() {
|
||||||
} else if arg.find(&[' ', '\t', '"'][..]).is_none() {
|
arguments_os.push("\"\"");
|
||||||
params.push_str(&arg);
|
} else if !arg_str.contains([' ', '\t', '"']) {
|
||||||
|
arguments_os.push(arg);
|
||||||
} else {
|
} else {
|
||||||
params.push('"');
|
// 包含空格或引号时进行标准转义包裹
|
||||||
for c in arg.chars() {
|
arguments_os.push("\"");
|
||||||
|
for c in arg_str.chars() {
|
||||||
match c {
|
match c {
|
||||||
'\\' => params.push_str("\\\\"),
|
'\\' => arguments_os.push("\\\\"),
|
||||||
'"' => params.push_str("\\\""),
|
'"' => arguments_os.push("\\\""),
|
||||||
c => params.push(c),
|
_ => arguments_os.push(c.to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
params.push('"');
|
arguments_os.push("\"");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// let runas = CString::new("runas").unwrap();
|
||||||
|
// let program = CString::new(program.to_str().unwrap()).unwrap();
|
||||||
|
// let mut arguments = String::new();
|
||||||
|
// for arg in args.iter() {
|
||||||
|
// arguments.push(' ');
|
||||||
|
// if arg.len() == 0 {
|
||||||
|
// arguments.push_str("\"\"");
|
||||||
|
// } else if arg.find(&[' ', '\t', '"'][..]).is_none() {
|
||||||
|
// arguments.push_str(&arg);
|
||||||
|
// } else {
|
||||||
|
// arguments.push('"');
|
||||||
|
// for c in arg.chars() {
|
||||||
|
// match c {
|
||||||
|
// '\\' => arguments.push_str("\\\\"),
|
||||||
|
// '"' => arguments.push_str("\\\""),
|
||||||
|
// c => arguments.push(c),
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// arguments.push('"');
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// 3. 准备 Windows 宽字符参数
|
||||||
|
let runas = to_wide_null("runas");
|
||||||
|
let program_wide = to_wide_null(program.as_os_str());
|
||||||
|
let arguments_wide = to_wide_null(&arguments_os);
|
||||||
|
|
||||||
let params = CString::new(¶ms[..]).unwrap();
|
let mut info = SHELLEXECUTEINFOW {
|
||||||
let mut info = SHELLEXECUTEINFOA::default();
|
cbSize: size_of::<SHELLEXECUTEINFOW>() as u32,
|
||||||
info.cbSize = size_of::<SHELLEXECUTEINFOA>() as DWORD;
|
fMask: SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS,
|
||||||
info.fMask = SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS;
|
hwnd: null_mut(),
|
||||||
info.lpVerb = runas.as_ptr();
|
lpVerb: runas.as_ptr(),
|
||||||
info.lpFile = program.as_ptr();
|
lpFile: program_wide.as_ptr(),
|
||||||
info.lpParameters = params.as_ptr();
|
lpParameters: arguments_wide.as_ptr(),
|
||||||
info.nShow = SW_NORMAL;
|
lpDirectory: null_mut(),
|
||||||
|
nShow: SW_NORMAL as i32,
|
||||||
|
hInstApp: null_mut(),
|
||||||
|
lpIDList: null_mut(),
|
||||||
|
lpClass: null_mut(),
|
||||||
|
hkeyClass: null_mut(),
|
||||||
|
dwHotKey: 0,
|
||||||
|
Anonymous: unsafe { std::mem::zeroed() },
|
||||||
|
hProcess: null_mut(),
|
||||||
|
};
|
||||||
|
// let arguments = CString::new(&arguments[..]).unwrap();
|
||||||
|
// let mut info = SHELLEXECUTEINFOA::default();
|
||||||
|
// info.cbSize = size_of::<SHELLEXECUTEINFOA>() as u32;
|
||||||
|
// info.fMask = SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS;
|
||||||
|
// info.lpVerb = runas.as_ptr().cast::<u8>();
|
||||||
|
// info.lpFile = program.as_ptr().cast::<u8>();
|
||||||
|
// info.lpParameters = arguments.as_ptr().cast::<u8>();
|
||||||
|
// info.nShow = SW_NORMAL;
|
||||||
let res = unsafe {
|
let res = unsafe {
|
||||||
CoInitializeEx(
|
CoInitializeEx(
|
||||||
null_mut(),
|
null_mut(),
|
||||||
COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE,
|
(COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE) as u32,
|
||||||
);
|
);
|
||||||
ShellExecuteExA(&mut info as *mut _)
|
// ShellExecuteExA(&mut info as *mut _)
|
||||||
|
ShellExecuteExW(&mut info)
|
||||||
};
|
};
|
||||||
if res == FALSE || info.hProcess == null_mut() {
|
if res == FALSE || info.hProcess == null_mut() {
|
||||||
return EXIT_FAILED_SPAWN_PROG;
|
return EXIT_FAILED_SPAWN_PROG;
|
||||||
}
|
}
|
||||||
let mut code: DWORD = 0;
|
// 5. 等待提权子进程执行结束并获取退出状态码
|
||||||
|
let mut exit_code: u32 = 0;
|
||||||
unsafe {
|
unsafe {
|
||||||
WaitForSingleObject(info.hProcess, INFINITE);
|
WaitForSingleObject(info.hProcess, INFINITE);
|
||||||
if GetExitCodeProcess(info.hProcess, &mut code as *mut _) == FALSE {
|
let ok = GetExitCodeProcess(info.hProcess, &mut exit_code);
|
||||||
|
CloseHandle(info.hProcess); // 释放进程句柄，防止资源泄露
|
||||||
|
|
||||||
|
if ok == FALSE {
|
||||||
return EXIT_FAILED_WAIT_PROG;
|
return EXIT_FAILED_WAIT_PROG;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
code as i32
|
|
||||||
|
exit_code as i32
|
||||||
|
|
||||||
|
// let mut code: u32 = 0;
|
||||||
|
// unsafe {
|
||||||
|
// WaitForSingleObject(info.hProcess, INFINITE);
|
||||||
|
// if GetExitCodeProcess(info.hProcess, &mut code as *mut _) == FALSE {
|
||||||
|
// return EXIT_FAILED_WAIT_PROG;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// code as i32
|
||||||
}
|
}
|
||||||
|
|||||||
260
src/runtime.rs
260
src/runtime.rs
@@ -1,18 +1,14 @@
|
|||||||
use crate::error::ShimError;
|
use crate::{ShimConfig, Layout};
|
||||||
use crate::{ShimConfig, ShimEnv};
|
use anyhow::{Context, Result, anyhow, bail};
|
||||||
use mlua::{FromLua, Lua, StdLib, Table, Value};
|
use mlua::{FromLua, Lua, StdLib, Table, Value};
|
||||||
|
use std::ffi::OsStr;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::{env, fs};
|
use std::{env, fs};
|
||||||
/// 将 Path 转换为适合 Lua 使用的安全字符串路径
|
/// 将 Path 转换为适合 Lua 使用的安全字符串路径
|
||||||
fn normalize_path_for_lua(path: &Path) -> String {
|
fn normalize_path_for_lua(path: &Path) -> String {
|
||||||
let path_str = path.to_string_lossy();
|
// 自动将 Windows UNC 规范路径转回传统路径
|
||||||
|
let simplified = dunce::simplified(path);
|
||||||
// 1. 剥离 Windows UNC 规范路径前缀 (\\?\)
|
simplified.to_string_lossy().replace('\\', "/")
|
||||||
let clean_str = path_str.strip_prefix(r"\\?\").unwrap_or(&path_str);
|
|
||||||
|
|
||||||
// 2. 将反斜杠转换成正斜杠（在非 UNC 路径下，Windows 和 Lua 均完美支持 /）
|
|
||||||
// 这样既避免了 Lua 字符串转义隐患，又不会破坏 Windows 路径
|
|
||||||
clean_str.replace('\\', "/")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct LuaRuntime {
|
pub struct LuaRuntime {
|
||||||
@@ -21,66 +17,264 @@ pub struct LuaRuntime {
|
|||||||
|
|
||||||
impl LuaRuntime {
|
impl LuaRuntime {
|
||||||
/// 初始化限定权限的 Lua 沙箱环境
|
/// 初始化限定权限的 Lua 沙箱环境
|
||||||
pub fn new(shim_env: &ShimEnv) -> Result<Self, ShimError> {
|
pub fn new(layout: &Layout) -> Result<Self> {
|
||||||
// 只加载安全的标准库，剥离 os / io 等风险模块
|
// 只加载安全的标准库，剥离 os / io 等风险模块
|
||||||
let lua = Lua::new_with(
|
let lua = Lua::new_with(
|
||||||
StdLib::TABLE | StdLib::STRING | StdLib::MATH | StdLib::PACKAGE,
|
StdLib::TABLE | StdLib::STRING | StdLib::MATH | StdLib::PACKAGE,
|
||||||
mlua::LuaOptions::default(),
|
mlua::LuaOptions::default(),
|
||||||
)
|
)
|
||||||
.map_err(|e| ShimError::EnvError(format!("初始化 Lua 失败: {}", e)))?;
|
.context("初始化 Lua 失败")?;
|
||||||
|
|
||||||
let globals = lua.globals();
|
let globals = lua.globals();
|
||||||
|
|
||||||
// 统一使用 POSIX 风格路径规范化路径字符串
|
// 统一使用 POSIX 风格路径规范化路径字符串
|
||||||
let root_dir_str = normalize_path_for_lua(&shim_env.root_dir);
|
let base_dir = normalize_path_for_lua(&layout.base_dir);
|
||||||
let tools_dir_str = normalize_path_for_lua(&shim_env.tools_dir);
|
let tools_dir = normalize_path_for_lua(&layout.tools_dir);
|
||||||
|
|
||||||
// 1. 注入锚点变量
|
// 1. 注入锚点变量 __SHIM_DIR__（shim 安装根目录）
|
||||||
globals
|
globals
|
||||||
.set("__SHIM_DIR__", root_dir_str.clone())
|
.set("__SHIM_DIR__", base_dir.clone())
|
||||||
.map_err(|e| ShimError::EnvError(e.to_string()))?;
|
.context("设置 __SHIM_DIR__ 环境变量失败")?;
|
||||||
|
|
||||||
// 2. 安全暴露 get_env 供配置读取环境变量
|
// 2. 安全暴露 get_env 供配置读取环境变量
|
||||||
|
// 返回按平台路径分隔符拆分后的段数组（自动剥离引号包裹），
|
||||||
|
// 便于 PATH 等列表变量直接嵌入数组：PATH = { prefix, get_env("PATH") }
|
||||||
let get_env = lua
|
let get_env = lua
|
||||||
.create_function(|_, key: String| -> mlua::Result<String> {
|
.create_function(|lua, key: String| -> mlua::Result<Table> {
|
||||||
Ok(env::var(key).unwrap_or_default())
|
// 缺失变量视为空字符串，拆分后得到空表（不贡献任何路径段）
|
||||||
|
let value = env::var_os(key).unwrap_or_default();
|
||||||
|
// 空输入返回空表；否则按平台分隔符拆分（split_paths 会剥离引号包裹）
|
||||||
|
if value.is_empty() {
|
||||||
|
return lua.create_table();
|
||||||
|
}
|
||||||
|
let table = lua.create_table()?;
|
||||||
|
for (i, p) in env::split_paths(&value).enumerate() {
|
||||||
|
// 3. 跨平台提取原始字节并转为 LuaString，保证 100% 无损
|
||||||
|
#[cfg(unix)]
|
||||||
|
let lua_str = {
|
||||||
|
use std::os::unix::ffi::OsStrExt;
|
||||||
|
lua.create_string(p.as_os_str().as_bytes())?
|
||||||
|
};
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
let lua_str = {
|
||||||
|
// Windows 路径是 UTF-16，转成字符串或保持其字节表达
|
||||||
|
let s = p.to_string_lossy();
|
||||||
|
lua.create_string(s.as_bytes())?
|
||||||
|
};
|
||||||
|
|
||||||
|
table.set(i + 1, lua_str)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(table)
|
||||||
})
|
})
|
||||||
.map_err(|e| ShimError::EnvError(e.to_string()))?;
|
.context("注册 get_env 函数失败")?;
|
||||||
|
|
||||||
globals
|
globals
|
||||||
.set("get_env", get_env)
|
.set("get_env", get_env)
|
||||||
.map_err(|e| ShimError::EnvError(e.to_string()))?;
|
.context("挂载 get_env 全局函数失败")?;
|
||||||
|
|
||||||
// 3. 配置 package.path，确保 require 行为正常
|
// 3. 配置 package.path，确保 require 行为正常
|
||||||
if let Ok(package) = globals.get::<Table>("package") {
|
if let Ok(package) = globals.get::<Table>("package") {
|
||||||
|
let _ = package.set("cpath", "");
|
||||||
|
let _ = package.set("loadlib", Value::Nil);
|
||||||
|
|
||||||
if let Ok(path) = package.get::<String>("path") {
|
if let Ok(path) = package.get::<String>("path") {
|
||||||
let new_path = format!(
|
let new_path = format!(
|
||||||
"{};{}/?.lua;{}/?/init.lua;{}/?.lua;{}/?/init.lua",
|
"{};{}/?.lua;{}/?/init.lua;{}/?.lua;{}/?/init.lua",
|
||||||
path, root_dir_str, root_dir_str, tools_dir_str, tools_dir_str
|
path, base_dir, base_dir, tools_dir, tools_dir
|
||||||
);
|
);
|
||||||
let _ = package.set("path", new_path);
|
let _ = package.set("path", new_path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 4. 包装 require：配置模块缺失/加载失败时记录日志并跳过该条目，
|
||||||
|
// 而不是让整个 mimic.lua 解析失败（排查问题时日志可见）
|
||||||
|
let original_require: mlua::Function = globals
|
||||||
|
.get("require")
|
||||||
|
.context("获取内置 require 函数失败")?;
|
||||||
|
globals
|
||||||
|
.set("_rshim_original_require", &original_require)
|
||||||
|
.context("备份原始 require 函数失败")?;
|
||||||
|
|
||||||
|
let wrapped_require = lua
|
||||||
|
.create_function(|lua, module: String| -> mlua::Result<Value> {
|
||||||
|
let original: mlua::Function = lua.globals().get("_rshim_original_require")?;
|
||||||
|
match original.call::<Value>(module.clone()) {
|
||||||
|
Ok(value) => Ok(value),
|
||||||
|
Err(e) => {
|
||||||
|
tracing::warn!(
|
||||||
|
module = %module,
|
||||||
|
error = %e,
|
||||||
|
"配置模块加载失败，已跳过该条目（可在独立配置文件中定义）"
|
||||||
|
);
|
||||||
|
Ok(Value::Nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.context("创建包装版 require 函数失败")?;
|
||||||
|
|
||||||
|
globals
|
||||||
|
.set("require", wrapped_require)
|
||||||
|
.context("重载 require 函数失败")?;
|
||||||
|
|
||||||
Ok(Self { lua })
|
Ok(Self { lua })
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 执行指定脚本文件，直接返回完整的 Lua Table
|
/// 执行指定脚本文件，直接返回完整的 Lua Table
|
||||||
pub fn evaluate_lua_script(&self, path: &Path) -> Result<Table, ShimError> {
|
pub fn eval_script<T: FromLua>(&self, path: impl AsRef<Path>) -> Result<T> {
|
||||||
let code = fs::read_to_string(path)?;
|
let path = path.as_ref();
|
||||||
|
// println!("path {:?}", path);
|
||||||
|
let bytes =
|
||||||
|
fs::read(path).with_context(|| format!("无法读取配置文件: {}", path.display()))?;
|
||||||
|
|
||||||
|
let code = String::from_utf8(bytes).with_context(|| {
|
||||||
|
format!(
|
||||||
|
"{} 不是有效的 UTF-8 文件（请将 Lua 配置文件保存为 UTF-8 编码）",
|
||||||
|
path.display()
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
println!("code {:?}", code);
|
||||||
|
let chunk_name = format!("@{}", path.display());
|
||||||
|
|
||||||
self.lua
|
self.lua
|
||||||
.load(&code)
|
.load(&code)
|
||||||
.set_name(path.to_string_lossy())
|
.set_name(&chunk_name)
|
||||||
.eval::<Table>()
|
.eval::<T>()
|
||||||
.map_err(|e| ShimError::LuaExecutionError {
|
// .map_err(|e| anyhow!(e.to_string()))
|
||||||
file: path.display().to_string(),
|
.with_context(|| format!("执行 Lua 配置文件失败: {}", path.display()))
|
||||||
source: e,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 将 Lua Value 解析转化为 ShimConfig 数据对象
|
}
|
||||||
pub fn parse_config(&self, value: Value) -> Result<ShimConfig, ShimError> {
|
|
||||||
ShimConfig::from_lua(value, &self.lua).map_err(|e| ShimError::InvalidConfig(e.to_string()))
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::Layout;
|
||||||
|
|
||||||
|
fn test_layout() -> Layout {
|
||||||
|
let root = std::env::temp_dir().join("rshim-test-layout");
|
||||||
|
Layout {
|
||||||
|
base_dir: root.clone(),
|
||||||
|
bin_dir: root.join("bin"),
|
||||||
|
tools_dir: root.join("tools"),
|
||||||
|
lua_file: Default::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn missing_module_require_returns_nil() {
|
||||||
|
let runtime = LuaRuntime::new(&test_layout()).unwrap();
|
||||||
|
let value: Value = runtime
|
||||||
|
.lua
|
||||||
|
.load(r#"return require("rshim_test_no_such_module")"#)
|
||||||
|
.eval()
|
||||||
|
.unwrap();
|
||||||
|
assert!(matches!(value, Value::Nil));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn builtin_module_require_still_works() {
|
||||||
|
let runtime = LuaRuntime::new(&test_layout()).unwrap();
|
||||||
|
let value: Value = runtime
|
||||||
|
.lua
|
||||||
|
.load(r#"return pcall(require, "string")"#)
|
||||||
|
.eval()
|
||||||
|
.unwrap();
|
||||||
|
assert!(matches!(value, Value::Boolean(true)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn get_env_returns_split_table() {
|
||||||
|
let runtime = LuaRuntime::new(&test_layout()).unwrap();
|
||||||
|
let value: Value = runtime
|
||||||
|
.lua
|
||||||
|
.load(r#"return get_env("PATH")"#)
|
||||||
|
.eval()
|
||||||
|
.unwrap();
|
||||||
|
let table = match value {
|
||||||
|
Value::Table(t) => t,
|
||||||
|
other => panic!("expected table, got {}", other.type_name()),
|
||||||
|
};
|
||||||
|
assert!(
|
||||||
|
table.raw_len() >= 1,
|
||||||
|
"PATH should have at least one segment"
|
||||||
|
);
|
||||||
|
|
||||||
|
// split_paths 会剥离引号包裹，拆分段不应再含双引号
|
||||||
|
for i in 1..=table.raw_len() {
|
||||||
|
let seg: String = table.raw_get(i).unwrap();
|
||||||
|
assert!(
|
||||||
|
!seg.contains('"'),
|
||||||
|
"segment should not contain quote: {seg:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn get_env_missing_returns_empty_table() {
|
||||||
|
let runtime = LuaRuntime::new(&test_layout()).unwrap();
|
||||||
|
let value: Value = runtime
|
||||||
|
.lua
|
||||||
|
.load(r#"return get_env("RSHIM_TEST_NO_SUCH_VAR_12345")"#)
|
||||||
|
.eval()
|
||||||
|
.unwrap();
|
||||||
|
match value {
|
||||||
|
Value::Table(t) => assert_eq!(t.raw_len(), 0),
|
||||||
|
other => panic!("expected table, got {}", other.type_name()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn path_with_get_env_joins_without_quote_error() {
|
||||||
|
// 复现用户场景：PATH = { base_dir .. "/tools/numa", get_env("PATH") }
|
||||||
|
// 宿主 PATH 即使含双引号，也应拆分后正常拼接，而不是报错
|
||||||
|
let runtime = LuaRuntime::new(&test_layout()).unwrap();
|
||||||
|
let cfg: ShimConfig = runtime
|
||||||
|
.lua
|
||||||
|
.load(
|
||||||
|
r#"
|
||||||
|
return {
|
||||||
|
target = __SHIM_DIR__ .. "/tools/numa/numa.exe",
|
||||||
|
args = { "--help" },
|
||||||
|
env = {
|
||||||
|
PATH = { __SHIM_DIR__ .. "/tools/numa", get_env("PATH") }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.eval()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let path = cfg.env.get("PATH").unwrap().to_str().unwrap();
|
||||||
|
let prefix = std::env::temp_dir()
|
||||||
|
.join("rshim-test-layout")
|
||||||
|
.to_string_lossy()
|
||||||
|
.replace('\\', "/")
|
||||||
|
+ "/tools/numa;";
|
||||||
|
assert!(path.starts_with(&prefix), "unexpected PATH: {path}");
|
||||||
|
|
||||||
|
// 宿主 PATH 的段应被附加在配置前缀之后
|
||||||
|
let host = std::env::var("PATH").unwrap_or_default();
|
||||||
|
if !host.is_empty() {
|
||||||
|
let host_first = std::env::split_paths(&host)
|
||||||
|
.next()
|
||||||
|
.unwrap()
|
||||||
|
.to_string_lossy()
|
||||||
|
.into_owned();
|
||||||
|
assert!(
|
||||||
|
path.contains(&host_first),
|
||||||
|
"missing host PATH segment: {host_first}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 宿主 PATH 里引号包裹的畸形段（如 "D:\\...\\bin;"）应被原样保留，
|
||||||
|
// 而不是让整个配置加载失败
|
||||||
|
if host.contains('"') {
|
||||||
|
assert!(
|
||||||
|
path.contains('"'),
|
||||||
|
"quoted host segments should be preserved"
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
112
src/shim.rs
112
src/shim.rs
@@ -1,57 +1,101 @@
|
|||||||
use crate::ShimError;
|
use crate::{LuaRuntime, ShimConfig, Layout};
|
||||||
use mlua::Value;
|
use anyhow::{Context, Result, bail};
|
||||||
use std::{
|
use mlua::{Table, Value};
|
||||||
env,
|
use std::env;
|
||||||
io::{Error, ErrorKind},
|
use tracing::{debug, trace, warn};
|
||||||
};
|
|
||||||
use crate::{ShimConfig, ShimEnv, LuaRuntime};
|
|
||||||
|
|
||||||
pub struct Shim;
|
pub struct Shim;
|
||||||
|
|
||||||
impl Shim {
|
impl Shim {
|
||||||
pub fn init() -> Result<ShimConfig, ShimError> {
|
pub fn load() -> Result<ShimConfig> {
|
||||||
let current_exe = env::current_exe()
|
let current_exe = env::current_exe().context("获取代理程序路径失败: {}")?;
|
||||||
.map_err(|e| Error::new(ErrorKind::Other, format!("获取代理程序路径失败: {}", e)))?;
|
debug!("当前目录 {}", current_exe.display());
|
||||||
println!("当前目录 {}", current_exe.display());
|
|
||||||
let shim_env = ShimEnv::new(current_exe)?;
|
|
||||||
let runtime = LuaRuntime::new(&shim_env)?;
|
|
||||||
|
|
||||||
Self::resolve_config(&runtime, &shim_env)
|
let target_name = current_exe
|
||||||
|
.file_stem()
|
||||||
|
.and_then(|s| s.to_str())
|
||||||
|
.with_context(|| format!("无法从路径 [{}] 提取有效的程序名称", current_exe.display()))?
|
||||||
|
.to_lowercase();
|
||||||
|
debug!(
|
||||||
|
target_name = %target_name,
|
||||||
|
current_exe = %current_exe.display(),
|
||||||
|
"开始加载 Shim 配置"
|
||||||
|
);
|
||||||
|
let layout = Layout::discover(¤t_exe)?;
|
||||||
|
|
||||||
|
debug!(
|
||||||
|
root_dir = %layout.base_dir.display(),
|
||||||
|
bin_dir = %layout.bin_dir.display(),
|
||||||
|
tools_dir = %layout.tools_dir.display(),
|
||||||
|
"Shim 目录布局解析完成"
|
||||||
|
);
|
||||||
|
|
||||||
|
let runtime = LuaRuntime::new(&layout)?;
|
||||||
|
|
||||||
|
Self::resolve_config(&runtime, &layout, &target_name)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn resolve_config(runtime: &LuaRuntime, env: &ShimEnv) -> Result<ShimConfig, ShimError> {
|
fn resolve_config(
|
||||||
// 策略 1: 尝试加载全局配置文件 shims.lua
|
runtime: &LuaRuntime,
|
||||||
let global_config = env.root_dir.join("shims.lua");
|
paths: &Layout,
|
||||||
if global_config.is_file() {
|
target_name: &str,
|
||||||
let root_table = runtime.evaluate_lua_script(&global_config)?;
|
) -> Result<ShimConfig> {
|
||||||
|
// 策略 1: 尝试加载全局配置文件 mimic.lua
|
||||||
|
let global_config = paths.base_dir.join("rshim.lua");
|
||||||
|
|
||||||
// 检查 shims.lua 中是否存在以 target_name 命名的 Table 节点
|
// if !global_config.is_file() {
|
||||||
if let Ok(target_val) = root_table.get::<Value>(env.target_name.as_str()) {
|
// bail!(
|
||||||
if matches!(target_val, Value::Table(_)) {
|
// "未找到主配置文件: [{}]，请确保在安装根目录创建 rshim.lua",
|
||||||
return runtime.parse_config(target_val);
|
// global_config.display()
|
||||||
}
|
// );
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
if global_config.is_file() {
|
||||||
|
trace!(path = %global_config.display(), "发现全局配置文件，尝试解析");
|
||||||
|
let root_table: Table = runtime.eval_script(&global_config)?;
|
||||||
|
|
||||||
|
// 检查 mimic.lua 中是否存在以 target_name 命名的 Table 节点
|
||||||
|
if root_table
|
||||||
|
.contains_key(target_name)
|
||||||
|
.context("检查全局配置失败")?
|
||||||
|
{
|
||||||
|
let target_val: ShimConfig = root_table
|
||||||
|
.get(target_name)
|
||||||
|
.with_context(|| format!("解析配置 [{}] 失败: ", target_name))?;
|
||||||
|
debug!(
|
||||||
|
target = %target_name,
|
||||||
|
source = %global_config.display(),
|
||||||
|
"成功从全局配置文件中匹配到目标工具"
|
||||||
|
);
|
||||||
|
|
||||||
|
return Ok(target_val);
|
||||||
}
|
}
|
||||||
// 穿透：若全局配置文件存在但未包含当前程序的 key，继续向下探查
|
// 穿透：若全局配置文件存在但未包含当前程序的 key，继续向下探查
|
||||||
|
trace!(target = %target_name, "全局配置文件中未包含该目标，继续探查独立配置");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 策略 2: 降级寻找独立文件 ({exe}.lua)，优先顺序：tools/ > root/
|
// 策略 2: 降级寻找独立文件 ({exe}.lua)，优先顺序：tools/ > root/
|
||||||
let target_filename = format!("{}.lua", env.target_name);
|
let target_filename = format!("{}.lua", target_name);
|
||||||
let candidates = [
|
let candidates = [
|
||||||
env.tools_dir.join(&target_filename),
|
paths.tools_dir.join(&target_filename),
|
||||||
env.root_dir.join(&target_filename),
|
paths.base_dir.join(&target_filename),
|
||||||
];
|
];
|
||||||
|
|
||||||
for config_path in &candidates {
|
for config_path in &candidates {
|
||||||
if config_path.is_file() {
|
if config_path.is_file() {
|
||||||
let table = runtime.evaluate_lua_script(config_path)?;
|
debug!(path = %config_path.display(), "找到独立配置文件，开始加载");
|
||||||
return runtime.parse_config(Value::Table(table));
|
// 直接泛型反序列化为 ShimConfig
|
||||||
|
return runtime.eval_script::<ShimConfig>(config_path);
|
||||||
}
|
}
|
||||||
|
trace!(path = %config_path.display(), "独立配置文件不存在，跳过");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 策略 3: 所有查找失败，抛出错误
|
// 策略 3: 所有查找失败，抛出错误
|
||||||
Err(ShimError::ConfigNotFound(format!(
|
warn!(target = %target_name, "未找到任何匹配的配置文件");
|
||||||
"未找到关于 '{}' 的配置。请检查 shims.lua 或特定的 {}.lua 文件",
|
bail!(
|
||||||
env.target_name, env.target_name
|
"未找到关于 '{}' 的配置。请检查 mimic.lua 或特定的 {}.lua 文件",
|
||||||
)))
|
target_name,
|
||||||
|
target_name
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user