Relayed inbound mail follows the settings in force now (#366) #367
No files matched your search
@@ -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<ServerInstance>,
|
||||
relay: &Relay,
|
||||
keys: &DownstreamKeys,
|
||||
@@ -993,6 +993,7 @@ async fn session(
|
||||
woken: &mut watch::Receiver<u64>,
|
||||
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,
|
||||
|
||||
@@ -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,
|
||||
"[email protected]",
|
||||
&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,
|
||||
"[email protected]",
|
||||
&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 =
|
||||
|
||||
Reference in new issue
Block a user