mirror of
https://github.com/storytold/gridcraft.git
synced 2026-11-18 16:14:57 +00:00
Create new saved files without group/other write permission (#2567)
* Create new saved files without group/other write permission Fixes #2519
This commit is contained in:
1 parent
dbf674ef48
commit
bf48def687
2 files changed
+34
No files matched your search
@@ -1055,6 +1055,12 @@ pub fn write_file(path: &str, bytes: &[u8]) -> Result<()> {
|
||||
use std::os::unix::fs::OpenOptionsExt;
|
||||
opts.mode(0o600);
|
||||
}
|
||||
// A brand-new file gets the restrictive default: no group/other write, whatever the umask.
|
||||
#[cfg(unix)]
|
||||
if prior.is_none() {
|
||||
use std::os::unix::fs::OpenOptionsExt;
|
||||
opts.mode(0o644);
|
||||
}
|
||||
let mut f = opts.open(&tmp).map_err(|e| {
|
||||
let _ = std::fs::remove_file(&tmp);
|
||||
EngineError::Other(format!("{path}: {e}"))
|
||||
|
||||
@@ -78,6 +78,34 @@ fn restored_mode_drops_the_group_and_special_bits_when_the_group_is_lost() {
|
||||
assert_eq!(super::restored_mode(0o104_755, false), 0o705, "setuid is dropped");
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn fresh_save_drops_group_and_other_write_under_a_permissive_umask() {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
if std::env::var_os("GRIDCRAFT_UMASK_CHILD").is_none() {
|
||||
// Re-run this test in a child shell whose umask is 0002.
|
||||
let exe = std::env::current_exe().unwrap();
|
||||
let status = std::process::Command::new("sh")
|
||||
.arg("-c")
|
||||
.arg("umask 0002 && exec \"$0\" --exact io::tests::fresh_save_drops_group_and_other_write_under_a_permissive_umask")
|
||||
.arg(exe)
|
||||
.env("GRIDCRAFT_UMASK_CHILD", "1")
|
||||
.status()
|
||||
.unwrap();
|
||||
assert!(status.success());
|
||||
return;
|
||||
}
|
||||
let dir = std::env::temp_dir().join(format!("gridcraft-fs-safety-umask-{}", std::process::id()));
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
let fresh = dir.join("new.xlsx");
|
||||
write_file(fresh.to_str().unwrap(), b"v").unwrap();
|
||||
let mode = std::fs::metadata(&fresh).unwrap().permissions().mode() & 0o777;
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
assert!(mode & 0o022 == 0, "mode {mode:o}");
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[test]
|
||||
fn open_refuses_directories_and_unknowable_lengths() {
|
||||
|
||||
Reference in new issue
Block a user