diff options
| -rw-r--r-- | cli/dts/lib.deno.ns.d.ts | 2 | ||||
| -rw-r--r-- | cli/dts/lib.deno.unstable.d.ts | 4 | ||||
| -rw-r--r-- | cli/tests/unit/permissions_test.ts | 4 | ||||
| -rw-r--r-- | runtime/js/11_workers.js | 11 | ||||
| -rw-r--r-- | runtime/js/40_permissions.js | 12 |
5 files changed, 9 insertions, 24 deletions
diff --git a/cli/dts/lib.deno.ns.d.ts b/cli/dts/lib.deno.ns.d.ts index 8aa478f12..a312f4bda 100644 --- a/cli/dts/lib.deno.ns.d.ts +++ b/cli/dts/lib.deno.ns.d.ts @@ -2159,7 +2159,7 @@ declare namespace Deno { * "github.com" * "deno.land:8080" */ - host?: string | URL; + host?: string; } export interface EnvPermissionDescriptor { diff --git a/cli/dts/lib.deno.unstable.d.ts b/cli/dts/lib.deno.unstable.d.ts index ccb5ae2cd..64efa0a2f 100644 --- a/cli/dts/lib.deno.unstable.d.ts +++ b/cli/dts/lib.deno.unstable.d.ts @@ -1041,7 +1041,7 @@ declare namespace Deno { * }); * ``` */ - net?: "inherit" | boolean | Array<string | URL>; + net?: "inherit" | boolean | string[]; /** Specifies if the `plugin` permission should be requested or revoked. * If set to `"inherit"`, the current `plugin` permission will be inherited. @@ -1136,7 +1136,7 @@ declare interface WorkerOptions { * * For example: `["https://deno.land", "localhost:8080"]`. */ - net?: "inherit" | boolean | Array<string | URL>; + net?: "inherit" | boolean | string[]; plugin?: "inherit" | boolean; read?: "inherit" | boolean | Array<string | URL>; run?: "inherit" | boolean | Array<string | URL>; diff --git a/cli/tests/unit/permissions_test.ts b/cli/tests/unit/permissions_test.ts index 2ed9c11a9..45ba39b96 100644 --- a/cli/tests/unit/permissions_test.ts +++ b/cli/tests/unit/permissions_test.ts @@ -71,8 +71,4 @@ unitTest(async function permissionURL() { name: "run", command: new URL(".", import.meta.url), }); - await Deno.permissions.query({ - name: "net", - host: new URL("https://deno.land/foo"), - }); }); diff --git a/runtime/js/11_workers.js b/runtime/js/11_workers.js index a0385357d..b59832635 100644 --- a/runtime/js/11_workers.js +++ b/runtime/js/11_workers.js @@ -94,9 +94,10 @@ value = ArrayPrototypeMap(value, (route) => { if (route instanceof URL) { if (permission === "net") { - route = route.host; - } - if (permission === "env") { + throw new Error( + `Expected 'string' for net permission, received 'URL'`, + ); + } else if (permission === "env") { throw new Error( `Expected 'string' for env permission, received 'URL'`, ); @@ -124,12 +125,12 @@ write = "inherit", }) { return { - env: parseArrayPermission(env, "env"), + env: parseUnitPermission(env, "env"), hrtime: parseUnitPermission(hrtime, "hrtime"), net: parseArrayPermission(net, "net"), plugin: parseUnitPermission(plugin, "plugin"), read: parseArrayPermission(read, "read"), - run: parseArrayPermission(run, "run"), + run: parseUnitPermission(run, "run"), write: parseArrayPermission(write, "write"), }; } diff --git a/runtime/js/40_permissions.js b/runtime/js/40_permissions.js index 019e65446..c84f8fde8 100644 --- a/runtime/js/40_permissions.js +++ b/runtime/js/40_permissions.js @@ -167,10 +167,6 @@ desc.path = pathFromURL(desc.path); } else if (desc.name === "run") { desc.command = pathFromURL(desc.command); - } else if (desc.name === "net") { - if (desc.host instanceof URL) { - desc.host = desc.host.host; - } } const state = opQuery(desc); @@ -190,10 +186,6 @@ desc.path = pathFromURL(desc.path); } else if (desc.name === "run") { desc.command = pathFromURL(desc.command); - } else if (desc.name === "net") { - if (desc.host instanceof URL) { - desc.host = desc.host.host; - } } const state = opRevoke(desc); @@ -213,10 +205,6 @@ desc.path = pathFromURL(desc.path); } else if (desc.name === "run") { desc.command = pathFromURL(desc.command); - } else if (desc.name === "net") { - if (desc.host instanceof URL) { - desc.host = desc.host.host; - } } const state = opRequest(desc); |