summaryrefslogtreecommitdiff
path: root/tests/specs/run
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-09-04 14:51:24 +0200
committerGitHub <noreply@github.com>2024-09-04 14:51:24 +0200
commit74fc66da110ec20d12751e7a0922cea300314399 (patch)
treeb0b057b7539b506b8db39287cd799e7c9cbd526f /tests/specs/run
parent334c842392e2587b8ca1d7cc7cc7d9231fc15286 (diff)
fix: lock down allow-run permissions more (#25370)
`--allow-run` even with an allow list has essentially been `--allow-all`... this locks it down more. 1. Resolves allow list for `--allow-run=` on startup to an absolute path, then uses these paths when evaluating if a command can execute. Also, adds these paths to `--deny-write` 1. Resolves the environment (cwd and env vars) before evaluating permissions and before executing a command. Then uses this environment to evaluate the permissions and then evaluate the command.
Diffstat (limited to 'tests/specs/run')
-rw-r--r--tests/specs/run/allow_run_allowlist_resolution/__test__.jsonc8
-rw-r--r--tests/specs/run/allow_run_allowlist_resolution/main.out15
-rw-r--r--tests/specs/run/allow_run_allowlist_resolution/main.ts67
-rw-r--r--tests/specs/run/ld_preload/__test__.jsonc6
-rw-r--r--tests/specs/run/ld_preload/env_arg.out12
-rw-r--r--tests/specs/run/ld_preload/env_arg.ts25
-rw-r--r--tests/specs/run/ld_preload/set_with_allow_env.out12
-rw-r--r--tests/specs/run/ld_preload/set_with_allow_env.ts14
8 files changed, 141 insertions, 18 deletions
diff --git a/tests/specs/run/allow_run_allowlist_resolution/__test__.jsonc b/tests/specs/run/allow_run_allowlist_resolution/__test__.jsonc
new file mode 100644
index 000000000..173e13027
--- /dev/null
+++ b/tests/specs/run/allow_run_allowlist_resolution/__test__.jsonc
@@ -0,0 +1,8 @@
+{
+ "args": "run --quiet -A main.ts",
+ "output": "main.out",
+ "envs": {
+ "DYLD_FALLBACK_LIBRARY_PATH": "",
+ "LD_LIBRARY_PATH": ""
+ }
+}
diff --git a/tests/specs/run/allow_run_allowlist_resolution/main.out b/tests/specs/run/allow_run_allowlist_resolution/main.out
new file mode 100644
index 000000000..f61f9b550
--- /dev/null
+++ b/tests/specs/run/allow_run_allowlist_resolution/main.out
@@ -0,0 +1,15 @@
+PermissionStatus { state: "granted", onchange: null }
+PermissionStatus { state: "granted", onchange: null }
+PermissionStatus { state: "prompt", onchange: null }
+PermissionStatus { state: "granted", onchange: null }
+---
+Info Failed to resolve 'deno' for allow-run: cannot find binary path
+PermissionStatus { state: "prompt", onchange: null }
+PermissionStatus { state: "prompt", onchange: null }
+PermissionStatus { state: "prompt", onchange: null }
+PermissionStatus { state: "prompt", onchange: null }
+---
+PermissionStatus { state: "granted", onchange: null }
+PermissionStatus { state: "granted", onchange: null }
+PermissionStatus { state: "prompt", onchange: null }
+PermissionStatus { state: "granted", onchange: null }
diff --git a/tests/specs/run/allow_run_allowlist_resolution/main.ts b/tests/specs/run/allow_run_allowlist_resolution/main.ts
new file mode 100644
index 000000000..bf33d8cbe
--- /dev/null
+++ b/tests/specs/run/allow_run_allowlist_resolution/main.ts
@@ -0,0 +1,67 @@
+// Testing the following (but with `deno` instead of `echo`):
+// | `deno run --allow-run=echo` | `which path == "/usr/bin/echo"` at startup | `which path != "/usr/bin/echo"` at startup |
+// |-------------------------------------|--------------------------------------------|--------------------------------------------|
+// | **`Deno.Command("echo")`** | ✅ | ✅ |
+// | **`Deno.Command("/usr/bin/echo")`** | ✅ | ❌ |
+
+// | `deno run --allow-run=/usr/bin/echo | `which path == "/usr/bin/echo"` at runtime | `which path != "/usr/bin/echo"` at runtime |
+// |-------------------------------------|--------------------------------------------|--------------------------------------------|
+// | **`Deno.Command("echo")`** | ✅ | ❌ |
+// | **`Deno.Command("/usr/bin/echo")`** | ✅ | ✅ |
+
+const execPath = Deno.execPath();
+const execPathParent = execPath.replace(/[/\\][^/\\]+$/, "");
+
+const testUrl = `data:application/typescript;base64,${
+ btoa(`
+ console.error(await Deno.permissions.query({ name: "run", command: "deno" }));
+ console.error(await Deno.permissions.query({ name: "run", command: "${
+ execPath.replaceAll("\\", "\\\\")
+ }" }));
+ Deno.env.set("PATH", "");
+ console.error(await Deno.permissions.query({ name: "run", command: "deno" }));
+ console.error(await Deno.permissions.query({ name: "run", command: "${
+ execPath.replaceAll("\\", "\\\\")
+ }" }));
+`)
+}`;
+
+const process1 = await new Deno.Command(Deno.execPath(), {
+ args: [
+ "run",
+ "--allow-env",
+ "--allow-run=deno",
+ testUrl,
+ ],
+ stdout: "inherit",
+ stderr: "inherit",
+ env: { "PATH": execPathParent },
+}).output();
+
+console.error("---");
+
+await new Deno.Command(Deno.execPath(), {
+ args: [
+ "run",
+ "--allow-env",
+ "--allow-run=deno",
+ testUrl,
+ ],
+ stderr: "inherit",
+ stdout: "inherit",
+ env: { "PATH": "" },
+}).output();
+
+console.error("---");
+
+await new Deno.Command(Deno.execPath(), {
+ args: [
+ "run",
+ "--allow-env",
+ `--allow-run=${execPath}`,
+ testUrl,
+ ],
+ stderr: "inherit",
+ stdout: "inherit",
+ env: { "PATH": execPathParent },
+}).output();
diff --git a/tests/specs/run/ld_preload/__test__.jsonc b/tests/specs/run/ld_preload/__test__.jsonc
index 767e423d0..882f157e9 100644
--- a/tests/specs/run/ld_preload/__test__.jsonc
+++ b/tests/specs/run/ld_preload/__test__.jsonc
@@ -7,13 +7,11 @@
"tests": {
"env_arg": {
"args": "run --allow-run=echo env_arg.ts",
- "output": "env_arg.out",
- "exitCode": 1
+ "output": "env_arg.out"
},
"set_with_allow_env": {
"args": "run --allow-run=echo --allow-env set_with_allow_env.ts",
- "output": "set_with_allow_env.out",
- "exitCode": 1
+ "output": "set_with_allow_env.out"
}
}
}
diff --git a/tests/specs/run/ld_preload/env_arg.out b/tests/specs/run/ld_preload/env_arg.out
index fbf37014a..3df781a8e 100644
--- a/tests/specs/run/ld_preload/env_arg.out
+++ b/tests/specs/run/ld_preload/env_arg.out
@@ -1,4 +1,8 @@
-error: Uncaught (in promise) PermissionDenied: Requires --allow-all permissions to spawn subprocess with LD_PRELOAD environment variable.
-}).spawn();
- ^
- at [WILDCARD]
+PermissionDenied: Requires --allow-all permissions to spawn subprocess with LD_PRELOAD environment variable.
+ [WILDCARD]
+ name: "PermissionDenied"
+}
+PermissionDenied: Requires --allow-all permissions to spawn subprocess with LD_PRELOAD environment variable.
+ [WILDCARD]
+ name: "PermissionDenied"
+}
diff --git a/tests/specs/run/ld_preload/env_arg.ts b/tests/specs/run/ld_preload/env_arg.ts
index 0b236619e..d7ca1073d 100644
--- a/tests/specs/run/ld_preload/env_arg.ts
+++ b/tests/specs/run/ld_preload/env_arg.ts
@@ -1,5 +1,20 @@
-const output = new Deno.Command("echo", {
- env: {
- "LD_PRELOAD": "./libpreload.so",
- },
-}).spawn();
+try {
+ new Deno.Command("echo", {
+ env: {
+ "LD_PRELOAD": "./libpreload.so",
+ },
+ }).spawn();
+} catch (err) {
+ console.log(err);
+}
+
+try {
+ Deno.run({
+ cmd: ["echo"],
+ env: {
+ "LD_PRELOAD": "./libpreload.so",
+ },
+ });
+} catch (err) {
+ console.log(err);
+}
diff --git a/tests/specs/run/ld_preload/set_with_allow_env.out b/tests/specs/run/ld_preload/set_with_allow_env.out
index 2e92763dd..60dba7cff 100644
--- a/tests/specs/run/ld_preload/set_with_allow_env.out
+++ b/tests/specs/run/ld_preload/set_with_allow_env.out
@@ -1,4 +1,8 @@
-error: Uncaught (in promise) PermissionDenied: Requires --allow-all permissions to spawn subprocess with LD_PRELOAD environment variable.
-const output = new Deno.Command("echo").spawn();
- ^
- at [WILDCARD]
+PermissionDenied: Requires --allow-all permissions to spawn subprocess with LD_PRELOAD environment variable.
+ [WILDCARD]
+ name: "PermissionDenied"
+}
+PermissionDenied: Requires --allow-all permissions to spawn subprocess with DYLD_FALLBACK_LIBRARY_PATH, LD_PRELOAD environment variables.
+ [WILDCARD]
+ name: "PermissionDenied"
+}
diff --git a/tests/specs/run/ld_preload/set_with_allow_env.ts b/tests/specs/run/ld_preload/set_with_allow_env.ts
index 9530f4478..79004aa16 100644
--- a/tests/specs/run/ld_preload/set_with_allow_env.ts
+++ b/tests/specs/run/ld_preload/set_with_allow_env.ts
@@ -1,3 +1,15 @@
Deno.env.set("LD_PRELOAD", "./libpreload.so");
-const output = new Deno.Command("echo").spawn();
+try {
+ new Deno.Command("echo").spawn();
+} catch (err) {
+ console.log(err);
+}
+
+Deno.env.set("DYLD_FALLBACK_LIBRARY_PATH", "./libpreload.so");
+
+try {
+ Deno.run({ cmd: ["echo"] }).spawnSync();
+} catch (err) {
+ console.log(err);
+}