Do not provide {auth_authen} Milter macro unless the user is authenticated

2025-10-10 20:45:48 +08:00 · 2024-07-31 20:05:42 +02:00 · 2024-07-31 20:05:42 +02:00 · 336c4876e2
commit 336c4876e2
parent 87f9736605
1 changed files with 7 additions and 3 deletions
--- a/crates/smtp/src/inbound/milter/message.rs
+++ b/crates/smtp/src/inbound/milter/message.rs
@ -232,9 +232,13 @@ impl<T: SessionStream> Session<T> {
                .mail_from(
                    &format!("<{addr}>"),
                    None::<&[&str]>,
-                    Macros::new()
-                        .with_mail_address(addr)
-                        .with_sasl_login_name(&self.data.authenticated_as),
+                    if !self.data.authenticated_as.is_empty() {
+                        Macros::new()
+                            .with_mail_address(addr)
+                            .with_sasl_login_name(&self.data.authenticated_as)
+                    } else {
+                        Macros::new().with_mail_address(addr)
+                    },
                )
                .await?
                .assert_continue()?;