From f9911f6c70ce0d2581943d4068e70ec7b853147f Mon Sep 17 00:00:00 2001 From: ari Date: Tue, 20 Oct 2026 16:24:44 -0400 Subject: [PATCH] H: warn once about plain http Validation runs at startup and on every reload, so the transport no longer repeats the warning per peer on its first request; the helper is named for the peer it reports. --- src/peers/client.rs | 19 ++----------------- src/peers/config.rs | 11 +++++++---- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/peers/client.rs b/src/peers/client.rs index d7aa816..002f4e9 100644 --- a/src/peers/client.rs +++ b/src/peers/client.rs @@ -5,7 +5,7 @@ //! client's provider choice is left alone. Redirects stay off: a peer URL is //! the only address we will talk to. -use std::collections::{HashMap, HashSet}; +use std::collections::HashMap; use std::net::{IpAddr, SocketAddr}; use std::path::Path; use std::pin::Pin; @@ -25,7 +25,7 @@ use rustls::{ClientConfig, RootCertStore}; use tokio::sync::{OwnedSemaphorePermit, Semaphore}; use crate::config::ConfigError; -use crate::peers::config::{denied, deny_networks, plain_http_allowed, plain_http_off_loopback}; +use crate::peers::config::{denied, deny_networks, plain_http_allowed}; use crate::peers::error::{PeerConfigError, PeerError}; use crate::peers::secrets::load_token; use crate::peers::transport::{PeerBody, PeerRequest, PeerResponse, PeerTransport}; @@ -75,7 +75,6 @@ struct Permits { pub struct ReqwestTransport { limits: Mutex, clients: Mutex>, - plain_warned: Mutex>, } impl ReqwestTransport { @@ -100,7 +99,6 @@ impl ReqwestTransport { deny, }), clients: Mutex::new(HashMap::new()), - plain_warned: Mutex::new(HashSet::new()), }) } @@ -161,18 +159,6 @@ impl ReqwestTransport { cache.insert(key, client.clone()); Ok(client) } - - /// The request happens on every check and proxy call, so the warning is - /// repeated once per peer rather than once per request. - fn warn_plain_http(&self, peer: &PeerConfig) { - if !plain_http_off_loopback(peer) { - return; - } - let mut seen = Self::lock(&self.plain_warned); - if seen.insert(peer.name.clone()) { - crate::peers::config::warn_plain_http(peer); - } - } } /// Rules that must hold before resolving anything. The same rules are @@ -500,7 +486,6 @@ impl PeerTransport for ReqwestTransport { let url = request_url(peer, &req)?; let deny = self.deny_list(); let (pin, addrs) = resolve_target(peer, &deny).await?; - self.warn_plain_http(peer); let owned = peer.clone(); let secret = tokio::task::spawn_blocking(move || load_token(&owned)) .await diff --git a/src/peers/config.rs b/src/peers/config.rs index 34a55ed..a1da151 100644 --- a/src/peers/config.rs +++ b/src/peers/config.rs @@ -113,9 +113,10 @@ pub(crate) fn plain_http_off_loopback(peer: &PeerConfig) -> bool { peer.url.scheme() == "http" && !url_is_loopback(&peer.url) } -/// One wording for the warning, whether it comes from config validation or -/// from the transport. -pub(crate) fn warn_plain_http(peer: &PeerConfig) { +/// Warn once per accepted peer. Every peer set passes through validation +/// before the registry uses it (startup and reload alike), so the transport +/// does not warn again: that would double the line per peer. +pub(crate) fn warn_plain_http_peer(peer: &PeerConfig) { tracing::warn!( peer = %peer.name, "plain http to a non-loopback host; the bearer token travels in cleartext" @@ -218,7 +219,7 @@ fn validate_url( ))); } if section_enabled && peer.enabled { - warn_plain_http(peer); + warn_plain_http_peer(peer); } } Ok(()) @@ -376,6 +377,8 @@ mod tests { assert!(logs.contains("cleartext"), "{logs}"); assert!(logs.contains("beta"), "{logs}"); assert!(!logs.contains("10.1.2.3"), "{logs}"); + // Once per accepted peer set; the transport does not warn again. + assert_eq!(logs.matches("cleartext").count(), 1, "{logs}"); } #[test]