T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dir::open_file, open_dir: correct symlink following

Browse Source
This commit is contained in:
Pat Hickey
2021-01-11 15:15:54 -08:00
parent 4a6e92f52f
commit 2d2e6d16a1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/wasi-c2/src/dir.rs
View File

@@ -263,6 +263,8 @@ impl WasiDir for cap_std::fs::Dir {
if symlink_follow { if symlink_follow {
opts.follow(FollowSymlinks::Yes); opts.follow(FollowSymlinks::Yes);
} else {
opts.follow(FollowSymlinks::No);
} }
let f = self.open_with(Path::new(path), &opts)?; let f = self.open_with(Path::new(path), &opts)?;
@@ -270,8 +272,12 @@ impl WasiDir for cap_std::fs::Dir {
} }
fn open_dir(&self, symlink_follow: bool, path: &str) -> Result<Box<dyn WasiDir>, Error> { fn open_dir(&self, symlink_follow: bool, path: &str) -> Result<Box<dyn WasiDir>, Error> {
// XXX obey symlink_follow let d = if symlink_follow {
let d = self.open_dir(Path::new(path))?; self.open_dir(Path::new(path))?
} else {
use cap_fs_ext::DirExt;
self.open_dir_nofollow(Path::new(path))?
};
Ok(Box::new(d)) Ok(Box::new(d))
} }