foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-24 16:19:12 -05:00
Code Issues Packages 1 Wiki Activity

fix: Resolve makeTemp* paths from CWD (#4104)

Browse source
This commit is contained in:
Nayeem Rahman 2020-02-25 14:23:23 +00:00 committed by GitHub
parent 91b606aaae
commit 14e7e1e3af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/ops/fs.rs
View file

@ -9,7 +9,7 @@ use deno_core::*;
use remove_dir_all::remove_dir_all;
use std::convert::From;
use std::fs;
use std::path::{Path, PathBuf};
use std::path::Path;
use std::time::UNIX_EPOCH;
#[cfg(unix)]
@ -534,7 +534,9 @@ fn op_make_temp_dir(
) -> Result<JsonOp, OpError> {
let args: MakeTempArgs = serde_json::from_value(args)?;
let dir = args.dir.map(PathBuf::from);
let dir = args
.dir
.map(|s| deno_fs::resolve_from_cwd(Path::new(&s)).unwrap());
let prefix = args.prefix.map(String::from);
let suffix = args.suffix.map(String::from);
@ -566,7 +568,9 @@ fn op_make_temp_file(
) -> Result<JsonOp, OpError> {
let args: MakeTempArgs = serde_json::from_value(args)?;
let dir = args.dir.map(PathBuf::from);
let dir = args
.dir
.map(|s| deno_fs::resolve_from_cwd(Path::new(&s)).unwrap());
let prefix = args.prefix.map(String::from);
let suffix = args.suffix.map(String::from);

1
cli/tests/056_make_temp_file_write_perm.out Normal file
View file

@ -0,0 +1 @@
good [WILDCARD]subdir[WILDCARD]

8
cli/tests/056_make_temp_file_write_perm.ts Normal file
View file

@ -0,0 +1,8 @@
const path = await Deno.makeTempFile({ dir: "./subdir/" });
if (path.startsWith(Deno.cwd())) {
console.log("good", path);
} else {
throw Error("bad " + path);
}
console.log(path);
await Deno.remove(path);

17
cli/tests/integration_tests.rs
View file

@ -784,6 +784,17 @@ itest!(_054_info_local_imports {
exit_code: 0,
});
itest!(_055_import_wasm_via_network {
args: "run --reload http://127.0.0.1:4545/cli/tests/055_import_wasm_via_network.ts",
output: "055_import_wasm_via_network.ts.out",
http_server: true,
});
itest!(_056_make_temp_file_write_perm {
args: "run --allow-write=./subdir/ 056_make_temp_file_write_perm.ts",
output: "056_make_temp_file_write_perm.out",
});
itest!(js_import_detect {
args: "run --reload js_import_detect.ts",
output: "js_import_detect.ts.out",
@ -1129,12 +1140,6 @@ itest!(_053_import_compression {
http_server: true,
});
itest!(import_wasm_via_network {
args: "run --reload http://127.0.0.1:4545/cli/tests/055_import_wasm_via_network.ts",
output: "055_import_wasm_via_network.ts.out",
http_server: true,
});
itest!(cafile_url_imports {
args: "run --reload --cert tls/RootCA.pem cafile_url_imports.ts",
output: "cafile_url_imports.ts.out",