summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/permissions.rs32
-rw-r--r--cli/tests/error_015_dynamic_import_permissions.out2
-rw-r--r--cli/tests/error_016_dynamic_import_permissions2.out2
-rw-r--r--std/fs/empty_dir_test.ts3
-rw-r--r--std/fs/exists_test.ts4
-rw-r--r--std/http/file_server_test.ts6
-rw-r--r--std/manual.md4
7 files changed, 25 insertions, 28 deletions
diff --git a/cli/permissions.rs b/cli/permissions.rs
index 3964b07a3..98b7e7a33 100644
--- a/cli/permissions.rs
+++ b/cli/permissions.rs
@@ -29,12 +29,13 @@ pub enum PermissionState {
impl PermissionState {
/// Checks the permission state and returns the result.
- pub fn check(self, msg: &str, err_msg: &str) -> Result<(), ErrBox> {
+ pub fn check(self, msg: &str, flag_name: &str) -> Result<(), ErrBox> {
if self == PermissionState::Allow {
log_perm_access(msg);
return Ok(());
}
- Err(permission_denied_msg(err_msg.to_string()))
+ let m = format!("{}, run again with the {} flag", msg, flag_name);
+ Err(permission_denied_msg(m))
}
pub fn is_allow(self) -> bool {
self == PermissionState::Allow
@@ -129,10 +130,9 @@ impl DenoPermissions {
}
pub fn check_run(&self) -> Result<(), ErrBox> {
- self.allow_run.check(
- "access to run a subprocess",
- "run again with the --allow-run flag",
- )
+ self
+ .allow_run
+ .check("access to run a subprocess", "--allow-run")
}
fn get_state_read(&self, path: &Option<&Path>) -> PermissionState {
@@ -145,7 +145,7 @@ impl DenoPermissions {
pub fn check_read(&self, path: &Path) -> Result<(), ErrBox> {
self.get_state_read(&Some(path)).check(
&format!("read access to \"{}\"", path.display()),
- "run again with the --allow-read flag",
+ "--allow-read",
)
}
@@ -159,7 +159,7 @@ impl DenoPermissions {
pub fn check_write(&self, path: &Path) -> Result<(), ErrBox> {
self.get_state_write(&Some(path)).check(
&format!("write access to \"{}\"", path.display()),
- "run again with the --allow-write flag",
+ "--allow-write",
)
}
@@ -188,30 +188,26 @@ impl DenoPermissions {
pub fn check_net(&self, hostname: &str, port: u16) -> Result<(), ErrBox> {
self.get_state_net(hostname, Some(port)).check(
&format!("network access to \"{}:{}\"", hostname, port),
- "run again with the --allow-net flag",
+ "--allow-net",
)
}
pub fn check_net_url(&self, url: &url::Url) -> Result<(), ErrBox> {
self
.get_state_net(&format!("{}", url.host().unwrap()), url.port())
- .check(
- &format!("network access to \"{}\"", url),
- "run again with the --allow-net flag",
- )
+ .check(&format!("network access to \"{}\"", url), "--allow-net")
}
pub fn check_env(&self) -> Result<(), ErrBox> {
- self.allow_env.check(
- "access to environment variables",
- "run again with the --allow-env flag",
- )
+ self
+ .allow_env
+ .check("access to environment variables", "--allow-env")
}
pub fn check_plugin(&self, path: &Path) -> Result<(), ErrBox> {
self.allow_plugin.check(
&format!("access to open a plugin: {}", path.display()),
- "run again with the --allow-plugin flag",
+ "--allow-plugin",
)
}
diff --git a/cli/tests/error_015_dynamic_import_permissions.out b/cli/tests/error_015_dynamic_import_permissions.out
index 2c8c388fc..dcc913e2b 100644
--- a/cli/tests/error_015_dynamic_import_permissions.out
+++ b/cli/tests/error_015_dynamic_import_permissions.out
@@ -1 +1 @@
-error: Uncaught TypeError: run again with the --allow-net flag
+error: Uncaught TypeError: network access to "http://localhost:4545/tests/subdir/mod4.js", run again with the --allow-net flag
diff --git a/cli/tests/error_016_dynamic_import_permissions2.out b/cli/tests/error_016_dynamic_import_permissions2.out
index 55579f829..8f561f130 100644
--- a/cli/tests/error_016_dynamic_import_permissions2.out
+++ b/cli/tests/error_016_dynamic_import_permissions2.out
@@ -1,2 +1,2 @@
[WILDCARD]
-error: Uncaught TypeError: run again with the --allow-read flag
+error: Uncaught TypeError: read access to "[WILDCARD]passwd", run again with the --allow-read flag
diff --git a/std/fs/empty_dir_test.ts b/std/fs/empty_dir_test.ts
index 77e98c0ce..b9145767e 100644
--- a/std/fs/empty_dir_test.ts
+++ b/std/fs/empty_dir_test.ts
@@ -2,6 +2,7 @@
import { test } from "../testing/mod.ts";
import {
assertEquals,
+ assertStrContains,
assertThrows,
assertThrowsAsync
} from "../testing/asserts.ts";
@@ -227,7 +228,7 @@ test(async function emptyDirPermission(): Promise<void> {
const output = await Deno.readAll(stdout);
- assertEquals(new TextDecoder().decode(output), s.output);
+ assertStrContains(new TextDecoder().decode(output), s.output);
}
} catch (err) {
await Deno.remove(testfolder, { recursive: true });
diff --git a/std/fs/exists_test.ts b/std/fs/exists_test.ts
index b8c968a02..c7c7dc54e 100644
--- a/std/fs/exists_test.ts
+++ b/std/fs/exists_test.ts
@@ -1,6 +1,6 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { test } from "../testing/mod.ts";
-import { assertEquals } from "../testing/asserts.ts";
+import { assertEquals, assertStrContains } from "../testing/asserts.ts";
import * as path from "../path/mod.ts";
import { exists, existsSync } from "./exists.ts";
@@ -134,7 +134,7 @@ test(async function existsPermission(): Promise<void> {
const output = await Deno.readAll(stdout);
- assertEquals(new TextDecoder().decode(output), s.output);
+ assertStrContains(new TextDecoder().decode(output), s.output);
}
// done
diff --git a/std/http/file_server_test.ts b/std/http/file_server_test.ts
index 170979b61..12a5b671f 100644
--- a/std/http/file_server_test.ts
+++ b/std/http/file_server_test.ts
@@ -1,6 +1,6 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { test } from "../testing/mod.ts";
-import { assert, assertEquals } from "../testing/asserts.ts";
+import { assert, assertEquals, assertStrContains } from "../testing/asserts.ts";
import { BufReader } from "../io/bufio.ts";
import { TextProtoReader } from "../textproto/mod.ts";
@@ -109,8 +109,8 @@ test(async function servePermissionDenied(): Promise<void> {
try {
await fetch("http://localhost:4500/");
- assertEquals(
- await errReader.readLine(),
+ assertStrContains(
+ (await errReader.readLine()) as string,
"run again with the --allow-read flag"
);
} finally {
diff --git a/std/manual.md b/std/manual.md
index 2fa93718f..f29256bd9 100644
--- a/std/manual.md
+++ b/std/manual.md
@@ -229,7 +229,7 @@ When this program is started, it throws PermissionDenied error.
```shell
$ deno https://deno.land/std/examples/echo_server.ts
-error: Uncaught PermissionDenied: run again with the --allow-net flag
+error: Uncaught PermissionDenied: network access to "0.0.0.0:8080", run again with the --allow-net flag
► $deno$/dispatch_json.ts:40:11
at DenoError ($deno$/errors.ts:20:5)
...
@@ -329,7 +329,7 @@ This is an example to restrict file system access by whitelist.
```shell
$ deno --allow-read=/usr https://deno.land/std/examples/cat.ts /etc/passwd
-error: Uncaught PermissionDenied: run again with the --allow-read flag
+error: Uncaught PermissionDenied: read access to "/etc/passwd", run again with the --allow-read flag
► $deno$/dispatch_json.ts:40:11
at DenoError ($deno$/errors.ts:20:5)
...
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 13:29:24 +0000