summaryrefslogtreecommitdiff
path: root/tests/specs/worker
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2024-09-26 02:50:54 +0100
committerGitHub <noreply@github.com>2024-09-26 01:50:54 +0000
commit5504acea6751480f1425c88353ad5d36257bdce7 (patch)
treefa02e6c546eae469aac894bfc71600ab4eccad28 /tests/specs/worker
parent05415bb9de475aa8646985a545f30fe93136207e (diff)
feat: add `--allow-import` flag (#25469)
This replaces `--allow-net` for import permissions and makes the security sandbox stricter by also checking permissions for statically analyzable imports. By default, this has a value of `--allow-import=deno.land:443,jsr.io:443,esm.sh:443,raw.githubusercontent.com:443,gist.githubusercontent.com:443`, but that can be overridden by providing a different set of hosts. Additionally, when no value is provided, import permissions are inferred from the CLI arguments so the following works because `fresh.deno.dev:443` will be added to the list of allowed imports: ```ts deno run -A -r https://fresh.deno.dev ``` --------- Co-authored-by: David Sherret <dsherret@gmail.com>
Diffstat (limited to 'tests/specs/worker')
-rw-r--r--tests/specs/worker/error_worker_permissions_remote/__test__.jsonc2
-rw-r--r--tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts.out2
-rw-r--r--tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts.out2
-rw-r--r--tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts.out2
-rw-r--r--tests/specs/worker/worker_permissions_dynamic_remote/__test__.jsonc4
-rw-r--r--tests/specs/worker/worker_permissions_dynamic_remote/permissions_dynamic_remote.ts12
-rw-r--r--tests/specs/worker/worker_permissions_dynamic_remote/permissions_dynamic_remote.ts.out6
-rw-r--r--tests/specs/worker/worker_permissions_remote_remote/__test__.jsonc2
-rw-r--r--tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts3
-rw-r--r--tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts.out2
10 files changed, 29 insertions, 8 deletions
diff --git a/tests/specs/worker/error_worker_permissions_remote/__test__.jsonc b/tests/specs/worker/error_worker_permissions_remote/__test__.jsonc
index 06a439fd4..d40e31a49 100644
--- a/tests/specs/worker/error_worker_permissions_remote/__test__.jsonc
+++ b/tests/specs/worker/error_worker_permissions_remote/__test__.jsonc
@@ -1,5 +1,5 @@
{
- "args": "run --reload error_worker_permissions_remote.ts",
+ "args": "run --reload --allow-import=other.host error_worker_permissions_remote.ts",
"output": "error_worker_permissions_remote.ts.out",
"exitCode": 1
}
diff --git a/tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts.out b/tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts.out
index afecff0a8..8019bb46d 100644
--- a/tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts.out
+++ b/tests/specs/worker/error_worker_permissions_remote/error_worker_permissions_remote.ts.out
@@ -1,2 +1,2 @@
-error: Uncaught (in worker "") Requires net access to "localhost:4545", run again with the --allow-net flag
+error: Uncaught (in worker "") Requires import access to "localhost:4545", run again with the --allow-import flag
[WILDCARD]
diff --git a/tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts.out b/tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts.out
index 6dc4f0f5f..67b817d6d 100644
--- a/tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts.out
+++ b/tests/specs/worker/worker_permissions_blob_remote/permissions_blob_remote.ts.out
@@ -1,4 +1,4 @@
-error: Uncaught (in worker "") Requires net access to "example.com:443", run again with the --allow-net flag
+error: Uncaught (in worker "") Requires import access to "example.com:443", run again with the --allow-import flag
at blob:null/[WILDCARD]:1:8
error: Uncaught (in promise) Error: Unhandled error in child worker.
at Worker.#pollControl[WILDCARD]
diff --git a/tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts.out b/tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts.out
index e7af110bb..0f5a99434 100644
--- a/tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts.out
+++ b/tests/specs/worker/worker_permissions_data_remote/permissions_data_remote.ts.out
@@ -1,4 +1,4 @@
-error: Uncaught (in worker "") Requires net access to "example.com:443", run again with the --allow-net flag
+error: Uncaught (in worker "") Requires import access to "example.com:443", run again with the --allow-import flag
at data:application/javascript;base64,aW1wb3J0ICJodHRwczovL2V4YW1wbGUuY29tL3NvbWUvZmlsZS50cyI7:1:8
error: Uncaught (in promise) Error: Unhandled error in child worker.
at Worker.#pollControl[WILDCARD]
diff --git a/tests/specs/worker/worker_permissions_dynamic_remote/__test__.jsonc b/tests/specs/worker/worker_permissions_dynamic_remote/__test__.jsonc
index 8343b17f6..498d9d507 100644
--- a/tests/specs/worker/worker_permissions_dynamic_remote/__test__.jsonc
+++ b/tests/specs/worker/worker_permissions_dynamic_remote/__test__.jsonc
@@ -1,5 +1,5 @@
{
- "args": "run --quiet --reload --allow-net --unstable-worker-options ../../../testdata/workers/permissions_dynamic_remote.ts",
- "output": "../../../testdata/workers/permissions_dynamic_remote.ts.out",
+ "args": "run --quiet --reload --allow-import --unstable-worker-options permissions_dynamic_remote.ts",
+ "output": "permissions_dynamic_remote.ts.out",
"exitCode": 1
}
diff --git a/tests/specs/worker/worker_permissions_dynamic_remote/permissions_dynamic_remote.ts b/tests/specs/worker/worker_permissions_dynamic_remote/permissions_dynamic_remote.ts
new file mode 100644
index 000000000..5f0fdf7a1
--- /dev/null
+++ b/tests/specs/worker/worker_permissions_dynamic_remote/permissions_dynamic_remote.ts
@@ -0,0 +1,12 @@
+new Worker(
+ "http://localhost:4545/workers/dynamic_remote.ts",
+ {
+ type: "module",
+ deno: {
+ permissions: {
+ // dynamic_remote.ts will import from example.com
+ import: false,
+ },
+ },
+ },
+);
diff --git a/tests/specs/worker/worker_permissions_dynamic_remote/permissions_dynamic_remote.ts.out b/tests/specs/worker/worker_permissions_dynamic_remote/permissions_dynamic_remote.ts.out
new file mode 100644
index 000000000..fa4232efd
--- /dev/null
+++ b/tests/specs/worker/worker_permissions_dynamic_remote/permissions_dynamic_remote.ts.out
@@ -0,0 +1,6 @@
+error: Uncaught (in worker "") (in promise) TypeError: Requires import access to "example.com:443", run again with the --allow-import flag
+await import("" + "https://example.com/some/file.ts");
+^
+ at async http://localhost:4545/workers/dynamic_remote.ts:2:1
+[WILDCARD]error: Uncaught (in promise) Error: Unhandled error in child worker.
+ at Worker.#pollControl [WILDCARD]
diff --git a/tests/specs/worker/worker_permissions_remote_remote/__test__.jsonc b/tests/specs/worker/worker_permissions_remote_remote/__test__.jsonc
index 8cf700158..00fd2a6e4 100644
--- a/tests/specs/worker/worker_permissions_remote_remote/__test__.jsonc
+++ b/tests/specs/worker/worker_permissions_remote_remote/__test__.jsonc
@@ -1,5 +1,5 @@
{
- "args": "run --quiet --reload --allow-net=localhost:4545 ../../../testdata/workers/permissions_remote_remote.ts",
+ "args": "run --quiet --reload --allow-import=localhost:4545 permissions_remote_remote.ts",
"output": "permissions_remote_remote.ts.out",
"exitCode": 1
}
diff --git a/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts b/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts
new file mode 100644
index 000000000..4df2a8a5d
--- /dev/null
+++ b/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts
@@ -0,0 +1,3 @@
+new Worker("http://localhost:4545/workers/static_remote.ts", {
+ type: "module",
+});
diff --git a/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts.out b/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts.out
index e5bdfc2dc..423120bb0 100644
--- a/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts.out
+++ b/tests/specs/worker/worker_permissions_remote_remote/permissions_remote_remote.ts.out
@@ -1,4 +1,4 @@
-error: Uncaught (in worker "") Requires net access to "example.com:443", run again with the --allow-net flag
+error: Uncaught (in worker "") Requires import access to "example.com:443", run again with the --allow-import flag
at http://localhost:4545/[WILDCARD]/static_remote.ts:2:8
error: Uncaught (in promise) Error: Unhandled error in child worker.
at Worker.#pollControl [WILDCARD]