From 2dcbef2abbf03055d64ee79c5b23318f23a31386 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 6 May 2024 19:21:58 -0400 Subject: fix(compile): relative permissions should be retained as relative (#23719) Closes #23715 --- cli/standalone/binary.rs | 6 +++--- cli/standalone/mod.rs | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'cli/standalone') diff --git a/cli/standalone/binary.rs b/cli/standalone/binary.rs index 4442f5a24..143c1824d 100644 --- a/cli/standalone/binary.rs +++ b/cli/standalone/binary.rs @@ -24,7 +24,6 @@ use deno_core::futures::AsyncSeekExt; use deno_core::serde_json; use deno_core::url::Url; use deno_npm::NpmSystemInfo; -use deno_runtime::permissions::PermissionsOptions; use deno_semver::package::PackageReq; use deno_semver::VersionReqSpecifierParseError; use log::Level; @@ -37,6 +36,7 @@ use crate::args::CaData; use crate::args::CliOptions; use crate::args::CompileFlags; use crate::args::PackageJsonDepsProvider; +use crate::args::PermissionFlags; use crate::args::UnstableConfig; use crate::cache::DenoDir; use crate::file_fetcher::FileFetcher; @@ -134,7 +134,7 @@ pub enum NodeModules { pub struct Metadata { pub argv: Vec, pub seed: Option, - pub permissions: PermissionsOptions, + pub permissions: PermissionFlags, pub location: Option, pub v8_flags: Vec, pub log_level: Option, @@ -621,7 +621,7 @@ impl<'a> DenoCompileBinaryWriter<'a> { argv: compile_flags.args.clone(), seed: cli_options.seed(), location: cli_options.location_flag().clone(), - permissions: cli_options.permissions_options(), + permissions: cli_options.permission_flags().clone(), v8_flags: cli_options.v8_flags().clone(), unsafely_ignore_certificate_errors: cli_options .unsafely_ignore_certificate_errors() diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 47b035fc7..4b7962a5f 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -499,7 +499,9 @@ pub async fn run( }; let permissions = { - let mut permissions = metadata.permissions; + let maybe_cwd = std::env::current_dir().ok(); + let mut permissions = + metadata.permissions.to_options(maybe_cwd.as_deref())?; // if running with an npm vfs, grant read access to it if let Some(vfs_root) = maybe_vfs_root { match &mut permissions.allow_read { -- cgit v1.2.3