foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-29 16:30:56 -05:00
Code Issues Packages 1 Wiki Activity

fix(permissions): process URL in Deno.FfiPermissionDescriptor.path for revoke() and request() (#17094)

Browse source 
Previously, `Deno.permissions.[revoke|request]()` wouldn't correctly
process the `path: URL` when `name` was `ffi`. This change fixes that
behaviour and adds a new function, `formDescriptor()`, to ensure `URL`
arguments are consistently handled across
`Deno.permissions.[query|revoke|request]()`.
This commit is contained in:
Asher Gomez 2023-01-04 07:50:14 +11:00 committed by Bartek Iwańczuk
parent 43e8b51316
commit 63ca68d058
No known key found for this signature in database
GPG key ID: 0C6BCDDC3B3AD750
2 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cli/tests/unit/permissions_test.ts
View file

@ -75,19 +75,14 @@ Deno.test(function permissionStatusIllegalConstructor() {
assertEquals(Deno.PermissionStatus.length, 0); assertEquals(Deno.PermissionStatus.length, 0);
}); });
// Regression test for https://github.com/denoland/deno/issues/17020
Deno.test(async function permissionURL() { Deno.test(async function permissionURL() {
await Deno.permissions.query({ const path = new URL(".", import.meta.url);
name: "read",
path: new URL(".", import.meta.url), await Deno.permissions.query({ name: "read", path });
}); await Deno.permissions.query({ name: "write", path });
await Deno.permissions.query({ await Deno.permissions.query({ name: "ffi", path });
name: "write", await Deno.permissions.query({ name: "run", command: path });
path: new URL(".", import.meta.url),
});
await Deno.permissions.query({
name: "run",
command: new URL(".", import.meta.url),
});
}); });
Deno.test(async function permissionDescriptorValidation() { Deno.test(async function permissionDescriptorValidation() {

34
runtime/js/10_permissions.js
View file

@ -161,6 +161,20 @@
ArrayPrototypeIncludes(permissionNames, desc.name); ArrayPrototypeIncludes(permissionNames, desc.name);
} }
/**
* @param {Deno.PermissionDescriptor} desc
* @returns {desc is Deno.PermissionDescriptor}
*/
function formDescriptor(desc) {
if (
desc.name === "read" || desc.name === "write" || desc.name === "ffi"
) {
desc.path = pathFromURL(desc.path);
} else if (desc.name === "run") {
desc.command = pathFromURL(desc.command);
}
}
class Permissions { class Permissions {
constructor(key = null) { constructor(key = null) {
if (key != illegalConstructorKey) { if (key != illegalConstructorKey) {
@ -177,13 +191,7 @@
); );
} }
if ( formDescriptor(desc);
desc.name === "read" || desc.name === "write" || desc.name === "ffi"
) {
desc.path = pathFromURL(desc.path);
} else if (desc.name === "run") {
desc.command = pathFromURL(desc.command);
}
const state = opQuery(desc); const state = opQuery(desc);
return PromiseResolve(cache(desc, state)); return PromiseResolve(cache(desc, state));
@ -198,11 +206,7 @@
); );
} }
if (desc.name === "read" || desc.name === "write") { formDescriptor(desc);
desc.path = pathFromURL(desc.path);
} else if (desc.name === "run") {
desc.command = pathFromURL(desc.command);
}
const state = opRevoke(desc); const state = opRevoke(desc);
return PromiseResolve(cache(desc, state)); return PromiseResolve(cache(desc, state));
@ -217,11 +221,7 @@
); );
} }
if (desc.name === "read" || desc.name === "write") { formDescriptor(desc);
desc.path = pathFromURL(desc.path);
} else if (desc.name === "run") {
desc.command = pathFromURL(desc.command);
}
const state = opRequest(desc); const state = opRequest(desc);
return PromiseResolve(cache(desc, state)); return PromiseResolve(cache(desc, state));