Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions crates/goose/src/config/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ use thiserror::Error;
fn write_secrets_file(path: &Path, content: &str) -> std::io::Result<()> {
#[cfg(unix)]
{
use std::os::unix::fs::OpenOptionsExt;
use std::os::unix::fs::{OpenOptionsExt, PermissionsExt};
let mut file = OpenOptions::new()
.write(true)
.create(true)
.truncate(true)
.truncate(false)
.mode(0o600)
.open(path)?;

file.set_permissions(std::fs::Permissions::from_mode(0o600))?;
file.set_len(0)?;
file.write_all(content.as_bytes())
}

Expand Down Expand Up @@ -2068,6 +2070,28 @@ mod tests {
Ok(())
}

#[test]
#[cfg(unix)]
fn test_existing_secrets_file_permissions_tightened_on_write() -> Result<(), ConfigError> {
use std::os::unix::fs::PermissionsExt;

let dir = TempDir::new().unwrap();
let config_file = NamedTempFile::new().unwrap();
let secrets_path = dir.path().join("secrets.yaml");
std::fs::write(&secrets_path, "existing: old\n")?;
std::fs::set_permissions(&secrets_path, std::fs::Permissions::from_mode(0o644))?;

let config = Config::new_with_file_secrets(config_file.path(), &secrets_path)?;
config.set_secret("key", &"value")?;

let value: String = config.get_secret("key")?;
assert_eq!(value, "value");
let mode = std::fs::metadata(&secrets_path)?.permissions().mode() & 0o777;
assert_eq!(mode, 0o600);

Ok(())
}

#[test]
fn test_merge_config_values_basic_override() {
let mut base = Mapping::new();
Expand Down
Loading