feat(stdlib): add explicitly granted env API

This commit is contained in:
Marqdo Agent committed 2026-11-21 08:40:54 +08:00
1 parent ae69391bc0
commit 9922bfae98
17 files changed
+322 -15

No files matched your search

+9 -2
View File
@@ -24,6 +24,8 @@ pub struct SandboxSettings {
pub allow_write: Vec<String>,
/// Network grants (IP literals, ADR-0034).
pub allow_net: Vec<String>,
/// Environment variable grants (ADR-0043).
pub allow_env: Vec<String>,
/// Foreign execution grant.
pub allow_foreign: bool,
/// Plugin grants.
@@ -74,6 +76,7 @@ impl SandboxSettings {
|| !self.allow_read.is_empty()
|| !self.allow_net.is_empty()
|| !self.allow_write.is_empty()
|| !self.allow_env.is_empty()
|| !self.allow_plugin.is_empty()
|| !self.plugins.is_empty()
|| self.trust_native_plugin
@@ -82,8 +85,8 @@ impl SandboxSettings {
if requested {
return Err(
"strict mode currently supports pure Marqdo and native Math only; \
--allow-read/--allow-write/--allow-foreign/--allow-plugin/--plugin/\
--trust-native-plugin/--kernel/--trace-file are rejected. Use \
--allow-read/--allow-write/--allow-env/--allow-foreign/--allow-plugin/\
--plugin/--trust-native-plugin/--kernel/--trace-file are rejected. Use \
--mode project for those capabilities."
.to_string(),
);
@@ -99,6 +102,7 @@ impl SandboxSettings {
if !self.allow_read.is_empty()
|| !self.allow_net.is_empty()
|| !self.allow_write.is_empty()
|| !self.allow_env.is_empty()
|| self.allow_foreign
|| !self.allow_plugin.is_empty()
{
@@ -119,6 +123,9 @@ impl SandboxSettings {
for host in &self.allow_net {
capabilities = capabilities.allow_net(host.clone());
}
for name in &self.allow_env {
capabilities = capabilities.allow_env(name.clone());
}
if self.allow_foreign {
capabilities = capabilities.allow_foreign();
}
+4
View File
@@ -92,6 +92,9 @@ struct SandboxArgs {
/// Grant write access to a project-relative glob (repeatable).
#[arg(long = "allow-write", value_name = "GLOB")]
allow_write: Vec<String>,
/// Grant read access to an environment variable (repeatable, ADR-0043).
#[arg(long = "allow-env", value_name = "NAME")]
allow_env: Vec<String>,
/// Grant explicit foreign kernel execution.
#[arg(long = "allow-foreign")]
allow_foreign: bool,
@@ -143,6 +146,7 @@ impl SandboxArgs {
allow_read: self.allow_read.clone(),
allow_net: self.allow_net.clone(),
allow_write: self.allow_write.clone(),
allow_env: self.allow_env.clone(),
allow_foreign: self.allow_foreign,
allow_plugin: self.allow_plugin.clone(),
fuel: self.fuel,
+34
View File
@@ -38,6 +38,7 @@ struct TestFile {
stdin: &'static str,
stdout: &'static str,
args: &'static [&'static str],
env: &'static [(&'static str, &'static str)],
}
fn product_tests() -> Vec<TestFile> {
@@ -52,6 +53,7 @@ fn product_tests() -> Vec<TestFile> {
stdin: "",
stdout: "",
args: &[],
env: &[],
};
}
let name = path.file_name().unwrap().to_string_lossy().to_string();
@@ -72,6 +74,18 @@ fn product_tests() -> Vec<TestFile> {
"--allow-write",
"out/**",
][..]
} else if name == "env.mq.md" {
&[
"--allow-env",
"MARQDO_TEST_ENV",
"--allow-env",
"MARQDO_MISSING_ENV",
][..]
} else {
&[][..]
};
let env = if name == "env.mq.md" {
&[("MARQDO_TEST_ENV", "env-value")][..]
} else {
&[][..]
};
@@ -80,6 +94,7 @@ fn product_tests() -> Vec<TestFile> {
stdin,
stdout,
args,
env,
}
})
.filter(|file| !file.name.is_empty())
@@ -99,6 +114,7 @@ fn run_product_test(file: &TestFile) -> serde_json::Value {
.args(["--json"])
.current_dir(stdlib_dir())
.env("MARQDO_STDLIB_DIR", stdlib_dir())
.envs(file.env.iter().copied())
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped())
@@ -132,6 +148,7 @@ fn every_public_stdlib_module_has_a_product_test() {
"csv.mq.md",
"datetime.mq.md",
"demo.mq.md",
"env.mq.md",
"format.mq.md",
"fs.mq.md",
"http.mq.md",
@@ -310,6 +327,23 @@ fn clock_test_reports_project_mode_unix_millis() {
assert_eq!(items[2]["value"], true);
}
#[test]
fn env_test_reads_only_granted_names() {
let report = run_product_test(
product_tests()
.iter()
.find(|file| file.name == "env.mq.md")
.expect("env test"),
);
let items = report["value"]["items"].as_array().expect("list");
assert_eq!(items[0]["value"], true);
assert_eq!(items[1]["value"], true);
assert_eq!(items[2]["value"], true);
assert_eq!(items[3]["value"], "env-value");
assert_eq!(items[4]["value"], false);
assert_eq!(items[5]["value"], "env.not_found");
}
#[test]
fn format_test_pins_value_semantics_and_handle_observation() {
let report = run_product_test(