summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrestlessronin <88921269+restlessronin@users.noreply.github.com>2024-02-07 12:08:40 +0530
committerGitHub <noreply@github.com>2024-02-07 06:38:40 +0000
commitb16e6220a2483098b1d2d4564d3d09f08756fae3 (patch)
tree8f1d39462703b5c94ac1ab437f21025df6d9e937
parent6c15dc3f061b1d3a5b014fdbf79686ce60c605d4 (diff)
fix: enable "--allow-sys=cpus" for "deno run" (#22260)
Fixes #22221 with the suggested fix, and added "cpus" to the existing tests.
-rw-r--r--cli/tests/unit/permissions_test.ts2
-rw-r--r--cli/tsc/dts/lib.deno.ns.d.ts3
-rw-r--r--runtime/permissions/mod.rs2
3 files changed, 5 insertions, 2 deletions
diff --git a/cli/tests/unit/permissions_test.ts b/cli/tests/unit/permissions_test.ts
index 0710228a4..4dab0696a 100644
--- a/cli/tests/unit/permissions_test.ts
+++ b/cli/tests/unit/permissions_test.ts
@@ -41,6 +41,7 @@ Deno.test(async function permissionSysValidKind() {
await Deno.permissions.query({ name: "sys", kind: "hostname" });
await Deno.permissions.query({ name: "sys", kind: "uid" });
await Deno.permissions.query({ name: "sys", kind: "gid" });
+ await Deno.permissions.query({ name: "sys", kind: "cpus" });
});
Deno.test(function permissionSysValidKindSync() {
@@ -51,6 +52,7 @@ Deno.test(function permissionSysValidKindSync() {
Deno.permissions.querySync({ name: "sys", kind: "hostname" });
Deno.permissions.querySync({ name: "sys", kind: "uid" });
Deno.permissions.querySync({ name: "sys", kind: "gid" });
+ Deno.permissions.querySync({ name: "sys", kind: "cpus" });
});
Deno.test(async function permissionSysInvalidKind() {
diff --git a/cli/tsc/dts/lib.deno.ns.d.ts b/cli/tsc/dts/lib.deno.ns.d.ts
index 8401d2302..f855a0c0e 100644
--- a/cli/tsc/dts/lib.deno.ns.d.ts
+++ b/cli/tsc/dts/lib.deno.ns.d.ts
@@ -4936,7 +4936,8 @@ declare namespace Deno {
| "osRelease"
| "osUptime"
| "uid"
- | "gid";
+ | "gid"
+ | "cpus";
}
/** The permission descriptor for the `allow-ffi` and `deny-ffi` permissions, which controls
diff --git a/runtime/permissions/mod.rs b/runtime/permissions/mod.rs
index 89adab361..bdefe4f12 100644
--- a/runtime/permissions/mod.rs
+++ b/runtime/permissions/mod.rs
@@ -688,7 +688,7 @@ impl Descriptor for SysDescriptor {
pub fn parse_sys_kind(kind: &str) -> Result<&str, AnyError> {
match kind {
"hostname" | "osRelease" | "osUptime" | "loadavg" | "networkInterfaces"
- | "systemMemoryInfo" | "uid" | "gid" => Ok(kind),
+ | "systemMemoryInfo" | "uid" | "gid" | "cpus" => Ok(kind),
_ => Err(type_error(format!("unknown system info kind \"{kind}\""))),
}
}