A: A2 validate peer names, URLs, token files and timeouts

This commit is contained in:
ari committed 2026-10-19 22:31:29 -04:00
1 parent 40d18c2253
commit bcac6c76e6
5 files changed
+582 -8

No files matched your search

+118 -8
View File
@@ -157,9 +157,16 @@ async fn peerless_default_is_off_and_unchanged() {
#[allow(clippy::result_large_err)] // figment::Jail closures return figment::Error
fn vm_peer_entries_load_when_enabled_and_ca_file_are_omitted() {
Jail::expect_with(|jail| {
let beta_token = jail.directory().join("peer-beta");
let gamma_token = jail.directory().join("peer-gamma");
let delta_token = jail.directory().join("peer-delta");
for path in [&beta_token, &gamma_token, &delta_token] {
write_private_token(path, "pending\n");
}
jail.create_file(
"peers.toml",
r#"
&format!(
r#"
[server]
bind = "0.0.0.0"
@@ -175,22 +182,26 @@ fn vm_peer_entries_load_when_enabled_and_ca_file_are_omitted() {
[[peers.peer]]
name = "beta"
url = "http://beta:1984"
token_file = "/run/credentials/skyg-linux-tracker.service/peer-beta"
token_file = "{beta}"
allow_plain_http = true
[[peers.peer]]
name = "gamma"
url = "https://gamma:1984"
token_file = "/run/credentials/skyg-linux-tracker.service/peer-gamma"
token_file = "{gamma}"
ca_file = "/etc/ssl/private-ca.pem"
allow_plain_http = false
[[peers.peer]]
name = "delta"
url = "https://delta:1984"
token_file = "/run/credentials/skyg-linux-tracker.service/peer-delta"
token_file = "{delta}"
enabled = false
"#,
beta = beta_token.display(),
gamma = gamma_token.display(),
delta = delta_token.display(),
),
)?;
let cfg = Config::load(Some(Path::new("peers.toml")), &CliOverrides::default())
.expect("peer entries must deserialize");
@@ -213,10 +224,7 @@ fn vm_peer_entries_load_when_enabled_and_ca_file_are_omitted() {
assert!(beta.enabled);
assert!(beta.allow_plain_http);
assert!(beta.ca_file.is_none());
assert_eq!(
beta.token_file,
PathBuf::from("/run/credentials/skyg-linux-tracker.service/peer-beta")
);
assert_eq!(beta.token_file, beta_token);
let gamma = peer("gamma");
assert!(gamma.enabled);
assert!(!gamma.allow_plain_http);
@@ -232,6 +240,108 @@ fn vm_peer_entries_load_when_enabled_and_ca_file_are_omitted() {
});
}
#[test]
#[allow(clippy::result_large_err)] // figment::Jail closures return figment::Error
fn load_rejects_invalid_peers_and_accepts_a_placeholder_token() {
Jail::expect_with(|jail| {
jail.create_file("empty-peers.toml", "[peers]\nenabled = true\n")?;
Config::load(
Some(Path::new("empty-peers.toml")),
&CliOverrides::default(),
)
.expect("enabled with zero peers is a warning, not an error");
jail.create_file(
"bad-name.toml",
"\
[peers]\n\
[[peers.peer]]\n\
name = \"Beta\"\n\
url = \"https://beta:1984\"\n\
token_file = \"/run/peers/beta\"\n\
",
)?;
let err = Config::load(Some(Path::new("bad-name.toml")), &CliOverrides::default())
.expect_err("peer name regex");
let text = err.to_string();
assert!(
text.contains("must match") || text.contains("Beta"),
"{text}"
);
jail.create_file(
"timeout.toml",
"[peers]\ntcp_interval_secs = 10\ntcp_timeout_secs = 10\n",
)?;
let err = Config::load(Some(Path::new("timeout.toml")), &CliOverrides::default())
.expect_err("timeout below interval");
assert!(err.to_string().contains("tcp_timeout_secs"), "{err}");
jail.create_file(
"userinfo.toml",
"\
[peers]\n\
[[peers.peer]]\n\
name = \"beta\"\n\
url = \"http://user:s3cret@127.0.0.1:1984\"\n\
token_file = \"/run/peers/beta\"\n\
",
)?;
let err = Config::load(Some(Path::new("userinfo.toml")), &CliOverrides::default())
.expect_err("userinfo");
let text = err.to_string();
assert!(text.contains("userinfo"), "{text}");
assert!(!text.contains("s3cret"), "{text}");
let missing = jail.directory().join("not-there");
jail.create_file(
"missing.toml",
&format!(
"\
[peers]\n\
enabled = true\n\
[[peers.peer]]\n\
name = \"beta\"\n\
url = \"https://beta:1984\"\n\
token_file = \"{}\"\n\
",
missing.display()
),
)?;
let err = Config::load(Some(Path::new("missing.toml")), &CliOverrides::default())
.expect_err("missing token file");
let text = err.to_string();
assert!(text.contains("peer beta"), "{text}");
assert!(text.contains("not readable"), "{text}");
let placeholder = jail.directory().join("placeholder");
write_private_token(&placeholder, "pending\n");
jail.create_file(
"ok.toml",
&format!(
"\
[peers]\n\
enabled = true\n\
tcp_interval_secs = 2\n\
tcp_timeout_secs = 1\n\
api_interval_secs = 3\n\
api_timeout_secs = 2\n\
[[peers.peer]]\n\
name = \"beta\"\n\
url = \"http://127.0.0.1:1984\"\n\
token_file = \"{}\"\n\
",
placeholder.display()
),
)?;
let cfg = Config::load(Some(Path::new("ok.toml")), &CliOverrides::default())
.expect("placeholder token file must load");
assert_eq!(cfg.peers.peer[0].name.as_str(), "beta");
assert!(!format!("{cfg:?}").contains("pending"));
Ok(())
});
}
#[tokio::test]
async fn ping_without_a_token_is_unauthorized() {
let pool = sqlx::sqlite::SqlitePoolOptions::new()