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.
This commit is contained in:
ari committed 2026-10-20 16:24:44 -04:00
1 parent a09c64de9a
commit f9911f6c70
2 files changed
+9 -21

No files matched your search

+2 -17
View File
@@ -5,7 +5,7 @@
//! client's provider choice is left alone. Redirects stay off: a peer URL is //! client's provider choice is left alone. Redirects stay off: a peer URL is
//! the only address we will talk to. //! the only address we will talk to.
use std::collections::{HashMap, HashSet}; use std::collections::HashMap;
use std::net::{IpAddr, SocketAddr}; use std::net::{IpAddr, SocketAddr};
use std::path::Path; use std::path::Path;
use std::pin::Pin; use std::pin::Pin;
@@ -25,7 +25,7 @@ use rustls::{ClientConfig, RootCertStore};
use tokio::sync::{OwnedSemaphorePermit, Semaphore}; use tokio::sync::{OwnedSemaphorePermit, Semaphore};
use crate::config::ConfigError; 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::error::{PeerConfigError, PeerError};
use crate::peers::secrets::load_token; use crate::peers::secrets::load_token;
use crate::peers::transport::{PeerBody, PeerRequest, PeerResponse, PeerTransport}; use crate::peers::transport::{PeerBody, PeerRequest, PeerResponse, PeerTransport};
@@ -75,7 +75,6 @@ struct Permits {
pub struct ReqwestTransport { pub struct ReqwestTransport {
limits: Mutex<Limits>, limits: Mutex<Limits>,
clients: Mutex<HashMap<ClientKey, reqwest::Client>>, clients: Mutex<HashMap<ClientKey, reqwest::Client>>,
plain_warned: Mutex<HashSet<PeerName>>,
} }
impl ReqwestTransport { impl ReqwestTransport {
@@ -100,7 +99,6 @@ impl ReqwestTransport {
deny, deny,
}), }),
clients: Mutex::new(HashMap::new()), clients: Mutex::new(HashMap::new()),
plain_warned: Mutex::new(HashSet::new()),
}) })
} }
@@ -161,18 +159,6 @@ impl ReqwestTransport {
cache.insert(key, client.clone()); cache.insert(key, client.clone());
Ok(client) 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 /// 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 url = request_url(peer, &req)?;
let deny = self.deny_list(); let deny = self.deny_list();
let (pin, addrs) = resolve_target(peer, &deny).await?; let (pin, addrs) = resolve_target(peer, &deny).await?;
self.warn_plain_http(peer);
let owned = peer.clone(); let owned = peer.clone();
let secret = tokio::task::spawn_blocking(move || load_token(&owned)) let secret = tokio::task::spawn_blocking(move || load_token(&owned))
.await .await
+7 -4
View File
@@ -113,9 +113,10 @@ pub(crate) fn plain_http_off_loopback(peer: &PeerConfig) -> bool {
peer.url.scheme() == "http" && !url_is_loopback(&peer.url) peer.url.scheme() == "http" && !url_is_loopback(&peer.url)
} }
/// One wording for the warning, whether it comes from config validation or /// Warn once per accepted peer. Every peer set passes through validation
/// from the transport. /// before the registry uses it (startup and reload alike), so the transport
pub(crate) fn warn_plain_http(peer: &PeerConfig) { /// does not warn again: that would double the line per peer.
pub(crate) fn warn_plain_http_peer(peer: &PeerConfig) {
tracing::warn!( tracing::warn!(
peer = %peer.name, peer = %peer.name,
"plain http to a non-loopback host; the bearer token travels in cleartext" "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 { if section_enabled && peer.enabled {
warn_plain_http(peer); warn_plain_http_peer(peer);
} }
} }
Ok(()) Ok(())
@@ -376,6 +377,8 @@ mod tests {
assert!(logs.contains("cleartext"), "{logs}"); assert!(logs.contains("cleartext"), "{logs}");
assert!(logs.contains("beta"), "{logs}"); assert!(logs.contains("beta"), "{logs}");
assert!(!logs.contains("10.1.2.3"), "{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] #[test]