pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(plugins): crash when reattaching to a non-existent host folder (#3126)

Browse source
This commit is contained in:
Aram Drevekenin 2024-02-09 16:39:37 +01:00 • committed by GitHub
parent e828e277c2
commit fffeca3e6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
zellij-server/src/plugins/plugin_loader.rs
View file

@ -795,11 +795,22 @@ impl<'a> PluginLoader<'a> {
}; };
let mut store = get_store(); let mut store = get_store();
let store_mut = &mut store; let store_mut = &mut store;
let dirs = vec![
("/host".to_owned(), self.zellij_cwd.clone()),
("/data".to_owned(), self.plugin_own_data_dir.clone()),
("/tmp".to_owned(), ZELLIJ_TMP_DIR.clone()),
];
let dirs = dirs.into_iter().filter(|(_dir_name, dir)| {
// note that this does not protect against TOCTOU errors
// eg. if one or more of these folders existed at the time of check but was deleted
// before we mounted in in the wasi environment, we'll crash
// when we move to a new wasi environment, we should address this with locking if
// there's no built-in solution
dir.try_exists().ok().unwrap_or(false)
});
let mut wasi_env = WasiState::new("Zellij") let mut wasi_env = WasiState::new("Zellij")
.env("CLICOLOR_FORCE", "1") .env("CLICOLOR_FORCE", "1")
.map_dir("/host", self.zellij_cwd.clone()) .map_dirs(dirs)
.and_then(|wasi| wasi.map_dir("/data", &self.plugin_own_data_dir))
.and_then(|wasi| wasi.map_dir("/tmp", ZELLIJ_TMP_DIR.as_path()))
.and_then(|wasi| { .and_then(|wasi| {
wasi.stdin(Box::new(Pipe::new())) wasi.stdin(Box::new(Pipe::new()))
.stdout(Box::new(Pipe::new())) .stdout(Box::new(Pipe::new()))