Deuxfleurs/garage
37
58
Fork 76
Code Issues 103 Pull requests 17 Releases 30 Wiki Activity

windows: Don't set private key perms or update disk usage metrics

Browse source
This commit is contained in:
Brian Picciano 2025-01-14 10:29:28 +01:00
parent 6a436267a4
commit c2b3cf521a
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/rpc/system.rs
View file

@ -219,11 +219,21 @@ pub fn gen_node_key(metadata_dir: &Path) -> Result<NodeKey, Error> {
let (pubkey, key) = ed25519::gen_keypair(); let (pubkey, key) = ed25519::gen_keypair();
{ {
use std::os::unix::fs::PermissionsExt;
let mut f = std::fs::File::create(key_file.as_path())?; let mut f = std::fs::File::create(key_file.as_path())?;
let mut perm = f.metadata()?.permissions();
perm.set_mode(0o600); #[cfg(not(windows))]
std::fs::set_permissions(key_file.as_path(), perm)?; {
use std::os::unix::fs::PermissionsExt;
let mut perm = f.metadata()?.permissions();
perm.set_mode(0o600);
std::fs::set_permissions(key_file.as_path(), perm)?;
}
#[cfg(windows)]
{
// TODO(mediocregopher): set permissions on windows
}
f.write_all(&key[..])?; f.write_all(&key[..])?;
} }
@ -805,6 +815,7 @@ impl NodeStatus {
} }
} }
#[cfg(not(windows))]
fn update_disk_usage(&mut self, meta_dir: &Path, data_dir: &DataDirEnum) { fn update_disk_usage(&mut self, meta_dir: &Path, data_dir: &DataDirEnum) {
use nix::sys::statvfs::statvfs; use nix::sys::statvfs::statvfs;
let mount_avail = |path: &Path| match statvfs(path) { let mount_avail = |path: &Path| match statvfs(path) {
@ -842,6 +853,11 @@ impl NodeStatus {
})(), })(),
}; };
} }
#[cfg(windows)]
fn update_disk_usage(&mut self, _meta_dir: &Path, _data_dir: &DataDirEnum) {
// TODO(mediocregopher): update disk usage on windows, only used for metrics
}
} }
/// Obtain the list of currently available IP addresses on all non-loopback /// Obtain the list of currently available IP addresses on all non-loopback