cqrenet/relay
6
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-09-13 02:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Improve address extraction from SMTP commands (#14)

Browse Source 
Prevents extraction failing on SRS.

Fixes: #9

Signed-off-by: Jagoda Ślązak <jslazak@jslazak.com>
This commit is contained in:
Jagoda Estera Ślązak
2026-08-18 12:21:27 +02:00
committed by missytake
parent 2350cbabeb
commit 6f5dd21c8e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filtermail/src/utils.rs
+6 -9
View File
@@ -7,20 +7,15 @@ use std::error::Error;
/// ///
/// Returns the first address if multiple are present. /// Returns the first address if multiple are present.
pub fn extract_address(input: &str) -> Option<String> { pub fn extract_address(input: &str) -> Option<String> {
// TODO: at this point it's probably simpler to use regex ;p
let input_lower = input.to_lowercase(); let input_lower = input.to_lowercase();
let mut trimmed = input_lower let mut trimmed = input_lower
.trim_start_matches("mail from:") .trim_start_matches("mail from:")
.trim_start_matches("rcpt to:"); .trim_start_matches("rcpt to:");
let addr_end = trimmed.find('>').unwrap_or(trimmed.len() - 1);
trimmed = trimmed trimmed = trimmed
.split_once("=") .split_at_checked(addr_end + 1)
.map(|(address_raw, _)| { .map(|(address_raw, _)| address_raw)
address_raw
.rsplit_once(' ')
.map(|(addr, _)| addr)
.unwrap_or(address_raw)
.trim()
})
.unwrap_or(trimmed); .unwrap_or(trimmed);
mailparse::addrparse(trimmed) mailparse::addrparse(trimmed)
@@ -63,6 +58,8 @@ mod tests {
#[rstest] #[rstest]
#[case("MAIL FROM:<t1@example.org>", Some("t1@example.org".to_string()))] #[case("MAIL FROM:<t1@example.org>", Some("t1@example.org".to_string()))]
#[case("MAIL FROM:<t2@example.org> SOMETHING=SOMETHING OTHER=OTHER", Some("t2@example.org".to_string()))] #[case("MAIL FROM:<t2@example.org> SOMETHING=SOMETHING OTHER=OTHER", Some("t2@example.org".to_string()))]
#[case("MAIL FROM:<SRS1=HHH=example.com==HHH=TT=example.org=alice@example.net> abc=def", Some("srs1=hhh=example.com==hhh=tt=example.org=alice@example.net".to_string()))]
#[case("MAIL FROM:<abc+alice@example.net> abc=def", Some("abc+alice@example.net".to_string()))]
#[case("RCPT TO:<t3@example.org>", Some("t3@example.org".to_string()))] #[case("RCPT TO:<t3@example.org>", Some("t3@example.org".to_string()))]
#[case("mail from:<t4@example.org>", Some("t4@example.org".to_string()))] #[case("mail from:<t4@example.org>", Some("t4@example.org".to_string()))]
#[case("Foo Bar <t5@example.org>", Some("t5@example.org".to_string()))] #[case("Foo Bar <t5@example.org>", Some("t5@example.org".to_string()))]