From b242398f4141a23871d378f551b1a34ee3fd76d7 Mon Sep 17 00:00:00 2001 From: John Coffey Date: Tue, 10 Nov 2026 18:18:35 -0700 Subject: [PATCH] Relayed inbound mail follows the settings in force now (#366) The relay link service built its Server once per connection, and a Server holds a snapshot of the core. Every relayed message was judged through that snapshot, so a reload after a registry write (a domain's directory and its mailbox filter, RCPT/DATA stage rules, the spam filter, sender authentication) didn't reach mail arriving through a relay until the link reconnected, usually at a restart. Mail on port 25 used the new settings at once, so the two paths disagreed. Each relayed message is now judged with a Server built from the shared core when it's taken, and the link loop refreshes its Server on every pass, so sync, events and outbound statuses see current settings too. Test: relay_link_tests lowers maxReceivedHeaders to 3 with the link up, and the next relayed message with five Received headers is refused with 450 4.4.6; set back to 50, the same message is delivered. Without the fix the first one was accepted (250). Fixes #366 --- crates/services/src/inbuxa_relay_link.rs | 11 +++++-- tests/src/system/relay.rs | 38 ++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/crates/services/src/inbuxa_relay_link.rs b/crates/services/src/inbuxa_relay_link.rs index 291dfa50..6cb11367 100644 --- a/crates/services/src/inbuxa_relay_link.rs +++ b/crates/services/src/inbuxa_relay_link.rs @@ -985,7 +985,7 @@ struct Sent { /// The relay linked: kept up to date until the link drops, the relay is /// turned off, moved or joined again, or this node stops. async fn session( - server: &Server, + link_server: &Server, instance: &Arc, relay: &Relay, keys: &DownstreamKeys, @@ -993,6 +993,7 @@ async fn session( woken: &mut watch::Receiver, status: &mut StatusWriter, ) -> Result<(), LinkError> { + let server = link_server; let data = server.store(); let pin = relay.join.relay_pin; let dialer = Arc::new(Dialer::new(relay, cert, pin)?); @@ -1044,6 +1045,10 @@ async fn session( ping.set_missed_tick_behavior(MissedTickBehavior::Delay); ping.reset(); loop { + // inbuxa: #366: each pass sees the settings in force now; a reload + // swaps the shared core while the link stays up + let current = link_server.inner.build_server(); + let server = ¤t; tokio::select! { frame = ws.frame() => { let frame = frame?; @@ -1548,8 +1553,10 @@ impl Taker { { continue; } + // inbuxa: #366: the settings in force now, not when the link + // connected: a reload swaps the shared core under a live link let job = Job { - server: self.server.clone(), + server: self.server.inner.build_server(), instance: self.instance.clone(), dialer: self.dialer.clone(), relay_id: self.relay_id, diff --git a/tests/src/system/relay.rs b/tests/src/system/relay.rs index 61724531..f382c043 100644 --- a/tests/src/system/relay.rs +++ b/tests/src/system/relay.rs @@ -35,8 +35,9 @@ use registry::{ prelude::{ObjectType, Property}, structs::{ Certificate, CertificateManagement, DkimManagement, DnsManagement, Domain, Expression, - ExpressionMatch, MtaOutboundStrategy, MtaRoute, MtaRouteInbuxaRelay, PublicText, - PublicTextValue, SecretText, SecretTextValue, Tenant, TlsInternalReport, UserRoles, + ExpressionMatch, MtaOutboundStrategy, MtaRoute, MtaRouteInbuxaRelay, MtaStageData, + PublicText, PublicTextValue, SecretText, SecretTextValue, Tenant, TlsInternalReport, + UserRoles, }, }, types::{datetime::UTCDateTime, map::Map}, @@ -1070,6 +1071,39 @@ pub async fn link(test: &mut TestServer) { assert!(reply.starts_with("250"), "{reply}"); wait_for_mail(&jane, "Live one", 1).await; + // #366: a setting changed while the link is up applies to the next + // relayed message, without the link reconnecting + let max_hops = |hops: &str| MtaStageData { + max_received_headers: Expression { + else_: hops.into(), + ..Default::default() + }, + ..Default::default() + }; + admin + .registry_update_setting(max_hops("3"), &[Property::MaxReceivedHeaders]) + .await; + let five_hops = + "Received: from a.example by b.example; Thu, 29 Oct 2026 10:00:00 +0000\n".repeat(5); + let reply = send_mail( + smtp_port, + "jane@example.com", + &message("Five hops", &five_hops), + ) + .await; + assert!(reply.starts_with("450 4.4.6"), "#366: {reply}"); + admin + .registry_update_setting(max_hops("50"), &[Property::MaxReceivedHeaders]) + .await; + let reply = send_mail( + smtp_port, + "jane@example.com", + &message("Five hops again", &five_hops), + ) + .await; + assert!(reply.starts_with("250"), "#366: {reply}"); + wait_for_mail(&jane, "Five hops again", 1).await; + // Live: this server's refusal is the sender's reply, and the relay // keeps nothing let loop_headers = -- 2.54.0