summaryrefslogtreecommitdiff
path: root/ext/node
diff options
context:
space:
mode:
authorLuca Casonato <hello@lcas.dev>2024-09-10 20:12:24 +0200
committerGitHub <noreply@github.com>2024-09-10 11:12:24 -0700
commit7bfcb4dd10d31f5f9566c90a28449c0951f3a48e (patch)
treefca0dec6e98118418f1712c6e8451a04c7e89988 /ext/node
parentbe5419d479fcae16c8a07dec00ce11b532b7996a (diff)
feat(cli): use NotCapable error for permission errors (#25431)
Closes #7394 --------- Co-authored-by: snek <snek@deno.com>
Diffstat (limited to 'ext/node')
-rw-r--r--ext/node/polyfills/_process/process.ts4
-rw-r--r--ext/node/polyfills/internal_binding/pipe_wrap.ts22
-rw-r--r--ext/node/polyfills/internal_binding/tcp_wrap.ts10
-rw-r--r--ext/node/polyfills/internal_binding/udp_wrap.ts10
4 files changed, 10 insertions, 36 deletions
diff --git a/ext/node/polyfills/_process/process.ts b/ext/node/polyfills/_process/process.ts
index e4b88a11a..6f69139c9 100644
--- a/ext/node/polyfills/_process/process.ts
+++ b/ext/node/polyfills/_process/process.ts
@@ -53,8 +53,8 @@ function denoEnvGet(name: string) {
} catch (e) {
if (
ObjectPrototypeIsPrototypeOf(TypeErrorPrototype, e) ||
- // TODO(iuioiua): Use `PermissionDeniedPrototype` when it's available
- ObjectPrototypeIsPrototypeOf(Deno.errors.PermissionDenied.prototype, e)
+ // TODO(iuioiua): Use `NotCapablePrototype` when it's available
+ ObjectPrototypeIsPrototypeOf(Deno.errors.NotCapable.prototype, e)
) {
return undefined;
}
diff --git a/ext/node/polyfills/internal_binding/pipe_wrap.ts b/ext/node/polyfills/internal_binding/pipe_wrap.ts
index f5c3c5439..3e366b3c7 100644
--- a/ext/node/polyfills/internal_binding/pipe_wrap.ts
+++ b/ext/node/polyfills/internal_binding/pipe_wrap.ts
@@ -160,16 +160,8 @@ export class Pipe extends ConnectionWrap {
}
},
(e) => {
- // TODO(cmorten): correct mapping of connection error to status code.
- let code: number;
-
- if (e instanceof Deno.errors.NotFound) {
- code = codeMap.get("ENOENT")!;
- } else if (e instanceof Deno.errors.PermissionDenied) {
- code = codeMap.get("EACCES")!;
- } else {
- code = codeMap.get("ECONNREFUSED")!;
- }
+ const code = codeMap.get(e.code ?? "UNKNOWN") ??
+ codeMap.get("UNKNOWN")!;
try {
this.afterConnect(req, code);
@@ -207,16 +199,10 @@ export class Pipe extends ConnectionWrap {
try {
listener = Deno.listen(listenOptions);
} catch (e) {
- if (e instanceof Deno.errors.AddrInUse) {
- return codeMap.get("EADDRINUSE")!;
- } else if (e instanceof Deno.errors.AddrNotAvailable) {
- return codeMap.get("EADDRNOTAVAIL")!;
- } else if (e instanceof Deno.errors.PermissionDenied) {
+ if (e instanceof Deno.errors.NotCapable) {
throw e;
}
-
- // TODO(cmorten): map errors to appropriate error codes.
- return codeMap.get("UNKNOWN")!;
+ return codeMap.get(e.code ?? "UNKNOWN") ?? codeMap.get("UNKNOWN")!;
}
const address = listener.addr as Deno.UnixAddr;
diff --git a/ext/node/polyfills/internal_binding/tcp_wrap.ts b/ext/node/polyfills/internal_binding/tcp_wrap.ts
index 4b57a7e1e..973a1d1c0 100644
--- a/ext/node/polyfills/internal_binding/tcp_wrap.ts
+++ b/ext/node/polyfills/internal_binding/tcp_wrap.ts
@@ -212,16 +212,10 @@ export class TCP extends ConnectionWrap {
try {
listener = Deno.listen(listenOptions);
} catch (e) {
- if (e instanceof Deno.errors.AddrInUse) {
- return codeMap.get("EADDRINUSE")!;
- } else if (e instanceof Deno.errors.AddrNotAvailable) {
- return codeMap.get("EADDRNOTAVAIL")!;
- } else if (e instanceof Deno.errors.PermissionDenied) {
+ if (e instanceof Deno.errors.NotCapable) {
throw e;
}
-
- // TODO(cmorten): map errors to appropriate error codes.
- return codeMap.get("UNKNOWN")!;
+ return codeMap.get(e.code ?? "UNKNOWN") ?? codeMap.get("UNKNOWN")!;
}
const address = listener.addr as Deno.NetAddr;
diff --git a/ext/node/polyfills/internal_binding/udp_wrap.ts b/ext/node/polyfills/internal_binding/udp_wrap.ts
index 7cbd6cabe..db6961ddb 100644
--- a/ext/node/polyfills/internal_binding/udp_wrap.ts
+++ b/ext/node/polyfills/internal_binding/udp_wrap.ts
@@ -337,16 +337,10 @@ export class UDP extends HandleWrap {
try {
listener = DenoListenDatagram(listenOptions);
} catch (e) {
- if (e instanceof Deno.errors.AddrInUse) {
- return codeMap.get("EADDRINUSE")!;
- } else if (e instanceof Deno.errors.AddrNotAvailable) {
- return codeMap.get("EADDRNOTAVAIL")!;
- } else if (e instanceof Deno.errors.PermissionDenied) {
+ if (e instanceof Deno.errors.NotCapable) {
throw e;
}
-
- // TODO(cmorten): map errors to appropriate error codes.
- return codeMap.get("UNKNOWN")!;
+ return codeMap.get(e.code ?? "UNKNOWN") ?? codeMap.get("UNKNOWN")!;
}
const address = listener.addr as Deno.NetAddr;