A: A1 peers config section, env overrides and print-config redaction
This commit is contained in:
1 parent
12c3a40708
commit
40d18c2253
3 files changed
+211
No files matched your search
@@ -491,4 +491,90 @@ mod tests {
|
||||
assert!(!s.contains("secret"));
|
||||
assert!(s.contains("port = 1984"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn peerless_print_config_adds_only_the_peers_block() {
|
||||
let s = Config::default().to_toml_redacted().unwrap();
|
||||
assert!(s.contains("[peers]\n"));
|
||||
assert!(s.contains("enabled = false\n"));
|
||||
assert!(s.contains("tcp_interval_secs = 10\n"));
|
||||
assert!(s.contains("tcp_timeout_secs = 3\n"));
|
||||
assert!(s.contains("api_interval_secs = 30\n"));
|
||||
assert!(s.contains("api_timeout_secs = 5\n"));
|
||||
assert!(s.contains("fail_threshold = 2\n"));
|
||||
assert!(s.contains("request_timeout_secs = 10\n"));
|
||||
assert!(s.contains("max_response_bytes = 8388608\n"));
|
||||
assert!(s.contains("max_concurrent_per_peer = 4\n"));
|
||||
assert!(s.contains("max_concurrent_total = 16\n"));
|
||||
assert!(s.contains("deny_cidrs = ["));
|
||||
assert!(s.contains("169.254.0.0/16"));
|
||||
assert!(s.contains("0.0.0.0/8"));
|
||||
assert!(s.contains("peer = []\n"));
|
||||
// The rest of the default document is unchanged.
|
||||
assert!(s.contains("port = 1984\n"));
|
||||
assert!(s.contains("[server.tls]\n"));
|
||||
assert!(s.contains("[auth]\n"));
|
||||
assert!(s.contains("db_path = \"/var/lib/skyg-linux-tracker/db.sqlite\"\n"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn peers_env_overrides_scalars_and_keeps_file_entries() {
|
||||
Jail::expect_with(|jail| {
|
||||
let token = jail.directory().join("peer.token");
|
||||
write_private_token(&token, "slinuxm_PEER_TOKEN_SHOULD_NOT_LEAK");
|
||||
let file = format!(
|
||||
"\
|
||||
[peers]\n\
|
||||
enabled = false\n\
|
||||
tcp_interval_secs = 10\n\
|
||||
\n\
|
||||
[[peers.peer]]\n\
|
||||
name = \"beta\"\n\
|
||||
url = \"http://127.0.0.1:1984\"\n\
|
||||
token_file = \"{}\"\n\
|
||||
",
|
||||
token.display()
|
||||
);
|
||||
jail.create_file("c.toml", &file)?;
|
||||
jail.set_env("SKYG_PEERS__ENABLED", "true");
|
||||
jail.set_env("SKYG_PEERS__TCP_INTERVAL_SECS", "20");
|
||||
jail.set_env("SKYG_PEERS__TCP_TIMEOUT_SECS", "4");
|
||||
jail.set_env("SKYG_PEERS__API_INTERVAL_SECS", "40");
|
||||
jail.set_env("SKYG_PEERS__API_TIMEOUT_SECS", "6");
|
||||
jail.set_env("SKYG_PEERS__FAIL_THRESHOLD", "3");
|
||||
jail.set_env("SKYG_PEERS__REQUEST_TIMEOUT_SECS", "12");
|
||||
jail.set_env("SKYG_PEERS__MAX_RESPONSE_BYTES", "1000");
|
||||
jail.set_env("SKYG_PEERS__MAX_CONCURRENT_PER_PEER", "2");
|
||||
jail.set_env("SKYG_PEERS__MAX_CONCURRENT_TOTAL", "8");
|
||||
jail.set_env("SKYG_PEERS__DENY_CIDRS", r#"["10.0.0.0/8"]"#);
|
||||
let c = load(Some("c.toml"), &CliOverrides::default()).unwrap();
|
||||
assert!(c.peers.enabled);
|
||||
assert_eq!(c.peers.tcp_interval_secs, 20);
|
||||
assert_eq!(c.peers.tcp_timeout_secs, 4);
|
||||
assert_eq!(c.peers.api_interval_secs, 40);
|
||||
assert_eq!(c.peers.api_timeout_secs, 6);
|
||||
assert_eq!(c.peers.fail_threshold, 3);
|
||||
assert_eq!(c.peers.request_timeout_secs, 12);
|
||||
assert_eq!(c.peers.max_response_bytes, 1000);
|
||||
assert_eq!(c.peers.max_concurrent_per_peer, 2);
|
||||
assert_eq!(c.peers.max_concurrent_total, 8);
|
||||
assert_eq!(c.peers.deny_cidrs, vec!["10.0.0.0/8".to_string()]);
|
||||
assert_eq!(c.peers.peer.len(), 1);
|
||||
assert_eq!(c.peers.peer[0].name.as_str(), "beta");
|
||||
assert_eq!(c.peers.peer[0].token_file, token);
|
||||
let printed = c.to_toml_redacted().unwrap();
|
||||
assert!(printed.contains(&token.display().to_string()));
|
||||
assert!(!printed.contains("SHOULD_NOT_LEAK"));
|
||||
assert!(!format!("{c:?}").contains("SHOULD_NOT_LEAK"));
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
|
||||
/// 0600 so a later permission check accepts the file. The contents are a
|
||||
/// stand-in secret and must never show up in printed config.
|
||||
fn write_private_token(path: &std::path::Path, contents: &str) {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
std::fs::write(path, contents).unwrap();
|
||||
std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o600)).unwrap();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user