A: A3 secrets loader reads token files with redaction and permission checks

This commit is contained in:
ari committed 2026-10-19 22:31:29 -04:00
1 parent bcac6c76e6
commit 7d10153677
4 files changed
+390 -18

No files matched your search

+66
View File
@@ -342,6 +342,72 @@ fn load_rejects_invalid_peers_and_accepts_a_placeholder_token() {
});
}
#[test]
#[allow(clippy::result_large_err)] // figment::Jail closures return figment::Error
fn config_load_uses_the_token_loader_and_rereads_a_rotated_file() {
Jail::expect_with(|jail| {
let creds = jail.directory().join("credentials");
jail.create_dir("credentials")?;
jail.set_env("CREDENTIALS_DIRECTORY", creds.display());
let token = creds.join("peer-beta");
std::fs::write(&token, "pending\n").unwrap();
std::fs::set_permissions(&token, std::fs::Permissions::from_mode(0o644)).unwrap();
jail.create_file(
"creds.toml",
&format!(
"\
[peers]\n\
enabled = true\n\
[[peers.peer]]\n\
name = \"beta\"\n\
url = \"http://127.0.0.1:1984\"\n\
token_file = \"{}\"\n\
",
token.display()
),
)?;
// systemd's credential directory protects the file, not its mode.
let cfg = Config::load(Some(Path::new("creds.toml")), &CliOverrides::default())
.expect("credential-directory token must load");
assert_eq!(cfg.peers.peer[0].name.as_str(), "beta");
let outside = jail.directory().join("outside");
jail.create_dir("outside")?;
let loose = outside.join("peer-beta");
std::fs::write(&loose, "pending\n").unwrap();
std::fs::set_permissions(&loose, std::fs::Permissions::from_mode(0o644)).unwrap();
jail.create_file(
"loose.toml",
&format!(
"\
[peers]\n\
enabled = true\n\
[[peers.peer]]\n\
name = \"beta\"\n\
url = \"http://127.0.0.1:1984\"\n\
token_file = \"{}\"\n\
",
loose.display()
),
)?;
let err = Config::load(Some(Path::new("loose.toml")), &CliOverrides::default())
.expect_err("group/world readable token outside the credential dir");
let text = err.to_string();
assert!(text.contains("peer beta"), "{text}");
assert!(text.contains("group or world readable"), "{text}");
assert!(!text.contains("pending"), "{text}");
// The loader keeps no copy: a replacement file is read on the next call.
std::fs::write(&token, "rotated\n").unwrap();
let cfg = Config::load(Some(Path::new("creds.toml")), &CliOverrides::default())
.expect("rotated token must load");
let secret = skyg_linux_tracker::peers::load_token(&cfg.peers.peer[0]).unwrap();
assert_eq!(secret.expose(), "rotated");
assert!(!format!("{secret:?}").contains("rotated"));
Ok(())
});
}
#[tokio::test]
async fn ping_without_a_token_is_unauthorized() {
let pool = sqlx::sqlite::SqlitePoolOptions::new()