mirror/kumomta
1
0
Fork 0
mirror of https://github.com/mailscope/kumomta.git synced 2026-10-27 08:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resend EHLO after STARTTLS

Browse Source 
Fixes https://github.com/KumoCorp/kumomta/issues/61

RFC 3207 suggests clients MUST forget the EHLO capabilities obtained prior to STARTTLS, and SHOULD re-send an EHLO after TLS negotiation completes (https://datatracker.ietf.org/doc/html/rfc3207#section-4.2). Some SMTP servers seem to _require_ an EHLO after STARTTLS so this ensures we send one.
This commit is contained in:
Ben Dyer
2023-06-16 07:49:05 -07:00
committed by Wez Furlong
parent 4cf2e65c94
commit 97d67fbb7f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/kumod/src/smtp_dispatcher.rs
+4 -2
View File
@@ -194,10 +194,10 @@ impl QueueDispatcher for SmtpDispatcher {
.with_context(|| connect_context.clone())?;
// Say EHLO
let caps = client.ehlo(&ehlo_name).await.context("EHLO")?;
let pretls_caps = client.ehlo(&ehlo_name).await.context("EHLO")?;
// Use STARTTLS if available.
let has_tls = caps.contains_key("STARTTLS");
let has_tls = pretls_caps.contains_key("STARTTLS");
let tls_enabled = match (enable_tls, has_tls) {
(Tls::Required | Tls::RequiredInsecure, false) => {
anyhow::bail!("tls policy is {enable_tls:?} but STARTTLS is not advertised",);
@@ -216,6 +216,8 @@ impl QueueDispatcher for SmtpDispatcher {
if let Some(handshake_error) = client.starttls(enable_tls.allow_insecure()).await? {
client.send_command(&rfc5321::Command::Quit).await.ok();
anyhow::bail!("TLS handshake failed: {handshake_error}");
} else {
client.ehlo(&ehlo_name).await.context("EHLO")?;
}
true
}