Allow catch-all addresses when validating must match sender

stalwartlabs · Apr 28, 2024 · a93c792 · a93c792 · moeffju · Apr 28, 2024
1 parent 20a74e7
commit a93c792
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/crates/smtp/src/inbound/mail.rs b/crates/smtp/src/inbound/mail.rs
@@ -109,7 +109,9 @@ impl<T: SessionStream> Session<T> {
         if !self.data.authenticated_as.is_empty()
             && self.params.auth_match_sender
             && (self.data.authenticated_as != address_lcase
-                && !self.data.authenticated_emails.contains(&address_lcase))
+                && !self.data.authenticated_emails.iter().any(|e| {
+                    e == &address_lcase || (e.starts_with('@') && address_lcase.ends_with(e))
+                }))
         {
             return self
                 .write(b"501 5.5.4 You are not allowed to send from this address.\r\n")