From 6e74d3d99b56cad8d0c3cd1d7ff35fd44e1f620c Mon Sep 17 00:00:00 2001 From: ari Date: Tue, 20 Oct 2026 16:12:07 -0400 Subject: [PATCH] H: canonicalise addresses in the deny check Match IPv4-mapped IPv6 addresses against the IPv4 deny list at connect time, with tests for ::ffff:169.254.169.254 --- src/peers/client.rs | 22 ++++++++++++++++++++++ src/peers/config.rs | 6 ++++++ 2 files changed, 28 insertions(+) diff --git a/src/peers/client.rs b/src/peers/client.rs index 45147a2..d7aa816 100644 --- a/src/peers/client.rs +++ b/src/peers/client.rs @@ -1075,6 +1075,28 @@ mod tests { let _ = std::fs::remove_file(&token); } + /// An IPv4-mapped literal resolves to a socket address in the IPv6 family. + /// Without canonicalising it the IPv4 deny list would miss it and the + /// metadata endpoint would be contacted. + #[tokio::test] + async fn an_ipv4_mapped_address_is_matched_against_the_v4_deny_list() { + let token = write_token("t", 0o600); + let mut p = peer(80, &token, None); + p.url = url("http://[::ffff:169.254.169.254]/"); + p.allow_plain_http = true; + let deny = deny_networks(&PeersConfig::default().deny_cidrs).unwrap(); + assert!(matches!( + resolve_target(&p, &deny).await, + Err(PeerError::Unreachable) + )); + let transport = ReqwestTransport::new(&PeersConfig::default()).unwrap(); + assert!(matches!( + transport.tcp_check(&p, Duration::from_secs(1)).await, + Err(PeerError::Unreachable) + )); + let _ = std::fs::remove_file(&token); + } + #[test] fn invalid_deny_cidr_and_plain_http_opt_in() { let mut cfg = limits(2, 2, 1024); diff --git a/src/peers/config.rs b/src/peers/config.rs index 57a6556..0fba74c 100644 --- a/src/peers/config.rs +++ b/src/peers/config.rs @@ -409,6 +409,12 @@ mod tests { let err = message(validate(&cfg).unwrap_err()); assert!(err.contains("deny_cidrs"), "{err}"); + // The address form the connector sees is matched the same way. + let deny = deny_networks(&cfg.deny_cidrs).unwrap(); + assert!(denied("::ffff:169.254.169.254".parse().unwrap(), &deny)); + assert!(denied("169.254.169.254".parse().unwrap(), &deny)); + assert!(!denied("::ffff:10.0.0.1".parse().unwrap(), &deny)); + // Same for loopback: a mapped literal is loopback, so plain http is // allowed without the flag. let cfg = disabled_section(vec![peer("beta", "http://[::ffff:127.0.0.1]:1984")]);