mirror/kumomta
1
0
Fork 0
mirror of https://github.com/mailscope/kumomta.git synced 2026-09-09 03:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

mailparse: fix FIXME for obs_phrase

Browse Source
This commit is contained in:
Wez Furlong
2023-08-13 22:10:13 -07:00
parent f2d086c997
commit f100b6f15a
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/mailparsing/src/rfc5322.pest
+1 -1
View File
@@ -57,7 +57,7 @@ obs_qp = { "\\" ~ ( "\u{00}" | obs_no_ws_ctl | "\r" | "\n") }
word = { atom | quoted_string }
phrase = { (encoded_word | word)+ | obs_phrase }
obs_phrase = { (encoded_word | word) ~ (encoded_word | word | "." | cfws)* }
obs_phrase = { (encoded_word | word) ~ (encoded_word | word | dot | cfws)* }
unstructured = {
// This rule always matches; since obs_unstruct is a superset,
crates/mailparsing/src/rfc5322_parser.rs
+34 -2
View File
@@ -575,10 +575,42 @@ impl Parser {
match p.as_rule() {
Rule::word => words.push(Self::parse_word(p)?),
Rule::encoded_word => words.push(Self::parse_encoded_word(p)?),
// FIXME: obs_phrase
Rule::obs_phrase => {
words.append(&mut Self::parse_obs_phrase(p)?);
}
rule => {
return Err(MailParsingError::HeaderParse(format!(
"Unhandled {rule:?} in parse_phrase"
"Unexpected {rule:?} in parse_phrase"
)))
}
}
}
Ok(words)
}
fn parse_obs_phrase(pair: Pair<Rule>) -> Result<Vec<String>> {
let mut words = vec![];
let mut current_word = String::new();
for p in pair.into_inner() {
match p.as_rule() {
Rule::word => {
current_word += &Self::parse_word(p)?;
}
Rule::encoded_word => {
current_word += &Self::parse_encoded_word(p)?;
}
Rule::dot => {
current_word.push('.');
}
Rule::cfws => {
if !current_word.is_empty() {
words.push(current_word.clone());
current_word.clear();
}
}
rule => {
return Err(MailParsingError::HeaderParse(format!(
"Unexpected {rule:?} in parse_obs_phrase"
)))
}
}