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
47 changes: 45 additions & 2 deletions rust/src/cli/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ fn read_json_config<T>(path: &Path) -> Result<(), ConfigFileError>
where
T: DeserializeOwned,
{
let content = std::fs::read_to_string(path).map_err(ConfigFileError::Read)?;
// Match the application loaders so validation supports DPAPI-protected
// config files without materializing plaintext on disk.
let content = crate::secure_file::read_string(path).map_err(ConfigFileError::Read)?;
serde_json::from_str::<T>(&content)
.map(|_| ())
.map_err(ConfigFileError::Parse)
Expand Down Expand Up @@ -476,9 +478,50 @@ async fn show_paths() -> anyhow::Result<()> {

#[cfg(test)]
mod tests {
use super::sanitize_settings_for_dump;
use super::{ConfigFileError, read_json_config, sanitize_settings_for_dump};
#[cfg(windows)]
use crate::secure_file;
use crate::settings::ManualCookies;
use serde_json::json;

#[cfg(windows)]
#[test]
fn validates_dpapi_protected_manual_cookies_without_plaintext() {
let dir = tempfile::tempdir().expect("create temporary directory");
let path = dir.path().join("manual_cookies.json");
let expected = r#"{"cookies":{}}"#;

secure_file::write_string(&path, expected).expect("write protected cookies");

let raw = std::fs::read_to_string(&path).expect("read protected wrapper");
assert!(raw.contains("\"format\": \"codexbar.secure-file\""));
assert!(!raw.contains(expected));
assert!(
read_json_config::<ManualCookies>(&path).is_ok(),
"valid protected cookies should validate"
);
}

#[test]
fn rejects_malformed_secure_wrapper_without_echoing_payload() {
let dir = tempfile::tempdir().expect("create temporary directory");
let path = dir.path().join("manual_cookies.json");
let payload = "AA==";
let malformed = format!(
r#"{{"format":"codexbar.secure-file","version":1,"protection":"unsupported","payload":"{payload}"}}"#
);
std::fs::write(&path, malformed).expect("write malformed wrapper");

let error = read_json_config::<ManualCookies>(&path)
.expect_err("reject malformed protected wrapper");
let ConfigFileError::Read(error) = error else {
panic!("malformed protected wrapper must be a read error");
};
let message = error.to_string();
assert!(message.contains("unsupported secure file protection"));
assert!(!message.contains(payload));
}

#[test]
fn sanitize_settings_for_dump_redacts_secret_fields() {
let raw = json!({
Expand Down
Loading